From 405f565df843e0bb1be1f8aec222959c260923cf Mon Sep 17 00:00:00 2001 From: Ryan Niebur Date: Wed, 23 Oct 2013 20:26:27 -0700 Subject: [PATCH] Imported Upstream version 0.4.3+dfsg --- .gitignore | 2 +- ChangeLog | 129 - INSTALL | 23 +- README | 16 +- configure | 2 +- data/about.css | 70 - data/autosuggestcontrol.js | 10 +- data/error.html | 60 +- data/faq.css | 61 +- data/faq.html | 495 +- data/gtk3.css | 28 - data/midori.desktop.in | 9 +- data/speeddial-head.html | 176 +- docs/api/wscript_build | 18 +- extensions/adblock.c | 684 +- extensions/addons.c | 59 +- extensions/colorful-tabs.c | 5 +- .../cookie-manager/cookie-manager-page.c | 43 +- extensions/delayed-load.vala | 231 - extensions/external-download-manager.vala | 314 - extensions/feed-panel/feed-panel.c | 3 +- extensions/formhistory.c | 600 ++ extensions/formhistory/formhistory-frontend.h | 74 - .../formhistory/formhistory-gdom-frontend.c | 516 -- .../formhistory/formhistory-js-frontend.c | 143 - extensions/formhistory/formhistory.c | 681 -- extensions/history-list.vala | 17 +- extensions/shortcuts.c | 2 + extensions/statusbar-features.c | 158 +- extensions/tab-panel.c | 13 +- extensions/toolbar-editor.c | 30 +- extensions/web-cache.c | 3 +- extensions/wscript_build | 9 +- ...internet-news-reader.png => news-feed.png} | Bin ...internet-news-reader.png => news-feed.png} | Bin ...internet-news-reader.svg => news-feed.svg} | 0 icons/wscript_build | 2 +- katze/gtk3-compat.c | 65 +- katze/gtk3-compat.h | 45 +- katze/katze-array.c | 89 +- katze/katze-arrayaction.c | 114 +- katze/katze-http-cookies-sqlite.c | 154 +- katze/katze-http-cookies.c | 6 +- katze/katze-item.c | 88 +- katze/katze-item.h | 9 +- katze/katze-net.c | 47 +- katze/katze-net.h | 2 + katze/katze-preferences.c | 25 +- katze/katze-throbber.c | 17 +- katze/katze-utils.c | 117 +- katze/katze-utils.h | 21 - katze/katze.vapi | 25 - katze/midori-hsts.vala | 143 - katze/midori-paths.vala | 244 - katze/midori-uri.vala | 63 +- midori/gtkiconentry.c | 1914 ++++++ midori/gtkiconentry.h | 93 +- midori/main.c | 992 +-- midori/marshal.list | 1 - midori/midori-app.c | 296 +- midori/midori-app.h | 13 +- midori/midori-array.c | 77 +- midori/midori-array.h | 7 - midori/midori-bookmarks.c | 335 - midori/midori-bookmarks.h | 32 - midori/midori-browser.c | 2351 +++---- midori/midori-browser.h | 12 - midori/midori-download.vala | 320 - midori/midori-extension.c | 75 +- midori/midori-locationaction.c | 817 +-- midori/midori-panedaction.c | 227 + midori/midori-panedaction.h | 70 + midori/midori-panedaction.vala | 79 - midori/midori-panel.c | 112 +- midori/midori-panel.h | 6 +- midori/midori-platform.h | 14 +- midori/midori-preferences.c | 80 +- midori/midori-searchaction.c | 238 +- midori/midori-searchaction.h | 10 - midori/midori-settings.vala | 109 - midori/midori-speeddial.vala | 401 -- midori/midori-stock.h | 44 +- midori/midori-view.c | 2384 +++---- midori/midori-view.h | 55 +- midori/midori-viewable.c | 163 + midori/midori-viewable.h | 61 + midori/midori-viewable.vala | 23 - midori/midori-websettings.c | 1302 +++- midori/midori-websettings.h | 38 +- midori/midori.h | 2 +- midori/midori.vapi | 71 +- midori/socket.c | 223 + midori/socket.h | 20 + midori/sokoke.c | 917 ++- midori/sokoke.h | 92 +- midori/wscript_build | 23 +- panels/midori-bookmarks.c | 267 +- panels/midori-bookmarks.h | 18 +- panels/midori-extensions.c | 17 +- panels/midori-history.c | 114 +- panels/midori-transfers.c | 82 +- panels/midori-transfers.h | 6 +- po/POTFILES.in | 9 +- po/ar.po | 2319 +++---- po/ast.po | 34 +- po/be.po | 3274 ---------- po/ca.po | 2297 ++++--- po/cs.po | 2839 ++++---- po/da.po | 1654 ++--- po/de.po | 2758 ++++---- po/el.po | 1935 +++--- po/en_GB.po | 2709 ++++---- po/eo.po | 2793 -------- po/es.po | 2851 ++++---- po/et.po | 22 +- po/eu.po | 2958 --------- po/fi.po | 38 +- po/fr.po | 2488 +++---- po/gl.po | 2046 +++--- po/he.po | 1868 +++--- po/hr.po | 1654 ++--- po/hu.po | 2719 ++++---- po/id.po | 3055 ++++----- po/it.po | 3172 ++++----- po/ja.po | 2838 ++++---- po/ko.po | 2929 +++++---- po/lt.po | 2712 ++++---- po/nl.po | 2658 ++++---- po/no.po | 28 +- po/pa.po | 32 +- po/pl.po | 1705 +++-- po/pt.po | 2814 ++++---- po/pt_BR.po | 2754 ++++---- po/ro.po | 1662 ++--- po/ru.po | 2231 +++---- po/sk.po | 1380 ++-- po/sr.po | 3276 +++++----- po/sr@latin.po | 16 +- po/sv.po | 38 +- po/tr.po | 2150 +++--- po/ug.po | 5785 ++++++++--------- po/uk.po | 2668 ++++---- po/zh_CN.po | 1615 +++-- po/zh_TW.po | 1815 +++--- tests/bookmarks.c | 208 - tests/browser.c | 64 +- tests/download.vala | 58 - tests/extensions.c | 26 +- tests/hsts.vala | 31 - tests/magic-uri.c | 117 +- tests/properties.c | 119 +- tests/searchaction.vala | 46 - tests/speeddial.vala | 92 - tests/wscript_build | 16 +- toolbars/midori-findbar.c | 96 +- toolbars/midori-findbar.h | 7 +- toolbars/midori-transferbar.c | 176 +- tools/midori-dev | 2 +- waf | Bin 92452 -> 0 bytes waf-modules/wafadmin/3rdparty/boost.py | 225 + waf-modules/wafadmin/3rdparty/fluid.py | 17 + waf-modules/wafadmin/Build.py | 676 ++ waf-modules/wafadmin/Configure.py | 316 + waf-modules/wafadmin/Constants.py | 47 + waf-modules/wafadmin/Environment.py | 158 + waf-modules/wafadmin/Logs.py | 97 + waf-modules/wafadmin/Node.py | 496 ++ waf-modules/wafadmin/Options.py | 158 + waf-modules/wafadmin/Runner.py | 165 + waf-modules/wafadmin/Scripting.py | 414 ++ waf-modules/wafadmin/Task.py | 780 +++ waf-modules/wafadmin/TaskGen.py | 346 + waf-modules/wafadmin/Tools/__init__.py | 4 + waf-modules/wafadmin/Tools/ar.py | 26 + waf-modules/wafadmin/Tools/bison.py | 26 + waf-modules/wafadmin/Tools/cc.py | 70 + waf-modules/wafadmin/Tools/ccroot.py | 397 ++ waf-modules/wafadmin/Tools/compiler_cc.py | 43 + waf-modules/wafadmin/Tools/compiler_cxx.py | 43 + waf-modules/wafadmin/Tools/compiler_d.py | 25 + waf-modules/wafadmin/Tools/config_c.py | 532 ++ waf-modules/wafadmin/Tools/cs.py | 44 + waf-modules/wafadmin/Tools/cxx.py | 71 + waf-modules/wafadmin/Tools/d.py | 368 ++ waf-modules/wafadmin/Tools/dbus.py | 24 + waf-modules/wafadmin/Tools/dmd.py | 44 + waf-modules/wafadmin/Tools/flex.py | 12 + waf-modules/wafadmin/Tools/gas.py | 27 + waf-modules/wafadmin/Tools/gcc.py | 93 + waf-modules/wafadmin/Tools/gdc.py | 36 + waf-modules/wafadmin/Tools/glib2.py | 83 + waf-modules/wafadmin/Tools/gnome.py | 163 + waf-modules/wafadmin/Tools/gnu_dirs.py | 63 + waf-modules/wafadmin/Tools/gob2.py | 10 + waf-modules/wafadmin/Tools/gxx.py | 93 + waf-modules/wafadmin/Tools/icc.py | 32 + waf-modules/wafadmin/Tools/icpc.py | 31 + waf-modules/wafadmin/Tools/intltool.py | 95 + waf-modules/wafadmin/Tools/javaw.py | 162 + waf-modules/wafadmin/Tools/kde4.py | 57 + waf-modules/wafadmin/Tools/libtool.py | 239 + waf-modules/wafadmin/Tools/lua.py | 13 + waf-modules/wafadmin/Tools/misc.py | 302 + waf-modules/wafadmin/Tools/msvc.py | 586 ++ waf-modules/wafadmin/Tools/nasm.py | 31 + waf-modules/wafadmin/Tools/ocaml.py | 225 + waf-modules/wafadmin/Tools/osx.py | 138 + waf-modules/wafadmin/Tools/perl.py | 69 + waf-modules/wafadmin/Tools/preproc.py | 616 ++ waf-modules/wafadmin/Tools/python.py | 278 + waf-modules/wafadmin/Tools/qt4.py | 376 ++ waf-modules/wafadmin/Tools/ruby.py | 88 + waf-modules/wafadmin/Tools/suncc.py | 56 + waf-modules/wafadmin/Tools/suncxx.py | 56 + waf-modules/wafadmin/Tools/tex.py | 183 + waf-modules/wafadmin/Tools/unittestw.py | 211 + waf-modules/wafadmin/Tools/vala.py | 235 + waf-modules/wafadmin/Tools/winres.py | 32 + waf-modules/wafadmin/Tools/xlc.py | 58 + waf-modules/wafadmin/Tools/xlcxx.py | 58 + waf-modules/wafadmin/Utils.py | 532 ++ waf-modules/wafadmin/__init__.py | 4 + waf-modules/wafadmin/ansiterm.py | 158 + waf-modules/wafadmin/pproc.py | 496 ++ waf-modules/wafadmin/py3kfixes.py | 104 + waf-unpacked | 159 + win32/makedist/makedist.midori | 178 +- win32/makedist/midori-0.3.3.nsi | 299 +- win32/x86-mingw32-opensuse/install.sh | 2 +- wscript | 109 +- 230 files changed, 58280 insertions(+), 62399 deletions(-) delete mode 100644 data/about.css delete mode 100644 data/gtk3.css delete mode 100644 extensions/delayed-load.vala delete mode 100644 extensions/external-download-manager.vala create mode 100644 extensions/formhistory.c delete mode 100644 extensions/formhistory/formhistory-frontend.h delete mode 100644 extensions/formhistory/formhistory-gdom-frontend.c delete mode 100644 extensions/formhistory/formhistory-js-frontend.c delete mode 100644 extensions/formhistory/formhistory.c rename icons/16x16/{internet-news-reader.png => news-feed.png} (100%) rename icons/22x22/{internet-news-reader.png => news-feed.png} (100%) rename icons/scalable/{internet-news-reader.svg => news-feed.svg} (100%) delete mode 100644 katze/katze.vapi delete mode 100644 katze/midori-hsts.vala delete mode 100644 katze/midori-paths.vala delete mode 100644 midori/midori-bookmarks.c delete mode 100644 midori/midori-bookmarks.h delete mode 100644 midori/midori-download.vala create mode 100644 midori/midori-panedaction.c create mode 100644 midori/midori-panedaction.h delete mode 100644 midori/midori-panedaction.vala delete mode 100644 midori/midori-settings.vala delete mode 100644 midori/midori-speeddial.vala create mode 100644 midori/midori-viewable.c create mode 100644 midori/midori-viewable.h delete mode 100644 midori/midori-viewable.vala delete mode 100644 po/be.po delete mode 100644 po/eo.po delete mode 100644 po/eu.po delete mode 100644 tests/bookmarks.c delete mode 100644 tests/download.vala delete mode 100644 tests/hsts.vala delete mode 100644 tests/searchaction.vala delete mode 100644 tests/speeddial.vala delete mode 100755 waf create mode 100644 waf-modules/wafadmin/3rdparty/boost.py create mode 100644 waf-modules/wafadmin/3rdparty/fluid.py create mode 100644 waf-modules/wafadmin/Build.py create mode 100644 waf-modules/wafadmin/Configure.py create mode 100644 waf-modules/wafadmin/Constants.py create mode 100644 waf-modules/wafadmin/Environment.py create mode 100644 waf-modules/wafadmin/Logs.py create mode 100644 waf-modules/wafadmin/Node.py create mode 100644 waf-modules/wafadmin/Options.py create mode 100644 waf-modules/wafadmin/Runner.py create mode 100644 waf-modules/wafadmin/Scripting.py create mode 100644 waf-modules/wafadmin/Task.py create mode 100644 waf-modules/wafadmin/TaskGen.py create mode 100644 waf-modules/wafadmin/Tools/__init__.py create mode 100644 waf-modules/wafadmin/Tools/ar.py create mode 100644 waf-modules/wafadmin/Tools/bison.py create mode 100644 waf-modules/wafadmin/Tools/cc.py create mode 100644 waf-modules/wafadmin/Tools/ccroot.py create mode 100644 waf-modules/wafadmin/Tools/compiler_cc.py create mode 100644 waf-modules/wafadmin/Tools/compiler_cxx.py create mode 100644 waf-modules/wafadmin/Tools/compiler_d.py create mode 100644 waf-modules/wafadmin/Tools/config_c.py create mode 100644 waf-modules/wafadmin/Tools/cs.py create mode 100644 waf-modules/wafadmin/Tools/cxx.py create mode 100644 waf-modules/wafadmin/Tools/d.py create mode 100644 waf-modules/wafadmin/Tools/dbus.py create mode 100644 waf-modules/wafadmin/Tools/dmd.py create mode 100644 waf-modules/wafadmin/Tools/flex.py create mode 100644 waf-modules/wafadmin/Tools/gas.py create mode 100644 waf-modules/wafadmin/Tools/gcc.py create mode 100644 waf-modules/wafadmin/Tools/gdc.py create mode 100644 waf-modules/wafadmin/Tools/glib2.py create mode 100644 waf-modules/wafadmin/Tools/gnome.py create mode 100644 waf-modules/wafadmin/Tools/gnu_dirs.py create mode 100644 waf-modules/wafadmin/Tools/gob2.py create mode 100644 waf-modules/wafadmin/Tools/gxx.py create mode 100644 waf-modules/wafadmin/Tools/icc.py create mode 100644 waf-modules/wafadmin/Tools/icpc.py create mode 100644 waf-modules/wafadmin/Tools/intltool.py create mode 100644 waf-modules/wafadmin/Tools/javaw.py create mode 100644 waf-modules/wafadmin/Tools/kde4.py create mode 100644 waf-modules/wafadmin/Tools/libtool.py create mode 100644 waf-modules/wafadmin/Tools/lua.py create mode 100644 waf-modules/wafadmin/Tools/misc.py create mode 100644 waf-modules/wafadmin/Tools/msvc.py create mode 100644 waf-modules/wafadmin/Tools/nasm.py create mode 100644 waf-modules/wafadmin/Tools/ocaml.py create mode 100644 waf-modules/wafadmin/Tools/osx.py create mode 100644 waf-modules/wafadmin/Tools/perl.py create mode 100644 waf-modules/wafadmin/Tools/preproc.py create mode 100644 waf-modules/wafadmin/Tools/python.py create mode 100644 waf-modules/wafadmin/Tools/qt4.py create mode 100644 waf-modules/wafadmin/Tools/ruby.py create mode 100644 waf-modules/wafadmin/Tools/suncc.py create mode 100644 waf-modules/wafadmin/Tools/suncxx.py create mode 100644 waf-modules/wafadmin/Tools/tex.py create mode 100644 waf-modules/wafadmin/Tools/unittestw.py create mode 100644 waf-modules/wafadmin/Tools/vala.py create mode 100644 waf-modules/wafadmin/Tools/winres.py create mode 100644 waf-modules/wafadmin/Tools/xlc.py create mode 100644 waf-modules/wafadmin/Tools/xlcxx.py create mode 100644 waf-modules/wafadmin/Utils.py create mode 100644 waf-modules/wafadmin/__init__.py create mode 100644 waf-modules/wafadmin/ansiterm.py create mode 100644 waf-modules/wafadmin/pproc.py create mode 100644 waf-modules/wafadmin/py3kfixes.py create mode 100755 waf-unpacked diff --git a/.gitignore b/.gitignore index 4aaa84a2..e6c4297f 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,7 @@ Makefile .waf-* .lock-wscript -_build +_build_ po/.intltool-merge-cache po/LINGUAS diff --git a/ChangeLog b/ChangeLog index 676410b8..24f87ea7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,134 +1,5 @@ This file is licensed under the terms of the expat license, see the file EXPAT. -v0.4.7: - Unify download behavior: link fingerprints, space check, clearing, tooltips - GIO-based check for enough space and permissions, GIO-based themed icons - Show opener/ tab domain in download dialog: - http://lcamtuf.coredump.cx/fldl/ http://lcamtuf.coredump.cx/switch/ - Extension to download with a specific command line - Size in download dialog and fallback filename heuristic - - Windows: GTK+3, Faenza icons, gdb helper, Netscape plugins, - ship CA bundle, fix View source, --portable/ -P on Windows - Granite (Beta): about dialog, static notebook, no "New Tab" in toolbar, Print → Share - Support building with Wayland-enabled GTK+3 - Theming: content view, secondary toolbar class, drop old icon names, bigger error icon - Introduce --plain mode equivalent to GtkLauncher, lazy URLs for --snapshot/ -s - Log bookmarks, history and downloads to zeitgeist - - Show security details and export certificates with GCR, error out instead of colored urlbar - Only allow data: URLs in urlbar for images - Recognize and cache HSTS, system-wide /etc/xdg/midori/hsts - Strip HTTP Host to outsmart some filter proxies - - Completion: Fix PageUp/Down, Shift+Tab and wrap: This is consistent with GTK+ (excluding Tab) and Firefox - Change Focus Current Tab to Ctrl+Alt+Home - Fix Shift+Space for scrolling upwards - Control+Alt+R: Readable mode - Handle access key in link hints - Drop speed dial keyboard access in favour of "." link hints - - No Open, Bookmark bar, Customize toolbar, Inspect page in app menu; split panel menu - Use ellipsises instead of period thresomes - Hinted text in bookmarks, history and cookie manager - Ellipsize panels (except for Transfers) - Add icon to bookmark dialog and remove labels - Validate proxy server IP and render invalid URLs in GTK+3 - Rename "Toplevel" folder to "Bookmarks" - - Chrome identification option; "Automatic" user agent is Chrome-based - Search: Create engines from search forms, remove "icon" field - Copy Image s/Address// always copy both URL and data - Rework debugging by introducing MIDORI_DEBUG; about:paths - Adblock: Refresh filters based on file time and meta data, abp: links - Optionally save website including resources - Merged NextForward akin to StopReload - PanedAction, Viewable, SpeedDial, (most of) Settings, Paths in Vala - Improved database: requires sqlite 3.6.19 and 0.2.6 in import dialog - - Confirm Caret Browsing before enabling it - Support for custom items in Statusbar Features (see FAQ) - Draggable favicon as URL or text, URL icon for URL entries - Remember if inspector was attached - Open tabs in the background by default - RTL support in special/ error pages - Fix progressbar text with GTK+3 - Build fix: More robust GTK+2 version check - Ensure progress in urlbar and tab match - Zoom text and images by default - Don't mixup tokens starting with the same letters - Seemless running out of build folder - No speed dial in --app/ --private, fix layout with many tiles - Add X-GNOME-Fullname to .desktop and translate desktop shortcuts - Delayed Load extension - -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 diff --git a/INSTALL b/INSTALL index f65e7a82..aed4768e 100644 --- a/INSTALL +++ b/INSTALL @@ -37,7 +37,7 @@ Midori is now built with debugging symbols. 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'. @@ -49,32 +49,27 @@ function names and line numbers. 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_DEBUG=headers _build/default/midori/midori' +'MIDORI_SOUP_DEBUG=2 _build_/default/midori/midori' -Where 'headers' can be replaced with 'body' to get full message contents. +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_DEBUG=unarmed _build/default/midori/midori' +'MIDORI_UNARMED=1 _build_/default/midori/midori' -If you want to test bookmarks, you can enable database tracing: +To debug extensions you can specify the path: -'MIDORI_DEBUG=bookmarks _build/default/midori/midori' - -To disable Netscape plugins, use MOZ_PLUGIN_PATH=/. - -When running from the build folder, extensions will also be located -in the build folder (setting MIDORI_EXTENSION_PATH is no longer needed). +'export MIDORI_EXTENSION_PATH=_build_/default/extensions' For further information a tutorial for gdb and reading up on how you can install debugging diff --git a/README b/README index cc78dc95..805d5db6 100644 --- a/README +++ b/README @@ -2,19 +2,19 @@ This file is licensed under the terms of the expat license, see the file EXPAT. Midori is a lightweight web browser. -* Full integration with GTK+2 and GTK+3. -* Fast rendering with WebKit and HTML5 video with GStreamer. +* Full integration with GTK+2. +* Fast rendering with WebKit. * Tabs, windows and session management. -* History completion and configurable Web Search. +* Flexibly configurable Web Search. * User scripts and user styles support. -* Adblock Plus compatible, external download manager support. * Straightforward bookmark management. -* Customizable interface, extensions written in C and Vala. +* Customizable and extensible interface. +* Extensions written in C. -Requirements: GLib 2.22, GTK+ 2.16, WebkitGTK+ 1.1.17, libXML2, - libsoup 2.27.90, sqlite 3.0, Vala 0.14 +Requirements: GLib 2.22, GTK+ 2.10, WebkitGTK+ 1.1.17, libXML2, + libsoup 2.27.90, sqlite 3.0, Vala 0.10 -Optional: GTK+ 3.0, Unique 0.9, libnotify, gcr +Optional: GTK+ 3.0, Unique 0.9, libnotify For installation instructions read INSTALL. diff --git a/configure b/configure index f5e9d8fa..f38dd4a4 100755 --- a/configure +++ b/configure @@ -130,7 +130,7 @@ clean: distclean: @$WAF distclean - @-rm -rf _build + @-rm -rf _build_ @-rm -f Makefile check: diff --git a/data/about.css b/data/about.css deleted file mode 100644 index 66cb3345..00000000 --- a/data/about.css +++ /dev/null @@ -1,70 +0,0 @@ -/* - 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%; -} - -html[dir="rtl"] #icon { - float: right; - padding-right: 1%; -} - -#main { - float: right; - width: 75%; -} - -h1 { - font-size: 1.4em; - font-weight: bold; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; -} - -#logo { - position: absolute; bottom: 15px; - z-index: -1; -} - -html[dir="ltr"] #logo { - right: 15px; -} - -html[dir="rtl"] #logo { - left: 15px; -} - -button span, -button img { - vertical-align: middle; - padding: 2px 1px; -} - -message { - font-size: 1.1em; -} - -description { - font-size: 1em; -} diff --git a/data/autosuggestcontrol.js b/data/autosuggestcontrol.js index 389bfd47..85a506ab 100644 --- a/data/autosuggestcontrol.js +++ b/data/autosuggestcontrol.js @@ -186,10 +186,10 @@ AutoSuggestControl.prototype.init = function () { }; //assign onblur event handler (hides suggestions) - if (!this.textbox.onblur) - this.textbox.onblur = function () { oThis.hideSuggestions(); }; - if (!this.textbox.onclick) - this.textbox.onclick = function () { oThis.hideSuggestions(); }; + this.textbox.onblur = + this.textbox.onclick = function () { + oThis.hideSuggestions(); + }; //create the suggestions dropdown this.createDropDown(); @@ -299,7 +299,7 @@ function initSuggestions () { if (inputs.length == 0) return false; - for (var i=0;i - + + {title} - +
diff --git a/data/faq.css b/data/faq.css index 5d92ae19..eb96e13e 100644 --- a/data/faq.css +++ b/data/faq.css @@ -8,64 +8,29 @@ Stylesheet for Midori's documentation based on a version of Enrico Troeger. @media screen { - html, body { - width: 100% !important; - height: 100% !important; - margin: 0 !important; - padding: 0 !important; + body { + background-color: #f6fff3; + color: #404040; + margin-left: 0.4em; + width: 60em; + font-size: 90%; } - * { - background: #f6fff3 !important; - color: #404040 !important; - font-size: 14pt !important; - font-family: serif !important; - text-align: justify !important; - line-height: 1.4em !important; - word-spacing: 0.4mm !important; - letter-spacing: 0.2mm !important; - -webkit-column-count: auto !important; - -webkit-column-width: auto !important; - -webkit-box-shadow: none !important; - width: auto !important; - word-wrap: break-word !important; + a { + color: #013100; } - div, p { - padding: 5pt !important; - } - - li { - padding-left: 5pt !important; - } - - img, *[accesskey], form *, form, iframe, - *[id^=navigation], *[id$=navigation], *[id*=navigation], .collapsed, .expanded { - display: none !important - } - - /* FIXME: we want "images bigger than 50px here" */ - img[width] { - display: inline !important - } - - :link, :link * { - color: #013100 !important; - text-decoration: underline !important; - } - - :visited, :visited * { - color: #7E558E !important; - text-decoration: underline !important; + a:visited { + color: #7E558E; } a:hover { - text-decoration: none !important; + text-decoration: none; } h1, h2, h3 { - font-family: serif !important; - color: #002a00 !important; + font-family: sans-serif; + color: #002a00; } h1 { diff --git a/data/faq.html b/data/faq.html index a43a70bb..e4717731 100644 --- a/data/faq.html +++ b/data/faq.html @@ -7,7 +7,7 @@ midori:faq - + @@ -17,13 +17,11 @@ - - - + - +
@@ -34,35 +32,31 @@ var NS='midori';var JSINFO = {"id":"midori:faq","namespace":"midori"}; + +
  • Mouse Gestures
    • +
  • Spell check
    • +
  • User scripts
    • +
  • User styles
    • +
    @@ -82,10 +76,15 @@ This is a snapshot of Frequently Asked Questions designated for offline viewing.

    - +

    Getting started

    +
    + +

    About Midori

    +
    +

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

    @@ -132,9 +131,9 @@ Midori and all delivered artwork are licensed under the LGPL2.

    - -

    Common problems

    -
    + +

    Common problems

    +
    @@ -194,12 +193,6 @@ 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:

    @@ -216,80 +209,7 @@ There appears to be an issue with Glib 2.16. The recommended solution is to upgr
    -

    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 -

    - -
    - -

    Security features

    -
    - -
    - -

    HSTS/ HTTP Strict Transport Security

    -
    - -

    -Midori >= 0.4.7 automatically picks up the Strict-Transport-Security header and caches sites locally. By design, there's no UI. System administrators can however place a pre-loaded cache at /etc/xdg/midori/hsts. -

    - -
    - -

    Certificate Handling

    -
    - -

    -Midori >= 0.4.7 supports http://git.gnome.org/browse/gcr/tree/gcr for certificate display and management, you can click the lock in the urlbar to see detailed information. Earlier versions, or one without gcr will not handle certificates beyond the lock icon in the urlbar. -

    - -
    - -
    Error granting trust: Couldn't find a place to store the imported certificate
    -
    - -

    -No key store is available or it's incorrectly setup. By default GNOME keyring can do this. Under Xfce it is recommended to enable “GNOME services” under “Session and Startup settings”. Otherwise this can occur if a script doesn't correctly send the output of “gnome-keyring –startup” to the environment. -

    - -
    - -
    A testcase for self-signed certificates
    -
    - -

    -https://selfsigned.notyours.dk:444/menu.gif -

    - -
    - -

    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. -

    - -

    -Starting with WebkitGTK+ 1.8.2 (Midori 0.4.7) Netscape plugins are now supported. -Midori should pick them up from standard netscape plugins locations. -

    - -
    - -

    Netscape plugins on Linux, BSD and OS X

    +

    Flash/ Netscape plugins don't work

    @@ -307,17 +227,11 @@ You can either run that above line and run Midori in the same terminal afterward

    -

    Flash is crashing/ No Flash with GTK+3

    +

    Flash is crashing all the time

    -nspluginwrapper is a program that runs Flash and other Netscape plugins in a separate process. So a crash can't cresh the whole browser and Flash, which is GTK+2 can run in GTK+3. -

    - -

    -sudo apt-get install nspluginwrapper -sudo nspluginwrapper -i /usr/lib/flashplugin-installer/libflashplayer.so -nspluginwrapper -v -a -n -i +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.

    @@ -332,28 +246,13 @@ That's a problem with WebKit. You can work around it to some extent if you -

    256-bit encryption isn't supported?

    -
    - -

    -There's no official support right now. It's possible to patch glib-networking to enable 256-bit SSL. -

    - -
    - -

    Scroll with middle mouse button/ pan-scrolling

    +

    Scroll with middle mouse button

    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

    @@ -367,6 +266,8 @@ You need to have GStreamer plugins installed which implement the codecs.
  • You may need gstreamer0.10-alsa for ALSA, depending on your distribution.
    • +
  • With Arch Linux, you may need to install liboil explicitly if it is not installed already (see this bug report).
    +
  • 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.
  • For Youtube or Vimeo, you need WebKitGTK+ 1.1.20 or newer.
    @@ -392,6 +293,36 @@ icedtea6 version 1.8 and above has been known to crash midori. If this is the c +

    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. +
    + +
    +

    How do I get rid of the menubar?

    @@ -500,138 +431,25 @@ 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
    +
      x-scheme-handler/magnet=transmission-gtk.desktop

    Or install an application which advertises the scheme like so:

    -
    MimeType=x-scheme-handler/magnet;
    +
      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. You should see a list of suggestions at the top of the menu. -

    - -

    -On Windows you need to download OpenOffice dictionaries, find the zipped file(s) for your locale(s) and unpack the contents into share/myspell/dicts/ in your Midori installation. The folder should contain *.aff and *.dic files -

    - -
    - -

    Is it possible to disable Same Origin Policy? What Webkit settings not in the preferences can I change?

    -
    - -

    -You can change all values of WebKitWebSettings in the config file (~/.config/midori/config on unices, %APPDATA%\midori\config [please check :)] on Windows). For example, to disable Same Origin Policy for local files, add -

    -
    enable-universal-access-from-file-uris=true
    - -

    - to your config file. -

    - -
    - -

    How do I change the proxy server from the toolbar or statusbar?

    -
    -
      -
    1. Activate the Statusbar Features plugin.
      -
      2. -
    2. Close Midori.
      -
      3. -
    3. Create a folder ~/.config/midori/extensions/libstatusbar-features.so/
      -
      4. -
    4. Create a text file “config”
      -
      5. -
    5. Type the following for the default setup:
      -
      6. -
    -
      [settings]
-  items=auto-load-images;enable-scripts;enable-plugins;identify-as;zoom-level
    - -

    -Add button types separated by semicolon: -

    -
      -
    • proxy-type Proxy Server
      -
      • -
    • preferred-encoding Character Set/ Encoding
      -
      • -
    • enable-spell-checking Spell Check
      -
      • -
    • zoom-text-and-images Only zoom in text, or text and images
      -
      • -
    • first-party-cookies-only First party cookies only
      -
      • -
    • site-data-rules see Blacklisting cookies
      -
      • -
    - -

    -Most settings listed at http://webkitgtk.org/reference/webkitgtk/stable/WebKitWebSettings.html will also work as button types. -

    - -
    - -

    Privacy

    + +

    Features

    - -

    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

    + +

    Web Applications

    @@ -651,13 +469,13 @@ There are two closely related features to open websites as dedicated windows of

    - -

    Private Browsing

    + +

    Private Browsing

    - -

    -File menu/ App Menu button → Private Browsing -

    +
      +
    1. File menu/ App Menu button → Private Browsing
      +
      2. +

    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. @@ -677,51 +495,10 @@ The same options available to -a/ –app can be used for private browsing mode.

    - -

    Portable mode/ Win32

    + +

    Proxy servers

    -

    -On Windows builds, -P/ –portable causes all data to be written to the “profile” folder in the Midori folder. Everything, including temporary files and cache, is stored in a sub-folder without touching the system. So Midori can be run eg. from a USB stick on different machines. -

    - -
    - -

    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.

    @@ -768,48 +545,14 @@ Mousehole is a scriptable proxy server written in Ruby.

    - -

    Are SOCKS proxy servers supported?

    -
    - -

    -The coming libSoup 2.40 will support SOCKS proxies, see the relevant bug report. -

    - -

    -libSoup < 2.40 only supports HTTP proxy servers 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

    -
    + +

    Using the Keyboard

    +
    - -

    HJKL

    -
    + +

    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: @@ -823,12 +566,12 @@ You can also use the arrow keys to do the same.

    - -

    Following Links

    -
    + +

    Following Links

    +

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

    @@ -836,9 +579,9 @@ With hints enabled, type the link number, and press Enter to open the link in th

    - -

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

    -
    + +

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

    +

    Since Midori 0.3.5 Ctrl+Tab is supported by default. @@ -849,18 +592,18 @@ In older versions you can enable the History List extension under Tools → Exte

    - -

    Customizing keyboard shortcuts

    -
    + +

    Customizing keyboard shortcuts

    +

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

    - -

    Using Find

    -
    + +

    Using Find

    +

    Default shortcuts for Find are: @@ -869,7 +612,7 @@ Default shortcuts for Find are:

    Find: Ctrl+f ”/” and ”,”
    -FindNext: Ctrl+g and Enter
    +FindNext: Ctrl+g
    FindPrevious: Shift+Ctrl+g
    @@ -884,9 +627,9 @@ When using Ctrl+f to bring up Find, use Ctrl+f again or ESC. When using ”/”

    - -

    Mouse Gestures

    -
    + +

    Mouse Gestures

    +

    By default the right mouse button initiates gestures. @@ -914,9 +657,28 @@ Additionally, there are programs allowing mouse gestures system-wide, for exampl

    + +

    Spell check

    +
    -

    User scripts and styles

    -
    +

    +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. +

    + +
    + +

    User scripts

    +
    + +
    + +

    Overview

    +

    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. @@ -975,10 +737,15 @@ You can also use

    User styles

    +
    + +

    Overview

    +
    +

    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.

    @@ -1037,6 +804,6 @@ Customize as needed: }
    -
    +
    diff --git a/data/gtk3.css b/data/gtk3.css deleted file mode 100644 index e6353665..00000000 --- a/data/gtk3.css +++ /dev/null @@ -1,28 +0,0 @@ -.notebook tab .button { - -GtkButton-default-border: 0; - -GtkButton-default-outside-border: 0; - -GtkButton-inner-border: 0; - -GtkWidget-focus-line-width: 0; - -GtkWidget-focus-padding: 0; - padding: 0; -} - -GtkOverlay > * { - padding: 4px; - border-style: solid; - border-radius: 0 5px 0 0; - border-width: 1px 1px 0 0; -} - -GtkOverlay MidoriFindbar { - border-radius: 0 0 0 5px; - border-width: 0 0 1px 1px; /* top right bottom left */ -} - -/* Kill grey backround on inactive buttons */ -GtkDrawingArea, -GtkImage, -GtkImage:insensitive, -GtkImage:selected { - background-color: @transparent; -} diff --git a/data/midori.desktop.in b/data/midori.desktop.in index fc6f39e7..8ec2364a 100644 --- a/data/midori.desktop.in +++ b/data/midori.desktop.in @@ -3,8 +3,7 @@ Version=1.0 Type=Application _Name=Midori _GenericName=Web Browser -_X-GNOME-Fullname=Midori Web Browser -_Comment=Browse the Web +_Comment=Lightweight web browser _X-GNOME-Keywords=Internet;WWW;Explorer _X-AppInstall-Keywords=Internet;WWW;Explorer Categories=GTK;Network;WebBrowser; @@ -18,17 +17,17 @@ X-Osso-Service=midori X-Ayatana-Desktop-Shortcuts=TabNew;WindowNew;Private [TabNew Shortcut Group] -_Name=New Tab +Name=New _Tab Exec=midori -e TabNew TargetEnvironment=Unity [WindowNew Shortcut Group] -_Name=New Window +Name=New _Window Exec=midori -e WindowNew TargetEnvironment=Unity [Private Shortcut Group] -_Name=New Private Browsing Window +Name=New P_rivate Browsing Window Exec=midori --private TargetEnvironment=Unity diff --git a/data/speeddial-head.html b/data/speeddial-head.html index 89cb96bb..01249cf9 100644 --- a/data/speeddial-head.html +++ b/data/speeddial-head.html @@ -55,7 +55,10 @@ width: 85%; height: 75%; margin: auto; - -webkit-box-shadow: 0 2px 5px rgba(0,0,0,.3), 0 0 0px #fff inset; + -webkit-box-shadow: 0 4px 18px rgba(0,0,0,.3), 0 0 2px #fff inset; + background-image: -webkit-gradient( + linear, center top, center bottom, + from(#f6f6f6), to(#e3e3e3)); border: 1px solid #bcbcbc; border-bottom-color: #a0a0a0; position: relative; @@ -72,15 +75,9 @@ div.shortcut .preview.new .add { display: block; height: 100%; - width: 100%; + width: 50%; margin: 0 auto; cursor: pointer; - -webkit-box-shadow: 0 2px 5px rgba(0,0,0,.3), 0 0 0px #fff inset; - background-image: -webkit-gradient( - linear, center top, center bottom, - from(#f6f6f6), to(#e3e3e3)); - background-repeat: repeat-x; - -webkit-border-radius: 3px; } .title { @@ -114,148 +111,95 @@ display:none; } - .selected { - outline: 1px dotted black; - background-color: #eef; + div.osd { + top: 9px; + position: fixed; + width: 100%; + text-align: right; + } + + div.osd span { + border: 1px solid #999; + background-color: #f5f5f5; + padding: 8px; + color: #999; + -webkit-border-bottom-left-radius: 10px; + visibility: hidden; } - + +
    + +
    diff --git a/docs/api/wscript_build b/docs/api/wscript_build index df546b18..fdcecb50 100644 --- a/docs/api/wscript_build +++ b/docs/api/wscript_build @@ -6,20 +6,18 @@ import pproc as subprocess import os import Utils -blddir = '_build' # recognized by ack - for module in ('midori', 'katze'): try: - 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') + 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') subprocess.call (['gtkdoc-scan', '--module=' + module, - '--source-dir=' + module, '--output-dir=' + blddir + '/docs/api/' + module, + '--source-dir=' + module, '--output-dir=_build_/docs/api/' + module, '--rebuild-sections', '--rebuild-types']) - os.chdir (blddir + '/docs/api/' + module) + os.chdir ('_build_/docs/api/' + module) subprocess.call (['gtkdoc-mktmpl', '--module=' + module, '--output-dir=.' + module]) subprocess.call (['gtkdoc-mkdb', '--module=' + module, diff --git a/extensions/adblock.c b/extensions/adblock.c index 62f8fc7d..1b8e75e9 100644 --- a/extensions/adblock.c +++ b/extensions/adblock.c @@ -1,6 +1,6 @@ /* - Copyright (C) 2009-2012 Christian Dywan - Copyright (C) 2009-2012 Alexander Butenko + Copyright (C) 2009-2010 Christian Dywan + Copyright (C) 2009 Alexander Butenko This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -9,8 +9,8 @@ See the file COPYING for the full license text. */ + #include -#include "midori-core.h" #include #include "config.h" @@ -30,111 +30,67 @@ (__filter[4] != '-' && __filter[5] != '-') #ifdef G_ENABLE_DEBUG #define adblock_debug(dmsg, darg1, darg2) \ - do { if (midori_debug ("adblock:match")) g_debug (dmsg, darg1, darg2); } while (0) + do { if (debug == 1) g_debug (dmsg, darg1, darg2); } while (0) #else #define adblock_debug(dmsg, darg1, darg2) /* nothing */ #endif -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; -static GList* update_list = NULL; -static gboolean update_done = FALSE; - -static void -adblock_parse_file (gchar* path); +static GHashTable* pattern; +static GHashTable* keys; +static GHashTable* optslist; +static GHashTable* urlcache; +static GString* blockcss; +static GString* blockcssprivate; +static gchar* blockscript = NULL; +#ifdef G_ENABLE_DEBUG +static guint debug; +#endif static gboolean -adblock_file_is_up_to_date (gchar* path); +adblock_parse_file (gchar* path); static void adblock_reload_rules (MidoriExtension* extension, gboolean custom_only); static gchar* -adblock_build_js (const gchar* uri) +adblock_build_js (const gchar* private) { - 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 ( + return g_strdup_printf ( "window.addEventListener ('DOMContentLoaded'," "function () {" " if (document.getElementById('madblock'))" " return;" - " 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}';" + // Get just domain name from URL + " var URL = location.href.match(/:\\/\\/(.[^/]+)/)[1];" + " var sites = new Array(); %s;" + " var public = '.madblockplaceholder ';" + // Split domain into subdomain parts + " var subdomains = URL.split ('.');" + " var hostname = subdomains [subdomains.length - 1];" + " var i = subdomains.length - 2;" + // Check if any of subdomains do have blocking rules + " while (i >= 0) {" + " hostname = subdomains [i] + '.' + hostname;" + " if (sites [hostname])" + " public += ', ' + sites [hostname];" + " i--;" + " }" + " public += ' {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);"); - return g_string_free (code, FALSE); + "}, true);", + private); } 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 () { @@ -150,16 +106,12 @@ adblock_init_db () 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); + if (blockcssprivate && blockcssprivate->len > 0) + g_string_free (blockcssprivate, TRUE); blockcss = g_string_new ("z-non-exist"); + blockcssprivate = g_string_new (""); } static void @@ -167,26 +119,23 @@ adblock_download_notify_status_cb (WebKitDownload* download, GParamSpec* pspec, MidoriExtension* extension) { - if (update_done) + gchar* path; + MidoriApp* app; + MidoriWebSettings* settings; + + if (webkit_download_get_status (download) != WEBKIT_DOWNLOAD_STATUS_FINISHED) return; - if (webkit_download_get_status (download) == WEBKIT_DOWNLOAD_STATUS_FINISHED) - { - GList* li = NULL; - for (li = update_list; li != NULL; li = g_list_next (li)) - { - gchar* uri = g_strdup (webkit_download_get_destination_uri (download) + 7); - if (g_strcmp0 (li->data, uri)) - update_list = g_list_remove (update_list, li->data); - g_free (uri); - } - } + path = g_filename_from_uri (webkit_download_get_destination_uri (download), NULL, NULL); + adblock_parse_file (path); + g_free (path); - if (g_list_length (update_list) == 0) - { - adblock_reload_rules (extension, FALSE); - update_done = TRUE; - } + app = midori_extension_get_app (extension); + settings = katze_object_get_object (app, "settings"); + g_string_append (blockcss, " {display: none !important}\n"); + midori_web_settings_add_style (settings, "adblock-blockcss", blockcss->str); + katze_assign (blockscript, adblock_build_js (blockcssprivate->str)); + g_object_unref (settings); } static gchar* @@ -202,7 +151,8 @@ adblock_get_filename_for_uri (const gchar* uri) if (!strncmp (uri, "file", 4)) return g_strndup (uri + 7, strlen (uri) - 7); - folder = g_build_filename (midori_paths_get_cache_dir (), "adblock", NULL); + folder = g_build_filename (g_get_user_cache_dir (), PACKAGE_NAME, + "adblock", NULL); katze_mkdir_with_parents (folder, 0700); filename = g_compute_checksum_for_string (G_CHECKSUM_MD5, uri, -1); @@ -224,8 +174,6 @@ adblock_reload_rules (MidoriExtension* extension, 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), @@ -245,7 +193,7 @@ adblock_reload_rules (MidoriExtension* extension, continue; } - if (!adblock_file_is_up_to_date (path)) + if (!adblock_parse_file (path)) { WebKitNetworkRequest* request; WebKitDownload* download; @@ -255,14 +203,11 @@ adblock_reload_rules (MidoriExtension* extension, download = webkit_download_new (request); g_object_unref (request); webkit_download_set_destination_uri (download, destination); - update_list = g_list_prepend (update_list, path); g_free (destination); g_signal_connect (download, "notify::status", G_CALLBACK (adblock_download_notify_status_cb), extension); webkit_download_start (download); } - else - adblock_parse_file (path); g_free (path); i++; } @@ -270,6 +215,7 @@ adblock_reload_rules (MidoriExtension* extension, g_strfreev (filters); g_string_append (blockcss, " {display: none !important}\n"); + katze_assign (blockscript, adblock_build_js (blockcssprivate->str)); midori_web_settings_add_style (settings, "adblock-blockcss", blockcss->str); g_object_unref (settings); } @@ -502,8 +448,6 @@ adblock_get_preferences_dialog (MidoriExtension* extension) GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, #endif NULL); - katze_widget_add_class (gtk_dialog_get_widget_for_response ( - GTK_DIALOG (dialog), GTK_RESPONSE_HELP), "help_button"); content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); g_signal_connect (dialog, "destroy", G_CALLBACK (gtk_widget_destroyed), &dialog); @@ -529,10 +473,8 @@ adblock_get_preferences_dialog (MidoriExtension* extension) "and click \"Add\" to add it to the list. " "You can find more lists at %s."), #if GTK_CHECK_VERSION (2, 18, 0) - "adblockplus.org/en/subscriptions " "easylist.adblockplus.org"); #else - "http://adblockplus.org/en/subscriptions " "http://easylist.adblockplus.org/"); #endif #if GTK_CHECK_VERSION (2, 18, 0) @@ -597,7 +539,6 @@ adblock_get_preferences_dialog (MidoriExtension* extension) vbox = gtk_vbox_new (FALSE, 4); gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 4); button = gtk_button_new_from_stock (GTK_STOCK_ADD); - g_object_set_data (G_OBJECT (dialog), "entry", entry); g_object_set_data (G_OBJECT (button), "entry", entry); g_signal_connect (button, "clicked", G_CALLBACK (adblock_preferences_add_clicked_cb), liststore); @@ -646,9 +587,8 @@ adblock_get_preferences_dialog (MidoriExtension* extension) return dialog; } -static GtkWidget* -adblock_show_preferences_dialog (MidoriExtension* extension, - const gchar* uri) +static void +adblock_open_preferences_cb (MidoriExtension* extension) { static GtkWidget* dialog = NULL; @@ -661,19 +601,6 @@ adblock_show_preferences_dialog (MidoriExtension* extension, } else gtk_window_present (GTK_WINDOW (dialog)); - - if (uri != NULL) - { - GtkWidget* entry = g_object_get_data (G_OBJECT (dialog), "entry"); - gtk_entry_set_text (GTK_ENTRY (entry), uri); - } - return dialog; -} - -static void -adblock_open_preferences_cb (MidoriExtension* extension) -{ - adblock_show_preferences_dialog (extension, NULL); } static inline gint @@ -695,9 +622,7 @@ adblock_check_rule (GRegex* regex, return FALSE; } /* TODO: Domain opt check */ - #ifdef G_ENABLE_DEBUG adblock_debug ("blocked by pattern regexp=%s -- %s", g_regex_get_pattern (regex), req_uri); - #endif return TRUE; } @@ -826,51 +751,13 @@ adblock_prepare_urihider_js (GList* 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, - MidoriExtension* extension) -{ - const gchar* uri = webkit_network_request_get_uri (request); - if (g_str_has_prefix (uri, "abp:")) - { - gchar** parts; - gchar* filter; - if (g_str_has_prefix (uri, "abp:subscribe?location=")) - uri = &uri[23]; - else if (g_str_has_prefix (uri, "abp://subscribe?location=")) - uri = &uri[25]; - else - return FALSE; - - parts = g_strsplit (uri, "&", 2); - filter = soup_uri_decode (parts[0]); - webkit_web_policy_decision_ignore (decision); - adblock_show_preferences_dialog (extension, filter); - g_free (filter); - g_strfreev (parts); - return TRUE; - } - - if (web_frame == webkit_web_view_get_main_frame (web_view)) - { - const gchar* req_uri = webkit_network_request_get_uri (request); - g_hash_table_replace (navigationwhitelist, web_view, g_strdup (req_uri)); - } - return false; -} - - static void adblock_resource_request_starting_cb (WebKitWebView* web_view, WebKitWebFrame* web_frame, WebKitWebResource* web_resource, WebKitNetworkRequest* request, WebKitNetworkResponse* response, - MidoriView* view) + GtkWidget* image) { SoupMessage* msg; GList* blocked_uris; @@ -882,11 +769,12 @@ adblock_resource_request_starting_cb (WebKitWebView* web_view, if (midori_uri_is_blank (page_uri)) return; - req_uri = webkit_network_request_get_uri (request); - - if (!g_strcmp0 (req_uri, g_hash_table_lookup (navigationwhitelist, web_view))) + /* Never filter the main page itself */ + if (web_frame == webkit_web_view_get_main_frame (web_view) + && webkit_web_frame_get_load_status (web_frame) == WEBKIT_LOAD_PROVISIONAL) return; + req_uri = webkit_network_request_get_uri (request); if (!midori_uri_is_http (req_uri) || g_str_has_suffix (req_uri, "favicon.ico")) return; @@ -895,17 +783,8 @@ adblock_resource_request_starting_cb (WebKitWebView* web_view, if (!(msg && !g_strcmp0 (msg->method, "GET"))) return; - 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 (midori_debug ("adblock:time")) + if (debug == 2) g_test_timer_start (); #endif if (adblock_is_matched (req_uri, page_uri)) @@ -916,7 +795,7 @@ adblock_resource_request_starting_cb (WebKitWebView* web_view, g_object_set_data (G_OBJECT (web_view), "blocked-uris", blocked_uris); } #ifdef G_ENABLE_DEBUG - if (midori_debug ("adblock:time")) + if (debug == 2) g_debug ("match: %f%s", g_test_timer_elapsed (), "seconds"); #endif @@ -975,16 +854,16 @@ adblock_custom_block_image_cb (GtkWidget* widget, custom_list = g_build_filename (midori_extension_get_config_dir (extension), CUSTOM_LIST_NAME, NULL); - katze_mkdir_with_parents (midori_extension_get_config_dir (extension), 0700); - if ((list = g_fopen (custom_list, "a+"))) + if (!(list = g_fopen (custom_list, "a+"))) { - 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_free (custom_list); + return; } - else - g_debug ("%s: Failed to open custom list %s\n", G_STRFUNC, custom_list); + + g_fprintf (list, "%s\n", gtk_entry_get_text (GTK_ENTRY (entry))); + fclose (list); + adblock_reload_rules (extension, TRUE); + g_free (custom_list); gtk_widget_destroy (dialog); } @@ -1053,19 +932,13 @@ adblock_window_object_cleared_cb (WebKitWebView* web_view, JSObjectRef js_window) { 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); + g_free (sokoke_js_script_eval (js_context, blockscript, NULL)); } static void @@ -1074,33 +947,31 @@ adblock_add_tab_cb (MidoriBrowser* browser, MidoriExtension* extension) { GtkWidget* web_view = midori_view_get_web_view (view); + GtkWidget* image = g_object_get_data (G_OBJECT (browser), "status-image"); g_signal_connect (web_view, "window-object-cleared", G_CALLBACK (adblock_window_object_cleared_cb), 0); g_signal_connect_after (web_view, "populate-popup", G_CALLBACK (adblock_populate_popup_cb), extension); - g_signal_connect (web_view, "navigation-policy-decision-requested", - G_CALLBACK (adblock_navigation_policy_decision_requested_cb), extension); g_signal_connect (web_view, "resource-request-starting", - G_CALLBACK (adblock_resource_request_starting_cb), view); + G_CALLBACK (adblock_resource_request_starting_cb), image); g_signal_connect (web_view, "load-finished", - G_CALLBACK (adblock_load_finished_cb), view); -} - -static void -adblock_remove_tab_cb (MidoriBrowser* browser, - MidoriView* view, - MidoriExtension* extension) -{ - GtkWidget* web_view = midori_view_get_web_view (view); - g_hash_table_remove (navigationwhitelist, web_view); + G_CALLBACK (adblock_load_finished_cb), image); } static void adblock_deactivate_cb (MidoriExtension* extension, MidoriBrowser* browser); +static void +adblock_add_tab_foreach_cb (MidoriView* view, + MidoriBrowser* browser, + MidoriExtension* extension) +{ + adblock_add_tab_cb (browser, view, extension); +} + static void adblock_app_add_browser_cb (MidoriApp* app, MidoriBrowser* browser, @@ -1108,8 +979,6 @@ adblock_app_add_browser_cb (MidoriApp* app, { GtkWidget* statusbar; GtkWidget* image; - GtkWidget* view; - gint i; statusbar = katze_object_get_object (browser, "statusbar"); image = NULL; @@ -1119,14 +988,10 @@ adblock_app_add_browser_cb (MidoriApp* app, g_object_set_data_full (G_OBJECT (browser), "status-image", image, (GDestroyNotify)gtk_widget_destroy); - i = 0; - while((view = midori_browser_get_nth_tab(browser, i++))) - adblock_add_tab_cb (browser, MIDORI_VIEW (view), extension); - + midori_browser_foreach (browser, + (GtkCallback)adblock_add_tab_foreach_cb, extension); g_signal_connect (browser, "add-tab", G_CALLBACK (adblock_add_tab_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", @@ -1224,9 +1089,7 @@ adblock_compile_regexp (GString* gpatt, if (!g_regex_match_simple ("[\\*]", sig, G_REGEX_UNGREEDY, G_REGEX_MATCH_NOTEMPTY) && !g_hash_table_lookup (keys, sig)) { - #ifdef G_ENABLE_DEBUG adblock_debug ("sig: %s %s", sig, patt); - #endif g_hash_table_insert (keys, sig, regex); g_hash_table_insert (optslist, sig, g_strdup (opts)); signature_count++; @@ -1236,9 +1099,7 @@ adblock_compile_regexp (GString* gpatt, if (g_regex_match_simple ("^\\*", sig, G_REGEX_UNGREEDY, G_REGEX_MATCH_NOTEMPTY) && !g_hash_table_lookup (pattern, patt)) { - #ifdef G_ENABLE_DEBUG adblock_debug ("patt2: %s %s", sig, patt); - #endif g_hash_table_insert (pattern, patt, regex); g_hash_table_insert (optslist, patt, g_strdup (opts)); } @@ -1254,9 +1115,7 @@ adblock_compile_regexp (GString* gpatt, } else { - #ifdef G_ENABLE_DEBUG adblock_debug ("patt: %s%s", patt, ""); - #endif /* Pattern is a regexp chars */ g_hash_table_insert (pattern, patt, regex); g_hash_table_insert (optslist, patt, g_strdup (opts)); @@ -1311,9 +1170,7 @@ adblock_add_url_pattern (gchar* prefix, 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]) @@ -1343,22 +1200,6 @@ adblock_frame_add (gchar* line) g_string_append (blockcss, line); } -static 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) @@ -1390,16 +1231,18 @@ adblock_frame_add_private (const gchar* line, /* Ignore Firefox-specific option */ if (!g_strcmp0 (domain, "~pregecko2")) continue; - /* FIXME: ~ should negate match */ + /* strip ~ from domain */ if (domain[0] == '~') domain++; - adblock_update_css_hash (g_strstrip (domain), data[1]); + g_string_append_printf (blockcssprivate, ";sites['%s']+=',%s'", + g_strstrip (domain), data[1]); } g_strfreev (domains); } else { - adblock_update_css_hash (data[0], data[1]); + g_string_append_printf (blockcssprivate, ";sites['%s']+=',%s'", + data[0], data[1]); } g_strfreev (data); } @@ -1407,92 +1250,12 @@ adblock_frame_add_private (const gchar* line, static gchar* adblock_parse_line (gchar* line) { - /* - * 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])) + if (!line) + return NULL; + g_strchomp (line); + /* Ignore comments and new lines */ + if (line[0] == '!') return NULL; - /* FIXME: No support for whitelisting */ if (line[0] == '@' && line[1] == '@') return NULL; @@ -1500,7 +1263,9 @@ adblock_parse_line (gchar* line) if (line[0] == '[') return NULL; - g_strchomp (line); + /* Skip garbage */ + if (line[0] == ' ' || !line[0]) + return NULL; /* Got CSS block hider */ if (line[0] == '#' && line[1] == '#' ) @@ -1518,13 +1283,13 @@ adblock_parse_line (gchar* line) 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] == '|' ) { @@ -1540,156 +1305,7 @@ adblock_parse_line (gchar* line) return adblock_add_url_pattern ("", "uri", line); } -static GDateMonth -str_month_name_to_gdate (const gchar* month) -{ - guint i; - const gchar* months[] = { - "", "January", "February", "March", "April", "May", "June", - "July", "August", "September", "October", "November", "December" - }; - - for (i = 0; i < G_N_ELEMENTS (months); i++) - { - if (strncmp (month, months[i], 3) == 0) - return i; - } - return 0; -} - static gboolean -adblock_file_is_up_to_date (gchar* path) -{ - FILE* file; - gchar line[2000]; - - /* Check a chunk of header for update info */ - if ((file = g_fopen (path, "r"))) - { - gint days_to_expire = 0; - gchar* timestamp = NULL; - guint i; - gboolean found_meta = FALSE; - gint fs_days_elapsed, days_elapsed = 0, least_days; - - for (i = 0; i <= 15; i++) - { - fgets (line, 2000, file); - if (strncmp ("! Expires", line, 9) == 0) - { - gchar** parts = g_strsplit (line, " ", 4); - days_to_expire = atoi (parts[2]); - g_strfreev (parts); - found_meta = TRUE; - } - if (strncmp ("! This list expires after", line, 25) == 0) - { - gchar** parts = g_strsplit (line, " ", 7); - - if (strncmp (parts[6], "days", 4) == 0) - days_to_expire = atoi (parts[5]); - if (strncmp (parts[6], "hours", 5) == 0) - days_to_expire = (atoi (parts[5])) / 24; - - g_strfreev (parts); - found_meta = TRUE; - } - - if (strncmp ("! Last modified", line, 15) == 0 - || strncmp ("! Updated", line, 9) == 0) - { - gchar** parts = g_strsplit (line, ":", 2); - timestamp = g_strdup (parts[1] + 1); - g_strchomp (timestamp); - g_strfreev (parts); - found_meta = TRUE; - } - } - - if (!found_meta) - { - g_print ("Adblock: no metadata found in %s (broken download?)\n", path); - return FALSE; - } - - /* query filesystem about file change, maybe there is no update yet - * or there is no "modified" metadata to check, otherwise we will repeatedly - * download files that have no new updates */ - { - GDate* current = g_date_new (); - GDate* fs_mod_date = g_date_new (); - GTimeVal mod_time; - GFile* filter_file = g_file_new_for_path (path); - GFileInfo* info = g_file_query_info (filter_file, "time:modified", 0, NULL, NULL); - - g_file_info_get_modification_time (info, &mod_time); - g_date_set_time_t (current, time (NULL)); - g_date_set_time_val (fs_mod_date, &mod_time); - - fs_days_elapsed = g_date_days_between (fs_mod_date, current); - - g_date_free (current); - g_date_free (fs_mod_date); - } - - /* If there is no update metadata but file is valid, assume one week */ - if ((!days_to_expire && !timestamp) && fs_days_elapsed < 7) - return TRUE; - - if (days_to_expire && timestamp != NULL) - { - GDate* current = g_date_new (); - GDate* mod_date = g_date_new (); - gchar** parts; - gboolean use_dots = FALSE; - - /* Common dates are 20 Mar 2012, 20.08.2012 */ - if (g_strrstr (timestamp, ".")) - { - use_dots = TRUE; - parts = g_strsplit (timestamp, ".", 4); - } - else - parts = g_strsplit (timestamp, " ", 4); - - g_date_set_day (mod_date, atoi (parts[0])); - - if (use_dots) - g_date_set_month (mod_date, atoi (parts[1])); - else - g_date_set_month (mod_date, str_month_name_to_gdate (parts[1])); - - g_date_set_year (mod_date, atoi (parts[2])); - g_strfreev (parts); - - g_date_set_time_t (current, time (NULL)); - days_elapsed = g_date_days_between (mod_date, current); - - g_date_free (current); - g_date_free (mod_date); - g_free (timestamp); - } - - /* File from the future? Assume up to date */ - if (days_elapsed < 0) - { - g_print ("Adblock: file %s appears to be from the future," - "check your system clock!\n", path); - return TRUE; - } - - least_days = days_elapsed < fs_days_elapsed ? days_elapsed : fs_days_elapsed; - if (least_days < days_to_expire) - return TRUE; - else - return FALSE; - - return TRUE; - } - return FALSE; -} - -static void adblock_parse_file (gchar* path) { FILE* file; @@ -1700,7 +1316,9 @@ adblock_parse_file (gchar* path) while (fgets (line, 2000, file)) adblock_parse_line (line); fclose (file); + return TRUE; } + return FALSE; } static void @@ -1709,25 +1327,24 @@ adblock_deactivate_tabs (MidoriView* view, MidoriExtension* extension) { GtkWidget* web_view = midori_view_get_web_view (view); + GtkWidget* image = g_object_get_data (G_OBJECT (browser), "status-image"); + 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); g_signal_handlers_disconnect_by_func ( web_view, adblock_populate_popup_cb, extension); g_signal_handlers_disconnect_by_func ( - web_view, adblock_resource_request_starting_cb, view); - g_signal_handlers_disconnect_by_func ( - web_view, adblock_load_finished_cb, view); + web_view, adblock_resource_request_starting_cb, image); g_signal_handlers_disconnect_by_func ( - web_view, adblock_navigation_policy_decision_requested_cb, extension); + web_view, adblock_load_finished_cb, image); } 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"); @@ -1739,15 +1356,18 @@ adblock_deactivate_cb (MidoriExtension* extension, app, adblock_app_add_browser_cb, extension); g_signal_handlers_disconnect_by_func ( browser, adblock_add_tab_cb, extension); - g_signal_handlers_disconnect_by_func ( - browser, adblock_remove_tab_cb, extension); + midori_browser_foreach (browser, (GtkCallback)adblock_deactivate_tabs, browser); - i = 0; - while((view = midori_browser_get_nth_tab(browser, i++))) - adblock_deactivate_tabs (MIDORI_VIEW (view), browser, extension); + if (blockcss) + g_string_free (blockcss, TRUE); + if (blockcssprivate) + g_string_free (blockcssprivate, TRUE); - adblock_destroy_db (); midori_web_settings_remove_style (settings, "adblock-blockcss"); + blockcssprivate = blockcss = NULL; + g_hash_table_destroy (pattern); + g_hash_table_destroy (optslist); + g_hash_table_destroy (urlcache); g_object_unref (settings); } @@ -1755,9 +1375,25 @@ static void adblock_activate_cb (MidoriExtension* extension, MidoriApp* app) { + #ifdef G_ENABLE_DEBUG + const gchar* debug_mode; + #endif KatzeArray* browsers; MidoriBrowser* browser; + #ifdef G_ENABLE_DEBUG + debug_mode = g_getenv ("MIDORI_ADBLOCK"); + if (debug_mode) + { + if (*debug_mode == '1') + debug = 1; + else if (*debug_mode == '2') + debug = 2; + else + debug = 0; + } + #endif + adblock_reload_rules (extension, FALSE); browsers = katze_object_get_object (app, "browsers"); @@ -1790,57 +1426,6 @@ test_adblock_parse (void) g_assert_cmpstr (adblock_parse_line ("http://bla.blub/*"), ==, "http://bla.blub/"); } -static void -test_subscription_update (void) -{ - gint temp; - gchar* filename; - - temp = g_file_open_tmp ("midori_adblock_update_test_XXXXXX", &filename, NULL); - close (temp); - - g_file_set_contents (filename, "", -1, NULL); - g_assert (!adblock_file_is_up_to_date (filename)); - - g_file_set_contents (filename, - "[Adblock Plus 1.1]\n" - "! Checksum: 48f6Qdo4PsNogsurLvQ71w\n" - "! Title: EasyList\n" - "! Last modified: 05 Sep 2010 11:00 UTC\n" - "! This list expires after 48 hours\n", - -1, NULL); - g_assert (!adblock_file_is_up_to_date (filename)); - - g_file_set_contents (filename, - "[Adblock Plus 1.1]\n" - "! Checksum: 48f6Qdo4PsNogsurLvQ71w\n" - "! Title: EasyList\n" - "! Last modified: 05.09.2010 11:00 UTC\n" - "! Expires: 2 days (update frequency)\n", - -1, NULL); - g_assert (!adblock_file_is_up_to_date (filename)); - - g_file_set_contents (filename, - "[Adblock Plus 1.1]\n" - "! Checksum: 48f6Qdo4PsNogsurLvQ71w\n" - "! Title: EasyList\n" - "! Updated: 05 Nov 2014 11:00 UTC\n" - "! Expires: 5 days (update frequency)\n", - -1, NULL); - g_assert (adblock_file_is_up_to_date (filename)); - - g_file_set_contents (filename, - "[Adblock]\n" - "! dutchblock v3\n" - "! This list expires after 14 days\n" - "|http://b*.mookie1.com/\n", - -1, NULL); - g_assert (adblock_file_is_up_to_date (filename)); - - g_unlink (filename); - g_free (filename); -} - static void test_adblock_pattern (void) { @@ -1904,7 +1489,6 @@ extension_test (void) { g_test_add_func ("/extensions/adblock/parse", test_adblock_parse); g_test_add_func ("/extensions/adblock/pattern", test_adblock_pattern); - g_test_add_func ("/extensions/adblock/update", test_subscription_update); } #endif @@ -1914,7 +1498,7 @@ extension_init (void) MidoriExtension* extension = g_object_new (MIDORI_TYPE_EXTENSION, "name", _("Advertisement blocker"), "description", _("Block advertisements according to a filter list"), - "version", "0.6" MIDORI_VERSION_SUFFIX, + "version", "0.5" MIDORI_VERSION_SUFFIX, "authors", "Christian Dywan ", NULL); midori_extension_install_string_list (extension, "filters", NULL, G_MAXSIZE); diff --git a/extensions/addons.c b/extensions/addons.c index 37e42fb7..7c566f41 100644 --- a/extensions/addons.c +++ b/extensions/addons.c @@ -14,7 +14,6 @@ /* This extensions add support for user addons: userscripts and userstyles */ #include -#include "midori-core.h" #include #include "config.h" @@ -183,8 +182,8 @@ addons_install_response (GtkWidget* infobar, if (!filename) filename = g_path_get_basename (uri); - folder_path = g_build_path (G_DIR_SEPARATOR_S, - midori_paths_get_user_data_dir (), PACKAGE_NAME, folder, NULL); + 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); @@ -294,13 +293,13 @@ addons_button_add_clicked_cb (GtkToolItem* toolitem, if (addons->kind == ADDONS_USER_SCRIPTS) { addons_type = g_strdup ("userscripts"); - path = g_build_path (G_DIR_SEPARATOR_S, midori_paths_get_user_data_dir (), + path = g_build_path (G_DIR_SEPARATOR_S, g_get_user_data_dir (), PACKAGE_NAME, "scripts", NULL); } else if (addons->kind == ADDONS_USER_STYLES) { addons_type = g_strdup ("userstyles"); - path = g_build_path (G_DIR_SEPARATOR_S, midori_paths_get_user_data_dir (), + path = g_build_path (G_DIR_SEPARATOR_S, g_get_user_data_dir (), PACKAGE_NAME, "styles", NULL); } else @@ -337,13 +336,23 @@ addons_button_add_clicked_cb (GtkToolItem* toolitem, if (!g_file_test (path, G_FILE_TEST_EXISTS)) katze_mkdir_with_parents (path, 0700); + #if !GTK_CHECK_VERSION (2, 14, 0) + files = gtk_file_chooser_get_filenames (GTK_FILE_CHOOSER (dialog)); + #else files = gtk_file_chooser_get_files (GTK_FILE_CHOOSER (dialog)); + #endif + while (files) { GFile* src_file; GError* error = NULL; + #if !GTK_CHECK_VERSION (2, 14, 0) + src_file = g_file_new_for_path (files); + #else src_file = files->data; + #endif + if (G_IS_FILE (src_file)) { GFile* dest_file; @@ -482,7 +491,7 @@ addons_open_in_editor_clicked_cb (GtkWidget* toolitem, g_object_get (settings, "text-editor", &text_editor, NULL); if (text_editor && *text_editor) - sokoke_spawn_program (text_editor, TRUE, element->fullpath, TRUE); + sokoke_spawn_program (text_editor, element->fullpath); else { gchar* element_uri = g_filename_to_uri (element->fullpath, NULL, NULL); @@ -513,13 +522,10 @@ addons_open_target_folder_clicked_cb (GtkWidget* toolitem, folder = g_path_get_dirname (element->fullpath); } else - { - folder = g_build_path (G_DIR_SEPARATOR_S, midori_paths_get_user_data_dir (), - PACKAGE_NAME, addons->kind == ADDONS_USER_SCRIPTS - ? "scripts" : "styles", NULL); - katze_mkdir_with_parents (folder, 0700); - } - + folder = g_build_path (G_DIR_SEPARATOR_S, g_get_user_data_dir (), + PACKAGE_NAME, + addons->kind == ADDONS_USER_SCRIPTS + ? "scripts" : "styles", NULL); folder_uri = g_filename_to_uri (folder, NULL, NULL); g_free (folder); @@ -777,10 +783,11 @@ addons_treeview_render_text_cb (GtkTreeViewColumn* column, gtk_tree_model_get (model, iter, 0, &element, -1); - g_object_set (renderer, "text", element->displayname, - "sensitive", element->enabled, - "ellipsize", PANGO_ELLIPSIZE_END, - NULL); + g_object_set (renderer, "text", element->displayname, NULL); + if (!element->enabled) + g_object_set (renderer, "sensitive", false, NULL); + else + g_object_set (renderer, "sensitive", true, NULL); } static void @@ -824,16 +831,19 @@ addons_get_directories (AddonsKind kind) else g_assert_not_reached (); - path = g_build_path (G_DIR_SEPARATOR_S, midori_paths_get_user_data_dir (), + path = g_build_path (G_DIR_SEPARATOR_S, g_get_user_data_dir (), PACKAGE_NAME, folder_name, NULL); - directories = g_slist_prepend (directories, path); + if (g_access (path, X_OK) == 0) + directories = g_slist_prepend (directories, path); + else + g_free (path); datadirs = g_get_system_data_dirs (); while (*datadirs) { path = g_build_path (G_DIR_SEPARATOR_S, *datadirs, PACKAGE_NAME, folder_name, NULL); - if (g_slist_find (directories, path) == NULL) + if (g_slist_find (directories, path) == NULL && g_access (path, X_OK) == 0) directories = g_slist_prepend (directories, path); else g_free (path); @@ -1325,9 +1335,8 @@ addons_init (Addons* addons) G_CALLBACK (addons_cell_renderer_toggled_cb), addons); gtk_tree_view_append_column (GTK_TREE_VIEW (addons->treeview), column); column = gtk_tree_view_column_new (); - gtk_tree_view_column_set_expand (column, TRUE); renderer_text = gtk_cell_renderer_text_new (); - gtk_tree_view_column_pack_start (column, renderer_text, TRUE); + gtk_tree_view_column_pack_start (column, renderer_text, FALSE); gtk_tree_view_column_set_cell_data_func (column, renderer_text, (GtkTreeCellDataFunc)addons_treeview_render_text_cb, addons->treeview, NULL); @@ -1678,10 +1687,10 @@ addons_save_settings (MidoriApp* app, config_dir = midori_extension_get_config_dir (extension); config_file = g_build_filename (config_dir, "addons", NULL); - if (config_dir != NULL) - katze_mkdir_with_parents (config_dir, 0700); + katze_mkdir_with_parents (config_dir, 0700); sokoke_key_file_save_to_file (keyfile, config_file, &error); - if (error && midori_extension_get_config_dir (extension) != NULL) + /* 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); diff --git a/extensions/colorful-tabs.c b/extensions/colorful-tabs.c index 9bb84c3b..bb261d58 100644 --- a/extensions/colorful-tabs.c +++ b/extensions/colorful-tabs.c @@ -48,10 +48,11 @@ colorful_tabs_view_notify_uri_cb (MidoriView* view, 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) + && katze_object_get_enum (view, "load-status") == MIDORI_LOAD_FINISHED) { icon = midori_view_get_icon (view); - if (icon != NULL) + + if (midori_view_get_icon_uri (view) != NULL) { GdkPixbuf* newpix; guchar* pixels; diff --git a/extensions/cookie-manager/cookie-manager-page.c b/extensions/cookie-manager/cookie-manager-page.c index 186e310e..d21d128d 100644 --- a/extensions/cookie-manager/cookie-manager-page.c +++ b/extensions/cookie-manager/cookie-manager-page.c @@ -702,6 +702,7 @@ static gchar *cm_get_domain_description_text(const gchar *domain, gint cookie_co } +#if GTK_CHECK_VERSION(2, 12, 0) static gboolean cm_tree_query_tooltip(GtkWidget *widget, gint x, gint y, gboolean keyboard_mode, GtkTooltip *tooltip, CookieManagerPage *cmp) { @@ -730,6 +731,8 @@ static gboolean cm_tree_query_tooltip(GtkWidget *widget, gint x, gint y, gboolea return FALSE; } +#endif + static gboolean cm_filter_match(const gchar *haystack, const gchar *needle) { @@ -809,20 +812,25 @@ static void cm_filter_entry_changed_cb(GtkEditable *editable, CookieManagerPage if (priv->ignore_changed_filter) return; - if (!g_object_get_data (G_OBJECT (editable), "sokoke_has_default")) - text = gtk_entry_get_text(GTK_ENTRY(editable)); - else - text = NULL; + text = gtk_entry_get_text(GTK_ENTRY(editable)); cm_filter_tree(cmp, text); cookie_manager_update_filter(priv->parent, text); - if (text && *text) - gtk_tree_view_collapse_all(GTK_TREE_VIEW(priv->treeview)); - else + if (*text != '\0') gtk_tree_view_expand_all(GTK_TREE_VIEW(priv->treeview)); + else + gtk_tree_view_collapse_all(GTK_TREE_VIEW(priv->treeview)); } + +static void cm_filter_entry_clear_icon_released_cb(GtkIconEntry *e, gint pos, gint btn, gpointer data) +{ + if (pos == GTK_ICON_ENTRY_SECONDARY) + gtk_entry_set_text(GTK_ENTRY(e), ""); +} + + static void cm_tree_selection_changed_cb(GtkTreeSelection *selection, CookieManagerPage *cmp) { GList *rows; @@ -994,7 +1002,6 @@ static void cm_tree_render_text_cb(GtkTreeViewColumn *column, GtkCellRenderer *r } else g_object_set(renderer, "text", name, NULL); - g_object_set (renderer, "ellipsize", PANGO_ELLIPSIZE_END, NULL); g_free(name); } @@ -1015,7 +1022,6 @@ static GtkWidget *cm_tree_prepare(CookieManagerPage *cmp) renderer = gtk_cell_renderer_text_new(); column = gtk_tree_view_column_new_with_attributes( _("Name"), renderer, "text", COOKIE_MANAGER_COL_NAME, NULL); - gtk_tree_view_column_set_expand (column, TRUE); gtk_tree_view_column_set_sort_indicator(column, TRUE); gtk_tree_view_column_set_sort_column_id(column, COOKIE_MANAGER_COL_NAME); gtk_tree_view_column_set_resizable(column, TRUE); @@ -1039,8 +1045,10 @@ static GtkWidget *cm_tree_prepare(CookieManagerPage *cmp) g_signal_connect(treeview, "popup-menu", G_CALLBACK(cm_tree_popup_menu_cb), cmp); /* tooltips */ +#if GTK_CHECK_VERSION(2, 12, 0) gtk_widget_set_has_tooltip(treeview, TRUE); g_signal_connect(treeview, "query-tooltip", G_CALLBACK(cm_tree_query_tooltip), cmp); +#endif /* drag'n'drop */ gtk_tree_view_enable_model_drag_source( @@ -1092,6 +1100,7 @@ static void cookie_manager_page_init(CookieManagerPage *self) GtkWidget *desc_swin; GtkWidget *paned; GtkWidget *filter_hbox; + GtkWidget *filter_label; GtkWidget *treeview; CookieManagerPagePrivate *priv; @@ -1123,15 +1132,29 @@ static void cookie_manager_page_init(CookieManagerPage *self) tree_swin = gtk_scrolled_window_new(NULL, NULL); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(tree_swin), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(tree_swin), GTK_SHADOW_IN); gtk_container_add(GTK_CONTAINER(tree_swin), treeview); gtk_widget_show(tree_swin); - priv->filter_entry = sokoke_search_entry_new (_("Search Cookies by Name or Domain")); + filter_label = gtk_label_new(_("Filter:")); + gtk_widget_show(filter_label); + + priv->filter_entry = gtk_icon_entry_new(); + gtk_widget_set_tooltip_text(priv->filter_entry, + _("Enter a filter string to show only cookies whose name or domain " + "field match the entered filter")); gtk_widget_show(priv->filter_entry); + gtk_icon_entry_set_icon_from_stock(GTK_ICON_ENTRY(priv->filter_entry), + GTK_ICON_ENTRY_SECONDARY, GTK_STOCK_CLEAR); + gtk_icon_entry_set_icon_highlight(GTK_ICON_ENTRY (priv->filter_entry), + GTK_ICON_ENTRY_SECONDARY, TRUE); + g_signal_connect(priv->filter_entry, "icon-release", + G_CALLBACK(cm_filter_entry_clear_icon_released_cb), NULL); g_signal_connect(priv->filter_entry, "changed", G_CALLBACK(cm_filter_entry_changed_cb), self); g_signal_connect(priv->filter_entry, "activate", G_CALLBACK(cm_filter_entry_changed_cb), self); filter_hbox = gtk_hbox_new(FALSE, 0); + gtk_box_pack_start(GTK_BOX(filter_hbox), filter_label, FALSE, FALSE, 3); gtk_box_pack_start(GTK_BOX(filter_hbox), priv->filter_entry, TRUE, TRUE, 3); gtk_widget_show(filter_hbox); diff --git a/extensions/delayed-load.vala b/extensions/delayed-load.vala deleted file mode 100644 index 83af2539..00000000 --- a/extensions/delayed-load.vala +++ /dev/null @@ -1,231 +0,0 @@ -/* - 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 Katze; -using Midori; - -namespace DelayedLoad { - private class PreferencesDialog : Dialog { - protected Manager dl_manager; - protected Scale slider; - - public PreferencesDialog (Manager manager) { - this.dl_manager = manager; - - this.title = _("Preferences for %s").printf ( _("Delayed load")); - 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: - this.dl_manager.set_integer ("delay", (int) (this.slider.get_value () * 1000)); - this.dl_manager.preferences_changed (); - this.destroy (); - break; - case ResponseType.CANCEL: - this.destroy (); - break; - } - } - - private void create_widgets () { - Label text = new Label (_("Delay in seconds until loading the page:")); -#if HAVE_GTK3 - this.slider = new Scale.with_range (Orientation.HORIZONTAL, 0, 15, 0.1); -#else - this.slider = new HScale.with_range (0, 15, 0.1); -#endif - - int delay = this.dl_manager.get_integer ("delay"); - if (delay > 0) - this.slider.set_value ((float)delay / 1000); - -#if HAVE_GTK3 - Gtk.Box vbox = get_content_area () as Gtk.Box; - vbox.pack_start (text, false, false, 0); - vbox.pack_start (this.slider, false, true, 0); -#else - this.vbox.pack_start (text, false, false, 0); - this.vbox.pack_start (this.slider, false, true, 0); -#endif - - this.add_button (Gtk.STOCK_CANCEL, ResponseType.CANCEL); - this.add_button (Gtk.STOCK_APPLY, ResponseType.APPLY); - - this.show_all (); - } - } - - private class TabShaker : GLib.Object { - public unowned Midori.Browser browser; - public GLib.PtrArray tasks; - - public bool reload_tab () { - if (tasks.len == 1) { - Midori.View? view = browser.tab as Midori.View; - Midori.View scheduled_view = tasks.index (0) as Midori.View; - if (scheduled_view == view) { - Katze.Item item = view.get_proxy_item (); - item.ref(); - - int64 delay = item.get_meta_integer ("delay"); - if (delay == -2) { - view.reload (true); - } - } - } - tasks.remove_index (0); - return false; - } - - public TabShaker (Midori.Browser browser) { - this.browser = browser; - } - - construct { - this.tasks = new GLib.PtrArray (); - } - } - - private class Manager : Midori.Extension { - private int timeout = 0; - private bool timeout_handler = false; - private HashTable tasks; - - public signal void preferences_changed (); - - private void preferences_changed_cb () { - this.timeout = get_integer ("delay"); - } - - private void show_preferences () { - PreferencesDialog dialog = new PreferencesDialog (this); - dialog.show (); - } - - private void schedule_reload (Midori.Browser browser, Midori.View view) { - if (this.timeout == 0) - view.reload (true); - else { - unowned TabShaker shaker = tasks.get (browser); - if (shaker != null) { - shaker.tasks.add (view); - Timeout.add (this.timeout, shaker.reload_tab); - } - } - } - - private void tab_changed (Midori.View? old_view, Midori.View? new_view) { - if (new_view != null) { - Midori.App app = get_app (); - Midori.Browser browser = app.browser; - - Katze.Item item = new_view.get_proxy_item (); - item.ref(); - - int64 delay = item.get_meta_integer ("delay"); - if (delay == -2 && new_view.progress < 1.0) { - this.schedule_reload (browser, new_view); - } - } - } - - private bool reload_first_tab () { - Midori.App app = get_app (); - Midori.Browser? browser = app.browser; - Midori.View? view = browser.tab as Midori.View; - - if (view != null) { - Katze.Item item = view.get_proxy_item (); - item.ref(); - - int64 delay = item.get_meta_integer ("delay"); - if (delay != 1) { - unowned WebKit.WebView web_view = view.get_web_view (); - WebKit.LoadStatus load_status = web_view.load_status; - if (load_status == WebKit.LoadStatus.FINISHED) { - if (this.timeout != 0) - this.tasks.set (browser, new TabShaker (browser)); - - if (view.progress < 1.0) - this.schedule_reload (browser, view); - - return false; - } - } - } - - return true; - } - - private void browser_added (Midori.Browser browser) { - browser.switch_tab.connect_after (this.tab_changed); - } - - private void browser_removed (Midori.Browser browser) { - browser.switch_tab.disconnect (this.tab_changed); - } - - public void activated (Midori.App app) { - /* FIXME: override behavior without changing the preference */ - app.settings.load_on_startup = MidoriStartup.DELAYED_PAGES; - - this.preferences_changed (); - - Midori.Browser? focused_browser = app.browser; - if (focused_browser == null) - Timeout.add (50, this.reload_first_tab); - - foreach (Midori.Browser browser in app.get_browsers ()) { - browser_added (browser); - } - app.add_browser.connect (browser_added); - } - - public void deactivated () { - Midori.App app = get_app (); - foreach (Midori.Browser browser in app.get_browsers ()) { - browser_removed (browser); - } - app.add_browser.disconnect (browser_added); - } - - internal Manager () { - GLib.Object (name: _("Delayed load"), - description: _("Delay page load until you actually use the tab."), - version: "0.1", - authors: "André Stösel "); - - install_integer ("delay", 0); - - activate.connect (this.activated); - deactivate.connect (this.deactivated); - open_preferences.connect (show_preferences); - preferences_changed.connect (preferences_changed_cb); - - this.tasks = new HashTable (GLib.direct_hash, GLib.direct_equal); - } - } -} - -public Midori.Extension extension_init () { - return new DelayedLoad.Manager (); -} - diff --git a/extensions/external-download-manager.vala b/extensions/external-download-manager.vala deleted file mode 100644 index b8c60142..00000000 --- a/extensions/external-download-manager.vala +++ /dev/null @@ -1,314 +0,0 @@ -/* - 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) { - Midori.DownloadType download_type = download.get_data ("midori-download-type"); - - if (download_type == Midori.DownloadType.SAVE) { - 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); - } - } - - private class CommandLinePreferences : Dialog { - protected Entry input; - protected CommandLine commandline; - - public CommandLinePreferences(CommandLine cl) { - this.commandline = cl; - - string ext_name; - this.get ("name",out ext_name); - - this.title = _("Preferences for %s").printf (ext_name); - 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 (400, 100); - this.create_widgets (); - - this.response.connect (response_cb); - } - - private void response_cb (Dialog source, int response_id) { - switch (response_id) { - case ResponseType.APPLY: - this.commandline.set_string ("commandline", this.input.get_text ()); - this.destroy (); - break; - case ResponseType.CANCEL: - this.destroy (); - break; - } - } - - private void create_widgets () { - Label text = new Label (_("Command:")); - this.input = new Entry (); - this.input.set_text (this.commandline.get_string ("commandline")); - - -#if HAVE_GTK3 - Gtk.Box vbox = get_content_area () as Gtk.Box; - vbox.pack_start (text, false, false, 0); - vbox.pack_start (this.input, false, true, 0); -#else - this.vbox.pack_start (text, false, false, 0); - this.vbox.pack_start (this.input, false, true, 0); -#endif - - this.add_button (Gtk.STOCK_CANCEL, ResponseType.CANCEL); - this.add_button (Gtk.STOCK_APPLY, ResponseType.APPLY); - - this.show_all (); - } - } - - private class CommandLine : ExternalDownloadManager { - private void show_preferences () { - CommandLinePreferences dialog = new CommandLinePreferences (this); - dialog.show (); - } - - public override bool download (DownloadRequest dlReq) { - try { - string cmd = this.get_string ("commandline"); - cmd = cmd.replace("{REFERER}", GLib.Shell.quote (dlReq.referer)); - if (dlReq.cookie_header != null) { - cmd = cmd.replace("{COOKIES}", GLib.Shell.quote ("Cookie: " + dlReq.cookie_header)); - } else { - cmd = cmd.replace("{COOKIES}", "\'\'"); - } - cmd = cmd.replace("{URL}", GLib.Shell.quote (dlReq.uri)); - GLib.Process.spawn_command_line_async (cmd); - return true; - } catch (Error e) { - this.handle_exception (e); - } - return false; - } - - internal CommandLine () { - GLib.Object (name: _("External Download Manager - CommandLine"), - description: _("Download files with a specified command"), - version: "0.1" + Midori.VERSION_SUFFIX, - authors: "André Stösel ", - key: "commandline"); - - this.install_string ("commandline", "wget --no-check-certificate --referer={REFERER} --header={COOKIES} {URL}"); - - this.activate.connect (activated); - this.deactivate.connect (deactivated); - this.open_preferences.connect (show_preferences); - } - } -} - -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 ()); - extensions.add_item (new EDM.CommandLine ()); - return extensions; -} - diff --git a/extensions/feed-panel/feed-panel.c b/extensions/feed-panel/feed-panel.c index de0d457e..327237dc 100644 --- a/extensions/feed-panel/feed-panel.c +++ b/extensions/feed-panel/feed-panel.c @@ -840,8 +840,7 @@ feed_panel_init (FeedPanel* panel) 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); + font_desc = gtk_style_context_get_font(gtk_widget_get_style_context(treeview), GTK_STATE_FLAG_NORMAL); #else font_desc = treeview->style->font_desc; #endif diff --git a/extensions/formhistory.c b/extensions/formhistory.c new file mode 100644 index 00000000..00e9ea72 --- /dev/null +++ b/extensions/formhistory.c @@ -0,0 +1,600 @@ +/* + 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 + +#include "config.h" +#if HAVE_UNISTD_H + #include +#endif + +static GHashTable* global_keys; +static gchar* jsforms; + + +static void +formhistory_toggle_state_cb (GtkAction* action, + MidoriBrowser* browser); + +static gboolean +formhistory_prepare_js () +{ + 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); + 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 (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 () +{ + GString* suggestions; + GHashTableIter iter; + gpointer key, value; + + suggestions = g_string_new ( + "function FormSuggestions(eid) { " + "arr = new Array();"); + g_hash_table_iter_init (&iter, global_keys); + while (g_hash_table_iter_next (&iter, &key, &value)) + { + g_string_append_printf (suggestions, " arr[\"%s\"] = [%s]; ", + (gchar*)key, (gchar*)value); + } + g_string_append (suggestions, "this.suggestions = arr[eid]; }"); + g_string_append (suggestions, jsforms); + return g_string_free (suggestions, FALSE); +} + +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; +} + +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;iF"); + 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_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); + g_signal_handlers_disconnect_by_func ( + web_view, formhistory_navigation_decision_cb, extension); +} + +static void +formhistory_deactivate_cb (MidoriExtension* extension, + MidoriBrowser* browser) +{ + MidoriApp* app = midori_extension_get_app (extension); + sqlite3* db; + + 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_tabs, 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); + } + + 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) != 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, "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); +} + +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_tabs, 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); + + 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_tabs (view, browser, extension); + } else { + formhistory_add_tab_cb (browser, view, extension); + } +} + + +#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" MIDORI_VERSION_SUFFIX; + 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) + { + 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 --git a/extensions/formhistory/formhistory-frontend.h b/extensions/formhistory/formhistory-frontend.h deleted file mode 100644 index 378ae65e..00000000 --- a/extensions/formhistory/formhistory-frontend.h +++ /dev/null @@ -1,74 +0,0 @@ -/* - 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 --git a/extensions/formhistory/formhistory-gdom-frontend.c b/extensions/formhistory/formhistory-gdom-frontend.c deleted file mode 100644 index 76e03617..00000000 --- a/extensions/formhistory/formhistory-gdom-frontend.c +++ /dev/null @@ -1,516 +0,0 @@ -/* - 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 --git a/extensions/formhistory/formhistory-js-frontend.c b/extensions/formhistory/formhistory-js-frontend.c deleted file mode 100644 index ec64d7ac..00000000 --- a/extensions/formhistory/formhistory-js-frontend.c +++ /dev/null @@ -1,143 +0,0 @@ -/* - 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 = midori_app_find_res_filename ("autosuggestcontrol.js"); - if (!g_file_get_contents (file, &autosuggest, NULL, NULL)) - { - g_free (file); - return FALSE; - } - g_strchomp (autosuggest); - - katze_assign (file, midori_app_find_res_filename ("autosuggestcontrol.css")); - 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 --git a/extensions/formhistory/formhistory.c b/extensions/formhistory/formhistory.c deleted file mode 100644 index fca8aada..00000000 --- a/extensions/formhistory/formhistory.c +++ /dev/null @@ -1,681 +0,0 @@ -/* - 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); - if (config_dir != NULL) - katze_mkdir_with_parents (config_dir, 0700); - filename = g_build_filename (config_dir, "forms.db", NULL); - if (sqlite3_open (filename, &db) != SQLITE_OK) - { - if (config_dir != NULL) - 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 --git a/extensions/history-list.vala b/extensions/history-list.vala index 499bb740..44af649f 100644 --- a/extensions/history-list.vala +++ b/extensions/history-list.vala @@ -462,7 +462,7 @@ namespace HistoryList { tab_added (browser, tab); browser.add_tab.connect (tab_added); browser.remove_tab.connect (tab_removed); - browser.switch_tab.connect (this.tab_changed); + browser.notify["tab"].connect (this.tab_changed); } void browser_removed (Midori.Browser browser) { @@ -491,7 +491,7 @@ namespace HistoryList { browser.add_tab.disconnect (tab_added); browser.remove_tab.disconnect (tab_removed); - browser.switch_tab.disconnect (this.tab_changed); + browser.notify["tab"].disconnect (this.tab_changed); } void tab_added (Midori.Browser browser, Midori.View view) { @@ -520,18 +520,21 @@ namespace HistoryList { } } - void tab_changed (Midori.View? old_view, Midori.View? new_view) { + void tab_changed (GLib.Object window, GLib.ParamSpec pspec) { if(this.ignoreNextChange) { this.ignoreNextChange = false; } else { - Midori.Browser? browser = Midori.Browser.get_for_widget (new_view); - Midori.View? last_view - = browser.get_data ("history-list-last-change"); + 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", new_view); + browser.set_data ("history-list-last-change", view); } } diff --git a/extensions/shortcuts.c b/extensions/shortcuts.c index b4cb0427..552f1694 100644 --- a/extensions/shortcuts.c +++ b/extensions/shortcuts.c @@ -180,6 +180,8 @@ shortcuts_get_preferences_dialog (MidoriExtension* extension) 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); diff --git a/extensions/statusbar-features.c b/extensions/statusbar-features.c index e2210d7f..76ca2d3b 100644 --- a/extensions/statusbar-features.c +++ b/extensions/statusbar-features.c @@ -66,14 +66,11 @@ statusbar_features_browser_notify_tab_cb (MidoriBrowser* browser, 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); + gchar* zoom_level_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))), + zoom_level_text); + g_free (zoom_level_text); } static void @@ -107,81 +104,6 @@ statusbar_features_zoom_level_changed_cb (GtkWidget* combobox, midori_view_set_zoom_level (view, zoom_level / 100.0); } -GtkWidget* -statusbar_features_property_proxy (MidoriWebSettings* settings, - const gchar* property, - GtkWidget* toolbar) -{ - const gchar* kind = NULL; - GtkWidget* button; - GtkWidget* image; - if (!strcmp (property, "auto-load-images") - || !strcmp (property, "enable-scripts") - || !strcmp (property, "enable-plugins")) - kind = "toggle"; - else if (!strcmp (property, "identify-as")) - kind = "custom-user-agent"; - else if (strstr (property, "font") != NULL) - kind = "font"; - else if (!strcmp (property, "zoom-level")) - { - MidoriBrowser* browser = midori_browser_get_for_widget (toolbar); - gint i; - 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); - 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); - return button; - } - - button = katze_property_proxy (settings, property, kind); - if (GTK_IS_BIN (button)) - { - GtkWidget* label = gtk_bin_get_child (GTK_BIN (button)); - if (GTK_IS_LABEL (label)) - gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END); - } - - if (!strcmp (property, "auto-load-images")) - { - 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); - gtk_widget_set_tooltip_text (button, _("Load images automatically")); - 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); - } - if (!strcmp (property, "enable-scripts")) - { - g_object_set_data (G_OBJECT (button), "feature-label", _("Scripts")); - image = gtk_image_new_from_stock (STOCK_SCRIPT, GTK_ICON_SIZE_MENU); - gtk_button_set_image (GTK_BUTTON (button), image); - gtk_widget_set_tooltip_text (button, _("Enable scripts")); - 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); - } - else if (!strcmp (property, "enable-plugins")) - { - if (!midori_web_settings_has_plugin_support ()) - gtk_widget_hide (button); - 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); - gtk_widget_set_tooltip_text (button, _("Enable Netscape plugins")); - 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); - } - return button; -} - static void statusbar_features_app_add_browser_cb (MidoriApp* app, MidoriBrowser* browser, @@ -192,8 +114,8 @@ statusbar_features_app_add_browser_cb (MidoriApp* app, MidoriWebSettings* settings; GtkWidget* toolbar; GtkWidget* button; + GtkWidget* image; gsize i; - gchar** filters; /* FIXME: Monitor each view and modify its settings individually instead of merely replicating the global preferences. */ @@ -202,37 +124,48 @@ statusbar_features_app_add_browser_cb (MidoriApp* app, bbox = gtk_hbox_new (FALSE, 0); settings = midori_browser_get_settings (browser); toolbar = katze_object_get_object (browser, "navigationbar"); - - filters = midori_extension_get_string_list (extension, "items", NULL); - if (filters && *filters) - { - i = 0; - while (filters[i] != NULL) - { - button = statusbar_features_property_proxy (settings, filters[i], toolbar); - gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 2); - i++; - } - } - else - { - button = statusbar_features_property_proxy (settings, "auto-load-images", toolbar); - gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 2); - button = statusbar_features_property_proxy (settings, "enable-scripts", toolbar); - gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 2); - button = statusbar_features_property_proxy (settings, "enable-plugins", toolbar); - gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 2); - button = statusbar_features_property_proxy (settings, "identify-as", toolbar); - gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 2); - button = statusbar_features_property_proxy (settings, "zoom-level", toolbar); - gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 2); - } + 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); + gtk_widget_set_tooltip_text (button, _("Load images automatically")); + 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); + 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); + gtk_widget_set_tooltip_text (button, _("Enable scripts")); + 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); + 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); + gtk_widget_set_tooltip_text (button, _("Enable Netscape plugins")); + 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); + 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); gtk_widget_show_all (bbox); - gtk_box_pack_end (GTK_BOX (statusbar), bbox, FALSE, FALSE, 3); + gtk_box_pack_start (GTK_BOX (statusbar), bbox, FALSE, FALSE, 3); g_object_unref (statusbar); - g_object_unref (toolbar); - g_strfreev (filters); g_signal_connect (extension, "deactivate", G_CALLBACK (statusbar_features_deactivate_cb), bbox); } @@ -261,7 +194,6 @@ extension_init (void) "version", "0.1" MIDORI_VERSION_SUFFIX, "authors", "Christian Dywan ", NULL); - midori_extension_install_string_list (extension, "items", NULL, G_MAXSIZE); g_signal_connect (extension, "activate", G_CALLBACK (statusbar_features_activate_cb), NULL); diff --git a/extensions/tab-panel.c b/extensions/tab-panel.c index 44e23e6a..fa54bdf5 100644 --- a/extensions/tab-panel.c +++ b/extensions/tab-panel.c @@ -143,6 +143,7 @@ midori_extension_cursor_or_row_changed_cb (GtkTreeView* treeview, /* Nothing to do */ } +#if GTK_CHECK_VERSION (2, 12, 0) static gboolean tab_panel_treeview_query_tooltip_cb (GtkWidget* treeview, gint x, @@ -170,6 +171,7 @@ tab_panel_treeview_query_tooltip_cb (GtkWidget* treeview, return TRUE; } +#endif static void midori_extension_row_activated_cb (GtkTreeView* treeview, @@ -229,12 +231,12 @@ midori_extension_button_release_event_cb (GtkWidget* widget, if (gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (widget), event->x, event->y, NULL, &column, NULL, NULL) && column == gtk_tree_view_get_column (GTK_TREE_VIEW (widget), 1)) - midori_browser_remove_tab (browser, view); + gtk_widget_destroy (view); else midori_browser_set_current_tab (browser, view); } else if (event->button == 2) - midori_browser_remove_tab (midori_browser_get_for_widget (widget), view); + gtk_widget_destroy (view); else tab_panel_popup (widget, event, view); @@ -417,7 +419,8 @@ tab_panel_browser_add_tab_cb (MidoriBrowser* browser, GtkWidget* view, MidoriExtension* extension) { - gint page = midori_browser_page_num (browser, view); + GtkWidget* notebook = katze_object_get_object (browser, "notebook"); + gint page = gtk_notebook_page_num (GTK_NOTEBOOK (notebook), 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)); @@ -465,6 +468,8 @@ tab_panel_browser_add_tab_cb (MidoriBrowser* browser, g_signal_connect (view, "notify::title", G_CALLBACK (tab_panel_view_notify_title_cb), extension); } + + g_object_unref (notebook); } static void @@ -532,9 +537,11 @@ tab_panel_app_add_browser_cb (MidoriApp* app, treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model)); gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), FALSE); gtk_tree_view_set_show_expanders (GTK_TREE_VIEW (treeview), FALSE); + #if GTK_CHECK_VERSION (2, 12, 0) g_signal_connect (treeview, "query-tooltip", G_CALLBACK (tab_panel_treeview_query_tooltip_cb), NULL); gtk_widget_set_has_tooltip (treeview, TRUE); + #endif column = gtk_tree_view_column_new (); renderer_pixbuf = gtk_cell_renderer_pixbuf_new (); gtk_tree_view_column_pack_start (column, renderer_pixbuf, FALSE); diff --git a/extensions/toolbar-editor.c b/extensions/toolbar-editor.c index 93486682..6d3e10a3 100644 --- a/extensions/toolbar-editor.c +++ b/extensions/toolbar-editor.c @@ -46,6 +46,8 @@ static const GtkTargetEntry tb_editor_dnd_targets[] = }; static const gint tb_editor_dnd_targets_len = G_N_ELEMENTS(tb_editor_dnd_targets); +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); @@ -56,6 +58,7 @@ static void tb_editor_deactivate_cb(MidoriExtension *extension, MidoriBrowser *b { 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); @@ -104,12 +107,7 @@ static GSList *tb_editor_array_to_list(const gchar **items) name = items; while (*name != NULL) { - #ifdef HAVE_GRANITE - /* A "new tab" button is already part of the notebook */ - if (*name[0] != '\0' && strcmp (*name, "TabNew")) - #else if (*name[0] != '\0') - #endif list = g_slist_append(list, g_strdup(*name)); name++; } @@ -396,7 +394,11 @@ static TBEditorWidget *tb_editor_create_dialog(MidoriBrowser *parent) GTK_WINDOW(parent), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL); - vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog)); +#if !GTK_CHECK_VERSION(3,0,0) + vbox = (GTK_DIALOG(dialog))->vbox; +#else + vbox = GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))); +#endif gtk_box_set_spacing(GTK_BOX(vbox), 6); gtk_widget_set_name(dialog, "GeanyDialog"); gtk_window_set_default_size(GTK_WINDOW(dialog), -1, 400); @@ -408,7 +410,7 @@ static TBEditorWidget *tb_editor_create_dialog(MidoriBrowser *parent) G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING); label = gtk_label_new( - _("Select items to be displayed on the toolbar. Items can be reordered by drag and drop.")); + _("Select items to be displayed on the toolbar. Items can be reodered by drag and drop.")); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); tree_available = gtk_tree_view_new(); @@ -576,6 +578,17 @@ static void tb_editor_menu_configure_toolbar_activate_cb(GtkWidget *menuitem, Mi g_free(tbw); } +static void tb_editor_browser_populate_tool_menu_cb(MidoriBrowser *browser, GtkWidget *menu, MidoriExtension *ext) +{ + GtkWidget *menuitem; + + menuitem = gtk_menu_item_new_with_mnemonic (_("Customize _Toolbar...")); + 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_browser_populate_toolbar_menu_cb(MidoriBrowser *browser, GtkWidget *menu, MidoriExtension *ext) { @@ -585,7 +598,7 @@ static void tb_editor_browser_populate_toolbar_menu_cb(MidoriBrowser *browser, G 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 Toolbar…")); + 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); @@ -594,6 +607,7 @@ static void tb_editor_browser_populate_toolbar_menu_cb(MidoriBrowser *browser, G 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(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); } diff --git a/extensions/web-cache.c b/extensions/web-cache.c index 53ea445b..a3e592bf 100644 --- a/extensions/web-cache.c +++ b/extensions/web-cache.c @@ -28,7 +28,8 @@ web_cache_get_cache_dir (void) { static gchar* cache_dir = NULL; if (!cache_dir) - cache_dir = g_build_filename (midori_paths_get_cache_dir (), "web", NULL); + cache_dir = g_build_filename (g_get_user_cache_dir (), + PACKAGE_NAME, "web", NULL); return cache_dir; } diff --git a/extensions/wscript_build b/extensions/wscript_build index 152d8206..e209aed4 100644 --- a/extensions/wscript_build +++ b/extensions/wscript_build @@ -28,16 +28,13 @@ for extension in extensions: 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 = '.. ../katze ../midori' + obj.includes = '..' obj.source = source obj.uselib = 'UNIQUE LIBSOUP GIO GTK SQLITE WEBKIT LIBXML HILDON' - obj.vapi_dirs = '../midori ../katze' - obj.packages = 'glib-2.0 gio-2.0 libsoup-2.4 midori midori-core katze' + obj.vapi_dirs = '../midori' + obj.packages = 'glib-2.0 gio-2.0 libsoup-2.4 midori' if bld.env['HAVE_GTK3']: obj.packages += ' gtk+-3.0 webkitgtk-3.0' else: diff --git a/icons/16x16/internet-news-reader.png b/icons/16x16/news-feed.png similarity index 100% rename from icons/16x16/internet-news-reader.png rename to icons/16x16/news-feed.png diff --git a/icons/22x22/internet-news-reader.png b/icons/22x22/news-feed.png similarity index 100% rename from icons/22x22/internet-news-reader.png rename to icons/22x22/news-feed.png diff --git a/icons/scalable/internet-news-reader.svg b/icons/scalable/news-feed.svg similarity index 100% rename from icons/scalable/internet-news-reader.svg rename to icons/scalable/news-feed.svg diff --git a/icons/wscript_build b/icons/wscript_build index 4e2345c9..6421b80c 100644 --- a/icons/wscript_build +++ b/icons/wscript_build @@ -41,4 +41,4 @@ def add_image (bld, category, name): add_image (bld, 'categories', 'extension') add_image (bld, 'apps', 'midori') -add_image (bld, 'status', 'internet-news-reader') +add_image (bld, 'status', 'news-feed') diff --git a/katze/gtk3-compat.c b/katze/gtk3-compat.c index d7fd2495..0c0a4369 100644 --- a/katze/gtk3-compat.c +++ b/katze/gtk3-compat.c @@ -27,9 +27,9 @@ sokoke_on_entry_focus_in_event (GtkEntry* entry, 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)); - gtk_entry_set_text (entry, ""); sokoke_widget_set_pango_font_style (GTK_WIDGET (entry), PANGO_STYLE_NORMAL); } @@ -46,9 +46,9 @@ sokoke_on_entry_focus_out_event (GtkEntry* entry, { 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)); - gtk_entry_set_text (entry, default_text); sokoke_widget_set_pango_font_style (GTK_WIDGET (entry), PANGO_STYLE_ITALIC); } @@ -71,15 +71,14 @@ 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 (default_text == NULL) - g_object_set_data (G_OBJECT (entry), "sokoke_has_default", GINT_TO_POINTER (0)); - else if (!old_value) + 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); + 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); @@ -90,19 +89,55 @@ gtk_entry_set_placeholder_text (GtkEntry* entry, } 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")); + 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); + 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); } +#endif + +#if !GTK_CHECK_VERSION (2, 12, 0) -const gchar* -gtk_entry_get_placeholder_text (GtkEntry* entry) +void +gtk_widget_set_has_tooltip (GtkWidget* widget, + gboolean has_tooltip) { - return g_object_get_data (G_OBJECT (entry), "sokoke_default_text"); + /* 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 --git a/katze/gtk3-compat.h b/katze/gtk3-compat.h index a8450af2..fddfe977 100644 --- a/katze/gtk3-compat.h +++ b/katze/gtk3-compat.h @@ -6,7 +6,7 @@ G_BEGIN_DECLS -#if GTK_CHECK_VERSION (3, 2, 0) && defined (GTK_DISABLE_DEPRECATED) +#if GTK_CHECK_VERSION (3, 2, 0) #define GTK_TYPE_VBOX GTK_TYPE_BOX #define GtkVBox GtkBox #define GtkVBoxClass GtkBoxClass @@ -39,6 +39,25 @@ G_BEGIN_DECLS #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) @@ -70,10 +89,24 @@ G_BEGIN_DECLS #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); + #define gtk_entry_set_placeholder_text sokoke_entry_set_default_text +#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) @@ -116,10 +149,6 @@ G_BEGIN_DECLS #define GDK_KEY_Return GDK_Return #endif -#ifndef GDK_IS_X11_DISPLAY - #define GDK_IS_X11_DISPLAY(display) TRUE -#endif - G_END_DECLS #endif diff --git a/katze/katze-array.c b/katze/katze-array.c index 602c1647..49291d03 100644 --- a/katze/katze-array.c +++ b/katze/katze-array.c @@ -74,13 +74,6 @@ 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) @@ -91,7 +84,6 @@ _katze_array_add_item (KatzeArray* array, katze_item_set_parent (item, array); array->items = g_list_append (array->items, item); - _katze_array_update (array); } static void @@ -103,7 +95,6 @@ _katze_array_remove_item (KatzeArray* array, if (KATZE_IS_ITEM (item)) katze_item_set_parent (item, NULL); g_object_unref (item); - _katze_array_update (array); } static void @@ -113,7 +104,6 @@ _katze_array_move_item (KatzeArray* array, { array->items = g_list_remove (array->items, item); array->items = g_list_insert (array->items, item, position); - _katze_array_update (array); } static void @@ -122,10 +112,9 @@ _katze_array_clear (KatzeArray* array) GObject* item; while ((item = g_list_nth_data (array->items, 0))) - g_signal_emit (array, signals[REMOVE_ITEM], 0, item); + katze_array_remove_item (array, item); g_list_free (array->items); array->items = NULL; - _katze_array_update (array); } static void @@ -203,7 +192,7 @@ katze_array_class_init (KatzeArrayClass* class) "update", G_TYPE_FROM_CLASS (class), (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), - G_STRUCT_OFFSET (KatzeArrayClass, update), + 0, 0, NULL, g_cclosure_marshal_VOID__VOID, @@ -216,7 +205,6 @@ katze_array_class_init (KatzeArrayClass* class) 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 @@ -229,11 +217,14 @@ katze_array_init (KatzeArray* array) static void katze_array_finalize (GObject* object) { - KatzeArray* array = KATZE_ARRAY (object); - GList* items; + KatzeArray* array; + guint i; + gpointer item; - for (items = array->items; items; items = g_list_next (items)) - g_object_unref (items->data); + array = KATZE_ARRAY (object); + i = 0; + while ((item = g_list_nth_data (array->items, i++))) + g_object_unref (item); g_list_free (array->items); G_OBJECT_CLASS (katze_array_parent_class)->finalize (object); @@ -373,44 +364,37 @@ katze_array_get_item_index (KatzeArray* array, /** * katze_array_find_token: * @array: a #KatzeArray - * @token: a token string, or "token keywords" string + * @token: a token string * * Looks up an item in the array which has the specified token. * - * This function will fail if the type of the list - * is not based on #KatzeItem children. + * 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. * * 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) { - goffset token_length; - GList* items; + guint i; + gpointer item; 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); - - token_length = strchr (token, ' ') - token; - if (token_length < 1) - token_length = strlen (token); - for (items = array->items; items; items = g_list_next (items)) + i = 0; + while ((item = g_list_nth_data (array->items, i++))) { - const gchar* found_token = ((KatzeItem*)items->data)->token; - if (found_token != NULL) - { - guint bigger_item = strlen (found_token) > token_length ? strlen (found_token) : token_length; - - if (strncmp (token, found_token, bigger_item) == 0) - return items->data; - } + const gchar* found_token; + + if (!KATZE_IS_ITEM (item)) + continue; + found_token = ((KatzeItem*)item)->token; + if (!g_strcmp0 (found_token, token)) + return item; } return NULL; } @@ -422,8 +406,9 @@ katze_array_find_token (KatzeArray* array, * * Looks up an item in the array which has the specified URI. * - * This function will fail if the type of the list - * is not based on #KatzeItem children. + * 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. * * Return value: an item, or %NULL * @@ -433,17 +418,19 @@ gpointer katze_array_find_uri (KatzeArray* array, const gchar* uri) { - GList* items; + guint i; + gpointer item; - 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); - - for (items = array->items; items; items = g_list_next (items)) + i = 0; + while ((item = g_list_nth_data (array->items, i++))) { - const gchar* found_uri = ((KatzeItem*)items->data)->uri; - if (found_uri != NULL && !strcmp (found_uri, uri)) - return items->data; + const gchar* found_uri; + + if (!KATZE_IS_ITEM (item)) + continue; + found_uri = ((KatzeItem*)item)->uri; + if (!g_strcmp0 (found_uri, uri)) + return item; } return NULL; } diff --git a/katze/katze-arrayaction.c b/katze/katze-arrayaction.c index e5edad6a..5ce84f52 100644 --- a/katze/katze-arrayaction.c +++ b/katze/katze-arrayaction.c @@ -355,16 +355,11 @@ katze_array_action_generate_menu (KatzeArrayAction* array_action, 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; @@ -390,7 +385,18 @@ katze_array_action_generate_menu (KatzeArrayAction* array_action, } menuitem = katze_image_menu_item_new_ellipsized ( katze_item_get_name (item)); - image = katze_item_get_image (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); + } gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image); gtk_image_menu_item_set_always_show_image ( GTK_IMAGE_MENU_ITEM (menuitem), TRUE); @@ -400,13 +406,8 @@ katze_array_action_generate_menu (KatzeArrayAction* array_action, { 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 { @@ -420,39 +421,21 @@ katze_array_action_generate_menu (KatzeArrayAction* array_action, } } -static gboolean -katze_array_action_menu_item_need_update (KatzeArrayAction* array_action, - GtkWidget* proxy) +static void +katze_array_action_menu_item_select_cb (GtkWidget* proxy, + KatzeArrayAction* array_action) { 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 @@ -475,21 +458,20 @@ katze_array_action_proxy_clicked_cb (GtkWidget* proxy, KatzeArray* array; gboolean handled = FALSE; - array = (KatzeArray*)g_object_get_data (G_OBJECT (proxy), "KatzeItem"); if (GTK_IS_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))); - } + 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))); 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); @@ -570,6 +552,7 @@ katze_array_action_item_notify_cb (KatzeItem* item, const gchar* property; const gchar* title; const gchar* desc; + GdkPixbuf* icon; GtkWidget* image; if (!G_IS_PARAM_SPEC_STRING (pspec)) @@ -596,13 +579,16 @@ katze_array_action_item_notify_cb (KatzeItem* item, } else if (KATZE_ITEM_IS_BOOKMARK (item) && !strcmp (property, "uri")) { - image = katze_item_get_image (item); + icon = katze_load_cached_icon (katze_item_get_uri (item), GTK_WIDGET (toolitem)); + image = gtk_image_new_from_pixbuf (icon); + g_object_unref (icon); gtk_widget_show (image); gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (toolitem), image); } else if (!strcmp (property, "icon")) { - image = katze_item_get_image (item); + image = gtk_image_new_from_icon_name (katze_item_get_icon (item), + GTK_ICON_SIZE_MENU); gtk_widget_show (image); gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (toolitem), image); } @@ -614,12 +600,25 @@ katze_array_action_proxy_create_menu_proxy_cb (GtkWidget* proxy, { 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)); - image = katze_item_get_image (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); + } gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image); gtk_image_menu_item_set_always_show_image ( GTK_IMAGE_MENU_ITEM (menuitem), TRUE); @@ -675,6 +674,7 @@ katze_array_action_create_tool_item_for (KatzeArrayAction* array_action, const gchar* uri; const gchar* desc; GtkToolItem* toolitem; + GdkPixbuf* icon; GtkWidget* image; GtkWidget* label; @@ -686,12 +686,20 @@ katze_array_action_create_tool_item_for (KatzeArrayAction* array_action, return gtk_separator_tool_item_new (); if (KATZE_ITEM_IS_FOLDER (item)) + { toolitem = gtk_toggle_tool_button_new (); + icon = gtk_widget_render_icon (GTK_WIDGET (toolitem), + GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_MENU, NULL); + } else + { toolitem = gtk_tool_button_new (NULL, ""); + icon = katze_load_cached_icon (uri, GTK_WIDGET (toolitem)); + } g_signal_connect (toolitem, "create-menu-proxy", G_CALLBACK (katze_array_action_proxy_create_menu_proxy_cb), item); - image = katze_item_get_image (item); + image = gtk_image_new_from_pixbuf (icon); + g_object_unref (icon); gtk_widget_show (image); gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (toolitem), image); label = gtk_label_new (NULL); @@ -731,9 +739,6 @@ static void 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); @@ -745,10 +750,9 @@ katze_array_action_connect_proxy (GtkAction* action, 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); } } diff --git a/katze/katze-http-cookies-sqlite.c b/katze/katze-http-cookies-sqlite.c index 10eb3f33..be3202ed 100644 --- a/katze/katze-http-cookies-sqlite.c +++ b/katze/katze-http-cookies-sqlite.c @@ -27,7 +27,7 @@ #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 CREATE_TABLE "CREATE TABLE 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;" @@ -71,6 +71,80 @@ G_DEFINE_TYPE_WITH_CODE (KatzeHttpCookiesSqlite, katze_http_cookies_sqlite, G_TY Copyright (C) 2009 Collabora Ltd. Mostly copied from libSoup 2.30, coding style retained */ +static void +try_create_table (sqlite3 *db) +{ + char *error = NULL; + + if (sqlite3_exec (db, CREATE_TABLE, NULL, NULL, &error)) { + g_warning ("Failed to execute query: %s", error); + sqlite3_free (error); + } +} + +static void +exec_query_with_try_create_table (sqlite3* db, + const char* sql, + int (*callback)(void*,int,char**,char**), + void *argument) +{ + char *error = NULL; + gboolean try_create = TRUE; + +try_exec: + if (sqlite3_exec (db, sql, callback, argument, &error)) { + if (try_create) { + try_create = FALSE; + try_create_table (db); + sqlite3_free (error); + error = NULL; + goto try_exec; + } else { + g_warning ("Failed to execute query: %s", error); + sqlite3_free (error); + } + } +} + +static int +callback (void *data, int argc, char **argv, char **colname) +{ + SoupCookie *cookie = NULL; + SoupCookieJar *jar = SOUP_COOKIE_JAR (data); + + char *name, *value, *host, *path; + gint64 expire_time; + time_t now; + int max_age; + gboolean http_only = FALSE, secure = FALSE; + + now = time (NULL); + + name = argv[COL_NAME]; + value = argv[COL_VALUE]; + host = argv[COL_HOST]; + path = argv[COL_PATH]; + expire_time = g_ascii_strtoull (argv[COL_EXPIRY], NULL, 10); + + if (now >= expire_time) + return 0; + max_age = (expire_time - now <= G_MAXINT ? expire_time - now : G_MAXINT); + + http_only = (g_strcmp0 (argv[COL_HTTP_ONLY], "1") == 0); + secure = (g_strcmp0 (argv[COL_SECURE], "1") == 0); + + 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 (jar, cookie); + + return 0; +} + /* Follows sqlite3 convention; returns TRUE on error */ static gboolean katze_http_cookies_sqlite_open_db (KatzeHttpCookiesSqlite* http_cookies) @@ -83,91 +157,23 @@ katze_http_cookies_sqlite_open_db (KatzeHttpCookiesSqlite* http_cookies) 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)) { + if (sqlite3_exec (http_cookies->db, "PRAGMA synchronous = OFF; 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); - } + exec_query_with_try_create_table (http_cookies->db, QUERY_ALL, callback, http_cookies->jar); } static void katze_http_cookies_sqlite_jar_changed_cb (SoupCookieJar* jar, @@ -207,14 +213,14 @@ katze_http_cookies_sqlite_jar_changed_cb (SoupCookieJar* jar, } } - if (!g_strcmp0 (g_getenv ("MIDORI_DEBUG"), "cookies")) + 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); + exec_query_with_try_create_table (http_cookies->db, query, NULL, NULL); sqlite3_free (query); } @@ -228,7 +234,7 @@ katze_http_cookies_sqlite_jar_changed_cb (SoupCookieJar* jar, expires, new_cookie->secure, new_cookie->http_only); - sqlite3_exec (http_cookies->db, query, NULL, NULL, NULL); + exec_query_with_try_create_table (http_cookies->db, query, NULL, NULL); sqlite3_free (query); } } diff --git a/katze/katze-http-cookies.c b/katze/katze-http-cookies.c index 1ccb8d9a..a25f62a1 100644 --- a/katze/katze-http-cookies.c +++ b/katze/katze-http-cookies.c @@ -211,7 +211,7 @@ katze_http_cookies_update_jar (KatzeHttpCookies* http_cookies) goto failed; g_free (temporary_filename); - if (!g_strcmp0 (g_getenv ("MIDORI_DEBUG"), "cookies")) + if (g_getenv ("MIDORI_COOKIES_DEBUG") != NULL) { g_print ("KatzeHttpCookies: %d cookies changed\n", http_cookies->counter); http_cookies->counter = 0; @@ -223,7 +223,7 @@ failed: fclose (f); g_unlink (temporary_filename); g_free (temporary_filename); - if (!g_strcmp0 (g_getenv ("MIDORI_DEBUG"), "cookies")) + if (g_getenv ("MIDORI_COOKIES_DEBUG") != NULL) g_print ("KatzeHttpCookies: Failed to write '%s'\n", http_cookies->filename); return FALSE; @@ -263,7 +263,7 @@ katze_http_cookies_jar_changed_cb (SoupCookieJar* jar, } } - if (!g_strcmp0 (g_getenv ("MIDORI_DEBUG"), "cookies")) + if (g_getenv ("MIDORI_COOKIES_DEBUG") != NULL) http_cookies->counter++; if (!http_cookies->timeout && (old_cookie || new_cookie->expires)) diff --git a/katze/katze-item.c b/katze/katze-item.c index 43ed856c..1d3a3ee7 100644 --- a/katze/katze-item.c +++ b/katze/katze-item.c @@ -15,8 +15,6 @@ #include -#include - /** * SECTION:katze-item * @short_description: A useful item @@ -317,8 +315,6 @@ katze_item_set_name (KatzeItem* item, 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"); } @@ -418,86 +414,9 @@ katze_item_set_icon (KatzeItem* item, 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 @@ -608,22 +527,17 @@ katze_item_set_meta_data_value (KatzeItem* item, * 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]; - value = g_hash_table_lookup (item->metadata, key); - return value && *value ? value : NULL; + return g_hash_table_lookup (item->metadata, key); } /** diff --git a/katze/katze-item.h b/katze/katze-item.h index 0bd44fdb..40c250f8 100644 --- a/katze/katze-item.h +++ b/katze/katze-item.h @@ -12,7 +12,7 @@ #ifndef __KATZE_ITEM_H__ #define __KATZE_ITEM_H__ -#include +#include G_BEGIN_DECLS @@ -91,13 +91,6 @@ void 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 --git a/katze/katze-net.c b/katze/katze-net.c index 10b55bff..f873d08c 100644 --- a/katze/katze-net.c +++ b/katze/katze-net.c @@ -27,6 +27,9 @@ struct _KatzeNet { GObject parent_instance; + + gchar* cache_path; + guint cache_size; }; struct _KatzeNetClass @@ -51,14 +54,37 @@ katze_net_class_init (KatzeNetClass* class) static void katze_net_init (KatzeNet* net) { + net->cache_path = g_build_filename (g_get_user_cache_dir (), + PACKAGE_NAME, NULL); } static void katze_net_finalize (GObject* object) { + KatzeNet* net = KATZE_NET (object); + + katze_assign (net->cache_path, NULL); + G_OBJECT_CLASS (katze_net_parent_class)->finalize (object); } +static KatzeNet* +katze_net_new (void) +{ + static KatzeNet* net = NULL; + + if (!net) + { + net = g_object_new (KATZE_TYPE_NET, NULL); + /* Since this is a "singleton", keep an extra reference */ + g_object_ref (net); + } + else + g_object_ref (net); + + return net; +} + typedef struct { KatzeNetStatusCb status_cb; @@ -83,28 +109,29 @@ katze_net_get_cached_path (KatzeNet* net, const gchar* uri, const gchar* subfolder) { + gchar* cache_path; gchar* checksum; gchar* extension; gchar* cached_filename; gchar* cached_path; + net = katze_net_new (); + + if (subfolder) + cache_path = g_build_filename (net->cache_path, subfolder, NULL); + else + cache_path = net->cache_path; + katze_mkdir_with_parents (cache_path, 0700); checksum = g_compute_checksum_for_string (G_CHECKSUM_MD5, uri, -1); + extension = g_strrstr (uri, "."); cached_filename = g_strdup_printf ("%s%s", checksum, extension ? extension : ""); g_free (checksum); - + cached_path = g_build_filename (cache_path, cached_filename, NULL); + g_free (cached_filename); if (subfolder) - { - gchar* cache_path = g_build_filename (midori_paths_get_cache_dir (), subfolder, NULL); - katze_mkdir_with_parents (cache_path, 0700); - cached_path = g_build_filename (cache_path, cached_filename, NULL); g_free (cache_path); - } - else - cached_path = g_build_filename (midori_paths_get_cache_dir (), cached_filename, NULL); - - g_free (cached_filename); return cached_path; } diff --git a/katze/katze-net.h b/katze/katze-net.h index eea2df41..5658ff47 100644 --- a/katze/katze-net.h +++ b/katze/katze-net.h @@ -14,6 +14,8 @@ #include "katze-utils.h" +#include + G_BEGIN_DECLS #define KATZE_TYPE_NET \ diff --git a/katze/katze-preferences.c b/katze/katze-preferences.c index 6108fd4a..e4fd18aa 100644 --- a/katze/katze-preferences.c +++ b/katze/katze-preferences.c @@ -15,13 +15,6 @@ #include #endif -#ifdef HAVE_GRANITE - #if HAVE_OSX - #error FIXME granite on OSX is not implemented - #endif - #include -#endif - #if HAVE_HILDON #include "katze-scrolled.h" #include @@ -110,8 +103,11 @@ katze_preferences_init (KatzePreferences* preferences) gtk_dialog_add_buttons (GTK_DIALOG (preferences), GTK_STOCK_HELP, GTK_RESPONSE_HELP, NULL); - katze_widget_add_class (gtk_dialog_get_widget_for_response ( - GTK_DIALOG (preferences), GTK_RESPONSE_HELP), "help_button"); + #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 @@ -206,12 +202,7 @@ katze_preferences_prepare (KatzePreferences* preferences) g_signal_connect (priv->scrolled, "destroy", G_CALLBACK (gtk_widget_destroyed), &priv->scrolled); #else - #ifdef HAVE_GRANITE - /* FIXME: granite: should return GtkWidget* like GTK+ */ - priv->notebook = (GtkWidget*)granite_widgets_static_notebook_new (FALSE); - #else priv->notebook = gtk_notebook_new (); - #endif gtk_container_set_border_width (GTK_CONTAINER (priv->notebook), 6); #if HAVE_OSX @@ -305,14 +296,8 @@ katze_preferences_add_category (KatzePreferences* preferences, priv->sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); gtk_widget_show (priv->page); gtk_container_set_border_width (GTK_CONTAINER (priv->page), 4); - #ifdef HAVE_GRANITE - granite_widgets_static_notebook_append_page ( - GRANITE_WIDGETS_STATIC_NOTEBOOK (priv->notebook), - priv->page, GTK_LABEL (gtk_label_new (label))); - #else gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook), priv->page, gtk_label_new (label)); - #endif #if HAVE_OSX priv->toolbutton = GTK_WIDGET (priv->toolbutton ? gtk_radio_tool_button_new_from_widget ( diff --git a/katze/katze-throbber.c b/katze/katze-throbber.c index 85c206fc..d8c71b93 100644 --- a/katze/katze-throbber.c +++ b/katze/katze-throbber.c @@ -97,12 +97,12 @@ 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); + gint *minimal_width, + gint *natural_width); static void katze_throbber_get_preferred_width (GtkWidget *widget, - gint *minimal_width, - gint *natural_width); + gint *minimal_width, + gint *natural_width); #endif static void katze_throbber_unrealize (GtkWidget* widget); @@ -495,8 +495,8 @@ katze_throbber_set_animated (KatzeThrobber* throbber, (GSourceFunc)katze_throbber_timeout, throbber, (GDestroyNotify)katze_throbber_timeout_destroy); - #endif gtk_widget_queue_draw (GTK_WIDGET (throbber)); + #endif g_object_notify (G_OBJECT (throbber), "animated"); } @@ -857,14 +857,14 @@ katze_throbber_size_request (GtkWidget* widget, #if GTK_CHECK_VERSION (3, 0, 0) static void katze_throbber_get_preferred_height (GtkWidget *widget, - gint *minimal_height, - gint *natural_height) + gint *minimal_width, + gint *natural_width) { GtkRequisition requisition; katze_throbber_size_request (widget, &requisition); - *minimal_height = *natural_height = requisition.height; + *minimal_width = *natural_width = requisition.height; } static void @@ -902,7 +902,6 @@ katze_throbber_aligned_coords (GtkWidget* widget, #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); diff --git a/katze/katze-utils.c b/katze/katze-utils.c index 9c5ef9c6..ac9df02d 100644 --- a/katze/katze-utils.c +++ b/katze/katze-utils.c @@ -277,6 +277,7 @@ proxy_combo_box_changed_cb (GtkComboBox* button, if (custom_value) { + #if GTK_CHECK_VERSION (2, 12, 0) if (value == custom_value) gtk_widget_set_tooltip_text (GTK_WIDGET (button), NULL); else @@ -285,6 +286,7 @@ proxy_combo_box_changed_cb (GtkComboBox* button, gtk_widget_set_tooltip_text (GTK_WIDGET (button), custom_text); g_free (custom_text); } + #endif } } #endif @@ -329,13 +331,7 @@ proxy_widget_string_destroy_cb (GtkWidget* proxy, 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; @@ -521,8 +517,14 @@ katze_property_proxy (gpointer object, string = g_strdup (G_PARAM_SPEC_STRING (pspec)->default_value); gtk_file_chooser_set_uri (GTK_FILE_CHOOSER (widget), string ? string : ""); + #if GTK_CHECK_VERSION (2, 12, 0) g_signal_connect (widget, "file-set", G_CALLBACK (proxy_uri_file_set_cb), object); + #else + if (pspec->flags & G_PARAM_WRITABLE) + g_signal_connect (widget, "selection-changed", + G_CALLBACK (proxy_uri_file_set_cb), object); + #endif } else if (type == G_TYPE_PARAM_STRING && (_hint == I_("font") || _hint == I_("font-monospace"))) @@ -810,10 +812,11 @@ katze_property_proxy (gpointer object, G_CALLBACK (proxy_entry_focus_out_event_cb), object); g_object_set_data_full (G_OBJECT (entry), "property", g_strdup (custom), g_free); - gtk_widget_set_tooltip_text (widget, NULL); } + #if GTK_CHECK_VERSION (2, 12, 0) else gtk_widget_set_tooltip_text (widget, custom_text); + #endif g_free (custom_text); @@ -828,6 +831,10 @@ katze_property_proxy (gpointer object, widget = gtk_label_new (gettext (nick)); g_free (string); + #if GTK_CHECK_VERSION (2, 12, 0) + if (!gtk_widget_get_tooltip_text (widget)) + gtk_widget_set_tooltip_text (widget, g_param_spec_get_blurb (pspec)); + #endif gtk_widget_set_sensitive (widget, pspec->flags & G_PARAM_WRITABLE); g_object_set_data_full (G_OBJECT (widget), "property", @@ -868,8 +875,16 @@ katze_property_label (gpointer object, return gtk_label_new (property); } + #ifdef HAVE_HILDON_2_2 + if (G_PARAM_SPEC_TYPE (pspec) == G_TYPE_PARAM_ENUM) + return gtk_label_new (NULL); + #endif + nick = g_param_spec_get_nick (pspec); widget = gtk_label_new (nick); + #if GTK_CHECK_VERSION (2, 12, 0) + gtk_widget_set_tooltip_text (widget, g_param_spec_get_blurb (pspec)); + #endif gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.5); return widget; @@ -895,29 +910,21 @@ katze_widget_popup_position_menu (GtkMenu* menu, GtkRequisition widget_req; KatzePopupInfo* info = user_data; GtkWidget* widget = info->widget; - GdkWindow* window = gtk_widget_get_window (widget); gint widget_height; - if (!window) - return; - - #if !GTK_CHECK_VERSION (3, 0, 0) - if (GTK_IS_ENTRY (widget)) - window = gdk_window_get_parent (window); - #endif + gtk_widget_get_allocation (widget, &allocation); /* Retrieve size and position of both widget and menu */ - 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 + 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_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 */ @@ -1183,16 +1190,6 @@ katze_strip_mnemonics (const gchar* original) 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 @@ -1502,7 +1499,8 @@ katze_load_cached_icon (const gchar* uri, filename = g_strdup_printf ("%s%s", checksum, ext ? ext : ""); g_free (icon_uri); g_free (checksum); - path = g_build_filename (midori_paths_get_cache_dir (), "icons", filename, NULL); + path = g_build_filename (g_get_user_cache_dir (), PACKAGE_NAME, + "icons", filename, NULL); g_free (filename); if ((icon = gdk_pixbuf_new_from_file_at_size (path, 16, 16, NULL))) { @@ -1522,15 +1520,6 @@ katze_uri_entry_changed_cb (GtkWidget* entry, { 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 (!valid) - valid = midori_uri_is_ip_address (uri); - - #if GTK_CHECK_VERSION (3, 2, 0) - g_object_set_data (G_OBJECT (entry), "invalid", GINT_TO_POINTER (*uri && !valid)); - gtk_widget_queue_draw (entry); - #else if (*uri && !valid) { GdkColor bg_color = { 0 }; @@ -1545,34 +1534,11 @@ katze_uri_entry_changed_cb (GtkWidget* entry, gtk_widget_modify_base (entry, GTK_STATE_NORMAL, NULL); gtk_widget_modify_text (entry, GTK_STATE_NORMAL, NULL); } - #endif if (other_widget != NULL) gtk_widget_set_sensitive (other_widget, valid); } -#if GTK_CHECK_VERSION (3, 2, 0) -static gboolean -katze_uri_entry_draw_cb (GtkWidget* entry, - cairo_t* cr, - GtkWidget* other_widget) -{ - const GdkRGBA color = { 0.9, 0., 0., 1. }; - double width = gtk_widget_get_allocated_width (entry); - double height = gtk_widget_get_allocated_height (entry); - - if (!g_object_get_data (G_OBJECT (entry), "invalid")) - return FALSE; - - /* FIXME: error-underline-color requires GtkTextView */ - gdk_cairo_set_source_rgba (cr, &color); - - pango_cairo_show_error_underline (cr, width * 0.15, height / 1.9, - width * 0.75, height / 1.9 / 2); - return TRUE; -} -#endif - /** * katze_uri_entry_new: * @other_widget: a #GtkWidget, or %NULL @@ -1590,28 +1556,11 @@ GtkWidget* katze_uri_entry_new (GtkWidget* other_widget) { GtkWidget* entry = gtk_entry_new (); - - gtk_entry_set_icon_from_gicon (GTK_ENTRY (entry), GTK_ENTRY_ICON_PRIMARY, - g_themed_icon_new_with_default_fallbacks ("text-html-symbolic")); g_signal_connect (entry, "changed", G_CALLBACK (katze_uri_entry_changed_cb), other_widget); - #if GTK_CHECK_VERSION (3, 2, 0) - g_signal_connect_after (entry, "draw", - G_CALLBACK (katze_uri_entry_draw_cb), other_widget); - #endif return entry; } -void -katze_widget_add_class (GtkWidget* widget, - const gchar* class_name) -{ - #if GTK_CHECK_VERSION (3,0,0) - GtkStyleContext* context = gtk_widget_get_style_context (widget); - gtk_style_context_add_class (context, class_name); - #endif -} - /** * katze_assert_str_equal: * @input: a string diff --git a/katze/katze-utils.h b/katze/katze-utils.h index bf97cbff..643b4238 100644 --- a/katze/katze-utils.h +++ b/katze/katze-utils.h @@ -58,20 +58,6 @@ G_BEGIN_DECLS **/ #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, @@ -115,9 +101,6 @@ katze_bookmark_populate_tree_view (KatzeArray* array, 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); @@ -160,10 +143,6 @@ katze_load_cached_icon (const gchar* uri, GtkWidget* katze_uri_entry_new (GtkWidget* other_widget); -void -katze_widget_add_class (GtkWidget* widget, - const gchar* class_name); - void katze_assert_str_equal (const gchar* input, const gchar* result, diff --git a/katze/katze.vapi b/katze/katze.vapi deleted file mode 100644 index 1627568b..00000000 --- a/katze/katze.vapi +++ /dev/null @@ -1,25 +0,0 @@ -/* 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 { - static string assert_str_equal (string input, string result, string expected); - - [CCode (cheader_filename = "katze/katze.h")] - public class Array : Katze.Item { - public Array (GLib.Type type); - public void add_item (GLib.Object item); - } - - [CCode (cheader_filename = "katze/katze.h")] - public class Item : GLib.Object { - public string? uri { get; set; } - public string? name { get; set; } - public string? text { get; set; } - - public bool get_meta_boolean (string key); - public int64 get_meta_integer (string key); - public void set_meta_integer (string key, int64 value); - } -} - diff --git a/katze/midori-hsts.vala b/katze/midori-hsts.vala deleted file mode 100644 index a878a6ec..00000000 --- a/katze/midori-hsts.vala +++ /dev/null @@ -1,143 +0,0 @@ -/* - 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 - 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 Midori { - public class HSTS : GLib.Object, Soup.SessionFeature { - public class Directive { - public Soup.Date? expires = null; - public bool sub_domains = false; - - public Directive (bool include_sub_domains) { - expires = new Soup.Date.from_now (int.MAX); - sub_domains = include_sub_domains; - } - - public Directive.from_header (string header) { - var param_list = Soup.header_parse_param_list (header); - if (param_list == null) - return; - - string? max_age = param_list.lookup ("max-age"); - if (max_age != null) - expires = new Soup.Date.from_now (max_age.to_int ()); - // if (param_list.lookup_extended ("includeSubDomains", null, null)) - if ("includeSubDomains" in header) - sub_domains = true; - Soup.header_free_param_list (param_list); - } - - public bool is_valid () { - return expires != null && !expires.is_past (); - } - } - - File file; - HashTable whitelist; - bool debug = false; - - public HSTS (owned string filename) { - whitelist = new HashTable (str_hash, str_equal); - read_cache (File.new_for_path (Paths.get_preset_filename (null, "hsts"))); - file = File.new_for_path (filename); - read_cache (file); - if (strcmp (Environment.get_variable ("MIDORI_DEBUG"), "hsts") == 0) - debug = true; - } - - async void read_cache (File file) { - try { - var stream = new DataInputStream (yield file.read_async ()); - do { - string? line = yield stream.read_line_async (); - if (line == null) - break; - string[] parts = line.split (" ", 2); - if (parts[0] == null || parts[1] == null) - break; - var directive = new Directive.from_header (parts[1]); - if (directive.is_valid ()) - append_to_whitelist (parts[0], directive); - } while (true); - } - catch (Error error) { } - } - - /* No sub-features */ - public bool add_feature (Type type) { return false; } - public bool remove_feature (Type type) { return false; } - public bool has_feature (Type type) { return false; } - - public void attach (Soup.Session session) { session.request_queued.connect (queued); } - public void detach (Soup.Session session) { /* FIXME disconnect */ } - - /* Never called but required by the interface */ - public void request_started (Soup.Session session, Soup.Message msg, Soup.Socket socket) { } - public void request_queued (Soup.Session session, Soup.Message message) { } - public void request_unqueued (Soup.Session session, Soup.Message msg) { } - - bool should_secure_host (string host) { - Directive? directive = whitelist.lookup (host); - if (directive == null) - directive = whitelist.lookup ("*." + host); - return directive != null && directive.is_valid (); - } - - void queued (Soup.Session session, Soup.Message message) { - if (should_secure_host (message.uri.host)) { - message.uri.set_scheme ("https"); - session.requeue_message (message); - if (debug) - stdout.printf ("HSTS: Enforce %s\n", message.uri.host); - } - else if (message.uri.scheme == "http") - message.finished.connect (strict_transport_security_handled); - } - - void append_to_whitelist (string host, Directive directive) { - whitelist.insert (host, directive); - if (directive.sub_domains) - whitelist.insert ("*." + host, directive); - } - - async void append_to_cache (string host, string header) { - if (Midori.Paths.is_readonly ()) - return; - - try { - var stream = file.append_to/* FIXME _async*/ (FileCreateFlags.NONE); - yield stream.write_async ((host + " " + header + "\n").data); - yield stream.flush_async (); - } - catch (Error error) { - critical ("Failed to update %s: %s", file.get_path (), error.message); - } - } - - void strict_transport_security_handled (Soup.Message message) { - if (message == null || message.uri == null) - return; - - unowned string? hsts = message.response_headers.get_one ("Strict-Transport-Security"); - if (hsts == null) - return; - - var directive = new Directive.from_header (hsts); - if (directive.is_valid ()) { - append_to_whitelist (message.uri.host, directive); - append_to_cache (message.uri.host, hsts); - } - if (debug) - stdout.printf ("HSTS: '%s' sets '%s' valid? %s\n", - message.uri.host, hsts, directive.is_valid ().to_string ()); - } - - } -} diff --git a/katze/midori-paths.vala b/katze/midori-paths.vala deleted file mode 100644 index 16efc739..00000000 --- a/katze/midori-paths.vala +++ /dev/null @@ -1,244 +0,0 @@ -/* - 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 - 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 { - #if HAVE_WIN32 - extern static string win32_get_package_installation_directory_of_module (void* hmodule = null); - #endif -} - -extern const string LIBDIR; -extern const string MDATADIR; -extern const string PACKAGE_NAME; -extern const string SYSCONFDIR; -extern const string MIDORI_VERSION_SUFFIX; - -namespace Midori { - public enum RuntimeMode { - UNDEFINED, - NORMAL, - APP, - PRIVATE, - PORTABLE - } - - namespace Paths { - static string? exec_path = null; - static string[] command_line = null; - static RuntimeMode mode = RuntimeMode.UNDEFINED; - - static string? config_dir = null; - static string? readonly_dir = null; - static string? cache_dir = null; - static string? user_data_dir = null; - static string? tmp_dir = null; - - public static string get_readonly_config_dir () { - assert (mode != RuntimeMode.UNDEFINED); - return readonly_dir ?? config_dir; - } - - public static string get_readonly_config_filename (string filename) { - assert (mode != RuntimeMode.UNDEFINED); - return Path.build_path (Path.DIR_SEPARATOR_S, - readonly_dir ?? config_dir, filename); - } - - public bool is_readonly () { - assert (mode != RuntimeMode.UNDEFINED); - return readonly_dir != null; - } - - public static void init (RuntimeMode new_mode, string? config_base) { - assert (mode == RuntimeMode.UNDEFINED); - assert (new_mode != RuntimeMode.UNDEFINED); - mode = new_mode; - if (mode == RuntimeMode.PORTABLE) { - config_dir = Path.build_path (Path.DIR_SEPARATOR_S, - exec_path, "profile", "config"); - cache_dir = Path.build_path (Path.DIR_SEPARATOR_S, - exec_path, "profile", "cache"); - user_data_dir = Path.build_path (Path.DIR_SEPARATOR_S, - exec_path, "profile", "misc"); - tmp_dir = Path.build_path (Path.DIR_SEPARATOR_S, - exec_path, "profile", "tmp"); - } - else if (mode == RuntimeMode.PRIVATE || mode == RuntimeMode.APP) { - /* Use mock folders in development builds */ - if ("." in MIDORI_VERSION_SUFFIX) - config_dir = cache_dir = user_data_dir = config_base; - else - config_dir = cache_dir = user_data_dir = "/"; - readonly_dir = config_base ?? Path.build_path (Path.DIR_SEPARATOR_S, - Environment.get_user_config_dir (), PACKAGE_NAME); - tmp_dir = Path.build_path (Path.DIR_SEPARATOR_S, - Environment.get_tmp_dir (), "midori-" + Environment.get_user_name ()); - } - else { - config_dir = config_base ?? Path.build_path (Path.DIR_SEPARATOR_S, - Environment.get_user_config_dir (), PACKAGE_NAME); - cache_dir = Path.build_path (Path.DIR_SEPARATOR_S, - Environment.get_user_cache_dir (), PACKAGE_NAME); - user_data_dir = Environment.get_user_data_dir (); - tmp_dir = Path.build_path (Path.DIR_SEPARATOR_S, - Environment.get_tmp_dir (), "midori-" + Environment.get_user_name ()); - } - if (strcmp (Environment.get_variable ("MIDORI_DEBUG"), "paths") == 0) { - stdout.printf ("config: %s\ncache: %s\nuser_data: %s\ntmp: %s\n", - config_dir, cache_dir, user_data_dir, tmp_dir); - } - } - - public static unowned string get_config_dir () { - assert (config_dir != null); - return config_dir; - } - - public static string get_config_filename (string filename) { - assert (mode != RuntimeMode.UNDEFINED); - assert (config_dir != null); - return Path.build_path (Path.DIR_SEPARATOR_S, config_dir, filename); - } - - public static unowned string get_cache_dir () { - assert (cache_dir != null); - return cache_dir; - } - - public static unowned string get_user_data_dir () { - assert (user_data_dir != null); - return user_data_dir; - } - - public static unowned string get_tmp_dir () { - assert (tmp_dir != null); - return tmp_dir; - } - - public static void init_exec_path (string[] new_command_line) { - assert (command_line == null); - command_line = new_command_line; - #if HAVE_WIN32 - exec_path = win32_get_package_installation_directory_of_module (); - #else - string? executable; - try { - if (!Path.is_absolute (command_line[0])) { - string program = Environment.find_program_in_path (command_line[0]); - if (FileUtils.test (program, FileTest.IS_SYMLINK)) - executable = FileUtils.read_link (program); - else - executable = program; - } - else - executable = FileUtils.read_link (command_line[0]); - } - catch (Error error) { - executable = command_line[0]; - } - - exec_path = File.new_for_path (executable).get_parent ().get_parent ().get_path (); - #endif - if (strcmp (Environment.get_variable ("MIDORI_DEBUG"), "paths") == 0) { - stdout.printf ("command_line: %s\nexec_path: %s\nres: %s\nlib: %s\n", - get_command_line_str (), exec_path, - get_res_filename (""), get_lib_path (PACKAGE_NAME)); - } - } - - public static unowned string[] get_command_line () { - assert (command_line != null); - return command_line; - } - - public static string get_command_line_str () { - assert (command_line != null); - return "".joinv (" ", command_line).replace (Environment.get_home_dir (), "~"); - } - - public static string get_lib_path (string package) { - assert (command_line != null); - #if HAVE_WIN32 - return Path.build_filename (exec_path, "lib", package); - #else - string path = Path.build_filename (exec_path, "lib", package); - if (Posix.access (path, Posix.F_OK) == 0) - return path; - - if (package == PACKAGE_NAME) { - /* Fallback to build folder */ - path = Path.build_filename ((File.new_for_path (exec_path).get_path ()), "extensions"); - if (Posix.access (path, Posix.F_OK) == 0) - return path; - } - - return Path.build_filename (LIBDIR, PACKAGE_NAME); - #endif - } - - public static string get_res_filename (string filename) { - assert (command_line != null); - #if HAVE_WIN32 - return Path.build_filename (exec_path, "share", PACKAGE_NAME, "res", filename); - #else - string path = Path.build_filename (exec_path, "share", PACKAGE_NAME, "res", filename); - if (Posix.access (path, Posix.F_OK) == 0) - return path; - - /* Fallback to build folder */ - path = Path.build_filename ((File.new_for_path (exec_path) - .get_parent ().get_parent ().get_path ()), "data", filename); - if (Posix.access (path, Posix.F_OK) == 0) - return path; - - return Path.build_filename (MDATADIR, PACKAGE_NAME, "res", filename); - #endif - } - - public static string get_data_filename (string filename, bool res) { - assert (command_line != null); - string res1 = res ? PACKAGE_NAME : ""; - string res2 = res ? "res" : ""; - - #if HAVE_WIN32 - return Path.build_filename (exec_path, "share", res1, res2, filename); - #else - string path = Path.build_filename (get_user_data_dir (), res1, res2, filename); - if (Posix.access (path, Posix.F_OK) == 0) - return path; - - foreach (string data_dir in Environment.get_system_data_dirs ()) { - path = Path.build_filename (data_dir, res1, res2, filename); - if (Posix.access (path, Posix.F_OK) == 0) - return path; - } - - return Path.build_filename (MDATADIR, res1, res2, filename); - #endif - } - - public static string get_preset_filename (string? folder, string filename) { - assert (config_dir != null); - - #if HAVE_WIN32 - return Path.build_filename (exec_path, "etc", "xdg", PACKAGE_NAME, folder ?? "", filename); - #else - foreach (string config_dir in Environment.get_system_config_dirs ()) { - string path = Path.build_filename (config_dir, PACKAGE_NAME, folder ?? "", filename); - if (Posix.access (path, Posix.F_OK) == 0) - return path; - } - - return Path.build_filename (SYSCONFDIR, "xdg", PACKAGE_NAME, folder ?? "", filename); - #endif - } - } -} diff --git a/katze/midori-uri.vala b/katze/midori-uri.vala index 05ebceab..e01ba484 100644 --- a/katze/midori-uri.vala +++ b/katze/midori-uri.vala @@ -85,9 +85,6 @@ namespace Midori { 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; @@ -114,69 +111,43 @@ namespace Midori { || (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; - /* Skip leading user/ password */ - if (uri.chr (-1, '@') != null) - return is_ip_address (uri.split ("@")[1]); - /* IPv4 */ - if (uri[0] != '0' && 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; + return uri != null && uri[0].isdigit () + && (uri.chr (4, '.') != null || uri.chr (4, ':') != null); } public static bool is_valid (string? uri) { return uri != null && uri.chr (-1, ' ') == null && (URI.is_location (uri) || uri.chr (-1, '.') != null); } - - public static string? get_folder (string uri) { - /* Base the start folder on the current view's uri if it is local */ - try { - string? filename = Filename.from_uri (uri); - if (filename != null) { - string? dirname = Path.get_dirname (filename); - if (dirname != null && FileUtils.test (dirname, FileTest.IS_DIR)) - return dirname; - } - } - catch (Error error) { } - return 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 display = null; - GLib.ChecksumType type = (GLib.ChecksumType)int.MAX; - unowned string delimiter = "#!md5!"; + unowned string display = _("MD5-Checksum:"); + GLib.ChecksumType type = GLib.ChecksumType.MD5; unowned string? fragment = uri.str (delimiter); - if (fragment != null) { - display = _("MD5-Checksum:"); - type = GLib.ChecksumType.MD5; - } - - delimiter = "#!sha1!"; - fragment = uri.str (delimiter); - if (fragment != null) { + 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; } - - /* No SHA256: no known usage and no need for strong encryption */ if (&checksum != null) checksum = fragment != null diff --git a/midori/gtkiconentry.c b/midori/gtkiconentry.c index c15ac1f6..44fddc03 100644 --- a/midori/gtkiconentry.c +++ b/midori/gtkiconentry.c @@ -1,5 +1,27 @@ +/* + * Copyright (C) 2004-2006 Christian Hammond. + * Copyright (C) 2008 Cody Russell + * + * 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 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + #include "gtkiconentry.h" +#if GTK_CHECK_VERSION (2, 16, 0) + void gtk_icon_entry_set_icon_from_pixbuf (GtkEntry* entry, GtkEntryIconPosition position, @@ -14,3 +36,1895 @@ gtk_icon_entry_set_icon_from_pixbuf (GtkEntry* entry, gtk_entry_set_icon_activatable (entry, position, activatable); } +#else + +#include + +#if GTK_CHECK_VERSION (2, 14, 0) +#define _GTK_IMAGE_GICON GTK_IMAGE_GICON +#else +#define _GTK_IMAGE_GICON 8 +#endif + +#ifndef GTK_PARAM_READABLE +#define GTK_PARAM_READABLE G_PARAM_READABLE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB +#endif + +#ifndef GTK_PARAM_WRITABLE +#define GTK_PARAM_WRITABLE G_PARAM_WRITABLE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB +#endif + +#ifndef GTK_PARAM_READWRITE +#define GTK_PARAM_READWRITE G_PARAM_READWRITE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB +#endif + +#define P_(s) (s) + +#define ICON_MARGIN 2 +#define MAX_ICONS 2 + +#define IS_VALID_ICON_ENTRY_POSITION(pos) \ + ((pos) == GTK_ICON_ENTRY_PRIMARY || \ + (pos) == GTK_ICON_ENTRY_SECONDARY) + +typedef struct +{ + GdkPixbuf *pixbuf; + gboolean highlight; + gboolean hovered; + GdkWindow *window; + gchar *tooltip_text; + GdkCursorType cursor_type; + gboolean custom_cursor; + GtkImageType storage_type; + GIcon *gicon; + gchar *icon_name; + gboolean insensitive; +} EntryIconInfo; + +struct _GtkIconEntryPrivate +{ + gdouble fraction; + EntryIconInfo icons[MAX_ICONS]; + + gulong icon_released_id; +}; + +enum +{ + ICON_PRESSED, + ICON_RELEASED, + LAST_SIGNAL +}; + +enum +{ + PROP_0, + PROP_PIXBUF_PRIMARY, + PROP_PIXBUF_SECONDARY, + PROP_STOCK_PRIMARY, + PROP_STOCK_SECONDARY, + PROP_ICON_NAME_PRIMARY, + PROP_ICON_NAME_SECONDARY, + PROP_GICON_PRIMARY, + PROP_GICON_SECONDARY, + PROP_SENSITIVITY_PRIMARY, + PROP_SENSITIVITY_SECONDARY +}; + +static void gtk_icon_entry_editable_init (GtkEditableClass *iface); +static void gtk_icon_entry_finalize (GObject *obj); +static void gtk_icon_entry_dispose (GObject *obj); +static void gtk_icon_entry_map (GtkWidget *widget); +static void gtk_icon_entry_unmap (GtkWidget *widget); +static void gtk_icon_entry_realize (GtkWidget *widget); +static void gtk_icon_entry_unrealize (GtkWidget *widget); +static void gtk_icon_entry_size_request (GtkWidget *widget, + GtkRequisition *requisition); +static void gtk_icon_entry_size_allocate (GtkWidget *widget, + GtkAllocation *allocation); +static gint gtk_icon_entry_expose (GtkWidget *widget, + GdkEventExpose *event); +static gint gtk_icon_entry_enter_notify (GtkWidget *widget, + GdkEventCrossing *event); +static gint gtk_icon_entry_leave_notify (GtkWidget *widget, + GdkEventCrossing *event); +static gint gtk_icon_entry_button_press (GtkWidget *widget, + GdkEventButton *event); +static gint gtk_icon_entry_button_release (GtkWidget *widget, + GdkEventButton *event); +static void gtk_icon_entry_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec); +static void gtk_icon_entry_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec); +static void gtk_icon_entry_style_set (GtkWidget *widget, + GtkStyle *prev_style); +static void gtk_icon_entry_set_icon_internal (GtkIconEntry *entry, + GtkIconEntryPosition icon_pos, + GdkPixbuf *pixbuf); +static void icon_theme_changed (GtkIconEntry *entry); + + +static GtkEntryClass *parent_class = NULL; +static guint signals[LAST_SIGNAL] = {0}; + +G_DEFINE_TYPE_EXTENDED (GtkIconEntry, gtk_icon_entry, GTK_TYPE_ENTRY, + 0, + G_IMPLEMENT_INTERFACE (GTK_TYPE_EDITABLE, + gtk_icon_entry_editable_init)); + +static void +gtk_icon_entry_class_init (GtkIconEntryClass *klass) +{ + GObjectClass *gobject_class; + GtkObjectClass *object_class; + GtkWidgetClass *widget_class; + GtkEntryClass *entry_class; + + parent_class = g_type_class_peek_parent(klass); + + gobject_class = G_OBJECT_CLASS(klass); + object_class = GTK_OBJECT_CLASS(klass); + widget_class = GTK_WIDGET_CLASS(klass); + entry_class = GTK_ENTRY_CLASS(klass); + + gobject_class->finalize = gtk_icon_entry_finalize; + gobject_class->dispose = gtk_icon_entry_dispose; + gobject_class->set_property = gtk_icon_entry_set_property; + gobject_class->get_property = gtk_icon_entry_get_property; + + widget_class->map = gtk_icon_entry_map; + widget_class->unmap = gtk_icon_entry_unmap; + widget_class->realize = gtk_icon_entry_realize; + widget_class->unrealize = gtk_icon_entry_unrealize; + widget_class->size_request = gtk_icon_entry_size_request; + widget_class->size_allocate = gtk_icon_entry_size_allocate; + widget_class->expose_event = gtk_icon_entry_expose; + widget_class->enter_notify_event = gtk_icon_entry_enter_notify; + widget_class->leave_notify_event = gtk_icon_entry_leave_notify; + widget_class->button_press_event = gtk_icon_entry_button_press; + widget_class->button_release_event = gtk_icon_entry_button_release; + widget_class->style_set = gtk_icon_entry_style_set; + + /** + * GtkIconEntry::icon-pressed: + * @entry: The entry on which the signal is emitted. + * @icon_pos: The position of the clicked icon. + * @button: The mouse button clicked. + * + * The ::icon-pressed signal is emitted when an icon is clicked. + */ + if (!(signals[ICON_PRESSED] = g_signal_lookup ("icon-pressed", GTK_TYPE_ENTRY))) + signals[ICON_PRESSED] = + g_signal_new ("icon-pressed", + G_TYPE_FROM_CLASS (gobject_class), + G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, + G_STRUCT_OFFSET (GtkIconEntryClass, icon_pressed), + NULL, NULL, + gtk_marshal_VOID__INT_INT, + G_TYPE_NONE, 2, + G_TYPE_INT, + G_TYPE_INT); + + /** + * GtkIconEntry::icon-release: + * @entry: The entry on which the signal is emitted. + * @icon_pos: The position of the clicked icon. + * @button: The mouse button clicked. + * + * The ::icon-release signal is emitted on the button release from a + * mouse click. + */ + if (!(signals[ICON_RELEASED] = g_signal_lookup ("icon-release", GTK_TYPE_ENTRY))) + signals[ICON_RELEASED] = + g_signal_new ("icon-release", + G_TYPE_FROM_CLASS (gobject_class), + G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, + G_STRUCT_OFFSET (GtkIconEntryClass, icon_released), + NULL, NULL, + gtk_marshal_VOID__INT_INT, + G_TYPE_NONE, 2, + G_TYPE_INT, + G_TYPE_INT); + + /** + * GtkIconEntry:pixbuf-primary: + * + * An image to use as the primary icon for the entry. + */ + g_object_class_install_property (gobject_class, + PROP_PIXBUF_PRIMARY, + g_param_spec_object ("pixbuf-primary", + P_("Primary pixbuf"), + P_("Primary pixbuf for the entry"), + GDK_TYPE_PIXBUF, + GTK_PARAM_READWRITE)); + + /** + * GtkIconEntry:pixbuf-secondary: + * + * An image to use as the secondary icon for the entry. + */ + g_object_class_install_property (gobject_class, + PROP_PIXBUF_SECONDARY, + g_param_spec_object ("pixbuf-secondary", + P_("Secondary pixbuf"), + P_("Secondary pixbuf for the entry"), + GDK_TYPE_PIXBUF, + GTK_PARAM_READWRITE)); + + g_object_class_install_property (gobject_class, + PROP_STOCK_PRIMARY, + g_param_spec_string ("stock-primary", + P_("Primary stock ID"), + P_("Stock ID for primary icon"), + NULL, + GTK_PARAM_WRITABLE)); + + g_object_class_install_property (gobject_class, + PROP_STOCK_SECONDARY, + g_param_spec_string ("stock-secondary", + P_("Secondary stock ID"), + P_("Stock ID for secondary icon"), + NULL, + GTK_PARAM_WRITABLE)); + + g_object_class_install_property (gobject_class, + PROP_ICON_NAME_PRIMARY, + g_param_spec_string ("icon-name-primary", + P_("Primary icon name"), + P_("Icon name for primary icon"), + NULL, + GTK_PARAM_WRITABLE)); + + g_object_class_install_property (gobject_class, + PROP_ICON_NAME_SECONDARY, + g_param_spec_string ("icon-name-secondary", + P_("Secondary icon name"), + P_("Icon name for secondary icon"), + NULL, + GTK_PARAM_WRITABLE)); + + g_object_class_install_property (gobject_class, + PROP_GICON_PRIMARY, + g_param_spec_object ("gicon-primary", + P_("Primary GIcon"), + P_("GIcon for primary icon"), + G_TYPE_ICON, + GTK_PARAM_READWRITE)); + + g_object_class_install_property (gobject_class, + PROP_GICON_SECONDARY, + g_param_spec_object ("gicon-secondary", + P_("Secondary GIcon"), + P_("GIcon for secondary icon"), + G_TYPE_ICON, + GTK_PARAM_READWRITE)); + + g_type_class_add_private (klass, sizeof (GtkIconEntryPrivate)); +} + +static void +gtk_icon_entry_editable_init (GtkEditableClass *iface) +{ +}; + +/* GTK+/ GtkEntry internal helper function + Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald + Modified by the GTK+ Team and others 1997-2000 + Copied from Gtk+ 2.13, whitespace adjusted */ +static void +gtk_entry_get_pixel_ranges (GtkEntry *entry, + gint **ranges, + gint *n_ranges) +{ + gint start_char, end_char; + + if (gtk_editable_get_selection_bounds (GTK_EDITABLE (entry), + &start_char, &end_char)) + { + PangoLayout *layout = gtk_entry_get_layout (entry); + PangoLayoutLine *line = pango_layout_get_lines (layout)->data; + const char *text = pango_layout_get_text (layout); + gsize start_index = g_utf8_offset_to_pointer (text, start_char) - text; + gsize end_index = g_utf8_offset_to_pointer (text, end_char) - text; + gint real_n_ranges, i; + + pango_layout_line_get_x_ranges (line, + start_index, end_index, ranges, &real_n_ranges); + + if (ranges) + { + gint *r = *ranges; + + for (i = 0; i < real_n_ranges; ++i) + { + r[2 * i + 1] = (r[2 * i + 1] - r[2 * i]) / PANGO_SCALE; + r[2 * i] = r[2 * i] / PANGO_SCALE; + } + } + + if (n_ranges) + *n_ranges = real_n_ranges; + } + else + { + if (n_ranges) + *n_ranges = 0; + if (ranges) + *ranges = NULL; + } +} + +/* GTK+/ GtkEntry internal helper function + Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald + Modified by the GTK+ Team and others 1997-2000 + Copied from Gtk+ 2.13, whitespace adjusted + Code adjusted to not rely on internal qdata */ +static void +_gtk_entry_effective_inner_border (GtkEntry *entry, + GtkBorder *border) +{ + static const GtkBorder default_inner_border = { 2, 2, 2, 2 }; + GtkBorder *tmp_border; + + tmp_border = (GtkBorder*) gtk_entry_get_inner_border (entry); + + if (tmp_border) + { + *border = *tmp_border; + return; + } + + gtk_widget_style_get (GTK_WIDGET (entry), "inner-border", &tmp_border, NULL); + + if (tmp_border) + { + *border = *tmp_border; + gtk_border_free (tmp_border); + return; + } + + *border = default_inner_border; +} + +static void +gtk_entry_borders (GtkEntry* entry, + gint* xborder, + gint* yborder, + gboolean* interior_focus, + gint* focus_width) +{ + GtkWidget *widget = GTK_WIDGET (entry); + + if (entry->has_frame) + { + *xborder = widget->style->xthickness; + *yborder = widget->style->ythickness; + } + else + { + *xborder = 0; + *yborder = 0; + } + + gtk_widget_style_get (widget, "interior-focus", interior_focus, + "focus-line-width", focus_width, NULL); + + if (interior_focus) + { + *xborder += *focus_width; + *yborder += *focus_width; + } +} + +/* GTK+/ GtkEntry internal helper function + Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald + Modified by the GTK+ Team and others 1997-2000 + Copied from Gtk+ 2.13, whitespace adjusted */ +static void +gtk_entry_get_text_area_size (GtkEntry *entry, + gint *x, + gint *y, + gint *width, + gint *height) +{ + gint frame_height; + gint xborder, yborder; + gboolean interior_focus; + gint focus_width; + GtkRequisition requisition; + GtkWidget *widget = GTK_WIDGET (entry); + + gtk_widget_get_child_requisition (widget, &requisition); + gtk_entry_borders (entry, &xborder, &yborder, &interior_focus, &focus_width); + + if (GTK_WIDGET_REALIZED (widget)) + gdk_drawable_get_size (widget->window, NULL, &frame_height); + else + frame_height = requisition.height; + + if (GTK_WIDGET_HAS_FOCUS (widget) && interior_focus) + frame_height -= 2 * focus_width; + + if (x) + *x = xborder; + + if (y) + *y = frame_height / 2 - (requisition.height - yborder * 2) / 2; + + if (width) + *width = GTK_WIDGET (entry)->allocation.width - xborder * 2; + + if (height) + *height = requisition.height - yborder * 2; +} + +/* GTK+/ GtkEntry internal helper function + Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald + Modified by the GTK+ Team and others 1997-2000 + Copied from Gtk+ 2.13, whitespace adjusted */ +static void +get_layout_position (GtkEntry *entry, + gint *x, + gint *y) +{ + PangoLayout *layout; + PangoRectangle logical_rect; + gint area_width, area_height; + GtkBorder inner_border; + gint y_pos; + PangoLayoutLine *line; + + layout = gtk_entry_get_layout (entry); + + gtk_entry_get_text_area_size (entry, NULL, NULL, &area_width, &area_height); + _gtk_entry_effective_inner_border (entry, &inner_border); + + area_height = PANGO_SCALE * + (area_height - inner_border.top - inner_border.bottom); + + line = pango_layout_get_lines (layout)->data; + pango_layout_line_get_extents (line, NULL, &logical_rect); + + /* Align primarily for locale's ascent/descent */ + y_pos = ((area_height - entry->ascent - entry->descent) / 2 + + entry->ascent + logical_rect.y); + + /* Now see if we need to adjust to fit in actual drawn string */ + if (logical_rect.height > area_height) + y_pos = (area_height - logical_rect.height) / 2; + else if (y_pos < 0) + y_pos = 0; + else if (y_pos + logical_rect.height > area_height) + y_pos = area_height - logical_rect.height; + + y_pos = inner_border.top + y_pos / PANGO_SCALE; + + if (x) + *x = inner_border.left - entry->scroll_offset; + + if (y) + *y = y_pos; +} + +/* GTK+/ GtkEntry internal helper function + Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald + Modified by the GTK+ Team and others 1997-2000 + Copied from Gtk+ 2.13, whitespace adjusted + Code adjusted to not rely on internal _gtk_entry_ensure_layout */ +static void +gtk_entry_draw_text (GtkEntry *entry) +{ + GtkWidget *widget; + + if (!entry->visible && entry->invisible_char == 0) + return; + + if (GTK_WIDGET_DRAWABLE (entry)) + { + PangoLayout *layout = gtk_entry_get_layout (entry); + cairo_t *cr; + gint x, y; + gint start_pos, end_pos; + + widget = GTK_WIDGET (entry); + + get_layout_position (entry, &x, &y); + + cr = gdk_cairo_create (entry->text_area); + + cairo_move_to (cr, x, y); + gdk_cairo_set_source_color (cr, &widget->style->text [widget->state]); + pango_cairo_show_layout (cr, layout); + + if (gtk_editable_get_selection_bounds (GTK_EDITABLE (entry), + &start_pos, &end_pos)) + { + gint *ranges; + gint n_ranges, i; + PangoRectangle logical_rect; + GdkColor *selection_color, *text_color; + GtkBorder inner_border; + + pango_layout_get_pixel_extents (layout, NULL, &logical_rect); + gtk_entry_get_pixel_ranges (entry, &ranges, &n_ranges); + + if (GTK_WIDGET_HAS_FOCUS (entry)) + { + selection_color = &widget->style->base [GTK_STATE_SELECTED]; + text_color = &widget->style->text [GTK_STATE_SELECTED]; + } + else + { + selection_color = &widget->style->base [GTK_STATE_ACTIVE]; + text_color = &widget->style->text [GTK_STATE_ACTIVE]; + } + + _gtk_entry_effective_inner_border (entry, &inner_border); + + for (i = 0; i < n_ranges; ++i) + cairo_rectangle (cr, + inner_border.left - + entry->scroll_offset + ranges[2 * i], + y, + ranges[2 * i + 1], + logical_rect.height); + + cairo_clip (cr); + + gdk_cairo_set_source_color (cr, selection_color); + cairo_paint (cr); + + cairo_move_to (cr, x, y); + gdk_cairo_set_source_color (cr, text_color); + pango_cairo_show_layout (cr, layout); + + g_free (ranges); + } + + cairo_destroy (cr); + } +} + +static gboolean +entry_expose_event (GtkWidget* entry, + GdkEventExpose* event, + GtkIconEntry* icon_entry) +{ + GtkIconEntryPrivate *priv; + GdkWindow* text_area; + gint width, height; + + priv = icon_entry->priv; + text_area = GTK_ENTRY (entry)->text_area; + gdk_drawable_get_size (text_area, &width, &height); + + if (priv->fraction > 0.0) + { + gtk_paint_box (entry->style, text_area, + GTK_STATE_SELECTED, GTK_SHADOW_OUT, + &event->area, entry, "entry-progress", + 0, 0, priv->fraction * width, height); + gtk_entry_draw_text (GTK_ENTRY (entry)); + } + return FALSE; +} + +static void +gtk_icon_entry_init (GtkIconEntry *entry) +{ + entry->priv = G_TYPE_INSTANCE_GET_PRIVATE (entry, GTK_TYPE_ICON_ENTRY, + GtkIconEntryPrivate); + + g_signal_connect_after (entry, "expose-event", + G_CALLBACK (entry_expose_event), entry); +} + +static void +gtk_icon_entry_finalize (GObject *obj) +{ + GtkIconEntry *entry; + + g_return_if_fail (obj != NULL); + g_return_if_fail (GTK_IS_ICON_ENTRY(obj)); + + entry = GTK_ICON_ENTRY (obj); + + G_OBJECT_CLASS (parent_class)->finalize (obj); +} + +static void +gtk_icon_entry_dispose (GObject *obj) +{ + GtkIconEntry *entry; + + entry = GTK_ICON_ENTRY (obj); + + gtk_icon_entry_set_icon_from_pixbuf (entry, GTK_ICON_ENTRY_PRIMARY, NULL); + gtk_icon_entry_set_icon_from_pixbuf (entry, GTK_ICON_ENTRY_SECONDARY, NULL); + + G_OBJECT_CLASS (parent_class)->dispose (obj); +} + +static void +gtk_icon_entry_map (GtkWidget *widget) +{ + GtkIconEntryPrivate *priv; + GdkCursor *cursor; + + if (GTK_WIDGET_REALIZED (widget) && !GTK_WIDGET_MAPPED (widget)) + { + int i; + + GTK_WIDGET_CLASS (parent_class)->map (widget); + + priv = GTK_ICON_ENTRY (widget)->priv; + + for (i = 0; i < MAX_ICONS; i++) + { + if (priv->icons[i].pixbuf != NULL) + gdk_window_show (priv->icons[i].window); + + if (priv->icons[i].custom_cursor == TRUE && !priv->icons[i].insensitive) + { + cursor = gdk_cursor_new_for_display (gtk_widget_get_display (widget), + priv->icons[i].cursor_type); + + gdk_window_set_cursor (priv->icons[i].window, cursor); + gdk_cursor_unref (cursor); + } + } + + GTK_WIDGET_CLASS (parent_class)->map (widget); + } +} + +static void +gtk_icon_entry_unmap (GtkWidget *widget) +{ + GtkIconEntryPrivate *priv; + + if (GTK_WIDGET_MAPPED (widget)) + { + int i; + + priv = GTK_ICON_ENTRY (widget)->priv; + + for (i = 0; i < MAX_ICONS; i++) + { + if (priv->icons[i].pixbuf != NULL) + { + gdk_window_hide (priv->icons[i].window); + } + } + + GTK_WIDGET_CLASS (parent_class)->unmap (widget); + } +} + +static void +gtk_icon_entry_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec) +{ + GtkIconEntry *entry = GTK_ICON_ENTRY (object); + + switch (prop_id) + { + case PROP_PIXBUF_PRIMARY: + gtk_icon_entry_set_icon_from_pixbuf (entry, + GTK_ICON_ENTRY_PRIMARY, + g_value_get_object (value)); + break; + + case PROP_PIXBUF_SECONDARY: + gtk_icon_entry_set_icon_from_pixbuf (entry, + GTK_ICON_ENTRY_SECONDARY, + g_value_get_object (value)); + break; + + case PROP_STOCK_PRIMARY: + gtk_icon_entry_set_icon_from_stock (entry, + GTK_ICON_ENTRY_PRIMARY, + g_value_get_string (value)); + break; + + case PROP_STOCK_SECONDARY: + gtk_icon_entry_set_icon_from_stock (entry, + GTK_ICON_ENTRY_SECONDARY, + g_value_get_string (value)); + break; + + case PROP_ICON_NAME_PRIMARY: + gtk_icon_entry_set_icon_from_icon_name (entry, + GTK_ICON_ENTRY_PRIMARY, + g_value_get_string (value)); + break; + + case PROP_ICON_NAME_SECONDARY: + gtk_icon_entry_set_icon_from_icon_name (entry, + GTK_ICON_ENTRY_SECONDARY, + g_value_get_string (value)); + break; + + case PROP_GICON_PRIMARY: + gtk_icon_entry_set_icon_from_gicon (entry, + GTK_ICON_ENTRY_PRIMARY, + g_value_get_object (value)); + break; + + case PROP_GICON_SECONDARY: + gtk_icon_entry_set_icon_from_gicon (entry, + GTK_ICON_ENTRY_SECONDARY, + g_value_get_object (value)); + break; + } +} + +static void +gtk_icon_entry_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + GtkIconEntry *entry = GTK_ICON_ENTRY (object); + + switch (prop_id) + { + case PROP_PIXBUF_PRIMARY: + g_value_set_object (value, + gtk_icon_entry_get_pixbuf (entry, + GTK_ICON_ENTRY_PRIMARY)); + break; + + case PROP_PIXBUF_SECONDARY: + g_value_set_object (value, + gtk_icon_entry_get_pixbuf (entry, + GTK_ICON_ENTRY_SECONDARY)); + break; + + case PROP_GICON_PRIMARY: + g_value_set_object (value, + gtk_icon_entry_get_gicon (entry, + GTK_ICON_ENTRY_PRIMARY)); + break; + + case PROP_GICON_SECONDARY: + g_value_set_object (value, + gtk_icon_entry_get_gicon (entry, + GTK_ICON_ENTRY_SECONDARY)); + } +} + +static gint +get_icon_width (GtkIconEntry *entry, GtkIconEntryPosition icon_pos) +{ + gint menu_icon_width; + gint width; + GtkIconEntryPrivate *priv; + EntryIconInfo *icon_info; + + priv = entry->priv; + icon_info = &priv->icons[icon_pos]; + + if (icon_info->pixbuf == NULL) + return 0; + + gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &menu_icon_width, NULL); + + width = MAX (gdk_pixbuf_get_width (icon_info->pixbuf), menu_icon_width); + + return width; +} + +static void +get_borders (GtkIconEntry *entry, gint *xborder, gint *yborder) +{ + GtkWidget *widget = GTK_WIDGET (entry); + gint focus_width; + gboolean interior_focus; + + gtk_widget_style_get (widget, + "interior-focus", &interior_focus, + "focus-line-width", &focus_width, + NULL); + + if (gtk_entry_get_has_frame (GTK_ENTRY (entry))) + { + *xborder = widget->style->xthickness; + *yborder = widget->style->ythickness; + } + else + { + *xborder = 0; + *yborder = 0; + } + + if (!interior_focus) + { + *xborder += focus_width; + *yborder += focus_width; + } +} + +static void +get_text_area_size (GtkIconEntry *entry, GtkAllocation *alloc) +{ + GtkWidget *widget = GTK_WIDGET (entry); + GtkRequisition requisition; + gint xborder, yborder; + + gtk_widget_get_child_requisition (widget, &requisition); + get_borders (entry, &xborder, &yborder); + + alloc->x = xborder; + alloc->y = yborder; + alloc->width = widget->allocation.width - xborder * 2; + alloc->height = requisition.height - yborder * 2; +} + +static void +get_icon_allocation (GtkIconEntry *icon_entry, + gboolean left, + GtkAllocation *widget_alloc, + GtkAllocation *text_area_alloc, + GtkAllocation *allocation, + GtkIconEntryPosition *icon_pos) +{ + gboolean rtl; + + rtl = (gtk_widget_get_direction (GTK_WIDGET (icon_entry)) == + GTK_TEXT_DIR_RTL); + + if (left) + *icon_pos = (rtl ? GTK_ICON_ENTRY_SECONDARY : GTK_ICON_ENTRY_PRIMARY); + else + *icon_pos = (rtl ? GTK_ICON_ENTRY_PRIMARY : GTK_ICON_ENTRY_SECONDARY); + + allocation->y = text_area_alloc->y; + allocation->width = get_icon_width(icon_entry, *icon_pos); + allocation->height = text_area_alloc->height; + + if (left) + { + allocation->x = text_area_alloc->x + ICON_MARGIN; + } + else + { + allocation->x = text_area_alloc->x + text_area_alloc->width - + allocation->width - ICON_MARGIN; + } +} + +static void +gtk_icon_entry_realize (GtkWidget *widget) +{ + GtkIconEntry *entry; + GtkIconEntryPrivate *priv; + GdkWindowAttr attributes; + gint attributes_mask; + int i; + + entry = GTK_ICON_ENTRY (widget); + priv = entry->priv; + + GTK_WIDGET_CLASS (parent_class)->realize (widget); + + attributes.x = 0; + attributes.y = 0; + attributes.width = 1; + attributes.height = 1; + attributes.window_type = GDK_WINDOW_CHILD; + attributes.wclass = GDK_INPUT_OUTPUT; + attributes.visual = gtk_widget_get_visual (widget); + attributes.colormap = gtk_widget_get_colormap (widget); + attributes.event_mask = gtk_widget_get_events (widget); + attributes.event_mask |= + (GDK_EXPOSURE_MASK + | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK); + + attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP; + + for (i = 0; i < MAX_ICONS; i++) + { + EntryIconInfo *icon_info; + + icon_info = &priv->icons[i]; + icon_info->window = gdk_window_new (widget->window, &attributes, + attributes_mask); + gdk_window_set_user_data (icon_info->window, widget); + + gdk_window_set_background (icon_info->window, + &widget->style->base[GTK_WIDGET_STATE(widget)]); + } + + gtk_widget_queue_resize (widget); +} + +static void +gtk_icon_entry_unrealize (GtkWidget *widget) +{ + GtkIconEntry *entry; + GtkIconEntryPrivate *priv; + int i; + + entry = GTK_ICON_ENTRY (widget); + priv = entry->priv; + + GTK_WIDGET_CLASS (parent_class)->unrealize (widget); + + for (i = 0; i < MAX_ICONS; i++) + { + EntryIconInfo *icon_info = &priv->icons[i]; + + gdk_window_destroy (icon_info->window); + icon_info->window = NULL; + } +} + +static void +gtk_icon_entry_size_request (GtkWidget *widget, GtkRequisition *requisition) +{ + GtkEntry *gtkentry; + GtkIconEntry *entry; + gint icon_widths = 0; + int i; + + gtkentry = GTK_ENTRY(widget); + entry = GTK_ICON_ENTRY(widget); + + for (i = 0; i < MAX_ICONS; i++) + { + int icon_width = get_icon_width (entry, i); + + if (icon_width > 0) + { + icon_widths += icon_width + ICON_MARGIN; + } + } + + GTK_WIDGET_CLASS (parent_class)->size_request (widget, requisition); + + if (icon_widths > requisition->width) + requisition->width += icon_widths; +} + +static void +place_windows (GtkIconEntry *icon_entry, GtkAllocation *widget_alloc) +{ + GtkIconEntryPosition left_icon_pos; + GtkIconEntryPosition right_icon_pos; + GtkAllocation left_icon_alloc; + GtkAllocation right_icon_alloc; + GtkAllocation text_area_alloc; + GtkIconEntryPrivate *priv; + gint y; + + priv = icon_entry->priv; + + get_text_area_size (icon_entry, &text_area_alloc); + + /* DJW center text/icon + * TODO flicker needs to be eliminated + */ + gdk_window_get_geometry (GTK_ENTRY (icon_entry)->text_area, NULL, &y, NULL, NULL, NULL); + text_area_alloc.y = y; + + get_icon_allocation (icon_entry, TRUE, widget_alloc, &text_area_alloc, + &left_icon_alloc, &left_icon_pos); + get_icon_allocation (icon_entry, FALSE, widget_alloc, &text_area_alloc, + &right_icon_alloc, &right_icon_pos); + + if (left_icon_alloc.width > 0) + { + text_area_alloc.x = left_icon_alloc.x + left_icon_alloc.width + ICON_MARGIN; + } + + if (right_icon_alloc.width > 0) + { + text_area_alloc.width -= right_icon_alloc.width + ICON_MARGIN; + } + + text_area_alloc.width -= text_area_alloc.x; + + gdk_window_move_resize (priv->icons[left_icon_pos].window, + left_icon_alloc.x, left_icon_alloc.y, + left_icon_alloc.width, left_icon_alloc.height); + + gdk_window_move_resize (priv->icons[right_icon_pos].window, + right_icon_alloc.x, right_icon_alloc.y, + right_icon_alloc.width, right_icon_alloc.height); + + gdk_window_move_resize (GTK_ENTRY (icon_entry)->text_area, + text_area_alloc.x, text_area_alloc.y, + text_area_alloc.width, text_area_alloc.height); +} + +static void +gtk_icon_entry_size_allocate (GtkWidget *widget, GtkAllocation *allocation) +{ + g_return_if_fail (GTK_IS_ICON_ENTRY(widget)); + g_return_if_fail (allocation != NULL); + + widget->allocation = *allocation; + + GTK_WIDGET_CLASS (parent_class)->size_allocate (widget, allocation); + + if (GTK_WIDGET_REALIZED (widget)) + place_windows (GTK_ICON_ENTRY (widget), allocation); +} + +static GdkPixbuf * +get_pixbuf_from_icon (GtkIconEntry *entry, GtkIconEntryPosition icon_pos) +{ + EntryIconInfo *icon_info; + GtkIconEntryPrivate *priv; + + priv = entry->priv; + icon_info = &priv->icons[icon_pos]; + + g_object_ref (icon_info->pixbuf); + + return icon_info->pixbuf; +} + +/* Kudos to the gnome-panel guys. */ +static void +colorshift_pixbuf (GdkPixbuf *dest, GdkPixbuf *src, int shift) +{ + gint i, j; + gint width, height, has_alpha, src_rowstride, dest_rowstride; + guchar *target_pixels; + guchar *original_pixels; + guchar *pix_src; + guchar *pix_dest; + int val; + guchar r, g, b; + + has_alpha = gdk_pixbuf_get_has_alpha (src); + width = gdk_pixbuf_get_width (src); + height = gdk_pixbuf_get_height (src); + src_rowstride = gdk_pixbuf_get_rowstride (src); + dest_rowstride = gdk_pixbuf_get_rowstride (dest); + original_pixels = gdk_pixbuf_get_pixels (src); + target_pixels = gdk_pixbuf_get_pixels (dest); + + for (i = 0; i < height; i++) + { + pix_dest = target_pixels + i * dest_rowstride; + pix_src = original_pixels + i * src_rowstride; + + for (j = 0; j < width; j++) + { + r = *(pix_src++); + g = *(pix_src++); + b = *(pix_src++); + + val = r + shift; + *(pix_dest++) = CLAMP(val, 0, 255); + + val = g + shift; + *(pix_dest++) = CLAMP(val, 0, 255); + + val = b + shift; + *(pix_dest++) = CLAMP(val, 0, 255); + + if (has_alpha) + *(pix_dest++) = *(pix_src++); + } + } +} + +static void +draw_icon (GtkWidget *widget, GtkIconEntryPosition icon_pos) +{ + GtkIconEntry *entry; + GtkIconEntryPrivate *priv; + EntryIconInfo *icon_info; + GdkPixbuf *pixbuf; + gint x, y, width, height; + + entry = GTK_ICON_ENTRY (widget); + priv = entry->priv; + icon_info = &priv->icons[icon_pos]; + + if (icon_info->pixbuf == NULL || !GTK_WIDGET_REALIZED (widget)) + return; + + if ((pixbuf = get_pixbuf_from_icon (entry, icon_pos)) == NULL) + return; + + gdk_drawable_get_size (icon_info->window, &width, &height); + + if (width == 1 || height == 1) + { + /* + * size_allocate hasn't been called yet. These are the default values. + */ + return; + } + + if (gdk_pixbuf_get_height (pixbuf) > height) + { + GdkPixbuf *temp_pixbuf; + int scale; + + scale = height - (2 * ICON_MARGIN); + + temp_pixbuf = gdk_pixbuf_scale_simple (pixbuf, scale, scale, + GDK_INTERP_BILINEAR); + + g_object_unref (pixbuf); + + pixbuf = temp_pixbuf; + } + + x = (width - gdk_pixbuf_get_width(pixbuf)) / 2; + y = (height - gdk_pixbuf_get_height(pixbuf)) / 2; + + if (icon_info->insensitive) + { + GdkPixbuf *temp_pixbuf; + + temp_pixbuf = gdk_pixbuf_copy (pixbuf); + + gdk_pixbuf_saturate_and_pixelate (pixbuf, + temp_pixbuf, + 0.8f, + TRUE); + g_object_unref (pixbuf); + pixbuf = temp_pixbuf; + } + else if (icon_info->hovered) + { + GdkPixbuf *temp_pixbuf; + + temp_pixbuf = gdk_pixbuf_copy (pixbuf); + + colorshift_pixbuf (temp_pixbuf, pixbuf, 30); + + g_object_unref (pixbuf); + + pixbuf = temp_pixbuf; + } + + gdk_draw_pixbuf (icon_info->window, widget->style->black_gc, pixbuf, + 0, 0, x, y, -1, -1, + GDK_RGB_DITHER_NORMAL, 0, 0); + + g_object_unref (pixbuf); +} + +static gint +gtk_icon_entry_expose (GtkWidget *widget, GdkEventExpose *event) +{ + GtkIconEntry *entry; + GtkIconEntryPrivate *priv; + + g_return_val_if_fail (GTK_IS_ICON_ENTRY (widget), FALSE); + g_return_val_if_fail (event != NULL, FALSE); + + entry = GTK_ICON_ENTRY (widget); + priv = entry->priv; + + if (GTK_WIDGET_DRAWABLE (widget)) + { + gboolean found = FALSE; + int i; + + for (i = 0; i < MAX_ICONS && !found; i++) + { + EntryIconInfo *icon_info = &priv->icons[i]; + + if (event->window == icon_info->window) + { + gint width; + GtkAllocation text_area_alloc; + + get_text_area_size (entry, &text_area_alloc); + gdk_drawable_get_size (icon_info->window, &width, NULL); + + gtk_paint_flat_box (widget->style, icon_info->window, + GTK_WIDGET_STATE (widget), GTK_SHADOW_NONE, + NULL, widget, "entry_bg", + 0, 0, width, text_area_alloc.height); + + draw_icon (widget, i); + + found = TRUE; + } + } + + if (!found) + GTK_WIDGET_CLASS (parent_class)->expose_event (widget, event); + } + + return FALSE; +} + +static gint +gtk_icon_entry_enter_notify (GtkWidget *widget, GdkEventCrossing *event) +{ + GtkIconEntry *entry; + GtkIconEntryPrivate *priv; + int i; + + entry = GTK_ICON_ENTRY (widget); + priv = entry->priv; + + for (i = 0; i < MAX_ICONS; i++) + { + if (event->window == priv->icons[i].window) + { + if (gtk_icon_entry_get_icon_highlight (entry, i)) + { + priv->icons[i].hovered = TRUE; + + if (priv->icons[i].tooltip_text != NULL) + { + gtk_widget_set_tooltip_text (widget, + priv->icons[i].tooltip_text); + gtk_widget_set_has_tooltip (widget, TRUE); + } else { + gtk_widget_set_has_tooltip (widget, FALSE); + } + + gtk_widget_queue_draw (widget); + + break; + } + } + } + + return FALSE; +} + +static gint +gtk_icon_entry_leave_notify (GtkWidget *widget, GdkEventCrossing *event) +{ + GtkIconEntry *entry; + GtkIconEntryPrivate *priv; + int i; + + entry = GTK_ICON_ENTRY (widget); + priv = entry->priv; + + for (i = 0; i < MAX_ICONS; i++) + { + if (event->window == priv->icons[i].window) + { + if (gtk_icon_entry_get_icon_highlight (entry, i)) + { + priv->icons[i].hovered = FALSE; + + gtk_widget_set_has_tooltip (widget, FALSE); + gtk_widget_queue_draw (widget); + + break; + } + } + } + + return FALSE; +} + +static gint +gtk_icon_entry_button_press (GtkWidget *widget, GdkEventButton *event) +{ + GtkIconEntry *entry; + GtkIconEntryPrivate *priv; + int i; + + entry = GTK_ICON_ENTRY (widget); + priv = entry->priv; + + for (i = 0; i < MAX_ICONS; i++) + { + if (event->window == priv->icons[i].window) + { + if (event->button == 1 && gtk_icon_entry_get_icon_highlight (entry, i)) + { + priv->icons[i].hovered = FALSE; + + gtk_widget_queue_draw (widget); + } + + g_signal_emit (entry, signals[ICON_PRESSED], 0, i, event->button); + + return TRUE; + } + } + + if (GTK_WIDGET_CLASS (parent_class)->button_press_event) + return GTK_WIDGET_CLASS (parent_class)->button_press_event (widget, event); + + return FALSE; +} + +static gint +gtk_icon_entry_button_release (GtkWidget *widget, GdkEventButton *event) +{ + GtkIconEntry *entry; + GtkIconEntryPrivate *priv; + int i; + + entry = GTK_ICON_ENTRY (widget); + priv = entry->priv; + + for (i = 0; i < MAX_ICONS; i++) + { + GdkWindow *icon_window = priv->icons[i].window; + + if (event->window == icon_window) + { + int width, height; + gdk_drawable_get_size (icon_window, &width, &height); + + if (event->button == 1 && + gtk_icon_entry_get_icon_highlight (entry, i) && + event->x >= 0 && event->y >= 0 && + event->x <= width && event->y <= height) + { + priv->icons[i].hovered = TRUE; + + gtk_widget_queue_draw (widget); + } + + g_signal_emit (entry, signals[ICON_RELEASED], 0, i, event->button); + + return TRUE; + } + } + + if (GTK_WIDGET_CLASS (parent_class)->button_release_event) + return GTK_WIDGET_CLASS (parent_class)->button_release_event (widget, event); + + return FALSE; +} + +static void +gtk_icon_entry_style_set (GtkWidget *widget, GtkStyle *prev_style) +{ + GtkIconEntry *icon_entry; + + icon_entry = GTK_ICON_ENTRY (widget); + + if (GTK_WIDGET_CLASS (gtk_icon_entry_parent_class)->style_set) + GTK_WIDGET_CLASS (gtk_icon_entry_parent_class)->style_set (widget, prev_style); + + icon_theme_changed (icon_entry); +} + +static void +icon_theme_changed (GtkIconEntry *entry) +{ + GtkIconEntryPrivate *priv; + int i; + + priv = entry->priv; + + for (i = 0; i < MAX_ICONS; i++) + { + if (priv->icons[i].storage_type == GTK_IMAGE_ICON_NAME) + { + g_object_unref (priv->icons[i].pixbuf); + priv->icons[i].pixbuf = NULL; + + gtk_icon_entry_set_icon_from_icon_name (entry, i, priv->icons[i].icon_name); + } + else if (priv->icons[i].storage_type == _GTK_IMAGE_GICON) + { + g_object_unref (priv->icons[i].pixbuf); + priv->icons[i].pixbuf = NULL; + + gtk_icon_entry_set_icon_from_gicon (entry, i, priv->icons[i].gicon); + } + } + + gtk_widget_queue_draw (GTK_WIDGET (entry)); +} + +static void +gtk_icon_entry_set_icon_internal (GtkIconEntry *entry, + GtkIconEntryPosition icon_pos, + GdkPixbuf *pixbuf) +{ + EntryIconInfo *icon_info; + GtkIconEntryPrivate *priv; + + g_return_if_fail (entry != NULL); + g_return_if_fail (GTK_IS_ICON_ENTRY (entry)); + g_return_if_fail (IS_VALID_ICON_ENTRY_POSITION (icon_pos)); + + priv = entry->priv; + icon_info = &priv->icons[icon_pos]; + + if (pixbuf == icon_info->pixbuf) + return; + + if (icon_pos == GTK_ICON_ENTRY_SECONDARY && + priv->icon_released_id != 0) + { + g_signal_handler_disconnect (entry, priv->icon_released_id); + priv->icon_released_id = 0; + } + + if (pixbuf == NULL) + { + if (icon_info->pixbuf != NULL) + { + g_object_unref (icon_info->pixbuf); + icon_info->pixbuf = NULL; + + /* Explicitly check, as the pointer may become invalidated + * during destruction. + */ + if (icon_info->window != NULL && GDK_IS_WINDOW (icon_info->window)) + gdk_window_hide (icon_info->window); + } + } + else + { + if (icon_info->window != NULL && icon_info->pixbuf == NULL) + gdk_window_show (icon_info->window); + + icon_info->pixbuf = pixbuf; + g_object_ref (pixbuf); + } + + gtk_widget_queue_draw (GTK_WIDGET (entry)); +} + +/** + * gtk_icon_entry_new + * + * Creates a new GtkIconEntry widget. + * + * Returns a new #GtkIconEntry. + */ +GtkWidget * +gtk_icon_entry_new (void) +{ + return GTK_WIDGET (g_object_new (GTK_TYPE_ICON_ENTRY, NULL)); +} + +/** + * gtk_icon_entry_set_icon_from_pixbuf + * @entry: A #GtkIconEntry. + * @position: Icon position. + * @pixbuf: A #GdkPixbuf. + * + * Sets the icon shown in the specified position using a pixbuf. + */ +void +gtk_icon_entry_set_icon_from_pixbuf (GtkIconEntry *entry, + GtkIconEntryPosition icon_pos, + GdkPixbuf *pixbuf) +{ + EntryIconInfo *icon_info; + GtkIconEntryPrivate *priv; + + g_return_if_fail (entry != NULL); + g_return_if_fail (GTK_IS_ICON_ENTRY (entry)); + g_return_if_fail (IS_VALID_ICON_ENTRY_POSITION (icon_pos)); + + priv = entry->priv; + icon_info = &priv->icons[icon_pos]; + + if (pixbuf == icon_info->pixbuf) + return; + + if (icon_pos == GTK_ICON_ENTRY_SECONDARY && + priv->icon_released_id != 0) + { + g_signal_handler_disconnect (entry, priv->icon_released_id); + priv->icon_released_id = 0; + } + + if (pixbuf == NULL) + { + if (icon_info->pixbuf != NULL) + { + g_object_unref (icon_info->pixbuf); + icon_info->pixbuf = NULL; + + /* Explicitly check, as the pointer may become invalidated + * during destruction. + */ + if (icon_info->window != NULL && GDK_IS_WINDOW (icon_info->window)) + gdk_window_hide (icon_info->window); + } + } + else + { + if (icon_info->window != NULL && icon_info->pixbuf == NULL) + gdk_window_show (icon_info->window); + + icon_info->pixbuf = pixbuf; + g_object_ref (pixbuf); + } + + gtk_widget_queue_draw (GTK_WIDGET (entry)); +} + +/** + * gtk_icon_entry_set_icon_from_stock + * @entry: A #GtkIconEntry. + * @position: Icon position. + * @stock_id: The name of the stock item. + * + * Sets the icon shown in the entry at the specified position from a stock image. + */ +void +gtk_icon_entry_set_icon_from_stock (GtkIconEntry *entry, + GtkIconEntryPosition icon_pos, + const gchar *stock_id) +{ + GdkPixbuf *pixbuf; + + /* FIXME: Due to a bug in GtkIconEntry we need to set a non-NULL icon */ + if (! stock_id) + stock_id = GTK_STOCK_INFO; + + pixbuf = gtk_widget_render_icon (GTK_WIDGET (entry), + stock_id, + GTK_ICON_SIZE_MENU, + NULL); + + gtk_icon_entry_set_icon_internal (entry, + icon_pos, + pixbuf); +} + +/** + * gtk_icon_entry_set_icon_from_icon_name + * @entry: A #GtkIconEntry; + * @icon_pos: The position at which to set the icon + * @icon_name: An icon name + * + * Sets the icon shown in the entry at the specified position from the current + * icon theme. If the icon name isn't known, a "broken image" icon will be + * displayed instead. If the current icon theme is changed, the icon will be + * updated appropriately. + */ +void +gtk_icon_entry_set_icon_from_icon_name (GtkIconEntry *entry, + GtkIconEntryPosition icon_pos, + const gchar *icon_name) +{ + GdkPixbuf *pixbuf = NULL; + EntryIconInfo *icon_info; + GtkIconEntryPrivate *priv; + GdkScreen *screen; + GtkIconTheme *icon_theme; + GtkSettings *settings; + gint width, height; + GError *error = NULL; + + g_return_if_fail (entry != NULL); + g_return_if_fail (GTK_IS_ICON_ENTRY (entry)); + g_return_if_fail (IS_VALID_ICON_ENTRY_POSITION (icon_pos)); + + priv = entry->priv; + icon_info = &priv->icons[icon_pos]; + + screen = gtk_widget_get_screen (GTK_WIDGET (entry)); + icon_theme = gtk_icon_theme_get_for_screen (screen); + settings = gtk_settings_get_for_screen (screen); + + if (icon_name != NULL) + { + gtk_icon_size_lookup_for_settings (settings, + GTK_ICON_SIZE_MENU, + &width, &height); + + pixbuf = gtk_icon_theme_load_icon (icon_theme, + icon_name, + MIN (width, height), 0, &error); + + if (pixbuf == NULL) + { + g_error_free (error); + pixbuf = gtk_widget_render_icon (GTK_WIDGET (entry), + GTK_STOCK_MISSING_IMAGE, + GTK_ICON_SIZE_MENU, + NULL); + } + } + + gtk_icon_entry_set_icon_internal (entry, + icon_pos, + pixbuf); +} + +/** + * gtk_icon_entry_set_icon_from_gicon + * @entry: A #GtkIconEntry; + * @icon_pos: The position at which to set the icon + * @icon: The icon to set + * + * Sets the icon shown in the entry at the specified position from the current + * icon theme. If the icon isn't known, a "broken image" icon will be displayed + * instead. If the current icon theme is changed, the icon will be updated + * appropriately. + */ +void +gtk_icon_entry_set_icon_from_gicon (const GtkIconEntry *entry, + GtkIconEntryPosition icon_pos, + GIcon *icon) +{ + GdkPixbuf *pixbuf = NULL; + GtkIconEntryPrivate *priv; + EntryIconInfo *icon_info; + GdkScreen *screen; + GtkIconTheme *icon_theme; + GtkSettings *settings; + gint width, height; + GError *error = NULL; + GtkIconInfo *info; + + priv = entry->priv; + icon_info = &priv->icons[icon_pos]; + + screen = gtk_widget_get_screen (GTK_WIDGET (entry)); + icon_theme = gtk_icon_theme_get_for_screen (screen); + settings = gtk_settings_get_for_screen (screen); + + if (icon != NULL) + { + gtk_icon_size_lookup_for_settings (settings, + GTK_ICON_SIZE_MENU, + &width, &height); + + #if GTK_CHECK_VERSION (2, 14, 0) + info = gtk_icon_theme_lookup_by_gicon (icon_theme, + icon, + MIN (width, height), 0); + #else + info = NULL; + #endif + pixbuf = gtk_icon_info_load_icon (info, &error); + if (pixbuf == NULL) + { + g_error_free (error); + pixbuf = gtk_widget_render_icon (GTK_WIDGET (entry), + GTK_STOCK_MISSING_IMAGE, + GTK_ICON_SIZE_MENU, + NULL); + } + } + + gtk_icon_entry_set_icon_internal ((GtkIconEntry*)entry, + icon_pos, + pixbuf); +} + +/** + * gtk_icon_entry_set_cursor + * @entry: A #GtkIconEntry; + * @icon_pos: The position at which to set the cursor + * @cursor_type: A #GdkCursorType; describing the cursor to set + * + * Sets an alternate mouse cursor used for the specified icon. + */ +void +gtk_icon_entry_set_cursor (const GtkIconEntry *entry, + GtkIconEntryPosition icon_pos, + GdkCursorType cursor_type) +{ + EntryIconInfo *icon_info; + GtkIconEntryPrivate *priv; + GdkCursor *cursor; + + priv = entry->priv; + icon_info = &priv->icons[icon_pos]; + + icon_info->cursor_type = cursor_type; + icon_info->custom_cursor = TRUE; + + if (GTK_WIDGET_REALIZED (GTK_WIDGET (entry))) + { + cursor = gdk_cursor_new_for_display (gtk_widget_get_display (GTK_WIDGET (entry)), + cursor_type); + + gdk_window_set_cursor (icon_info->window, cursor); + gdk_cursor_unref (cursor); + } +} + +/** + * gtk_icon_entry_set_icon_highlight + * @entry: A #GtkIconEntry; + * @position: Icon position. + * @highlight: TRUE if the icon should highlight on mouse-over + * + * Determines whether the icon will highlight on mouse-over. + */ +void +gtk_icon_entry_set_icon_highlight (const GtkIconEntry *entry, + GtkIconEntryPosition icon_pos, + gboolean highlight) +{ + EntryIconInfo *icon_info; + GtkIconEntryPrivate *priv; + + priv = entry->priv; + + g_return_if_fail (entry != NULL); + g_return_if_fail (GTK_IS_ICON_ENTRY (entry)); + g_return_if_fail (IS_VALID_ICON_ENTRY_POSITION (icon_pos)); + + icon_info = &priv->icons[icon_pos]; + + if (icon_info->highlight == highlight) + return; + + icon_info->highlight = highlight; +} + +/** + * gtk_icon_entry_get_pixbuf + * @entry: A #GtkIconEntry. + * @position: Icon position. + * + * Retrieves the image used for the icon. Unlike the other methods of setting + * and getting icon data, this method will work regardless of whether the icon + * was set using a #GdkPixbuf, a #GIcon, a stock item, or an icon name. + * + * Returns: A #GdkPixbuf, or NULL if no icon is set for this position. + */ +GdkPixbuf * +gtk_icon_entry_get_pixbuf (const GtkIconEntry *entry, + GtkIconEntryPosition icon_pos) +{ + GtkIconEntryPrivate *priv; + + g_return_val_if_fail (entry != NULL, NULL); + g_return_val_if_fail (GTK_IS_ICON_ENTRY (entry), NULL); + g_return_val_if_fail (IS_VALID_ICON_ENTRY_POSITION (icon_pos), NULL); + + priv = entry->priv; + + return priv->icons[icon_pos].pixbuf; +} + +/** + * gtk_icon_entry_get_gicon + * @entry: A #GtkIconEntry + * @position: Icon position. + * + * Retrieves the GIcon used for the icon, or NULL if there is no icon or if + * the icon was set by some other method (e.g., by stock, pixbuf, or icon name). + * + * Returns: A #GIcon, or NULL if no icon is set or if the icon is not a GIcon. + */ +GIcon * +gtk_icon_entry_get_gicon (const GtkIconEntry *entry, + GtkIconEntryPosition icon_pos) +{ + GtkIconEntryPrivate *priv; + EntryIconInfo *icon_info; + + g_return_val_if_fail (entry != NULL, NULL); + g_return_val_if_fail (GTK_IS_ICON_ENTRY (entry), NULL); + g_return_val_if_fail (IS_VALID_ICON_ENTRY_POSITION (icon_pos), NULL); + + priv = entry->priv; + icon_info = &priv->icons[icon_pos]; + + return icon_info->storage_type == _GTK_IMAGE_GICON ? icon_info->gicon : NULL; +} + +/** + * gtk_icon_entry_get_icon_highlight + * @entry: A #GtkIconEntry. + * @position: Icon position. + * + * Retrieves whether entry will highlight the icon on mouseover. + * + * Returns: TRUE if icon highlights. + */ +gboolean +gtk_icon_entry_get_icon_highlight (const GtkIconEntry *entry, + GtkIconEntryPosition icon_pos) +{ + GtkIconEntryPrivate *priv; + + g_return_val_if_fail (entry != NULL, FALSE); + g_return_val_if_fail (GTK_IS_ICON_ENTRY (entry), FALSE); + g_return_val_if_fail (IS_VALID_ICON_ENTRY_POSITION (icon_pos), FALSE); + + priv = entry->priv; + + return priv->icons[icon_pos].highlight; +} + +/** + * gtk_icon_entry_set_tooltip + * @entry: A #GtkIconEntry. + * @position: Icon position. + * @text: The text to be used for the tooltip. + * + * Sets the tooltip text used for the specified icon. + */ +void +gtk_icon_entry_set_tooltip (const GtkIconEntry *entry, + GtkIconEntryPosition icon_pos, + const gchar *text) +{ + EntryIconInfo *icon_info; + GtkIconEntryPrivate *priv; + gchar *new_tooltip; + + g_return_if_fail (entry != NULL); + g_return_if_fail (GTK_IS_ICON_ENTRY (entry)); + g_return_if_fail (IS_VALID_ICON_ENTRY_POSITION (icon_pos)); + + priv = entry->priv; + + icon_info = &priv->icons[icon_pos]; + + new_tooltip = g_strdup (text); + if (icon_info->tooltip_text != NULL) + g_free (icon_info->tooltip_text); + icon_info->tooltip_text = new_tooltip; +} + +/** + * gtk_icon_entry_set_icon_sensitive + * @entry: A #GtkIconEntry. + * @position: Icon position. + * @sensitive: Specifies whether the icon should appear sensitive or insensitive. + * + * Sets the sensitivity for the specified icon. + */ +void +gtk_icon_entry_set_icon_sensitive (const GtkIconEntry *icon_entry, + GtkIconEntryPosition icon_pos, + gboolean sensitive) +{ + EntryIconInfo *icon_info; + GtkIconEntryPrivate *priv; + + g_return_if_fail (icon_entry != NULL); + g_return_if_fail (GTK_IS_ICON_ENTRY (icon_entry)); + g_return_if_fail (IS_VALID_ICON_ENTRY_POSITION (icon_pos)); + + priv = icon_entry->priv; + + icon_info = &priv->icons[icon_pos]; + + icon_info->insensitive = !sensitive; + + if (icon_info->custom_cursor == TRUE && GTK_WIDGET_REALIZED (GTK_WIDGET (icon_entry))) + { + GdkCursor *cursor = gdk_cursor_new_for_display (gtk_widget_get_display (GTK_WIDGET (icon_entry)), + sensitive ? icon_info->cursor_type : GDK_ARROW); + gdk_window_set_cursor (icon_info->window, cursor); + gdk_cursor_unref (cursor); + } +} + +void +gtk_icon_entry_set_progress_fraction (GtkIconEntry *icon_entry, + gdouble fraction) +{ + GtkIconEntryPrivate *priv; + + g_return_if_fail (GTK_IS_ICON_ENTRY (icon_entry)); + + priv = icon_entry->priv; + priv->fraction = CLAMP (fraction, 0.0, 1.0); + + if (GTK_ENTRY (icon_entry)->text_area) + gdk_window_invalidate_rect (GTK_ENTRY (icon_entry)->text_area, NULL, FALSE); +} + +#endif diff --git a/midori/gtkiconentry.h b/midori/gtkiconentry.h index daa1819d..18ec4e10 100644 --- a/midori/gtkiconentry.h +++ b/midori/gtkiconentry.h @@ -26,6 +26,7 @@ G_BEGIN_DECLS +#if GTK_CHECK_VERSION (2, 16, 0) #define GtkIconEntry GtkEntry #define GtkIconEntryPosition GtkEntryIconPosition #define GTK_ICON_ENTRY_PRIMARY GTK_ENTRY_ICON_PRIMARY @@ -41,9 +42,99 @@ G_BEGIN_DECLS GtkEntryIconPosition position, GdkPixbuf* pixbuf); #define gtk_icon_entry_set_tooltip gtk_entry_set_icon_tooltip_text - #define gtk_icon_entry_get_tooltip gtk_entry_get_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 + +#define GTK_TYPE_ICON_ENTRY (gtk_icon_entry_get_type()) +#define GTK_ICON_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_TYPE_ICON_ENTRY, GtkIconEntry)) +#define GTK_ICON_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GTK_TYPE_ICON_ENTRY, GtkIconEntryClass)) +#define GTK_IS_ICON_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GTK_TYPE_ICON_ENTRY)) +#define GTK_IS_ICON_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GTK_TYPE_ICON_ENTRY)) +#define GTK_ICON_ENTRY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ICON_ENTRY, GtkIconEntryClass)) + +typedef enum +{ + GTK_ICON_ENTRY_PRIMARY, + GTK_ICON_ENTRY_SECONDARY +} GtkIconEntryPosition; + +typedef struct _GtkIconEntry GtkIconEntry; +typedef struct _GtkIconEntryClass GtkIconEntryClass; +typedef struct _GtkIconEntryPrivate GtkIconEntryPrivate; + +struct _GtkIconEntry +{ + GtkEntry parent_object; + + GtkIconEntryPrivate* priv; +}; + +struct _GtkIconEntryClass +{ + GtkEntryClass parent_class; + + /* Signals */ + void (*icon_pressed) (GtkIconEntry *entry, + GtkIconEntryPosition icon_pos, + int button); + void (*icon_released) (GtkIconEntry *entry, + GtkIconEntryPosition icon_pos, + int button); + + void (*gtk_reserved1) (void); + void (*gtk_reserved2) (void); + void (*gtk_reserved3) (void); + void (*gtk_reserved4) (void); +}; + +GType gtk_icon_entry_get_type (void) G_GNUC_CONST; + +GtkWidget* gtk_icon_entry_new (void); + +void gtk_icon_entry_set_icon_from_pixbuf (GtkIconEntry *entry, + GtkIconEntryPosition icon_pos, + GdkPixbuf *pixbuf); +void gtk_icon_entry_set_icon_from_stock (GtkIconEntry *entry, + GtkIconEntryPosition icon_pos, + const gchar *stock_id); +void gtk_icon_entry_set_icon_from_icon_name (GtkIconEntry *entry, + GtkIconEntryPosition icon_pos, + const gchar *icon_name); + +void gtk_icon_entry_set_icon_from_gicon (const GtkIconEntry *entry, + GtkIconEntryPosition icon_pos, + GIcon *icon); + +GdkPixbuf* gtk_icon_entry_get_pixbuf (const GtkIconEntry *entry, + GtkIconEntryPosition icon_pos); + +GIcon* gtk_icon_entry_get_gicon (const GtkIconEntry *entry, + GtkIconEntryPosition icon_pos); + +void gtk_icon_entry_set_icon_highlight (const GtkIconEntry *entry, + GtkIconEntryPosition icon_pos, + gboolean highlight); + +gboolean gtk_icon_entry_get_icon_highlight (const GtkIconEntry *entry, + GtkIconEntryPosition icon_pos); + +void gtk_icon_entry_set_cursor (const GtkIconEntry *icon_entry, + GtkIconEntryPosition icon_pos, + GdkCursorType cursor_type); + +void gtk_icon_entry_set_tooltip (const GtkIconEntry *icon_entry, + GtkIconEntryPosition icon_pos, + const gchar *text); + +void gtk_icon_entry_set_icon_sensitive (const GtkIconEntry *icon_entry, + GtkIconEntryPosition icon_pos, + gboolean sensitive); + +void gtk_icon_entry_set_progress_fraction (GtkIconEntry *icon_entry, + gdouble fraction); + +#endif G_END_DECLS diff --git a/midori/main.c b/midori/main.c index 2d3af37a..3800457e 100644 --- a/midori/main.c +++ b/midori/main.c @@ -13,7 +13,6 @@ #include "midori-app.h" #include "midori-array.h" #include "midori-bookmarks.h" -#include "panels/midori-bookmarks.h" #include "midori-extension.h" #include "midori-extensions.h" #include "midori-history.h" @@ -45,6 +44,12 @@ #include #endif +#if HAVE_HILDON + #define BOOKMARK_FILE "/home/user/.bookmarks/MyBookmarks.xml" +#else + #define BOOKMARK_FILE "bookmarks.xbel" +#endif + #ifdef HAVE_X11_EXTENSIONS_SCRNSAVER_H #include #include @@ -52,11 +57,18 @@ #include #endif +static gchar* +build_config_filename (const gchar* filename) +{ + return g_build_filename (sokoke_set_config_dir (NULL), filename, NULL); +} + static MidoriWebSettings* -settings_and_accels_new (gchar*** extensions) +settings_and_accels_new (const gchar* config, + gchar*** extensions) { MidoriWebSettings* settings = midori_web_settings_new (); - gchar* config_file = midori_paths_get_readonly_config_filename ("config"); + gchar* config_file = g_build_filename (config, "config", NULL); GKeyFile* key_file = g_key_file_new (); GError* error = NULL; GObjectClass* class; @@ -76,7 +88,7 @@ settings_and_accels_new (gchar*** extensions) if (error->code == G_FILE_ERROR_NOENT) { GError* inner_error = NULL; - katze_assign (config_file, midori_paths_get_preset_filename (NULL, "config")); + 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, &inner_error); if (inner_error != NULL) @@ -149,9 +161,9 @@ settings_and_accels_new (gchar*** extensions) g_key_file_free (key_file); /* Load accelerators */ - katze_assign (config_file, midori_paths_get_config_filename ("accels")); + katze_assign (config_file, g_build_filename (config, "accels", NULL)); if (g_access (config_file, F_OK) != 0) - katze_assign (config_file, midori_paths_get_preset_filename (NULL, "accels")); + katze_assign (config_file, sokoke_find_config_filename (NULL, "accels")); gtk_accel_map_load (config_file); g_free (config_file); @@ -248,8 +260,15 @@ settings_save_to_file (MidoriWebSettings* settings, } g_free (pspecs); - /* Take frozen list of active extensions until preferences reset it */ - if ((_extensions = g_object_get_data (G_OBJECT (app), "extensions"))) + if (extensions) + { + 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); + g_object_unref (extensions); + } + else if ((_extensions = g_object_get_data (G_OBJECT (app), "extensions"))) { i = 0; while (_extensions[i]) @@ -258,30 +277,7 @@ settings_save_to_file (MidoriWebSettings* settings, i++; } } - else if (extensions) - { - KATZE_ARRAY_FOREACH_ITEM (extension, extensions) - if (midori_extension_is_active (extension)) - { - 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); - } saved = sokoke_key_file_save_to_file (key_file, filename, error); g_key_file_free (key_file); return saved; @@ -304,6 +300,8 @@ search_engines_new_from_file (const gchar* filename, key_file = g_key_file_new (); g_key_file_load_from_file (key_file, filename, G_KEY_FILE_KEEP_COMMENTS, error); + /*g_key_file_load_from_data_dirs(keyFile, sFilename, NULL + , G_KEY_FILE_KEEP_COMMENTS, error);*/ engines = g_key_file_get_groups (key_file, NULL); pspecs = g_object_class_list_properties (G_OBJECT_GET_CLASS (search_engines), &n_properties); @@ -329,9 +327,10 @@ search_engines_new_from_file (const gchar* filename, } static KatzeArray* -search_engines_new_from_folder (GString* error_messages) +search_engines_new_from_folder (const gchar* config, + GString* error_messages) { - gchar* config_file = midori_paths_get_config_filename ("search"); + gchar* config_file = g_build_filename (config, "search", NULL); GError* error = NULL; KatzeArray* search_engines; @@ -345,10 +344,18 @@ search_engines_new_from_folder (GString* error_messages) } 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, - midori_paths_get_preset_filename (NULL, "search")); - katze_object_assign (search_engines, - search_engines_new_from_file (config_file, NULL)); + 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) { @@ -416,6 +423,7 @@ midori_history_clear_cb (KatzeArray* array, static gboolean midori_history_initialize (KatzeArray* array, const gchar* filename, + const gchar* bookmarks_filename, char** errmsg) { sqlite3* db; @@ -423,9 +431,6 @@ midori_history_initialize (KatzeArray* array, sqlite3_stmt* stmt; gint result; gchar* sql; - gchar* bookmarks_filename; - - g_return_val_if_fail (errmsg != NULL, FALSE); if (sqlite3_open (filename, &db) != SQLITE_OK) { @@ -436,13 +441,7 @@ midori_history_initialize (KatzeArray* array, 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); + sqlite3_exec (db, "PRAGMA journal_mode = TRUNCATE;", NULL, NULL, errmsg); if (*errmsg) { g_warning ("Failed to set journal mode: %s", *errmsg); @@ -477,9 +476,7 @@ midori_history_initialize (KatzeArray* array, "COMMIT;", NULL, NULL, errmsg); - bookmarks_filename = midori_paths_get_config_filename ("bookmarks_v2.db"); sql = g_strdup_printf ("ATTACH DATABASE '%s' AS bookmarks", bookmarks_filename); - g_free (bookmarks_filename); sqlite3_exec (db, sql, NULL, NULL, errmsg); g_free (sql); g_object_set_data (G_OBJECT (array), "db", db); @@ -509,6 +506,93 @@ midori_history_terminate (KatzeArray* array, sqlite3_close (db); } +static 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")); +} + +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, "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; +} + +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 settings_notify_cb (MidoriWebSettings* settings, GParamSpec* pspec, @@ -518,10 +602,10 @@ settings_notify_cb (MidoriWebSettings* settings, gchar* config_file; /* Skip state related properties to avoid disk IO */ - if (pspec && midori_settings_delay_saving (MIDORI_SETTINGS (settings), pspec->name)) + if (pspec && pspec->flags & MIDORI_PARAM_DELAY_SAVING) return; - config_file = midori_paths_get_config_filename ("config"); + config_file = build_config_filename ("config"); if (!settings_save_to_file (settings, app, config_file, &error)) { g_warning (_("The configuration couldn't be saved. %s"), error->message); @@ -530,13 +614,22 @@ settings_notify_cb (MidoriWebSettings* settings, g_free (config_file); } +static void +extension_activate_cb (MidoriExtension* extension, + MidoriApp* app) +{ + MidoriWebSettings* settings = katze_object_get_object (app, "settings"); + settings_notify_cb (settings, NULL, app); + g_object_unref (settings); +} + static void accel_map_changed_cb (GtkAccelMap* accel_map, gchar* accel_path, guint accel_key, GdkModifierType accel_mods) { - gchar* config_file = midori_paths_get_config_filename ("accels"); + gchar* config_file = build_config_filename ("accels"); gtk_accel_map_save (config_file); g_free (config_file); } @@ -546,7 +639,7 @@ midori_search_engines_modify_cb (KatzeArray* array, gpointer item, KatzeArray* search_engines) { - gchar* config_file = midori_paths_get_config_filename ("search"); + gchar* config_file = build_config_filename ("search"); GError* error = NULL; if (!search_engines_save_to_file (search_engines, config_file, &error)) { @@ -581,7 +674,7 @@ static void midori_trash_remove_item_cb (KatzeArray* trash, GObject* item) { - gchar* config_file = midori_paths_get_config_filename ("tabtrash.xbel"); + 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)) @@ -600,51 +693,19 @@ midori_trash_add_item_cb (KatzeArray* trash, midori_trash_remove_item_cb (trash, item); } -static void -midori_load_module (MidoriApp* app, - const gchar* extension_path, - const gchar* filename, - gboolean activate); static void midori_browser_show_preferences_cb (MidoriBrowser* browser, KatzePreferences* preferences, MidoriApp* app) { KatzeArray* array; - gchar* extension_path; GtkWidget* scrolled; GtkWidget* addon; GList* children; GtkWidget* page; - if (!g_module_supported ()) - return; - - array = katze_object_get_object (app, "extensions"); - if ((extension_path = midori_paths_get_lib_path (PACKAGE_NAME))) - { - GDir* extension_dir = NULL; - if ((extension_dir = g_dir_open (extension_path, 0, NULL))) - { - const gchar* filename; - while ((filename = g_dir_read_name (extension_dir))) - { - /* Ignore files which don't have the correct suffix */ - if (!g_str_has_suffix (filename, G_MODULE_SUFFIX)) - continue; - - midori_load_module (app, extension_path, filename, FALSE); - } - g_dir_close (extension_dir); - } - g_free (extension_path); - } - - - /* Reset frozen list: allow active extensions to be saved */ - g_object_set_data (G_OBJECT (app), "extensions", NULL); - /* 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); @@ -660,7 +721,7 @@ midori_browser_show_preferences_cb (MidoriBrowser* browser, gtk_widget_reparent (g_list_nth_data (children, 0), scrolled); g_list_free (children); page = katze_preferences_add_category (preferences, - _("Extensions"), STOCK_EXTENSION); + _("Extensions"), STOCK_EXTENSIONS); gtk_box_pack_start (GTK_BOX (page), scrolled, TRUE, TRUE, 4); } @@ -676,17 +737,12 @@ midori_browser_privacy_preferences_cb (MidoriBrowser* browser, katze_preferences_add_category (preferences, _("Privacy"), GTK_STOCK_INDEX); katze_preferences_add_group (preferences, NULL); - button = gtk_label_new (_("Delete old Cookies after:")); - gtk_misc_set_alignment (GTK_MISC (button), 0.0, 0.5); - gtk_widget_set_tooltip_text (button, _("The maximum number of days to save cookies for")); + button = katze_property_label (settings, "maximum-cookie-age"); katze_preferences_add_widget (preferences, button, "indented"); button = katze_property_proxy (settings, "maximum-cookie-age", "days"); - gtk_widget_set_tooltip_text (button, _("The maximum number of days to save cookies for")); katze_preferences_add_widget (preferences, button, "spanned"); #ifdef HAVE_LIBSOUP_2_29_91 button = katze_property_proxy (settings, "first-party-cookies-only", NULL); - gtk_button_set_label (GTK_BUTTON (button), _("Only accept Cookies from sites you visit")); - gtk_widget_set_tooltip_text (button, _("Block cookies sent by third-party websites")); katze_preferences_add_widget (preferences, button, "filled"); #endif @@ -698,24 +754,15 @@ midori_browser_privacy_preferences_cb (MidoriBrowser* browser, g_free (markup); katze_preferences_add_widget (preferences, label, "filled"); button = katze_property_proxy (settings, "enable-offline-web-application-cache", NULL); - gtk_button_set_label (GTK_BUTTON (button), _("Enable offline web application cache")); katze_preferences_add_widget (preferences, button, "indented"); button = katze_property_proxy (settings, "enable-html5-local-storage", NULL); - gtk_button_set_label (GTK_BUTTON (button), _("Enable HTML5 local storage support")); katze_preferences_add_widget (preferences, button, "spanned"); button = katze_property_proxy (settings, "strip-referer", NULL); - /* i18n: Reworded: Shorten details propagated when going to another page */ - gtk_button_set_label (GTK_BUTTON (button), _("Strip referrer details sent to websites")); - /* i18n: Referer here is not a typo but a technical term */ - gtk_widget_set_tooltip_text (button, _("Whether the \"Referer\" header should be shortened to the hostname")); katze_preferences_add_widget (preferences, button, "indented"); katze_preferences_add_widget (preferences, gtk_label_new (NULL), "indented"); - button = gtk_label_new (_("Delete pages from history after:")); - gtk_misc_set_alignment (GTK_MISC (button), 0.0, 0.5); - gtk_widget_set_tooltip_text (button, _("The maximum number of days to save the history for")); + button = katze_property_label (settings, "maximum-history-age"); katze_preferences_add_widget (preferences, button, "indented"); button = katze_property_proxy (settings, "maximum-history-age", "days"); - gtk_widget_set_tooltip_text (button, _("The maximum number of days to save the history for")); katze_preferences_add_widget (preferences, button, "spanned"); } @@ -752,7 +799,7 @@ static guint save_timeout = 0; static gboolean midori_session_save_timeout_cb (KatzeArray* session) { - gchar* config_file = midori_paths_get_config_filename ("session.xbel"); + gchar* config_file = build_config_filename ("session.xbel"); GError* error = NULL; if (!midori_array_to_file (session, config_file, "xbel", &error)) { @@ -784,7 +831,7 @@ static void midori_app_quit_cb (MidoriBrowser* browser, KatzeArray* session) { - gchar* config_file = midori_paths_get_config_filename ("running"); + gchar* config_file = build_config_filename ("running"); g_unlink (config_file); g_free (config_file); @@ -876,69 +923,63 @@ soup_session_settings_notify_first_party_cb (MidoriWebSettings* settings, } #endif -#if defined (HAVE_LIBSOUP_2_34_0) -/* Implemented in MidoriLocationAction */ -void -midori_map_add_message (SoupMessage* message); - -static void -midori_soup_session_request_started_cb (SoupSession* session, - SoupMessage* message, - SoupSocket* socket, - gpointer user_data) -{ - midori_map_add_message (message); -} -#endif - static void midori_soup_session_settings_accept_language_cb (SoupSession* session, SoupMessage* msg, MidoriWebSettings* settings) { - const gchar* accept = midori_web_settings_get_accept_language (settings); - soup_message_headers_append (msg->request_headers, "Accept-Language", accept); + gchar* languages = katze_object_get_string (settings, "preferred-languages"); + gchar* accpt; + + /* Empty, use the system locales */ + if (!(languages && *languages)) + accpt = sokoke_accept_languages (g_get_language_names ()); + /* No =, no ., looks like a list of language names */ + else if (!(strchr (languages, '=') && strchr (languages, '.'))) + { + gchar ** lang_names = g_strsplit_set (languages, ",; ", -1); + accpt = sokoke_accept_languages ((const gchar* const *)lang_names); + g_strfreev (lang_names); + } + /* Presumably a well formatted list including priorities */ + else + accpt = languages; + + if (accpt != languages) + 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); - SoupURI* stripped_uri; - if (referer && destination && !strstr (referer, destination->host) - && (stripped_uri = soup_uri_new (referer))) + if (referer && destination && !strstr (referer, destination->host)) { + SoupURI* stripped_uri = soup_uri_new (referer); gchar* stripped_referer; - soup_uri_set_path (stripped_uri, ""); + soup_uri_set_path (stripped_uri, NULL); soup_uri_set_query (stripped_uri, NULL); stripped_referer = soup_uri_to_string (stripped_uri, FALSE); soup_uri_free (stripped_uri); - if (strcmp (stripped_referer, referer)) - { - if (midori_debug ("referer")) - g_message ("Referer '%s' stripped to '%s'", referer, stripped_referer); - soup_message_headers_replace (msg->request_headers, "Referer", - stripped_referer); - } + if (g_getenv ("MIDORI_SOUP_DEBUG")) + g_message ("Referer stripped"); + soup_message_headers_replace (msg->request_headers, "Referer", + stripped_referer); g_free (stripped_referer); } - - /* With HTTP, Host is optional. Strip to outsmart some filter proxies */ - if (destination && destination->scheme == SOUP_URI_SCHEME_HTTP) - soup_message_headers_remove (msg->request_headers, "Host"); } } static void midori_soup_session_debug (SoupSession* session) { - gint soup_debug_level = 0; - if (midori_debug ("headers")) - soup_debug_level = SOUP_LOGGER_LOG_HEADERS; - else if (midori_debug ("body")) - soup_debug_level = SOUP_LOGGER_LOG_BODY; - if (soup_debug_level > 0) + const char* soup_debug = g_getenv ("MIDORI_SOUP_DEBUG"); + + if (soup_debug) { + gint soup_debug_level = atoi (soup_debug); SoupLogger* logger = soup_logger_new (soup_debug_level, -1); soup_logger_attach (logger, session); g_object_unref (logger); @@ -950,7 +991,6 @@ midori_load_soup_session (gpointer settings) { SoupSession* session = webkit_get_default_session (); - #ifndef G_OS_WIN32 #if defined (HAVE_LIBSOUP_2_37_1) g_object_set (session, "ssl-use-system-ca-file", TRUE, @@ -981,17 +1021,6 @@ midori_load_soup_session (gpointer settings) g_warning (_("No root certificate file is available. " "SSL certificates cannot be verified.")); #endif - #else /* G_OS_WIN32 */ - /* We cannot use "ssl-use-system-ca-file" on Windows - * some GTLS backend pieces are missing currently. - * Instead we specify the bundle we ship ourselves */ - gchar* certificate_file = midori_paths_get_res_filename ("ca-bundle.crt"); - g_object_set (session, - "ssl-ca-file", certificate_file, - "ssl-strict", FALSE, - NULL); - g_free (certificate_file); - #endif #if !WEBKIT_CHECK_VERSION (1, 3, 5) /* See http://stevesouders.com/ua/index.php */ @@ -1000,7 +1029,6 @@ midori_load_soup_session (gpointer settings) 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); @@ -1013,23 +1041,9 @@ midori_load_soup_session (gpointer settings) G_CALLBACK (soup_session_settings_notify_first_party_cb), session); #endif - #if WEBKIT_CHECK_VERSION (1, 8, 0) - gchar* cache = g_build_filename (midori_paths_get_user_data_dir (), - "webkit", "icondatabase", NULL); - webkit_favicon_database_set_path (webkit_get_favicon_database (), cache); - g_free (cache); - #endif - - #if defined (HAVE_LIBSOUP_2_34_0) - g_signal_connect (session, "request-started", - G_CALLBACK (midori_soup_session_request_started_cb), session); - #endif g_signal_connect (session, "request-queued", G_CALLBACK (midori_soup_session_settings_accept_language_cb), settings); - soup_session_add_feature (session, SOUP_SESSION_FEATURE ( - midori_hsts_new (midori_paths_get_readonly_config_filename ("hsts")))); - midori_soup_session_debug (session); g_object_set_data (G_OBJECT (session), "midori-session-initialized", (void*)1); @@ -1051,7 +1065,6 @@ static void button_disable_extensions_clicked_cb (GtkWidget* button, MidoriApp* app) { - /* Reset frozen list of active extensions */ g_object_set_data (G_OBJECT (app), "extensions", NULL); gtk_widget_set_sensitive (button, FALSE); } @@ -1105,7 +1118,6 @@ midori_show_diagnostic_dialog (MidoriWebSettings* settings, gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 4); gtk_widget_show_all (align); button = katze_property_proxy (settings, "show-crash-dialog", NULL); - gtk_button_set_label (GTK_BUTTON (button), _("Show a dialog after Midori crashed")); 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))); @@ -1161,7 +1173,7 @@ midori_load_soup_session_full (gpointer settings) midori_load_soup_session (settings); - config_file = midori_paths_get_config_filename ("logins"); + 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); @@ -1171,7 +1183,7 @@ midori_load_soup_session_full (gpointer settings) soup_session_add_feature (session, SOUP_SESSION_FEATURE (jar)); g_object_unref (jar); - katze_assign (config_file, midori_paths_get_config_filename ("cookies.db")); + 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", @@ -1181,7 +1193,7 @@ midori_load_soup_session_full (gpointer settings) if (!have_new_cookies) { - katze_assign (config_file, midori_paths_get_config_filename ("cookies.txt")); + katze_assign (config_file, build_config_filename ("cookies.txt")); if (g_access (config_file, F_OK) == 0) { g_message ("Importing cookies from txt to sqlite3"); @@ -1194,7 +1206,8 @@ midori_load_soup_session_full (gpointer settings) } #if WEBKIT_CHECK_VERSION (1, 3, 11) - katze_assign (config_file, g_build_filename (midori_paths_get_cache_dir (), "web", NULL)); + 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), @@ -1206,135 +1219,95 @@ midori_load_soup_session_full (gpointer settings) return FALSE; } -static void -midori_load_extension (MidoriApp* app, - MidoriExtension* extension, - const gchar* filename) -{ - KatzeArray* extensions = katze_object_get_object (app, "extensions"); - /* 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); - g_object_unref (extensions); -} - -static void -midori_load_module (MidoriApp* app, - const gchar* extension_path, - const gchar* filename, - gboolean activate) -{ - gchar* fullname; - GModule* module; - typedef GObject* (*extension_init_func)(void); - extension_init_func extension_init; - GObject* extension = NULL; - static GHashTable* modules = NULL; - - if (strchr (filename, '/')) - { - gchar* clean = g_strndup (filename, strchr (filename, '/') - filename); - fullname = g_build_filename (extension_path, clean, NULL); - g_free (clean); - } - else - fullname = g_build_filename (extension_path, filename, NULL); - - module = g_module_open (fullname, G_MODULE_BIND_LOCAL); - g_free (fullname); - - /* GModule detects repeated loading but exposes no API to check it. - Skip any modules that were loaded before. */ - if (modules == NULL) - modules = g_hash_table_new (g_direct_hash, g_direct_equal); - if (g_hash_table_lookup (modules, module)) - return; - g_hash_table_insert (modules, module, g_strdup (filename)); - - if (module && g_module_symbol (module, "extension_init", - (gpointer) &extension_init) - && (extension = extension_init ())) - { - if (MIDORI_IS_EXTENSION (extension)) - { - midori_load_extension (app, MIDORI_EXTENSION (extension), filename); - if (activate) - g_signal_emit_by_name (extension, "activate", app); - } - else if (KATZE_IS_ARRAY (extension)) - { - MidoriExtension* extension_item; - KATZE_ARRAY_FOREACH_ITEM (extension_item, KATZE_ARRAY (extension)) - if (MIDORI_IS_EXTENSION (extension_item)) - { - gchar* key; - - midori_load_extension (app, extension_item, filename); - if (activate) - { - key = katze_object_get_string (extension_item, "key"); - if (key && strstr (filename, key)) - g_signal_emit_by_name (extension_item, "activate", app); - g_free (key); - } - } - } - } - - if (!extension && g_module_error () != NULL) - { - KatzeArray* extensions = katze_object_get_object (app, "extensions"); - 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); - g_object_unref (extensions); - } - g_object_unref (extension); -} - -static void -extensions_update_cb (KatzeArray* extensions, - MidoriApp* app) -{ - MidoriWebSettings* settings = katze_object_get_object (app, "settings"); - settings_notify_cb (settings, NULL, app); - g_object_unref (settings); -} - static gboolean midori_load_extensions (gpointer data) { MidoriApp* app = MIDORI_APP (data); - gchar** keys = g_object_get_data (G_OBJECT (app), "extensions"); + gchar** active_extensions = g_object_get_data (G_OBJECT (app), "extensions"); KatzeArray* extensions; #ifdef G_ENABLE_DEBUG - gboolean startup_timer = midori_debug ("startup"); + gboolean startup_timer = g_getenv ("MIDORI_STARTTIME") != NULL; GTimer* timer = startup_timer ? g_timer_new () : NULL; #endif /* Load extensions */ extensions = katze_array_new (MIDORI_TYPE_EXTENSION); - g_signal_connect (extensions, "update", G_CALLBACK (extensions_update_cb), app); g_object_set (app, "extensions", extensions, NULL); - if (g_module_supported ()) { gchar* extension_path; - if (keys && (extension_path = midori_paths_get_lib_path (PACKAGE_NAME))) + GDir* extension_dir = NULL; + + if (!(extension_path = g_strdup (g_getenv ("MIDORI_EXTENSION_PATH")))) + 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) { - gint i = 0; const gchar* filename; - while ((filename = keys[i++])) - midori_load_module (app, extension_path, filename, TRUE); - g_free (extension_path); + + while ((filename = g_dir_read_name (extension_dir))) + { + gchar* fullname; + GModule* module; + typedef MidoriExtension* (*extension_init_func)(void); + extension_init_func extension_init; + MidoriExtension* extension = NULL; + + /* Ignore files which don't have the correct suffix */ + if (!g_str_has_suffix (filename, G_MODULE_SUFFIX)) + continue; + + fullname = g_build_filename (extension_path, filename, NULL); + module = g_module_open (fullname, G_MODULE_BIND_LOCAL); + g_free (fullname); + + if (module && g_module_symbol (module, "extension_init", + (gpointer) &extension_init)) + { + 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 (!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); + 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); } + g_free (extension_path); } + g_strfreev (active_extensions); #ifdef G_ENABLE_DEBUG if (startup_timer) @@ -1349,7 +1322,7 @@ midori_browser_action_last_session_activate_cb (GtkAction* action, MidoriBrowser* browser) { KatzeArray* old_session = katze_array_new (KATZE_TYPE_ITEM); - gchar* config_file = midori_paths_get_readonly_config_filename ("session.old.xbel"); + gchar* config_file = build_config_filename ("session.old.xbel"); GError* error = NULL; if (midori_array_from_file (old_session, config_file, "xbel", &error)) { @@ -1383,7 +1356,7 @@ midori_load_session (gpointer data) gint64 current; gchar** command = g_object_get_data (G_OBJECT (app), "execute-command"); #ifdef G_ENABLE_DEBUG - gboolean startup_timer = midori_debug ("startup"); + gboolean startup_timer = g_getenv ("MIDORI_STARTTIME") != NULL; GTimer* timer = startup_timer ? g_timer_new () : NULL; #endif @@ -1391,7 +1364,7 @@ midori_load_session (gpointer data) g_signal_connect_after (katze_object_get_object (app, "settings"), "notify", G_CALLBACK (settings_notify_cb), app); - config_file = midori_paths_get_readonly_config_filename ("session.old.xbel"); + config_file = build_config_filename ("session.old.xbel"); if (g_access (config_file, F_OK) == 0) { GtkActionGroup* action_group = midori_browser_get_action_group (browser); @@ -1403,7 +1376,7 @@ midori_load_session (gpointer data) midori_app_add_browser (app, browser); gtk_widget_show (GTK_WIDGET (browser)); - katze_assign (config_file, midori_paths_get_readonly_config_filename ("accels")); + katze_assign (config_file, build_config_filename ("accels")); g_signal_connect_after (gtk_accel_map_get (), "changed", G_CALLBACK (accel_map_changed_cb), NULL); @@ -1447,7 +1420,7 @@ midori_load_session (gpointer data) g_object_unref (settings); g_object_unref (_session); - katze_assign (config_file, midori_paths_get_readonly_config_filename ("session.xbel")); + katze_assign (config_file, build_config_filename ("session.xbel")); g_signal_connect_after (browser, "add-tab", G_CALLBACK (midori_browser_session_cb), session); g_signal_connect_after (browser, "remove-tab", @@ -1501,6 +1474,21 @@ snapshot_load_finished_cb (GtkWidget* web_view, gtk_main_quit (); } +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)); + if (midori_view_is_blank (MIDORI_VIEW (view))) + icon = NULL; + gtk_window_set_icon (GTK_WINDOW (browser), icon); + } +} + static MidoriBrowser* midori_web_app_browser_new_window_cb (MidoriBrowser* browser, MidoriBrowser* new_browser, @@ -1522,7 +1510,7 @@ midori_remove_config_file (gint clear_prefs, { if ((clear_prefs & flag) == flag) { - gchar* config_file = midori_paths_get_config_filename (filename); + gchar* config_file = build_config_filename (filename); g_unlink (config_file); g_free (config_file); } @@ -1533,10 +1521,11 @@ midori_prepare_uri (const gchar *uri) { gchar* uri_ready; - if (g_str_has_prefix(uri, "javascript:")) + if (g_path_is_absolute (uri)) + return g_filename_to_uri (uri, NULL, NULL); + else 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)) + else if (g_file_test (uri, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR)) { gchar* current_dir = g_get_current_dir (); uri_ready = g_strconcat ("file://", current_dir, @@ -1559,6 +1548,93 @@ signal_handler (int signal_id) } #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 (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, @@ -1599,16 +1675,9 @@ midori_inactivity_timeout (gpointer data) if (has_extension == -1) { GdkDisplay* display = gtk_widget_get_display (GTK_WIDGET (mit->browser)); - if (GDK_IS_X11_DISPLAY (display)) - { - xdisplay = GDK_DISPLAY_XDISPLAY (display); - has_extension = XScreenSaverQueryExtension (xdisplay, - &event_base, &error_base); - } - else - { - has_extension = 0; - } + xdisplay = GDK_DISPLAY_XDISPLAY (display); + has_extension = XScreenSaverQueryExtension (xdisplay, + &event_base, &error_base); } if (has_extension) @@ -1626,7 +1695,7 @@ midori_inactivity_timeout (gpointer data) GList* data_items = sokoke_register_privacy_item (NULL, NULL, NULL); while ((view = midori_browser_get_nth_tab (mit->browser, i++))) - midori_browser_remove_tab (mit->browser, view); + gtk_widget_destroy (view); midori_browser_set_current_uri (mit->browser, mit->uri); /* Clear all private data */ if (history != NULL) @@ -1660,24 +1729,31 @@ midori_setup_inactivity_reset (MidoriBrowser* browser, } } +static void +midori_clear_page_icons_cb (void) +{ + gchar* cache = g_build_filename (g_get_user_cache_dir (), + PACKAGE_NAME, "icons", NULL); + 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); +} + 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); + SoupCookie* cookie = cookies->data; + soup_cookie_jar_delete_cookie ((SoupCookieJar*)jar, cookie); } soup_cookies_free (cookies); /* Removing KatzeHttpCookies makes it save outstanding changes */ @@ -1688,45 +1764,27 @@ midori_clear_web_cookies_cb (void) 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); +#ifdef GDK_WINDOWING_X11 +static void +midori_clear_flash_cookies_cb (void) +{ + gchar* cache = g_build_filename (g_get_home_dir (), ".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 } +#endif static void midori_clear_saved_logins_cb (void) { sqlite3* db; - gchar* path = g_build_filename (midori_paths_get_config_dir (), "logins", NULL); + 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 (midori_paths_get_config_dir (), + 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) { @@ -1736,34 +1794,35 @@ midori_clear_saved_logins_cb (void) g_free (path); } +static void +midori_clear_html5_databases_cb (void) +{ + webkit_remove_all_web_databases (); +} + #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 (midori_paths_get_cache_dir (), "web", NULL); + gchar* path = 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); + sokoke_remove_path (path, TRUE); + g_free (path); } #endif +#if WEBKIT_CHECK_VERSION (1, 3, 13) static void -midori_clear_page_icons_cb (void) +midori_clear_offline_appcache_cb (void) { - gchar* cache = g_build_filename (midori_paths_get_cache_dir (), "icons", NULL); - /* FIXME: Exclude search engine icons */ - sokoke_remove_path (cache, TRUE); - g_free (cache); - cache = g_build_filename (midori_paths_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 + /* Changing the size implies clearing the cache */ + unsigned long long maximum = webkit_application_cache_get_maximum_size (); + webkit_application_cache_set_maximum_size (maximum - 1); } +#endif static void midori_log_to_file (const gchar* log_domain, @@ -1814,8 +1873,6 @@ main (int argc, gchar* webapp; gchar* config; gboolean private; - gboolean portable; - gboolean plain; gboolean diagnostic_dialog; gboolean back_from_crash; gboolean run; @@ -1840,12 +1897,6 @@ main (int argc, #endif { "private", 'p', 0, G_OPTION_ARG_NONE, &private, N_("Private browsing, no changes are saved"), NULL }, - #ifdef G_OS_WIN32 - { "portable", 'P', 0, G_OPTION_ARG_NONE, &portable, - N_("Portable mode, all runtime files are stored in one place"), NULL }, - #endif - { "plain", '\0', 0, G_OPTION_ARG_NONE, &plain, - N_("Plain GTK+ window with WebKit, akin to GtkLauncher"), 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, @@ -1875,7 +1926,9 @@ main (int argc, gchar** extensions; MidoriWebSettings* settings; gchar* config_file; - MidoriSpeedDial* dial; + gchar* bookmarks_file; + GKeyFile* speeddial; + gboolean bookmarks_exist; MidoriStartup load_on_startup; KatzeArray* search_engines; KatzeArray* bookmarks; @@ -1891,19 +1944,34 @@ main (int argc, gint max_history_age; gint clear_prefs = MIDORI_CLEAR_NONE; #ifdef G_ENABLE_DEBUG - gboolean startup_timer = midori_debug ("startup"); + gboolean startup_timer = g_getenv ("MIDORI_STARTTIME") != NULL; #define midori_startup_timer(tmrmsg) if (startup_timer) \ g_debug (tmrmsg, (g_test_timer_last () - g_test_timer_elapsed ()) * -1) #else #define midori_startup_timer(tmrmsg) #endif + #ifdef HAVE_SIGNAL_H + #ifdef SIGHUP + signal (SIGHUP, &signal_handler); + #endif + #ifdef SIGINT + signal (SIGINT, &signal_handler); + #endif + #ifdef SIGTERM + signal (SIGTERM, &signal_handler); + #endif + #ifdef SIGQUIT + signal (SIGQUIT, &signal_handler); + #endif + #endif + + midori_app_setup (argv); + /* Parse cli options */ webapp = NULL; config = NULL; private = FALSE; - portable = FALSE; - plain = FALSE; back_from_crash = FALSE; diagnostic_dialog = FALSE; run = FALSE; @@ -1916,36 +1984,40 @@ main (int argc, block_uris = NULL; inactivity_reset = 0; error = NULL; - if (!midori_app_setup (&argc, &argv, entries, &error)) + if (!gtk_init_with_args (&argc, &argv, _("[Addresses]"), entries, + GETTEXT_PACKAGE, &error)) { g_print ("%s - %s\n", _("Midori"), error->message); g_error_free (error); return 1; } - /* 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); + g_critical (_("The specified configuration folder is invalid.")); + return 1; } - g_set_application_name (_("Midori")); - /* Versioned prgname to override menuproxy blacklist */ - g_set_prgname (PACKAGE_NAME "4"); + /* 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")); if (version) { g_print ( "%s %s\n\n" - "Copyright (c) 2007-2012 Christian Dywan\n\n" + "Copyright (c) 2007-2011 Christian Dywan\n\n" "%s\n" "\t%s\n\n" "%s\n" - "\thttp://www.midori-browser.org\n", + "\thttp://www.twotoasts.de\n", _("Midori"), PACKAGE_VERSION, _("Please report comments, suggestions and bugs to:"), PACKAGE_BUGREPORT, @@ -1959,21 +2031,11 @@ main (int argc, 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); + const gchar* space = " "; gchar* padding = g_strndup (space, strlen (space) - strlen (name)); gchar* label = katze_object_get_string (action, "label"); gchar* stripped = katze_strip_mnemonics (label); @@ -1985,7 +2047,6 @@ main (int argc, g_free (label); g_free (stripped); } - g_free (space); g_list_free (actions); gtk_widget_destroy (GTK_WIDGET (browser)); return 0; @@ -1996,7 +2057,6 @@ main (int argc, gchar* filename; gint fd; GtkWidget* web_view; - gchar* uri; #if HAVE_OFFSCREEN GtkWidget* offscreen; GdkScreen* screen; @@ -2033,9 +2093,7 @@ main (int argc, #endif g_signal_connect (web_view, "load-finished", G_CALLBACK (snapshot_load_finished_cb), filename); - uri = midori_prepare_uri (snapshot); - webkit_web_view_load_uri (WEBKIT_WEB_VIEW (web_view), uri); - g_free (uri); + webkit_web_view_open (WEBKIT_WEB_VIEW (web_view), snapshot); gtk_main (); g_free (filename); return 0; @@ -2046,65 +2104,34 @@ main (int argc, g_log_set_default_handler (midori_log_to_file, (gpointer)logfile); } - if (plain) - { - GtkWidget* window = gtk_window_new (GTK_WINDOW_TOPLEVEL); - GtkWidget* scrolled = gtk_scrolled_window_new (NULL, NULL); - GtkWidget* web_view = webkit_web_view_new (); - gchar* uri = midori_prepare_uri ( - (uris != NULL && uris[0]) ? uris[0] : "http://www.example.com"); - - gint width, height; - GdkRectangle monitor; - GdkScreen* screen = gtk_window_get_screen (GTK_WINDOW (window)); - gdk_screen_get_monitor_geometry (screen, 0, &monitor); - width = monitor.width / 1.7; height = monitor.height / 1.7; - gtk_window_set_default_size (GTK_WINDOW (window), width, height); - - gtk_container_add (GTK_CONTAINER (window), scrolled); - gtk_container_add (GTK_CONTAINER (scrolled), web_view); - g_signal_connect (window, "delete-event", - G_CALLBACK (gtk_main_quit), window); - gtk_widget_show_all (window); - webkit_web_view_load_uri (WEBKIT_WEB_VIEW (web_view), uri); - g_free (uri); - gtk_main (); - return 0; - } - - #ifdef HAVE_SIGNAL_H - #ifdef SIGHUP - signal (SIGHUP, &signal_handler); - #endif - #ifdef SIGINT - signal (SIGINT, &signal_handler); - #endif - #ifdef SIGTERM - signal (SIGTERM, &signal_handler); - #endif - #ifdef SIGQUIT - signal (SIGQUIT, &signal_handler); - #endif - #endif - + sokoke_register_privacy_item ("page-icons", _("Website icons"), + G_CALLBACK (midori_clear_page_icons_cb)); /* 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"), + sokoke_register_privacy_item ("web-cookies", _("Cookies"), G_CALLBACK (midori_clear_web_cookies_cb)); + #ifdef GDK_WINDOWING_X11 + sokoke_register_privacy_item ("flash-cookies", _("'Flash' Cookies"), + G_CALLBACK (midori_clear_flash_cookies_cb)); + #endif + sokoke_register_privacy_item ("html5-databases", _("HTML5 _Databases"), + G_CALLBACK (midori_clear_html5_databases_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)); + sokoke_register_privacy_item ("offline-appcache", _("Offline Application Cache"), + G_CALLBACK (midori_clear_offline_appcache_cb)); #endif - sokoke_register_privacy_item ("page-icons", _("Website icons"), - G_CALLBACK (midori_clear_page_icons_cb)); /* Web Application or Private Browsing support */ if (webapp || private || run) { SoupSession* session = webkit_get_default_session (); MidoriBrowser* browser = midori_browser_new (); + /* Update window icon according to page */ + g_signal_connect (browser, "notify::load-status", + G_CALLBACK (midori_web_app_browser_notify_load_status_cb), NULL); 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 ()), @@ -2112,28 +2139,21 @@ main (int argc, midori_startup_timer ("Browser: \t%f"); - if (private) - midori_paths_init (MIDORI_RUNTIME_MODE_PRIVATE, config); - else if (webapp) - midori_paths_init (MIDORI_RUNTIME_MODE_APP, config); - else - midori_paths_init (MIDORI_RUNTIME_MODE_NORMAL, config); - - if (private || !webapp) + if (config) { - settings = settings_and_accels_new (&extensions); + settings = settings_and_accels_new (config, &extensions); g_strfreev (extensions); - search_engines = search_engines_new_from_folder (NULL); + 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) { - /* Mask the timezone, which can be read by Javascript */ - g_setenv ("TZ", "UTC", TRUE); /* In-memory trash for re-opening closed tabs */ trash = katze_array_new (KATZE_TYPE_ITEM); g_signal_connect_after (trash, "add-item", @@ -2162,9 +2182,12 @@ main (int argc, "gtk-application-prefer-dark-theme", TRUE, NULL); #endif + } - g_object_set (gtk_settings_get_default (), - "gtk-recent-files-max-age", 0, NULL); + if (private || !config) + { + /* Disable saving by setting an unwritable folder */ + sokoke_set_config_dir ("/"); } midori_load_soup_session (settings); @@ -2223,7 +2246,6 @@ main (int argc, 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, @@ -2261,10 +2283,6 @@ main (int argc, } } - /* 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"); @@ -2278,17 +2296,9 @@ main (int argc, if (inactivity_reset > 0) g_error ("--inactivity-reset is currently only supported with --app."); - if (portable) - { - g_object_set (gtk_settings_get_default (), - "gtk-recent-files-max-age", 0, NULL); - midori_paths_init (MIDORI_RUNTIME_MODE_PORTABLE, config); - } - else - midori_paths_init (MIDORI_RUNTIME_MODE_NORMAL, config); - - app = midori_app_new (); - katze_assign (config, g_strdup (midori_paths_get_config_dir ())); + sokoke_set_config_dir (config); + app = midori_app_new (); + 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 @@ -2333,13 +2343,13 @@ main (int argc, /* Load configuration file */ error_messages = g_string_new (NULL); error = NULL; - settings = settings_and_accels_new (&extensions); + settings = settings_and_accels_new (config, &extensions); g_object_set (settings, "enable-developer-extras", TRUE, NULL); g_object_set (settings, "enable-html5-database", TRUE, NULL); midori_startup_timer ("Config and accels read: \t%f"); /* Load search engines */ - search_engines = search_engines_new_from_folder (error_messages); + 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)) @@ -2352,13 +2362,30 @@ main (int argc, midori_startup_timer ("Search read: \t%f"); bookmarks = katze_array_new (KATZE_TYPE_ARRAY); + 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, &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); errmsg = NULL; } + else if (!bookmarks_exist) + { + /* 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); + /* Leave old bookmarks around */ + } + g_free (old_bookmarks); + } g_object_set_data (G_OBJECT (bookmarks), "db", db); midori_startup_timer ("Bookmarks read: \t%f"); @@ -2368,7 +2395,7 @@ main (int argc, #if HAVE_LIBXML if (load_on_startup >= MIDORI_STARTUP_LAST_OPEN_PAGES) { - katze_assign (config_file, midori_paths_get_readonly_config_filename ("session.xbel")); + katze_assign (config_file, build_config_filename ("session.xbel")); error = NULL; if (!midori_array_from_file (_session, config_file, "xbel", &error)) { @@ -2399,16 +2426,17 @@ main (int argc, katze_assign (config_file, g_build_filename (config, "history.db", NULL)); errmsg = NULL; - if (!midori_history_initialize (history, config_file, &errmsg)) + 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); errmsg = NULL; } + g_free (bookmarks_file); midori_startup_timer ("History read: \t%f"); - katze_assign (config_file, g_build_filename (config, "speeddial", NULL)); - dial = midori_speed_dial_new (config_file, NULL); + error = NULL; + speeddial = speeddial_new_from_file (config, &error); /* In case of errors */ if (error_messages->len) @@ -2497,7 +2525,7 @@ main (int argc, G_CALLBACK (midori_trash_remove_item_cb), NULL); katze_item_set_parent (KATZE_ITEM (_session), app); - g_object_set_data_full (G_OBJECT (app), "extensions", extensions, (GDestroyNotify)g_strfreev); + 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, g_build_filename (config, "running", NULL)); @@ -2525,7 +2553,7 @@ main (int argc, "trash", trash, "search-engines", search_engines, "history", history, - "speed-dial", dial, + "speed-dial", speeddial, NULL); g_object_unref (history); g_object_unref (search_engines); @@ -2583,12 +2611,12 @@ main (int argc, load_on_startup = katze_object_get_int (settings, "load-on-startup"); if (load_on_startup < MIDORI_STARTUP_LAST_OPEN_PAGES) { - katze_assign (config_file, midori_paths_get_config_filename ("session.xbel")); + katze_assign (config_file, g_build_filename (config, "session.xbel", NULL)); g_unlink (config_file); } g_object_unref (settings); - g_object_unref (dial); + g_key_file_free (speeddial); g_object_unref (app); g_free (config_file); return 0; diff --git a/midori/marshal.list b/midori/marshal.list index df8bfd3f..b0808f8a 100644 --- a/midori/marshal.list +++ b/midori/marshal.list @@ -6,7 +6,6 @@ OBJECT:OBJECT VOID:BOOLEAN,STRING VOID:OBJECT,ENUM,BOOLEAN VOID:OBJECT,INT,INT -VOID:OBJECT,OBJECT VOID:POINTER,INT VOID:STRING,BOOLEAN VOID:STRING,INT,STRING diff --git a/midori/midori-app.c b/midori/midori-app.c index e6b5a200..0666e6f0 100644 --- a/midori/midori-app.c +++ b/midori/midori-app.c @@ -21,11 +21,9 @@ #include "midori-app.h" #include "midori-platform.h" -#include "midori-core.h" #include #include -#include #include #if ENABLE_NLS @@ -70,6 +68,10 @@ struct _MidoriApp { GObject parent_instance; + MidoriBrowser* browser; + GtkAccelGroup* accel_group; + + gchar* name; MidoriWebSettings* settings; KatzeArray* bookmarks; KatzeArray* trash; @@ -79,7 +81,6 @@ struct _MidoriApp KatzeArray* extensions; KatzeArray* browsers; - MidoriBrowser* browser; MidoriAppInstance instance; #if !HAVE_HILDON || !HAVE_LIBNOTIFY @@ -87,8 +88,6 @@ struct _MidoriApp #endif }; -static gchar* app_name = NULL; - struct _MidoriAppClass { GObjectClass parent_class; @@ -217,6 +216,7 @@ _midori_app_add_browser (MidoriApp* app, 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, @@ -229,32 +229,6 @@ _midori_app_add_browser (MidoriApp* app, katze_array_add_item (app->browsers, browser); - #if GTK_CHECK_VERSION (3, 0, 0) - if (app->browser == NULL) - { - gchar* filename; - if ((filename = midori_paths_get_res_filename ("gtk3.css"))) - { - GtkCssProvider* css_provider = gtk_css_provider_new (); - GError* error = NULL; - gtk_css_provider_load_from_path (css_provider, filename, &error); - if (error == NULL) - { - gtk_style_context_add_provider_for_screen ( - gtk_widget_get_screen (GTK_WIDGET (browser)), - GTK_STYLE_PROVIDER (css_provider), - GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); - } - else - { - g_warning ("Failed to load \"%s\": %s", filename, error->message); - g_error_free (error); - } - g_free (filename); - } - } - #endif - app->browser = browser; #if HAVE_UNIQUE /* We *do not* let unique watch windows because that includes @@ -746,35 +720,25 @@ midori_app_create_instance (MidoriApp* app) GIOChannel* channel; #endif - if (!(display = gdk_display_get_default ())) - return MidoriAppInstanceNull; - + if (!app->name) { - #if HAVE_UNIQUE - const gchar* config = midori_paths_get_config_dir (); + 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)); + 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 + if (!(display = gdk_display_get_default ())) + return MidoriAppInstanceNull; + display_name = g_strdup (gdk_display_get_name (display)); - #endif n = strlen (display_name); for (i = 0; i < n; i++) if (strchr (":.\\/", display_name[i])) display_name[i] = '_'; - instance_name = g_strdup_printf ("de.twotoasts.%s_%s", app_name, display_name); - g_free (display_name); - katze_assign (app_name, instance_name); + instance_name = g_strdup_printf ("de.twotoasts.%s_%s", app->name, display_name); #if HAVE_UNIQUE instance = unique_app_new (instance_name, NULL); @@ -782,7 +746,7 @@ midori_app_create_instance (MidoriApp* app) g_signal_connect (instance, "message-received", G_CALLBACK (midori_browser_message_received_cb), app); #else - instance = socket_init (instance_name, midori_paths_get_config_dir (), &exists); + instance = socket_init (instance_name, sokoke_set_config_dir (NULL), &exists); g_object_set_data (G_OBJECT (app), "sock-exists", exists ? (gpointer)0xdeadbeef : NULL); if (instance != MidoriAppInstanceNull) @@ -792,19 +756,19 @@ midori_app_create_instance (MidoriApp* app) (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; @@ -829,7 +793,9 @@ midori_app_finalize (GObject* object) { MidoriApp* app = MIDORI_APP (object); - katze_assign (app_name, NULL); + g_object_unref (app->accel_group); + + katze_assign (app->name, NULL); katze_object_assign (app->settings, NULL); katze_object_assign (app->bookmarks, NULL); katze_object_assign (app->trash, NULL); @@ -869,7 +835,7 @@ midori_app_set_property (GObject* object, 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)); @@ -909,7 +875,7 @@ midori_app_get_property (GObject* object, 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); @@ -1145,19 +1111,7 @@ midori_app_send_command (MidoriApp* app, /* g_return_val_if_fail (MIDORI_IS_APP (app), FALSE); */ g_return_val_if_fail (command != NULL, FALSE); - if (midori_app_instance_is_running (app)) - { - MidoriBrowser* browser = midori_browser_new (); - int i; - for (i=0; command && command[i]; i++) - { - gboolean action_known = (gtk_action_group_get_action (midori_browser_get_action_group (browser), command[i]) != NULL); - if (!action_known) - g_warning (_("Unexpected action '%s'."), command[i]); - } - gtk_widget_destroy (GTK_WIDGET (browser)); - } - else + if (!midori_app_instance_is_running (app)) return midori_app_command_received (app, "command", command, NULL); #if HAVE_HILDON @@ -1350,80 +1304,63 @@ midori_app_send_notification (MidoriApp* app, * * Since: 0.4.2 **/ -gboolean -midori_app_setup (gint *argc, - gchar** *argument_vector, - const GOptionEntry *entries, - GError* *error) +void +midori_app_setup (gchar** argument_vector) { GtkIconSource* icon_source; GtkIconSet* icon_set; GtkIconFactory* factory; gsize i; - gboolean success; - static GtkStockItem items[] = + typedef struct + { + const gchar* stock_id; + const gchar* label; + GdkModifierType modifier; + guint keyval; + const gchar* fallback; + } FatStockItem; + static FatStockItem items[] = { - { STOCK_IMAGE }, - { STOCK_WEB_BROWSER }, - { STOCK_NEWS_FEED }, - { STOCK_STYLE }, - - { STOCK_BOOKMARKS, N_("_Bookmarks"), GDK_CONTROL_MASK | GDK_SHIFT_MASK, GDK_KEY_B }, - { STOCK_BOOKMARK_ADD, N_("Add Boo_kmark") }, - { STOCK_EXTENSION, N_("_Extensions") }, - { STOCK_HISTORY, N_("_History"), GDK_CONTROL_MASK | GDK_SHIFT_MASK, GDK_KEY_H }, - { STOCK_SCRIPT, N_("_Userscripts") }, - { STOCK_STYLE, N_("User_styles") }, - { STOCK_TAB_NEW, N_("New _Tab") }, - { STOCK_TRANSFER, N_("_Transfers"), GDK_CONTROL_MASK | GDK_SHIFT_MASK, GDK_KEY_J }, - { STOCK_PLUGINS, N_("Netscape p_lugins") }, - { STOCK_USER_TRASH, N_("_Closed Tabs") }, - { STOCK_WINDOW_NEW, N_("New _Window") }, - { STOCK_FOLDER_NEW, N_("New _Folder") }, + { 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 }, }; - /* 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 + /* 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 - - /* Midori.Paths uses GFile */ - g_type_init (); - /* Preserve argument vector */ - midori_paths_init_exec_path (*argument_vector, *argc); #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 = midori_paths_get_data_filename ("locale", FALSE); + gchar* path = sokoke_find_data_filename ("locale", FALSE); bindtextdomain (GETTEXT_PACKAGE, path); g_free (path); } @@ -1434,14 +1371,18 @@ midori_app_setup (gint *argc, textdomain (GETTEXT_PACKAGE); #endif - success = gtk_init_with_args (argc, argument_vector, _("[Addresses]"), - entries, GETTEXT_PACKAGE, error); - + 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); @@ -1452,43 +1393,76 @@ midori_app_setup (gint *argc, gtk_icon_factory_add_default (factory); g_object_unref (factory); - return success; -} + #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" }, + }; -gboolean -midori_debug (const gchar* token) -{ - static const gchar* debug_token = NULL; - const gchar* debug = g_getenv ("MIDORI_DEBUG"); - const gchar* debug_tokens = "headers body referer cookies paths hsts unarmed "; - const gchar* full_debug_tokens = "adblock:match adblock:time startup bookmarks "; - if (debug_token == NULL) + factory = gtk_icon_factory_new (); + for (i = 0; i < G_N_ELEMENTS (compat_items); i++) { - gchar* found_token; - if (debug && (found_token = strstr (full_debug_tokens, debug)) && *(found_token + strlen (debug)) == ' ') - { - #ifdef G_ENABLE_DEBUG - debug_token = g_intern_static_string (debug); - #else - g_warning ("Value '%s' for MIDORI_DEBUG requires a full debugging build.", debug); - #endif - } - else if (debug && (found_token = strstr (debug_tokens, debug)) && *(found_token + strlen (debug)) == ' ') - debug_token = g_intern_static_string (debug); - else if (debug) - g_warning ("Unrecognized value '%s' for MIDORI_DEBUG.", debug); - else - debug_token = "NONE"; - if (!debug_token) + 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)) { - debug_token = "INVALID"; - g_print ("Supported values: %s\nWith full debugging: %s\n", - debug_tokens, full_debug_tokens); + freopen ("CONOUT$", "w", stdout); + dup2 (fileno (stdout), 1); + freopen ("CONOUT$", "w", stderr); + dup2 (fileno (stderr), 2); } } - if (debug_token != g_intern_static_string ("NONE") - && !strstr (debug_tokens, token) && !strstr (full_debug_tokens, token)) - g_warning ("Token '%s' passed to midori_debug is not a known token.", token); - return debug_token == g_intern_static_string (token); + #endif } diff --git a/midori/midori-app.h b/midori/midori-app.h index 07af1927..934ce0ce 100644 --- a/midori/midori-app.h +++ b/midori/midori-app.h @@ -41,9 +41,6 @@ midori_app_get_type (void) G_GNUC_CONST; MidoriApp* midori_app_new (void); -const gchar* -midori_app_get_name (MidoriApp* app); - gboolean midori_app_instance_is_running (MidoriApp* app); @@ -82,14 +79,8 @@ midori_app_send_notification (MidoriApp* app, const gchar* title, const gchar* message); -gboolean -midori_app_setup (gint *argc, - gchar** *argument_vector, - const GOptionEntry *entries, - GError* *error); - -gboolean -midori_debug (const gchar* token); +void +midori_app_setup (gchar** argument_vector); G_END_DECLS diff --git a/midori/midori-array.c b/midori/midori-array.c index aa10715e..1567ce50 100644 --- a/midori/midori-array.c +++ b/midori/midori-array.c @@ -982,26 +982,24 @@ katze_item_set_value_from_column (sqlite3_stmt* stmt, item->added = date; } else if (g_str_equal (name, "day") || g_str_equal (name, "app") - || g_str_equal (name, "toolbar") || g_str_equal (name, "id") - || g_str_equal (name, "parentid") || g_str_equal (name, "seq") - || g_str_equal (name, "pos_panel") || g_str_equal (name, "pos_bar")) + || g_str_equal (name, "toolbar")) { gint value; value = sqlite3_column_int64 (stmt, column); katze_item_set_meta_integer (item, name, value); } + else if (g_str_equal (name, "folder")) + { + const unsigned char* folder; + folder = sqlite3_column_text (stmt, column); + katze_item_set_meta_string (item, name, (gchar*)folder); + } else if (g_str_equal (name, "desc")) { const unsigned char* text; text = sqlite3_column_text (stmt, column); item->text = g_strdup ((gchar*)text); } - else if (g_str_equal (name, "sql")) - { - const unsigned char* sql; - sql = sqlite3_column_text (stmt, column); - katze_item_set_meta_string (item, name, (gchar*)sql); - } else g_warn_if_reached (); } @@ -1069,32 +1067,28 @@ katze_array_from_sqlite (sqlite3* db, } /** - * midori_array_query_recursive: + * 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 - * @recursive: if %TRUE include children * * Stores the result in a #KatzeArray. * * Return value: a #KatzeArray on success, %NULL otherwise * - * Since: 0.4.4 + * Since: 0.4.3 **/ KatzeArray* -midori_array_query_recursive (KatzeArray* bookmarks, - const gchar* fields, - const gchar* condition, - const gchar* value, - gboolean recursive) +midori_array_query (KatzeArray* bookmarks, + const gchar* fields, + const gchar* condition, + const gchar* value) { 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); @@ -1104,7 +1098,7 @@ midori_array_query_recursive (KatzeArray* bookmarks, return NULL; sqlcmd = g_strdup_printf ("SELECT %s FROM bookmarks WHERE %s " - "ORDER BY (uri='') ASC, title DESC", fields, condition); + "ORDER BY title DESC", fields, condition); if (strstr (condition, "%q")) { sqlcmd_value = sqlite3_mprintf (sqlcmd, value ? value : ""); @@ -1114,49 +1108,6 @@ midori_array_query_recursive (KatzeArray* bookmarks, 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)) - { - gchar* parentid = g_strdup_printf ("%" G_GINT64_FORMAT, - katze_item_get_meta_integer (item, "id")); - KatzeArray* subarray = midori_array_query_recursive (bookmarks, - fields, "parentid=%q", parentid, TRUE); - katze_item_set_name (KATZE_ITEM (subarray), item->name); - katze_array_add_item (array, subarray); - - g_free (parentid); - } - } - 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 --git a/midori/midori-array.h b/midori/midori-array.h index 1ff78638..35b4e17c 100644 --- a/midori/midori-array.h +++ b/midori/midori-array.h @@ -36,13 +36,6 @@ midori_array_query (KatzeArray* array, 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 --git a/midori/midori-bookmarks.c b/midori/midori-bookmarks.c deleted file mode 100644 index bbcb3eda..00000000 --- a/midori/midori-bookmarks.c +++ /dev/null @@ -1,335 +0,0 @@ -/* - 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 "sokoke.h" -#include "midori-core.h" - -#include -#include - -#include -#ifdef HAVE_UNISTD_H - #include -#endif - -#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_integer (item, "parentid")); -} - -void -midori_bookmarks_remove_item_cb (KatzeArray* array, - KatzeItem* item, - sqlite3* db) -{ - gchar* sqlcmd; - char* errmsg = NULL; - - - sqlcmd = sqlite3_mprintf ( - "DELETE FROM bookmarks WHERE id = %" G_GINT64_FORMAT ";", - katze_item_get_meta_integer (item, "id")); - - 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); -} - -#define _APPEND_TO_SQL_ERRORMSG(custom_errmsg) \ - do { \ - if (sql_errmsg) \ - { \ - g_string_append_printf (errmsg_str, "%s : %s\n", custom_errmsg, sql_errmsg); \ - sqlite3_free (sql_errmsg); \ - } \ - else \ - g_string_append (errmsg_str, custom_errmsg); \ - } while (0) - -gboolean -midori_bookmarks_import_from_old_db (sqlite3* db, - const gchar* oldfile, - gchar** errmsg) -{ - gint sql_errcode; - gboolean failure = FALSE; - gchar* sql_errmsg = NULL; - GString* errmsg_str = g_string_new (NULL); - gchar* attach_stmt = sqlite3_mprintf ("ATTACH DATABASE %Q AS old_db;", oldfile); - const gchar* convert_stmts = - "BEGIN TRANSACTION;" - "INSERT INTO main.bookmarks (parentid, title, uri, desc, app, toolbar) " - "SELECT NULL AS parentid, title, uri, desc, app, toolbar " - "FROM old_db.bookmarks;" - "UPDATE main.bookmarks SET parentid = (" - "SELECT id FROM main.bookmarks AS b1 WHERE b1.title = (" - "SELECT folder FROM old_db.bookmarks WHERE title = main.bookmarks.title));" - "COMMIT;"; - const gchar* detach_stmt = "DETACH DATABASE old_db;"; - - *errmsg = NULL; - sql_errcode = sqlite3_exec (db, attach_stmt, NULL, NULL, &sql_errmsg); - sqlite3_free (attach_stmt); - - if (sql_errcode != SQLITE_OK) - { - _APPEND_TO_SQL_ERRORMSG (_("failed to ATTACH old db")); - goto convert_failed; - } - - if (sqlite3_exec (db, convert_stmts, NULL, NULL, &sql_errmsg) != SQLITE_OK) - { - failure = TRUE; - _APPEND_TO_SQL_ERRORMSG (_("failed to import from old db")); - - /* try to get back to previous state */ - if (sqlite3_exec (db, "ROLLBACK TRANSACTION;", NULL, NULL, &sql_errmsg) != SQLITE_OK) - _APPEND_TO_SQL_ERRORMSG (_("failed to rollback the transaction")); - } - - if (sqlite3_exec (db, detach_stmt, NULL, NULL, &sql_errmsg) != SQLITE_OK) - _APPEND_TO_SQL_ERRORMSG (_("failed to DETACH ")); - - if (failure) - { - convert_failed: - *errmsg = g_string_free (errmsg_str, FALSE); - g_print ("ERRORR: %s\n", errmsg_str->str); - return FALSE; - } - - return TRUE; -} -#undef _APPEND_TO_SQL_ERRORMSG - -sqlite3* -midori_bookmarks_initialize (KatzeArray* array, - char** errmsg) -{ - sqlite3* db; - gchar* oldfile; - gchar* newfile; - gboolean newfile_did_exist, oldfile_exists; - const gchar* create_stmt; - gchar* sql_errmsg = NULL; - gchar* import_errmsg = NULL; - - g_return_val_if_fail (errmsg != NULL, NULL); - - oldfile = g_build_filename (midori_paths_get_config_dir (), "bookmarks.db", NULL); - oldfile_exists = g_access (oldfile, F_OK) == 0; - newfile = g_build_filename (midori_paths_get_config_dir (), "bookmarks_v2.db", NULL); - newfile_did_exist = g_access (newfile, F_OK) == 0; - - /* sqlite3_open will create the file if it did not exists already */ - if (sqlite3_open (newfile, &db) != SQLITE_OK) - { - if (db) - *errmsg = g_strdup_printf (_("failed to open database: %s\n"), - sqlite3_errmsg (db)); - else - *errmsg = g_strdup (_("failed to open database\n")); - - goto init_failed; - } - -#ifdef G_ENABLE_DEBUG - if (midori_debug ("bookmarks")) - sqlite3_trace (db, midori_bookmarks_dbtracer, NULL); -#endif - - create_stmt = /* Table structure */ - "CREATE TABLE IF NOT EXISTS bookmarks " - "(id INTEGER PRIMARY KEY AUTOINCREMENT, " - "parentid INTEGER DEFAULT NULL, " - "title TEXT, uri TEXT, desc TEXT, app INTEGER, toolbar INTEGER, " - "pos_panel INTEGER, pos_bar INTEGER, " - "created DATE DEFAULT CURRENT_TIMESTAMP, " - "last_visit DATE, visit_count INTEGER DEFAULT 0, " - "nick TEXT, " - "FOREIGN KEY(parentid) REFERENCES bookmarks(id) " - "ON DELETE CASCADE); PRAGMA foreign_keys = ON;" - - /* trigger: insert panel position */ - "CREATE TRIGGER IF NOT EXISTS bookmarkInsertPosPanel " - "AFTER INSERT ON bookmarks FOR EACH ROW " - "BEGIN UPDATE bookmarks SET pos_panel = (" - "SELECT ifnull(MAX(pos_panel),0)+1 FROM bookmarks WHERE " - "(NEW.parentid IS NOT NULL AND parentid = NEW.parentid) " - "OR (NEW.parentid IS NULL AND parentid IS NULL)) " - "WHERE id = NEW.id; END;" - - /* trigger: insert Bookmarkbar position */ - "CREATE TRIGGER IF NOT EXISTS bookmarkInsertPosBar " - "AFTER INSERT ON bookmarks FOR EACH ROW WHEN NEW.toolbar=1 " - "BEGIN UPDATE bookmarks SET pos_bar = (" - "SELECT ifnull(MAX(pos_bar),0)+1 FROM bookmarks WHERE " - "((NEW.parentid IS NOT NULL AND parentid = NEW.parentid) " - "OR (NEW.parentid IS NULL AND parentid IS NULL)) AND toolbar=1) " - "WHERE id = NEW.id; END;" - - /* trigger: update panel position */ - "CREATE TRIGGER IF NOT EXISTS bookmarkUpdatePosPanel " - "BEFORE UPDATE OF parentid ON bookmarks FOR EACH ROW " - "WHEN ((NEW.parentid IS NULL OR OLD.parentid IS NULL) " - "AND NEW.parentid IS NOT OLD.parentid) OR " - "((NEW.parentid IS NOT NULL AND OLD.parentid IS NOT NULL) " - "AND NEW.parentid!=OLD.parentid) " - "BEGIN UPDATE bookmarks SET pos_panel = pos_panel-1 " - "WHERE ((OLD.parentid IS NOT NULL AND parentid = OLD.parentid) " - "OR (OLD.parentid IS NULL AND parentid IS NULL)) AND pos_panel > OLD.pos_panel; " - "UPDATE bookmarks SET pos_panel = (" - "SELECT ifnull(MAX(pos_panel),0)+1 FROM bookmarks " - "WHERE (NEW.parentid IS NOT NULL AND parentid = NEW.parentid) " - "OR (NEW.parentid IS NULL AND parentid IS NULL)) " - "WHERE id = OLD.id; END;" - - /* trigger: update Bookmarkbar position */ - "CREATE TRIGGER IF NOT EXISTS bookmarkUpdatePosBar0 " - "AFTER UPDATE OF parentid, toolbar ON bookmarks FOR EACH ROW " - "WHEN ((NEW.parentid IS NULL OR OLD.parentid IS NULL) " - "AND NEW.parentid IS NOT OLD.parentid) " - "OR ((NEW.parentid IS NOT NULL AND OLD.parentid IS NOT NULL) " - "AND NEW.parentid!=OLD.parentid) OR (OLD.toolbar=1 AND NEW.toolbar=0) " - "BEGIN UPDATE bookmarks SET pos_bar = NULL WHERE id = NEW.id; " - "UPDATE bookmarks SET pos_bar = pos_bar-1 " - "WHERE ((OLD.parentid IS NOT NULL AND parentid = OLD.parentid) " - "OR (OLD.parentid IS NULL AND parentid IS NULL)) AND pos_bar > OLD.pos_bar; END;" - - /* trigger: update Bookmarkbar position */ - "CREATE TRIGGER IF NOT EXISTS bookmarkUpdatePosBar1 " - "BEFORE UPDATE OF parentid, toolbar ON bookmarks FOR EACH ROW " - "WHEN ((NEW.parentid IS NULL OR OLD.parentid IS NULL) " - "AND NEW.parentid IS NOT OLD.parentid) OR " - "((NEW.parentid IS NOT NULL AND OLD.parentid IS NOT NULL) " - "AND NEW.parentid!=OLD.parentid) OR (OLD.toolbar=0 AND NEW.toolbar=1) " - "BEGIN UPDATE bookmarks SET pos_bar = (" - "SELECT ifnull(MAX(pos_bar),0)+1 FROM bookmarks WHERE " - "(NEW.parentid IS NOT NULL AND parentid = NEW.parentid) " - "OR (NEW.parentid IS NULL AND parentid IS NULL)) " - "WHERE id = OLD.id; END;" - - /* trigger: delete panel position */ - "CREATE TRIGGER IF NOT EXISTS bookmarkDeletePosPanel " - "AFTER DELETE ON bookmarks FOR EACH ROW " - "BEGIN UPDATE bookmarks SET pos_panel = pos_panel-1 " - "WHERE ((OLD.parentid IS NOT NULL AND parentid = OLD.parentid) " - "OR (OLD.parentid IS NULL AND parentid IS NULL)) AND pos_panel > OLD.pos_panel; END;" - - /* trigger: delete Bookmarkbar position */ - "CREATE TRIGGER IF NOT EXISTS bookmarkDeletePosBar " - "AFTER DELETE ON bookmarks FOR EACH ROW WHEN OLD.toolbar=1 " - "BEGIN UPDATE bookmarks SET pos_bar = pos_bar-1 " - "WHERE ((OLD.parentid IS NOT NULL AND parentid = OLD.parentid) " - "OR (OLD.parentid IS NULL AND parentid IS NULL)) AND pos_bar > OLD.pos_bar; END;"; - - - if (newfile_did_exist) - { - /* we are done */ - goto init_success; - } - else - { - /* initial creation */ - if (sqlite3_exec (db, create_stmt, NULL, NULL, &sql_errmsg) != SQLITE_OK) - { - - if (errmsg) - { - if (sql_errmsg) - { - *errmsg = g_strdup_printf (_("could not create bookmarks table: %s\n"), sql_errmsg); - sqlite3_free (sql_errmsg); - } - else - *errmsg = g_strdup (_("could not create bookmarks table")); - } - - /* we can as well remove the new file */ - g_unlink (newfile); - goto init_failed; - } - - } - - if (oldfile_exists) - /* import from old db */ - if (!midori_bookmarks_import_from_old_db (db, oldfile, &import_errmsg)) - { - if (errmsg) - { - if (import_errmsg) - { - *errmsg = g_strdup_printf (_("could not import from old database: %s\n"), import_errmsg); - g_free (import_errmsg); - } - else - *errmsg = g_strdup_printf (_("could not import from old database")); - } - } - - init_success: - g_free (newfile); - g_free (oldfile); - 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; - - init_failed: - g_free (newfile); - g_free (oldfile); - - if (db) - sqlite3_close (db); - - return NULL; -} - -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, 0); -} diff --git a/midori/midori-bookmarks.h b/midori/midori-bookmarks.h deleted file mode 100644 index e4a3f8d6..00000000 --- a/midori/midori-bookmarks.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - 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, - char** errmsg); - -void -midori_bookmarks_import (const gchar* filename, - sqlite3* db); diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 12da322e..72770e11 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -13,13 +13,13 @@ #include "midori-browser.h" -#include "midori-app.h" #include "midori-array.h" #include "midori-view.h" #include "midori-preferences.h" #include "midori-panel.h" #include "midori-locationaction.h" #include "midori-searchaction.h" +#include "midori-panedaction.h" #include "midori-findbar.h" #include "midori-transferbar.h" #include "midori-platform.h" @@ -33,19 +33,14 @@ #include #include - -#ifdef HAVE_GRANITE - #include -#endif - -#ifdef HAVE_ZEITGEIST - #include -#endif - #ifdef HAVE_UNISTD_H #include #endif +#include +#include +#include + #ifdef HAVE_HILDON_2_2 #include #include @@ -70,6 +65,7 @@ struct _MidoriBrowser GtkActionGroup* action_group; GtkWidget* menubar; + GtkWidget* menu_tools; GtkWidget* throbber; GtkWidget* navigationbar; GtkWidget* bookmarkbar; @@ -100,7 +96,7 @@ struct _MidoriBrowser KatzeArray* trash; KatzeArray* search_engines; KatzeArray* history; - MidoriSpeedDial* dial; + GKeyFile* speeddial; gboolean show_tabs; gboolean show_navigationbar; @@ -145,7 +141,6 @@ enum ADD_TAB, REMOVE_TAB, MOVE_TAB, - SWITCH_TAB, ACTIVATE_ACTION, ADD_DOWNLOAD, SEND_NOTIFICATION, @@ -180,11 +175,12 @@ midori_browser_get_property (GObject* object, void midori_bookmarks_import_array_db (sqlite3* db, KatzeArray* array, - gint64 parentid); + gchar* folder); -gboolean -midori_bookmarks_update_item_db (sqlite3* db, - KatzeItem* item); +void +midori_bookmarks_export_array_db (sqlite3* db, + KatzeArray* array, + const gchar* folder); void midori_browser_open_bookmark (MidoriBrowser* browser, @@ -206,8 +202,7 @@ _midori_browser_set_toolbar_style (MidoriBrowser* browser, GtkWidget* midori_panel_construct_menu_item (MidoriPanel* panel, - MidoriViewable* viewable, - gboolean popup); + MidoriViewable* viewable); static void midori_browser_settings_notify (MidoriWebSettings* web_settings, @@ -262,12 +257,8 @@ static gboolean _toggle_tabbar_smartly (MidoriBrowser* browser, gboolean ignore_fullscreen) { - gboolean has_tabs = midori_browser_get_n_pages (browser) > 1; -#ifdef HAVE_GRANITE - gboolean show_tabs = !midori_browser_is_fullscreen (browser) || ignore_fullscreen; - granite_widgets_dynamic_notebook_set_show_tabs ( - GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser->notebook), show_tabs); -#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) @@ -276,7 +267,6 @@ _toggle_tabbar_smartly (MidoriBrowser* browser, 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; } @@ -296,30 +286,16 @@ _midori_browser_update_actions (MidoriBrowser* browser) } 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, - MidoriView* view) +_midori_browser_update_interface (MidoriBrowser* browser) { + GtkWidget* widget = midori_browser_get_current_tab (browser); + MidoriView* view = MIDORI_VIEW (widget); + gboolean loading = midori_view_get_load_status (view) != MIDORI_LOAD_FINISHED; + gboolean can_reload = midori_view_can_reload (view); GtkAction* action; + _action_set_sensitive (browser, "Reload", can_reload); + _action_set_sensitive (browser, "Stop", can_reload && loading); _action_set_sensitive (browser, "Back", midori_view_can_go_back (view)); _action_set_sensitive (browser, "Forward", midori_view_can_go_forward (view)); _action_set_sensitive (browser, "Previous", @@ -327,9 +303,10 @@ _midori_browser_update_interface (MidoriBrowser* browser, _action_set_sensitive (browser, "Next", midori_view_get_next_page (view) != NULL); - _action_set_sensitive (browser, "AddSpeedDial", !midori_view_is_blank (view)); - _action_set_sensitive (browser, "BookmarkAdd", !midori_view_is_blank (view)); + gtk_action_set_visible (_action_by_name (browser, "AddSpeedDial"), + !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", @@ -338,75 +315,101 @@ _midori_browser_update_interface (MidoriBrowser* browser, midori_view_can_view_source (view)); _action_set_sensitive (browser, "SourceView", midori_view_can_view_source (view)); + _action_set_sensitive (browser, "Find", + midori_view_can_find (view)); + _action_set_sensitive (browser, "FindNext", + midori_view_can_find (view)); + _action_set_sensitive (browser, "FindPrevious", + midori_view_can_find (view)); + midori_findbar_set_can_find (MIDORI_FINDBAR (browser->find), + midori_view_can_find (view)); - action = _action_by_name (browser, "NextForward"); - if (midori_view_can_go_forward (view)) + action = _action_by_name (browser, "ReloadStop"); + if (!loading) { g_object_set (action, - "stock-id", GTK_STOCK_GO_FORWARD, - "tooltip", _("Go forward to the next page"), - "sensitive", TRUE, NULL); + "stock-id", GTK_STOCK_REFRESH, + "tooltip", _("Reload the current page"), + "sensitive", can_reload, NULL); + katze_item_set_meta_integer (midori_view_get_proxy_item (view), + "dont-write-history", -1); } else { g_object_set (action, - "stock-id", GTK_STOCK_MEDIA_NEXT, - "tooltip", _("Go to the next sub-page"), - "sensitive", midori_view_get_next_page (view) != NULL, NULL); + "stock-id", GTK_STOCK_STOP, + "tooltip", _("Stop loading the current page"), NULL); } + #if HAVE_HILDON + #if HILDON_CHECK_VERSION (2, 2, 0) + hildon_gtk_window_set_progress_indicator (GTK_WINDOW (browser), loading); + #endif + #else + gtk_widget_set_sensitive (browser->throbber, loading); + katze_throbber_set_animated (KATZE_THROBBER (browser->throbber), loading); + #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, view, action); } static void _midori_browser_set_statusbar_text (MidoriBrowser* browser, - MidoriView* view, const gchar* text) { - #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_ENTRY (widget) && GTK_IS_ALIGNMENT (gtk_widget_get_parent (widget)); - #endif katze_assign (browser->statusbar_text, midori_uri_format_for_display (text)); - if (view == NULL) - return; - if (!gtk_widget_get_visible (browser->statusbar) && !is_location - && text && *text) - { - #if GTK_CHECK_VERSION (3, 2, 0) - midori_view_set_overlay_text (view, browser->statusbar_text); - #else - GtkAction* action = _action_by_name (browser, "Location"); - MidoriLocationAction* location_action = MIDORI_LOCATION_ACTION (action); - 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 (!browser->show_statusbar && !is_location) { - #if GTK_CHECK_VERSION (3, 2, 0) - midori_view_set_overlay_text (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 (view)); - #endif + 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))); + } + } } else { gtk_statusbar_pop (GTK_STATUSBAR (browser->statusbar), 1); gtk_statusbar_push (GTK_STATUSBAR (browser->statusbar), 1, - katze_str_non_null (browser->statusbar_text)); + browser->statusbar_text ? browser->statusbar_text : ""); } } @@ -423,74 +426,18 @@ static void _midori_browser_update_progress (MidoriBrowser* browser, MidoriView* view) { - GtkAction* action; - gdouble progress = midori_view_get_progress (view); - gboolean loading = progress > 0.0; - - action = _action_by_name (browser, "Location"); - midori_location_action_set_progress (MIDORI_LOCATION_ACTION (action), progress); + MidoriLocationAction* action; + gdouble progress; - _action_set_sensitive (browser, "Reload", !loading); - _action_set_sensitive (browser, "Stop", loading); - - action = _action_by_name (browser, "ReloadStop"); - if (!loading) - { - g_object_set (action, - "stock-id", GTK_STOCK_REFRESH, - "tooltip", _("Reload the current page"), NULL); - 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); - } - - gtk_widget_set_sensitive (browser->throbber, loading); - katze_throbber_set_animated (KATZE_THROBBER (browser->throbber), loading); -} - -/** - * midori_browser_update_history: - * @item: a #KatzeItem - * @type: "website", "bookmark" or "download" - * @event: "access", "leave", "modify", "delete" - * - * Since: 0.4.7 - **/ -void -midori_browser_update_history (KatzeItem* item, - const gchar* type, - const gchar* event) -{ - #ifdef HAVE_ZEITGEIST - const gchar* inter; - if (strstr (event, "access")) - inter = ZEITGEIST_ZG_ACCESS_EVENT; - else if (strstr (event, "leave")) - inter = ZEITGEIST_ZG_LEAVE_EVENT; - else if (strstr (event, "modify")) - inter = ZEITGEIST_ZG_MODIFY_EVENT; - else if (strstr (event, "create")) - inter = ZEITGEIST_ZG_CREATE_EVENT; - else if (strstr (event, "delete")) - inter = ZEITGEIST_ZG_DELETE_EVENT; + 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; + /* When loading we want to see at minimum 10% progress */ else - g_assert_not_reached (); - zeitgeist_log_insert_events_no_reply (zeitgeist_log_get_default (), - zeitgeist_event_new_full (inter, ZEITGEIST_ZG_USER_ACTIVITY, - "application://midori.desktop", - zeitgeist_subject_new_full ( - item->uri, - strstr (type, "bookmark") ? ZEITGEIST_NFO_BOOKMARK : ZEITGEIST_NFO_WEBSITE, - zeitgeist_manifestation_for_uri (item->uri), - katze_item_get_meta_string (item, "mime-type"), NULL, item->name, NULL), - NULL), - NULL); - #endif + progress = CLAMP (progress, 0.1, 1.0); + midori_location_action_set_progress (action, progress); } static void @@ -519,8 +466,6 @@ midori_browser_update_history_title (MidoriBrowser* browser, g_printerr (_("Failed to update title: %s\n"), sqlite3_errmsg (db)); sqlite3_reset (stmt); sqlite3_clear_bindings (stmt); - - midori_browser_update_history (item, "website", "access"); } static void @@ -539,11 +484,19 @@ midori_view_notify_icon_cb (MidoriView* view, GParamSpec* pspec, MidoriBrowser* browser) { + const gchar* uri; + GtkAction* action; + if (midori_browser_get_current_tab (browser) != (GtkWidget*)view) return; - if (midori_paths_is_readonly () /* APP, PRIVATE */) - gtk_window_set_icon (GTK_WINDOW (browser), midori_view_get_icon (view)); + 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)); } static void @@ -559,22 +512,27 @@ midori_view_notify_load_status_cb (GtkWidget* widget, 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"); } - _midori_browser_update_interface (browser, view); - _midori_browser_set_statusbar_text (browser, view, NULL); + _midori_browser_update_interface (browser); + _midori_browser_set_statusbar_text (browser, NULL); /* This is a hack to ensure that the address entry is focussed with speed dial open. */ if (midori_view_is_blank (view)) - midori_browser_activate_action (browser, "Location"); + gtk_action_activate (_action_by_name (browser, "Location")); } g_object_notify (G_OBJECT (browser), "load-status"); @@ -625,6 +583,9 @@ midori_view_notify_title_cb (GtkWidget* widget, MidoriBrowser* browser) { MidoriView* view = MIDORI_VIEW (widget); + const gchar* title; + + title = midori_view_get_display_title (view); if (midori_view_get_load_status (view) == MIDORI_LOAD_COMMITTED) { @@ -654,7 +615,7 @@ midori_view_notify_title_cb (GtkWidget* widget, } if (widget == midori_browser_get_current_tab (browser)) - midori_browser_set_title (browser, midori_view_get_display_title (view)); + midori_browser_set_title (browser, title); } static void @@ -664,11 +625,9 @@ midori_view_notify_minimized_cb (GtkWidget* widget, { if (katze_object_get_boolean (widget, "minimized")) { - #ifndef HAVE_GRANITE 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); @@ -694,16 +653,15 @@ midori_view_notify_statusbar_text_cb (GtkWidget* view, if (view == midori_browser_get_current_tab (browser)) { g_object_get (view, "statusbar-text", &text, NULL); - _midori_browser_set_statusbar_text (browser, MIDORI_VIEW (view), text); + _midori_browser_set_statusbar_text (browser, text); g_free (text); } } static GtkWidget* -midori_bookmark_folder_button_new (KatzeArray* array, - gboolean new_bookmark, - gint64 selected, - gint64 parentid) +midori_bookmark_folder_button_new (KatzeArray* array, + gboolean new_bookmark, + const gchar* selected) { GtkListStore* model; GtkWidget* combo; @@ -712,16 +670,16 @@ midori_bookmark_folder_button_new (KatzeArray* array, sqlite3* db; sqlite3_stmt* statement; gint result; - const gchar* sqlcmd = "SELECT title, id FROM bookmarks WHERE uri='' ORDER BY title ASC"; + const gchar* sqlcmd = "SELECT title from bookmarks where uri=''"; - model = gtk_list_store_new (3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT64); + 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, _("Bookmarks"), 1, PANGO_ELLIPSIZE_END, 2, (gint64)0, -1); + 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"); @@ -731,45 +689,34 @@ midori_bookmark_folder_button_new (KatzeArray* array, while ((result = sqlite3_step (statement)) == SQLITE_ROW) { const unsigned char* name = sqlite3_column_text (statement, 0); - gint64 id = sqlite3_column_int64 (statement, 1); - - /* do not show the folder itself */ - if (id != selected) - { - gtk_list_store_insert_with_values (model, NULL, G_MAXINT, - 0, name, 1, PANGO_ELLIPSIZE_END, 2, id, -1); - - if (!new_bookmark && id == parentid) - gtk_combo_box_set_active (GTK_COMBO_BOX (combo), n); - n++; - } + 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 gint64 +static gchar* midori_bookmark_folder_button_get_active (GtkWidget* combo) { - gint64 id; + gchar* selected = NULL; GtkTreeIter iter; - g_return_val_if_fail (GTK_IS_COMBO_BOX (combo), 0); + g_return_val_if_fail (GTK_IS_COMBO_BOX (combo), NULL); if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (combo), &iter)) { - gchar* selected = NULL; GtkTreeModel* model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo)); - gtk_tree_model_get (GTK_TREE_MODEL (model), &iter, 0, &selected, 2, &id, -1); - - if (g_str_equal (selected, _("Bookmarks"))) - id = 0; - - g_free (selected); + 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 id; + return selected; } static void @@ -795,14 +742,13 @@ midori_browser_edit_bookmark_add_speed_dial_cb (GtkWidget* button, midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, KatzeItem* bookmark, gboolean new_bookmark, - gboolean is_folder, - GtkWidget* proxy) + gboolean is_folder) { const gchar* title; GtkWidget* dialog; GtkWidget* content_area; + GtkSizeGroup* sizegroup; GtkWidget* view; - GtkWidget* vbox; GtkWidget* hbox; GtkWidget* label; const gchar* value; @@ -826,48 +772,18 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, title = new_bookmark ? _("New folder") : _("Edit folder"); else title = new_bookmark ? _("New bookmark") : _("Edit bookmark"); - #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, TRUE); - } - 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), + dialog = gtk_dialog_new_with_buttons ( + title, GTK_WINDOW (browser), + GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, 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)); - hbox = gtk_hbox_new (FALSE, 0); - gtk_box_pack_start (GTK_BOX (hbox), - gtk_image_new_from_stock (STOCK_BOOKMARK_ADD, GTK_ICON_SIZE_DIALOG), FALSE, FALSE, 0); - vbox = gtk_vbox_new (FALSE, 0); - #ifdef HAVE_GRANITE - if (proxy != NULL) - { - gchar* markup = g_strdup_printf ("%s", title); - label = gtk_label_new (markup); - g_free (markup); - gtk_label_set_use_markup (GTK_LABEL (label), TRUE); - gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0); - } - #endif - label = gtk_label_new (_("Type a name for this bookmark and choose where to keep it.")); - gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 12); - gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 12); - - gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, FALSE, 0); gtk_window_set_icon_name (GTK_WINDOW (dialog), new_bookmark ? GTK_STOCK_ADD : GTK_STOCK_REMOVE); gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); gtk_container_set_border_width (GTK_CONTAINER (content_area), 5); + sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); if (!bookmark) { @@ -884,6 +800,11 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, "name", midori_view_get_display_title (MIDORI_VIEW (view)), NULL); } + hbox = gtk_hbox_new (FALSE, 8); + gtk_container_set_border_width (GTK_CONTAINER (hbox), 4); + label = gtk_label_new_with_mnemonic (_("_Title:")); + gtk_size_group_add_widget (sizegroup, label); + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); entry_title = gtk_entry_new (); gtk_entry_set_activates_default (GTK_ENTRY (entry_title), TRUE); value = katze_item_get_name (bookmark); @@ -892,11 +813,18 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, GTK_DIALOG (dialog)); g_signal_connect (entry_title, "changed", G_CALLBACK (midori_browser_edit_bookmark_title_changed_cb), dialog); - gtk_container_add (GTK_CONTAINER (content_area), entry_title); + gtk_box_pack_start (GTK_BOX (hbox), entry_title, TRUE, TRUE, 0); + gtk_container_add (GTK_CONTAINER (content_area), hbox); + gtk_widget_show_all (hbox); entry_uri = NULL; if (!is_folder) { + hbox = gtk_hbox_new (FALSE, 8); + gtk_container_set_border_width (GTK_CONTAINER (hbox), 4); + label = gtk_label_new_with_mnemonic (_("_Address:")); + gtk_size_group_add_widget (sizegroup, label); + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); entry_uri = katze_uri_entry_new ( #if GTK_CHECK_VERSION (2, 20, 0) gtk_dialog_get_widget_for_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT)); @@ -910,41 +838,72 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, #endif gtk_entry_set_activates_default (GTK_ENTRY (entry_uri), TRUE); gtk_entry_set_text (GTK_ENTRY (entry_uri), katze_item_get_uri (bookmark)); - gtk_container_add (GTK_CONTAINER (content_area), entry_uri); + 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); } + 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_integer (bookmark, "id"), - katze_item_get_meta_integer (bookmark, "parentid")); - gtk_container_add (GTK_CONTAINER (content_area), combo_folder); + 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) { + hbox = gtk_hbox_new (FALSE, 8); + gtk_container_set_border_width (GTK_CONTAINER (hbox), 1); + label = gtk_label_new (NULL); + gtk_size_group_add_widget (sizegroup, label); + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); label = gtk_button_new_with_mnemonic (_("Add to _Speed Dial")); g_signal_connect (label, "clicked", G_CALLBACK (midori_browser_edit_bookmark_add_speed_dial_cb), bookmark); - gtk_container_add (GTK_CONTAINER (content_area), label); + gtk_box_pack_start (GTK_BOX (hbox), label, 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), 1); + label = gtk_label_new (NULL); + gtk_size_group_add_widget (sizegroup, label); + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); check_toolbar = gtk_check_button_new_with_mnemonic (_("Show in the tool_bar")); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_toolbar), katze_item_get_meta_boolean (bookmark, "toolbar")); - gtk_container_add (GTK_CONTAINER (content_area), check_toolbar); + gtk_box_pack_start (GTK_BOX (hbox), check_toolbar, TRUE, TRUE, 0); + gtk_container_add (GTK_CONTAINER (content_area), hbox); + gtk_widget_show_all (hbox); check_app = NULL; if (!is_folder) { + hbox = gtk_hbox_new (FALSE, 8); + gtk_container_set_border_width (GTK_CONTAINER (hbox), 1); + label = gtk_label_new (NULL); + gtk_size_group_add_widget (sizegroup, label); + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); check_app = gtk_check_button_new_with_mnemonic (_("Run as _web application")); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_app), katze_item_get_meta_boolean (bookmark, "app")); - gtk_container_add (GTK_CONTAINER (content_area), check_app); + gtk_box_pack_start (GTK_BOX (hbox), check_app, TRUE, TRUE, 0); + gtk_container_add (GTK_CONTAINER (content_area), hbox); + gtk_widget_show_all (hbox); } - gtk_widget_show_all (content_area); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT); if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) { - gint64 selected; + gchar* selected; + + if (!new_bookmark) + katze_array_remove_item (browser->bookmarks, bookmark); katze_item_set_name (bookmark, gtk_entry_get_text (GTK_ENTRY (entry_title))); @@ -959,17 +918,13 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, } selected = midori_bookmark_folder_button_get_active (combo_folder); - katze_item_set_meta_integer (bookmark, "parentid", selected); - - if (new_bookmark) - katze_array_add_item (browser->bookmarks, bookmark); - else - midori_bookmarks_update_item_db (db, bookmark); - midori_browser_update_history (bookmark, "bookmark", new_bookmark ? "create" : "modify"); + 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)) _action_set_active (browser, "Bookmarkbar", TRUE); + g_free (selected); return_status = TRUE; } if (gtk_widget_get_visible (browser->bookmarkbar)) @@ -984,8 +939,54 @@ midori_browser_prepare_download (MidoriBrowser* browser, const gchar* uri) { - if (!midori_download_has_enough_space (download, uri)) + guint64 total_size = webkit_download_get_total_size (download); + GFile* file = g_file_new_for_uri (uri); + GFile* folder = g_file_get_parent (file); + GError* error = NULL; + GFileInfo* info = g_file_query_filesystem_info (folder, + 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 || !can_write) + { + 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_object_unref (download); return FALSE; + } + webkit_download_set_destination_uri (download, uri); g_signal_emit (browser, signals[ADD_DOWNLOAD], 0, download); midori_transferbar_add_download_item (MIDORI_TRANSFERBAR (browser->transferbar), download); @@ -994,60 +995,23 @@ midori_browser_prepare_download (MidoriBrowser* browser, return TRUE; } -static void -midori_browser_save_resources (MidoriView* view, - const gchar* folder) -{ - WebKitWebView* web_view = WEBKIT_WEB_VIEW (midori_view_get_web_view (view)); - WebKitWebFrame* frame = webkit_web_view_get_main_frame (web_view); - WebKitWebDataSource* data_source = webkit_web_frame_get_data_source (frame); - GList* resources = webkit_web_data_source_get_subresources (data_source); - GList* list; - - katze_mkdir_with_parents (folder, 0700); - - for (list = resources; list; list = g_list_next (list)) - { - WebKitWebResource* resource = WEBKIT_WEB_RESOURCE (list->data); - GString* data = webkit_web_resource_get_data (resource); - - /* Resource could be adblocked, skip it in that case */ - if (!g_strcmp0 (webkit_web_resource_get_uri (resource), "about:blank")) - continue; - - gchar* sub_filename = midori_download_get_filename_suggestion_for_uri ( - webkit_web_resource_get_mime_type (resource), - webkit_web_resource_get_uri (resource)); - gchar* sub_path = g_build_filename (folder, sub_filename, NULL); - sub_path = midori_download_get_unique_filename (sub_path); - if (data) - { - GError* error = NULL; - if (!g_file_set_contents (sub_path, data->str, data->len, &error)) - { - g_warning ("Failed to save %s: %s", sub_filename, error->message); - g_error_free (error); - } - } - else - g_warning ("Skipping empty resource %s", sub_filename); - g_free (sub_filename); - g_free (sub_path); - } - g_list_free (resources); -} +static gchar* +midori_browser_save_source (const gchar* uri, + const gchar* data, + const size_t len, + const gchar* outfile); static void midori_browser_save_uri (MidoriBrowser* browser, - MidoriView* view, const gchar* uri) { static gchar* last_dir = NULL; + gboolean folder_set = FALSE; GtkWidget* dialog; - const gchar* title = midori_view_get_display_title (view); gchar* filename; - gboolean file_only = TRUE; - GtkWidget* checkbox = NULL; + gchar* dirname; + gchar* last_slash; + gchar* folder; if (!gtk_widget_get_visible (GTK_WIDGET (browser))) return; @@ -1056,56 +1020,53 @@ midori_browser_save_uri (MidoriBrowser* browser, GTK_WINDOW (browser), GTK_FILE_CHOOSER_ACTION_SAVE); gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE); - if (uri == NULL) - uri = midori_view_get_display_uri (view); - - if (midori_view_can_view_source (view)) + if (uri) { - file_only = FALSE; - checkbox = gtk_check_button_new_with_mnemonic (_("Save associated _resources")); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbox), TRUE); - gtk_file_chooser_set_extra_widget (GTK_FILE_CHOOSER (dialog), checkbox); - } + /* Base the start folder on the current view's uri if it is local */ + filename = g_filename_from_uri (uri, NULL, NULL); + if (filename) + { + dirname = g_path_get_dirname (filename); + if (dirname && g_file_test (dirname, G_FILE_TEST_IS_DIR)) + { + gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), dirname); + folder_set = TRUE; + } - if (last_dir && *last_dir) - gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), last_dir); - else - { - gchar* dirname = midori_uri_get_folder (uri); - if (dirname == NULL) - dirname = katze_object_get_string (browser->settings, "download-folder"); - gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), dirname); - g_free (dirname); - } + g_free (dirname); + g_free (filename); + } - if (!file_only && !g_str_equal (title, uri)) - filename = midori_download_clean_filename (title); - else - { - gchar* mime_type = katze_object_get_object (view, "mime-type"); - filename = midori_download_get_filename_suggestion_for_uri (mime_type, uri); - g_free (mime_type); + /* 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); } - gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog), filename); - g_free (filename); + + if (!folder_set && last_dir && *last_dir) + gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), last_dir); if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK) { + GtkWidget* view; + GtkWidget* web_view; + WebKitWebDataSource *data_source; + WebKitWebFrame *frame; + const GString *data; + filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); - if (checkbox != NULL) - file_only = !file_only && !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkbox)); - if (!file_only && !g_str_equal (title, uri)) - { - gchar* fullname = g_strconcat (filename, ".html", NULL); - midori_view_save_source (view, uri, fullname); - g_free (fullname); - } - else - midori_view_save_source (view, uri, filename); - if (!file_only) - midori_browser_save_resources (view, filename); - katze_assign (last_dir, - gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dialog))); + folder = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dialog)); + view = midori_browser_get_current_tab (browser); + web_view = midori_view_get_web_view (MIDORI_VIEW (view)); + 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) + midori_browser_save_source (uri, data->str, data->len, filename); + + g_free (last_dir); + last_dir = folder; } gtk_widget_destroy (dialog); } @@ -1115,19 +1076,41 @@ midori_view_save_as_cb (GtkWidget* menuitem, const gchar* uri, GtkWidget* view) { - MidoriBrowser* browser = midori_browser_get_for_widget (view); - midori_browser_save_uri (browser, MIDORI_VIEW (view), uri); + MidoriBrowser* browser; + + browser = midori_browser_get_for_widget (menuitem); + midori_browser_save_uri (browser, uri); } -static void -midori_browser_speed_dial_refresh_cb (MidoriSpeedDial* dial, - MidoriBrowser* browser) +static gchar* +midori_browser_speed_dial_get_next_free_slot (MidoriView* view) { - GList* tabs = midori_browser_get_tabs (browser); - for (; tabs != NULL; tabs = g_list_next (tabs)) - if (midori_view_is_blank (tabs->data)) - midori_view_reload (tabs->data, FALSE); - g_list_free (tabs); + MidoriBrowser* browser = midori_browser_get_for_widget (GTK_WIDGET (view)); + GKeyFile* key_file; + guint slot_count = 0, slot = 1, i; + gchar** groups; + + g_object_get (browser, "speed-dial", &key_file, 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++; + } + + while (slot <= slot_count) + { + 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++; + } + return g_strdup_printf ("s%d", slot_count + 1); } static void @@ -1135,14 +1118,44 @@ midori_browser_add_speed_dial (MidoriBrowser* browser) { GdkPixbuf* img; 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 (MIDORI_VIEW (view)); + + if (slot_id == NULL) + { + g_free (uri); + g_free (title); + return; + } if ((img = midori_view_get_snapshot (MIDORI_VIEW (view), 240, 160))) { - midori_speed_dial_add (browser->dial, - midori_view_get_display_uri (MIDORI_VIEW (view)), - midori_view_get_display_title (MIDORI_VIEW (view)), img); + 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_key_file_set_string (key_file, dial_id, "uri", uri); + g_key_file_set_string (key_file, dial_id, "title", title); + + 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); + + midori_view_save_speed_dial_config (MIDORI_VIEW (view), key_file); + 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); } @@ -1163,7 +1176,7 @@ midori_browser_tab_leave_notify_event_cb (GtkWidget* widget, GdkEventCrossing* event, MidoriBrowser* browser) { - _midori_browser_set_statusbar_text (browser, MIDORI_VIEW (widget), NULL); + _midori_browser_set_statusbar_text (browser, NULL); return TRUE; } @@ -1172,7 +1185,7 @@ midori_view_activate_action_cb (GtkWidget* view, const gchar* action, MidoriBrowser* browser) { - midori_browser_activate_action (browser, action); + _midori_browser_activate_action (browser, action); } static void @@ -1191,8 +1204,6 @@ midori_view_attach_inspector_cb (GtkWidget* view, gtk_widget_show_all (browser->inspector); browser->inspector_view = inspector_view; gtk_widget_destroy (toplevel); - if (!katze_object_get_boolean (browser->settings, "last-inspector-attached")) - g_object_set (browser->settings, "last-inspector-attached", TRUE, NULL); } static void @@ -1206,8 +1217,6 @@ midori_view_detach_inspector_cb (GtkWidget* view, gtk_container_remove (GTK_CONTAINER (scrolled), GTK_WIDGET (inspector_view)); gtk_container_add (GTK_CONTAINER (scrolled), browser->inspector_view); gtk_widget_hide (paned); - if (katze_object_get_boolean (browser->settings, "last-inspector-attached")) - g_object_set (browser->settings, "last-inspector-attached", FALSE, NULL); } static void @@ -1237,23 +1246,19 @@ midori_browser_view_copy_history (GtkWidget* view_to, } } -static gboolean +static gint midori_browser_notify_new_tab_timeout_cb (MidoriBrowser *browser) { - #ifndef G_OS_WIN32 gtk_window_set_opacity (GTK_WINDOW (browser), 1); - #endif - return G_SOURCE_REMOVE; + return 0; } static void -midori_browser_notify_new_tab (MidoriBrowser* browser) +midori_browser_notify_new_tab (MidoriBrowser *browser) { if (katze_object_get_boolean (browser->settings, "flash-window-on-new-bg-tabs")) { - #ifndef G_OS_WIN32 gtk_window_set_opacity (GTK_WINDOW (browser), 0.8); - #endif g_timeout_add (100, (GSourceFunc) midori_browser_notify_new_tab_timeout_cb, browser); } } @@ -1307,9 +1312,9 @@ midori_view_new_view_cb (GtkWidget* view, 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); } - else - midori_browser_notify_new_tab (browser); if (!user_initiated) { @@ -1329,43 +1334,21 @@ midori_view_new_view_cb (GtkWidget* view, } static void -midori_browser_download_status_cb (WebKitDownload* download, - GParamSpec* pspec, - GtkWidget* widget) +midori_view_download_save_as_response_cb (GtkWidget* dialog, + gint response, + MidoriBrowser* browser) { - const gchar* uri = webkit_download_get_destination_uri (download); - switch (webkit_download_get_status (download)) + WebKitDownload* download = g_object_get_data (G_OBJECT (dialog), "download"); + if (response == GTK_RESPONSE_OK) { - 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; + gchar* uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog)); + if (midori_browser_prepare_download (browser, download, uri)) + webkit_download_start (download); + g_free (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; + else + g_object_unref (download); + gtk_widget_hide (dialog); } static gboolean @@ -1373,92 +1356,90 @@ midori_view_download_requested_cb (GtkWidget* view, WebKitDownload* download, MidoriBrowser* browser) { - MidoriDownloadType type = midori_download_get_type (download); - GtkWidget* web_view; - WebKitWebFrame* web_frame; - WebKitWebDataSource* datasource; - gboolean handled; - - g_return_val_if_fail (MIDORI_IS_VIEW (view), FALSE); - handled = TRUE; - if (type == MIDORI_DOWNLOAD_CANCEL) - { - handled = FALSE; - } - else if (type == MIDORI_DOWNLOAD_OPEN_IN_VIEWER) + if (!webkit_download_get_destination_uri (download)) { - gchar* destination_uri = - midori_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); - webkit_download_start (download); - } - else if (!webkit_download_get_destination_uri (download)) - { - if (type == MIDORI_DOWNLOAD_SAVE_AS) + 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 ( GTK_FILE_CHOOSER (dialog), TRUE); gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE); - folder = midori_uri_get_folder (webkit_download_get_uri (download)); - if (folder == NULL) - folder = katze_object_get_string (browser->settings, "download-folder"); + folder = katze_object_get_string (browser->settings, "download-folder"); gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), folder); g_free (folder); g_signal_connect (dialog, "destroy", G_CALLBACK (gtk_widget_destroyed), &dialog); + g_signal_connect (dialog, "response", + G_CALLBACK (midori_view_download_save_as_response_cb), browser); } g_object_set_data (G_OBJECT (dialog), "download", download); - filename = midori_download_get_suggested_filename (download); - gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog), filename); - g_free (filename); + gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog), + webkit_download_get_suggested_filename (download)); + gtk_widget_show (dialog); + } + else + { + const gchar* suggested; + gchar* basename; + gchar* filename; + gchar* uri; - if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK) + 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) { - gtk_widget_hide (dialog); - gchar* uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog)); - if (!midori_browser_prepare_download (browser, download, uri)) + /* Put the number in front of the extension */ + gchar* extension = strrchr (filename, '.'); + gsize length = extension ? (gsize)(extension - filename) : strlen (filename); + do { - g_free (uri); - return FALSE; + 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); + } } - g_free (uri); + while (g_access (filename, F_OK) == 0); } - else - { - gtk_widget_hide (dialog); - return FALSE; - } - } - else - { - gchar* folder = type == MIDORI_DOWNLOAD_OPEN ? NULL - : katze_object_get_string (browser->settings, "download-folder"); - gchar* destination_uri = - midori_download_prepare_destination_uri (download, folder); - midori_browser_prepare_download (browser, download, destination_uri); - g_free (destination_uri); + g_free (folder); + uri = g_filename_to_uri (filename, NULL, NULL); + g_free (filename); + midori_browser_prepare_download (browser, download, uri); + g_free (uri); } - webkit_download_start (download); } - - /* 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; + return TRUE; } static void @@ -1470,70 +1451,57 @@ midori_view_search_text_cb (GtkWidget* view, midori_findbar_search_text (MIDORI_FINDBAR (browser->find), view, found, typing); } -gint -midori_browser_get_n_pages (MidoriBrowser* browser) -{ - #ifdef HAVE_GRANITE - return granite_widgets_dynamic_notebook_get_n_tabs ( - GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser->notebook)); - #else - return gtk_notebook_get_n_pages (GTK_NOTEBOOK (browser->notebook)); - #endif -} - -static void -midori_browser_tab_destroy_cb (MidoriView* view, +static gboolean +midori_browser_tab_destroy_cb (GtkWidget* widget, MidoriBrowser* browser) { - if (browser->proxy_array) + KatzeItem* item; + + if (browser->proxy_array && MIDORI_IS_VIEW (widget)) { - KatzeItem* item = midori_view_get_proxy_item (view); - if (katze_array_get_item_index (browser->proxy_array, item) != -1) - { - if (!midori_view_is_blank (view)) - { - if (browser->trash) - katze_array_add_item (browser->trash, item); - midori_browser_update_history (item, "website", "leave"); - } - katze_array_remove_item (browser->proxy_array, item); - } + item = midori_view_get_proxy_item (MIDORI_VIEW (widget)); + 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); + } + + _midori_browser_update_actions (browser); + + /* This callback must only be called once, but we need to ensure + that "remove-tab" is emitted in any case */ + g_signal_handlers_disconnect_by_func (widget, + midori_browser_tab_destroy_cb, browser); + + g_signal_emit (browser, signals[REMOVE_TAB], 0, widget); /* We don't ever want to be in a situation with no tabs, so just create an empty one if the last one is closed. The only exception is when we are closing the window, which is indicated by the proxy array having been unset. */ - if (midori_browser_get_n_pages (browser) == 0) - midori_browser_add_uri (browser, ""); - } - - _midori_browser_update_actions (browser); -} - -static void -_midori_browser_remove_tab (MidoriBrowser* browser, - GtkWidget* widget) -{ + if (browser->proxy_array && !midori_browser_get_current_tab (browser)) + midori_browser_add_uri (browser, ""); + 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))); + gint n = 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; + g_return_if_fail (n > 0); + if (allocation != NULL) notebook_size.width = allocation->width; else gtk_widget_get_allocation (browser->notebook, ¬ebook_size); - new_size = notebook_size.width / n; + new_size = notebook_size.width / n - 7; gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (browser->notebook), GTK_ICON_SIZE_MENU, &icon_size, NULL); @@ -1560,29 +1528,36 @@ midori_browser_notebook_resize (MidoriBrowser* browser, 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_connect_tab (MidoriBrowser* browser, - GtkWidget* view) +_midori_browser_add_tab (MidoriBrowser* browser, + GtkWidget* view) { - KatzeItem* item = midori_view_get_proxy_item (MIDORI_VIEW (view)); - katze_array_add_item (browser->proxy_array, item); + GtkNotebook* notebook = GTK_NOTEBOOK (browser->notebook); + GtkWidget* tab_label; + KatzeItem* item; + guint n; gtk_widget_set_can_focus (view, TRUE); + 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); + item = midori_view_get_proxy_item (MIDORI_VIEW (view)); + katze_array_add_item (browser->proxy_array, item); + g_object_connect (view, "signal::notify::icon", midori_view_notify_icon_cb, browser, @@ -1612,7 +1587,7 @@ midori_browser_connect_tab (MidoriBrowser* browser, midori_view_new_window_cb, browser, "signal::new-view", midori_view_new_view_cb, browser, - "signal-after::download-requested", + "signal::download-requested", midori_view_download_requested_cb, browser, "signal::search-text", midori_view_search_text_cb, browser, @@ -1622,51 +1597,36 @@ midori_browser_connect_tab (MidoriBrowser* browser, midori_view_add_speed_dial_cb, browser, "signal::leave-notify-event", midori_browser_tab_leave_notify_event_cb, browser, - "signal::destroy", - midori_browser_tab_destroy_cb, browser, NULL); -} - -static void -_midori_browser_add_tab (MidoriBrowser* browser, - GtkWidget* view) -{ - GtkWidget* notebook = browser->notebook; - KatzeItem* item = midori_view_get_proxy_item (MIDORI_VIEW (view)); - #ifndef HAVE_GRANITE - GtkWidget* tab_label; - #endif - guint n; - - midori_browser_connect_tab (browser, view); if (!katze_item_get_meta_boolean (item, "append") && katze_object_get_boolean (browser->settings, "open-tabs-next-to-current")) { - n = midori_browser_get_current_page (browser) + 1; + n = gtk_notebook_get_current_page (notebook) + 1; katze_array_move_item (browser->proxy_array, item, n); } else - n = midori_browser_get_n_pages (browser); + n = -1; + gtk_notebook_insert_page (notebook, view, tab_label, n); katze_item_set_meta_integer (item, "append", -1); -#ifdef HAVE_GRANITE - granite_widgets_dynamic_notebook_insert_tab ( - GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (notebook), - midori_view_get_tab (MIDORI_VIEW (view)), n); -#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); - midori_browser_notebook_size_allocate_cb (browser->notebook, NULL, browser); -#endif + gtk_notebook_set_tab_reorderable (notebook, view, TRUE); + gtk_notebook_set_tab_detachable (notebook, view, TRUE); + + /* 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 +_midori_browser_remove_tab (MidoriBrowser* browser, + GtkWidget* view) +{ + gtk_widget_destroy (view); + midori_browser_notebook_size_allocate_cb (browser->notebook, NULL, browser); } /** @@ -1685,17 +1645,10 @@ midori_browser_foreach (MidoriBrowser* browser, GtkCallback callback, gpointer callback_data) { - g_return_if_fail (MIDORI_IS_BROWSER (browser)); + g_return_if_fail (MIDORI_IS_BROWSER (browser)); - #ifdef HAVE_GRANITE - /* FIXME */ - if (GTK_IS_BIN (browser->notebook)) - gtk_container_foreach (GTK_CONTAINER (gtk_bin_get_child (GTK_BIN ( - browser->notebook))), callback, callback_data); - else - #endif - gtk_container_foreach (GTK_CONTAINER (browser->notebook), - callback, callback_data); + gtk_container_foreach (GTK_CONTAINER (browser->notebook), + callback, callback_data); } static void @@ -1719,14 +1672,14 @@ midori_browser_key_press_event (GtkWidget* widget, && event->keyval == GDK_KEY_Tab && (event->state & GDK_CONTROL_MASK)) { - midori_browser_activate_action (browser, "TabNext"); + gtk_action_activate (_action_by_name (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"); + gtk_action_activate (_action_by_name (browser, "TabPrevious")); return TRUE; } /* Interpret Ctrl+= as Zoom In for compatibility */ @@ -1739,7 +1692,7 @@ midori_browser_key_press_event (GtkWidget* widget, /* Interpret F5 as reloading for compatibility */ else if (event->keyval == GDK_KEY_F5) { - midori_browser_activate_action (browser, "Reload"); + gtk_action_activate (_action_by_name (browser, "Reload")); return TRUE; } @@ -1748,13 +1701,12 @@ midori_browser_key_press_event (GtkWidget* widget, 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 - && (!(event->state & GDK_SHIFT_MASK)) && !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)); + MidoriView* view = MIDORI_VIEW (gtk_widget_get_parent (GTK_WIDGET (scrolled))); 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))) @@ -1789,12 +1741,12 @@ midori_browser_key_press_event (GtkWidget* widget, if ((event->keyval == GDK_KEY_BackSpace) && (event->state & GDK_SHIFT_MASK)) { - midori_browser_activate_action (browser, "Forward"); + gtk_action_activate (_action_by_name (browser, "Forward")); return TRUE; } else if (event->keyval == GDK_KEY_BackSpace) { - midori_browser_activate_action (browser, "Back"); + gtk_action_activate (_action_by_name (browser, "Back")); return TRUE; } @@ -1885,28 +1837,6 @@ midori_browser_class_init (MidoriBrowserClass* class) G_TYPE_NONE, 3, GTK_TYPE_NOTEBOOK, G_TYPE_INT, G_TYPE_INT); - /** - * MidoriBrowser::switch-tab: - * @browser: the object on which the signal is emitted - * @old_view: the previous tab - * @new_view: the new tab - * - * Emitted when a tab is switched. - * There's no guarantee what the current tab is. - * - * Since: 0.4.7 - */ - signals[SWITCH_TAB] = g_signal_new ( - "switch-tab", - G_TYPE_FROM_CLASS (class), - (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), - 0, - 0, - NULL, - midori_cclosure_marshal_VOID__OBJECT_OBJECT, - G_TYPE_NONE, 2, - G_TYPE_OBJECT, G_TYPE_OBJECT); - signals[ACTIVATE_ACTION] = g_signal_new ( "activate-action", G_TYPE_FROM_CLASS (class), @@ -2080,11 +2010,7 @@ midori_browser_class_init (MidoriBrowserClass* class) "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, @@ -2254,16 +2180,16 @@ midori_browser_class_init (MidoriBrowserClass* class) * The speed dial configuration file. * * Since: 0.3.4 - * Since 0.4.7 this is a Midori.SpeedDial instance. */ g_object_class_install_property (gobject_class, PROP_SPEED_DIAL, g_param_spec_pointer ( "speed-dial", "Speeddial", - "Speed dial", + "Pointer to key-value object with speed dial items", G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + /** * MidoriBrowser:show-tabs: * @@ -2299,7 +2225,13 @@ static void _action_window_new_activate (GtkAction* action, MidoriBrowser* browser) { - midori_view_new_window_cb (NULL, "", browser); + MidoriBrowser* new_browser; + g_signal_emit (browser, signals[NEW_WINDOW], 0, NULL, &new_browser); + if (new_browser) + { + midori_browser_add_uri (new_browser, ""); + midori_browser_activate_action (new_browser, "Location"); + } } static void @@ -2314,7 +2246,8 @@ static void _action_private_browsing_activate (GtkAction* action, MidoriBrowser* browser) { - sokoke_spawn_app ("about:private", TRUE); + const gchar* uri = midori_browser_get_current_uri (browser); + sokoke_spawn_app (uri && *uri ? uri : "about:blank", TRUE); } static void @@ -2380,8 +2313,7 @@ static void _action_save_as_activate (GtkAction* action, MidoriBrowser* browser) { - GtkWidget* view = midori_browser_get_current_tab (browser); - midori_browser_save_uri (browser, MIDORI_VIEW (view), NULL); + midori_browser_save_uri (browser, midori_browser_get_current_uri (browser)); } static void @@ -2456,9 +2388,9 @@ midori_browser_subscribe_to_news_feed (MidoriBrowser* browser, /* 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", FALSE, feed, TRUE); + sokoke_spawn_program ("liferea-add-feed", feed); else - sokoke_spawn_program (browser->news_aggregator, TRUE, feed, TRUE); + sokoke_spawn_program (browser->news_aggregator, feed); g_free (feed); } else @@ -2527,7 +2459,11 @@ _action_compact_add_activate (GtkAction* action, g_free (label); gtk_widget_set_name (button, "GtkButton-thumb"); gtk_box_pack_start (box, button, TRUE, TRUE, 4); + #if GTK_CHECK_VERSION (2, 16, 0) gtk_activatable_set_related_action (GTK_ACTIVATABLE (button), action); + #else + gtk_action_connect_proxy (action, button); + #endif g_signal_connect_swapped (button, "clicked", G_CALLBACK (gtk_widget_destroy), dialog); } @@ -2542,16 +2478,16 @@ _action_tab_close_activate (GtkAction* action, MidoriBrowser* browser) { GtkWidget* widget = midori_browser_get_current_tab (browser); - MidoriView* view = MIDORI_VIEW (widget); - gboolean last_tab = midori_browser_get_n_pages (browser) == 1; - if (last_tab && midori_paths_is_readonly () /* APP, PRIVATE */) + gboolean last_tab = + gtk_notebook_get_nth_page (GTK_NOTEBOOK (browser->notebook), 1) == NULL; + if (last_tab && sokoke_is_app_or_private ()) { gtk_widget_destroy (GTK_WIDGET (browser)); return; } - if (last_tab && midori_view_is_blank (view)) + if (last_tab && midori_view_is_blank (MIDORI_VIEW (widget))) return; - midori_browser_remove_tab (browser, widget); + gtk_widget_destroy (widget); } static void @@ -2570,36 +2506,8 @@ _action_print_activate (GtkAction* action, if (!gtk_widget_get_visible (GTK_WIDGET (browser))) return; - if (!(view = midori_browser_get_current_tab (browser))) - return; - - #ifdef HAVE_GRANITE - /* FIXME: Blacklist/ custom contract doesn't work - gchar* blacklisted_contracts[] = { "print", NULL }; */ - /* FIXME: granite: should return GtkWidget* like GTK+ */ - GtkWidget* dialog = (GtkWidget*)granite_widgets_pop_over_new (); - GtkWidget* content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); - /* FIXME: granite: should return GtkWidget* like GTK+ */ - gchar* filename = midori_view_save_source (MIDORI_VIEW (view), NULL, NULL); - const gchar* mime_type = katze_item_get_meta_string ( - midori_view_get_proxy_item (MIDORI_VIEW (view)), "mime-type"); - GtkWidget* contractor = (GtkWidget*)granite_widgets_contractor_view_new ( - filename, mime_type, 32, TRUE); - /* granite_widgets_contractor_view_add_item (GRANITE_WIDGETS_CONTRACTOR_VIEW ( - contractor), _("_Print"), _("Send document to the printer"), "document-print", - 32, G_MAXINT, midori_view_print, view); - granite_widgets_contractor_view_name_blacklist (GRANITE_WIDGETS_CONTRACTOR_VIEW ( - contractor), blacklisted_contracts, -1); */ - g_free (filename); - gtk_container_add (GTK_CONTAINER (content_area), contractor); - gtk_widget_show (contractor); - gtk_widget_show (dialog); - if (gtk_widget_get_visible (browser->navigationbar)) - granite_widgets_pop_over_move_to_widget ( - GRANITE_WIDGETS_POP_OVER (dialog), browser->navigationbar, TRUE); - #else - midori_view_print (MIDORI_VIEW (view)); - #endif + if ((view = midori_browser_get_current_tab (browser))) + midori_view_print (MIDORI_VIEW (view)); } static void @@ -2689,7 +2597,6 @@ _action_copy_activate (GtkAction* action, 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)) { @@ -2699,7 +2606,6 @@ _action_copy_activate (GtkAction* action, 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"); } @@ -2765,14 +2671,14 @@ static void _action_find_next_activate (GtkAction* action, MidoriBrowser* browser) { - midori_findbar_find_text (MIDORI_FINDBAR (browser->find), NULL, TRUE); + midori_findbar_find (MIDORI_FINDBAR (browser->find), TRUE); } static void _action_find_previous_activate (GtkAction* action, MidoriBrowser* browser) { - midori_findbar_find_text (MIDORI_FINDBAR (browser->find), NULL, FALSE); + midori_findbar_find (MIDORI_FINDBAR (browser->find), FALSE); } static void @@ -2806,7 +2712,7 @@ midori_browser_get_toolbar_actions (MidoriBrowser* browser) static const gchar* actions[] = { "WindowNew", "TabNew", "Open", "SaveAs", "Print", "Find", "Fullscreen", "Preferences", "Window", "Bookmarks", - "ReloadStop", "ZoomIn", "TabClose", "NextForward", + "ReloadStop", "ZoomIn", "TabClose", "ZoomOut", "Separator", "Back", "Forward", "Homepage", "Panel", "Trash", "Search", "BookmarkAdd", "Previous", "Next", NULL }; @@ -2994,7 +2900,7 @@ _action_tools_populate_popup (GtkAction* action, j = 0; while ((widget = midori_panel_get_nth_page (panel, j++))) { - menuitem = midori_panel_construct_menu_item (panel, MIDORI_VIEWABLE (widget), FALSE); + menuitem = midori_panel_construct_menu_item (panel, MIDORI_VIEWABLE (widget)); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); } continue; @@ -3021,35 +2927,14 @@ _action_bookmarks_populate_folder (GtkAction* action, KatzeArray* folder, MidoriBrowser* browser) { - gint64 id; + const gchar* folder_name; KatzeArray* bookmarks; GtkWidget* menuitem; - id = katze_item_get_meta_integer (KATZE_ITEM (folder), "id"); - - if (id == -1) - { - if (!(bookmarks = midori_array_query (browser->bookmarks, - "id, title, parentid, uri, app, pos_panel, pos_bar", "parentid is NULL", NULL))) - { - g_warning ("midori_array_query returned NULL)"); - return FALSE; - } - } - else - { - gchar *parentid = g_strdup_printf ("%" G_GINT64_FORMAT, id); - - if (!(bookmarks = midori_array_query (browser->bookmarks, - "id, title, parentid, uri, app, pos_panel, pos_bar", "parentid = %q", parentid))) - { - g_warning ("midori_array_query returned NULL (id='%s')", parentid); - g_free (parentid); - return FALSE; - } - - g_free (parentid); - } + 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), @@ -3113,9 +2998,9 @@ _action_window_activate_item_alt (GtkAction* action, for (i = 0; i < n; i++) { GtkWidget* view; - view = midori_browser_get_nth_tab (browser, i); + view = gtk_notebook_get_nth_page (GTK_NOTEBOOK (browser->notebook), i); if (midori_view_get_proxy_item (MIDORI_VIEW (view)) == item) - midori_browser_set_current_page (browser, i); + gtk_notebook_set_current_page (GTK_NOTEBOOK (browser->notebook), i); } } @@ -3127,32 +3012,33 @@ _action_compact_menu_populate_popup (GtkAction* action, static const GtkActionEntry actions[] = { { "TabNew" }, { "WindowNew" }, - { "PrivateBrowsing" }, { NULL }, + { "Open" }, { "Find" }, #if !HAVE_HILDON { "Print" }, + { "InspectPage" }, #endif - { "Fullscreen" }, { NULL }, + { "PrivateBrowsing" }, #if !HAVE_HILDON - { "p" }, - { NULL }, - { "BookmarksImport" }, - { "BookmarksExport" }, { "ClearPrivateData" }, #if defined (GDK_WINDOWING_X11) { "AddDesktopShortcut" }, #endif + { NULL }, + { "BookmarksImport"}, + { "BookmarksExport"}, + { NULL }, + { "Fullscreen" }, + { "Panel" }, { "-" }, #endif { NULL }, #if !HAVE_HILDON - #ifndef HAVE_GRANITE { "HelpFAQ" }, { "HelpBugs"}, #endif - #endif { "About" }, { "Preferences" }, #if HAVE_HILDON @@ -3198,21 +3084,6 @@ _action_compact_menu_populate_popup (GtkAction* action, g_signal_emit (browser, signals[POPULATE_TOOL_MENU], 0, menu); continue; } - else if (actions[i].name[0] == 'p') - { - MidoriPanel* panel; - gsize j; - GtkWidget* widget; - - panel = MIDORI_PANEL (browser->panel); - j = 0; - while ((widget = midori_panel_get_nth_page (panel, j++))) - { - menuitem = midori_panel_construct_menu_item (panel, MIDORI_VIEWABLE (widget), TRUE); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); - } - continue; - } menuitem = sokoke_action_create_popup_menu_item ( _action_by_name (browser, actions[i].name)); } @@ -3232,7 +3103,7 @@ midori_preferences_response_help_cb (GtkWidget* preferences, MidoriBrowser* browser) { if (response == GTK_RESPONSE_HELP) - midori_browser_activate_action (browser, "HelpFAQ"); + gtk_action_activate (_action_by_name (browser, "HelpFAQ")); } static void @@ -3258,19 +3129,6 @@ _action_preferences_activate (GtkAction* action, 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* menubar_action, MidoriBrowser* browser) @@ -3281,9 +3139,6 @@ _action_menubar_activate (GtkToggleAction* menubar_action, 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)) @@ -3377,14 +3232,13 @@ _action_reload_stop_activate (GtkAction* action, { 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)))) + else { - gdk_window_get_pointer (window, &x, &y, &state); + gdk_window_get_pointer (NULL, &x, &y, &state); if (state & GDK_SHIFT_MASK) from_cache = FALSE; } @@ -3433,8 +3287,6 @@ _action_view_encoding_activate (GtkAction* action, 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")) @@ -3452,19 +3304,112 @@ _action_view_encoding_activate (GtkAction* action, } } +static gchar* +midori_browser_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++; + + *ext_end = 0; + return g_strdup (period); +} + +static gchar* +midori_browser_save_source (const gchar* uri, + const gchar* data, + const size_t len, + const gchar* outfile) +{ + gchar* unique_filename; + gint fd; + FILE* fp; + size_t ret; + + if (!outfile) + { + gchar* filename; + gchar* extension; + + extension = midori_browser_get_uri_extension (uri); + filename = g_strdup_printf ("%uXXXXXX%s", + g_str_hash (uri), extension && *extension ? extension : ".htm"); + g_free (extension); + fd = g_file_open_tmp (filename, &unique_filename, NULL); + g_free (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, 1, len, fp); + fclose (fp); + if ((ret - len) != 0) + { + g_warning ("Error writing to file %s " + "in midori_browser_source_transfer_cb()", unique_filename); + katze_assign (unique_filename, NULL); + } + } + close (fd); + } + return unique_filename; +} + static void _action_source_view_activate (GtkAction* action, MidoriBrowser* browser) { + WebKitWebDataSource *data_source; + WebKitWebFrame *frame; + const GString *data; GtkWidget* view; + GtkWidget* web_view; gchar* text_editor; gchar* filename = NULL; + const gchar* uri; 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)); + web_view = midori_view_get_web_view (MIDORI_VIEW (view)); + 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) + return; + + filename = midori_browser_save_source (uri, data->str, data->len, NULL); if (!(text_editor && *text_editor)) { GtkWidget* source; @@ -3482,7 +3427,7 @@ _action_source_view_activate (GtkAction* action, } else { - sokoke_spawn_program (text_editor, TRUE, filename, TRUE); + sokoke_spawn_program (text_editor, filename); g_free (filename); } g_free (text_editor); @@ -3492,33 +3437,7 @@ static void _action_caret_browsing_activate (GtkAction* action, MidoriBrowser* browser) { - gint response; - GtkWidget* dialog; - - if (!gtk_widget_get_visible (GTK_WIDGET (browser))) - return; - - if (!katze_object_get_boolean (browser->settings, "enable-caret-browsing")) - { - dialog = gtk_message_dialog_new (GTK_WINDOW (browser), - GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, - GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, - _("Toggle text cursor navigation")); - gtk_window_set_title (GTK_WINDOW (dialog), _("Toggle text cursor navigation")); - gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), - _("Pressing F7 toggles Caret Browsing. When active, a text cursor appears in all websites.")); - gtk_dialog_add_buttons (GTK_DIALOG (dialog), - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - _("_Enable Caret Browsing"), GTK_RESPONSE_ACCEPT, - NULL); - - response = gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); - - if (response != GTK_RESPONSE_ACCEPT) - return; - } - + _("Toggle text cursor navigation"); g_object_set (browser->settings, "enable-caret-browsing", !katze_object_get_boolean (browser->settings, "enable-caret-browsing"), NULL); } @@ -3535,9 +3454,6 @@ _action_fullscreen_activate (GtkAction* action, 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); @@ -3555,18 +3471,12 @@ _action_fullscreen_activate (GtkAction* action, } 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); - #ifdef HAVE_GRANITE - granite_widgets_dynamic_notebook_set_show_tabs ( - GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser->notebook), FALSE); - #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)); } @@ -3596,71 +3506,6 @@ _action_scroll_somewhere_activate (GtkAction* action, webkit_web_view_move_cursor (web_view, GTK_MOVEMENT_VISUAL_POSITIONS, 1); } -static void -_action_readable_activate (GtkAction* action, - MidoriBrowser* browser) -{ - GtkWidget* view = midori_browser_get_current_tab (browser); - gchar* filename; - gchar* stylesheet; - gint i; - gchar* script; - gchar* exception; - - if (!view) - return; - - filename = midori_paths_get_res_filename ("faq.css"); - stylesheet = NULL; - if (!g_file_get_contents (filename, &stylesheet, NULL, NULL)) - { - katze_assign (filename, midori_paths_get_data_filename ("doc/midori/faq.css", FALSE)); - g_file_get_contents (filename, &stylesheet, NULL, NULL); - } - if (!(stylesheet && *stylesheet)) - { - g_free (filename); - g_free (stylesheet); - midori_view_add_info_bar (MIDORI_VIEW (view), GTK_MESSAGE_ERROR, - "Stylesheet faq.css not found", NULL, view, - GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL); - return; - } - - i = 0; - while (stylesheet[i]) - { - /* Replace line breaks with spaces */ - if (stylesheet[i] == '\n' || stylesheet[i] == '\r') - stylesheet[i] = ' '; - /* Change all single quotes to double quotes */ - else if (stylesheet[i] == '\'') - stylesheet[i] = '\"'; - i++; - } - - script = g_strdup_printf ( - "(function () {" - "var style = document.createElement ('style');" - "style.setAttribute ('type', 'text/css');" - "style.appendChild (document.createTextNode ('%s'));" - "var head = document.getElementsByTagName ('head')[0];" - "if (head) head.appendChild (style);" - "else document.documentElement.insertBefore" - "(style, document.documentElement.firstChild);" - "}) ();", stylesheet); - g_free (stylesheet); - exception = NULL; - if (!midori_view_execute_script (MIDORI_VIEW (view), script, &exception)) - { - midori_view_add_info_bar (MIDORI_VIEW (view), GTK_MESSAGE_ERROR, - exception, NULL, view, - GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL); - g_free (exception); - } - g_free (script); -} - static gboolean _action_navigation_activate (GtkAction* action, MidoriBrowser* browser) @@ -3689,10 +3534,8 @@ _action_navigation_activate (GtkAction* action, return FALSE; view = MIDORI_VIEW (tab); - name = gtk_action_get_name (action); - if (!strcmp (name, "NextForward")) - name = midori_view_can_go_forward (view) ? "Forward" : "Next"; + name = gtk_action_get_name (action); if (g_str_equal (name, "Back")) { @@ -3812,14 +3655,8 @@ static void _action_location_focus_in (GtkAction* action, MidoriBrowser* browser) { - 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); + midori_location_action_set_secondary_icon ( + MIDORI_LOCATION_ACTION (action), GTK_STOCK_JUMP_TO); } static void @@ -3831,54 +3668,63 @@ _action_location_focus_out (GtkAction* action, if (!browser->show_navigationbar || midori_browser_is_fullscreen (browser)) gtk_widget_hide (browser->navigationbar); - midori_browser_update_secondary_icon (browser, MIDORI_VIEW (view), action); + 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); } static void _action_location_reset_uri (GtkAction* action, 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))); - } + const gchar* uri; + + uri = midori_browser_get_current_uri (browser); + midori_location_action_set_text (MIDORI_LOCATION_ACTION (action), uri); } + static void _action_location_submit_uri (GtkAction* action, const gchar* uri, gboolean new_tab, MidoriBrowser* browser) { + gchar* stripped_uri; gchar* new_uri; gint n; - uri = katze_skip_whitespace (uri); - new_uri = sokoke_magic_uri (uri); + stripped_uri = g_strdup (uri); + g_strstrip (stripped_uri); + new_uri = sokoke_magic_uri (stripped_uri); if (!new_uri) { - const gchar* keywords = NULL; + gchar** parts; + gchar* keywords = NULL; const gchar* search_uri = NULL; - KatzeItem* item; /* Do we have a keyword and a string? */ - if (browser->search_engines - && (item = katze_array_find_token (browser->search_engines, uri))) + parts = g_strsplit (stripped_uri, " ", 2); + if (parts[0] && browser->search_engines) { - keywords = strchr (uri, ' '); - if (keywords != NULL) - keywords++; - else - keywords = ""; - search_uri = katze_item_get_uri (item); + 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); + } } + g_strfreev (parts); - if (keywords == NULL) + if (keywords) + g_free (stripped_uri); + else { - keywords = uri; + keywords = stripped_uri; search_uri = browser->location_entry_search; } new_uri = midori_uri_for_search (search_uri, keywords); @@ -3907,7 +3753,11 @@ _action_location_submit_uri (GtkAction* action, if (sqlite3_step (statement) == SQLITE_DONE) sqlite3_clear_bindings (statement); } + + g_free (keywords); } + else + g_free (stripped_uri); if (new_tab) { @@ -4030,10 +3880,7 @@ _action_search_submit (GtkAction* action, search = midori_uri_for_search (url, keywords); if (new_tab) - { - int n = midori_browser_add_uri (browser, search); - midori_browser_set_current_page_smartly (browser, n); - } + midori_browser_add_uri (browser, search); else midori_browser_set_current_uri (browser, search); @@ -4045,11 +3892,13 @@ _action_search_activate (GtkAction* action, MidoriBrowser* browser) { GSList* proxies = gtk_action_get_proxies (action); + guint i = 0; + GtkWidget* proxy; const gchar* uri; gchar* search; - for (; proxies != NULL; proxies = g_slist_next (proxies)) - if (GTK_IS_TOOL_ITEM (proxies->data)) + while (((proxy = g_slist_nth_data (proxies, i++)))) + if (GTK_IS_TOOL_ITEM (proxy)) { if (!gtk_widget_get_visible (browser->navigationbar)) gtk_widget_show (browser->navigationbar); @@ -4188,7 +4037,13 @@ midori_browser_bookmark_open_in_window_activate_cb (GtkWidget* menuitem, item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem"); uri = katze_item_get_uri (item); - midori_view_new_window_cb (NULL, uri, browser); + + if (uri && *uri) + { + MidoriBrowser* new_browser; + g_signal_emit (browser, signals[NEW_WINDOW], 0, NULL, &new_browser); + midori_browser_add_uri (new_browser, uri); + } } static void @@ -4200,9 +4055,9 @@ midori_browser_bookmark_edit_activate_cb (GtkWidget* menuitem, 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, NULL); + midori_browser_edit_bookmark_dialog_new (browser, item, FALSE, FALSE); else - midori_browser_edit_bookmark_dialog_new (browser, item, FALSE, TRUE, NULL); + midori_browser_edit_bookmark_dialog_new (browser, item, FALSE, TRUE); } static void @@ -4300,19 +4155,10 @@ static void _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, proxy); + midori_browser_edit_bookmark_dialog_new (browser, NULL, TRUE, TRUE); else - midori_browser_edit_bookmark_dialog_new (browser, NULL, TRUE, FALSE, proxy); + midori_browser_edit_bookmark_dialog_new (browser, NULL, TRUE, FALSE); } static void @@ -4332,7 +4178,6 @@ _action_bookmarks_import_activate (GtkAction* action, { ".kde/share/apps/konqueror/bookmarks.xml", N_("Konqueror"), "konqueror" }, { ".gnome2/epiphany/bookmarks.rdf", N_("Epiphany"), "epiphany" }, { ".mozilla/firefox/*/bookmarks.html", N_("Firefox (%s)"), "firefox" }, - { ".config/midori/bookmarks.xbel", N_("Midori 0.2.6"), "midori" }, }; GtkWidget* dialog; @@ -4353,7 +4198,7 @@ _action_bookmarks_import_activate (GtkAction* action, return; dialog = gtk_dialog_new_with_buttons ( - _("Import bookmarks…"), GTK_WINDOW (browser), + _("Import bookmarks..."), GTK_WINDOW (browser), GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, _("_Import bookmarks"), GTK_RESPONSE_ACCEPT, @@ -4438,16 +4283,23 @@ _action_bookmarks_import_activate (GtkAction* action, gtk_container_add (GTK_CONTAINER (content_area), hbox); gtk_widget_show_all (hbox); - combobox_folder = midori_bookmark_folder_button_new (browser->bookmarks, - FALSE, 0, 0); - gtk_container_add (GTK_CONTAINER (content_area), combobox_folder); - + hbox = gtk_hbox_new (FALSE, 8); + gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); + label = gtk_label_new_with_mnemonic (_("_Folder:")); + gtk_size_group_add_widget (sizegroup, label); + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); + 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_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT); if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) { GtkTreeIter iter; gchar* path = NULL; - gint64 selected; + gchar* selected = NULL; GError* error; sqlite3* db = g_object_get_data (G_OBJECT (browser->bookmarks), "db"); @@ -4480,6 +4332,7 @@ _action_bookmarks_import_activate (GtkAction* action, midori_bookmarks_import_array_db (db, bookmarks, selected); katze_array_update (browser->bookmarks); g_object_unref (bookmarks); + g_free (selected); g_free (path); } else @@ -4495,6 +4348,7 @@ _action_bookmarks_export_activate (GtkAction* action, const gchar* format; gchar* path = NULL; GError* error; + sqlite3* db; KatzeArray* bookmarks; if (!browser->bookmarks || !gtk_widget_get_visible (GTK_WIDGET (browser))) @@ -4535,8 +4389,9 @@ wrong_format: return; error = NULL; - bookmarks = midori_array_query_recursive (browser->bookmarks, - "*", "parentid IS NULL", NULL, TRUE); + db = g_object_get_data (G_OBJECT (browser->history), "db"); + bookmarks = katze_array_new (KATZE_TYPE_ARRAY); + midori_bookmarks_export_array_db (db, bookmarks, ""); if (!midori_array_to_file (bookmarks, path, format, &error)) { sokoke_message_dialog (GTK_MESSAGE_ERROR, @@ -4667,8 +4522,6 @@ _action_clear_private_data_activate (GtkAction* action, GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, _("_Clear private data"), GTK_RESPONSE_ACCEPT, NULL); - katze_widget_add_class (gtk_dialog_get_widget_for_response ( - GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT), "noundo"); content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); gtk_window_set_skip_taskbar_hint (GTK_WINDOW (dialog), FALSE); screen = gtk_widget_get_screen (GTK_WIDGET (browser)); @@ -4754,19 +4607,13 @@ _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); + gint cur_pos = gtk_notebook_get_current_page (GTK_NOTEBOOK (browser->notebook)); + GtkWidget* widget = gtk_notebook_get_nth_page (GTK_NOTEBOOK (browser->notebook), cur_pos); if (cur_pos > 0) new_pos = cur_pos - 1; else - new_pos = midori_browser_get_n_pages (browser) - 1; - #ifdef HAVE_GRANITE - granite_widgets_dynamic_notebook_set_tab_position ( - GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser->notebook), - midori_view_get_tab (MIDORI_VIEW (widget)), new_pos); - #else + new_pos = gtk_notebook_get_n_pages (GTK_NOTEBOOK (browser->notebook)) - 1; gtk_notebook_reorder_child (GTK_NOTEBOOK (browser->notebook), widget, new_pos); - #endif g_signal_emit (browser, signals[MOVE_TAB], 0, browser->notebook, cur_pos, new_pos); } @@ -4775,19 +4622,13 @@ _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)) + gint cur_pos = gtk_notebook_get_current_page (GTK_NOTEBOOK (browser->notebook)); + GtkWidget* widget = gtk_notebook_get_nth_page (GTK_NOTEBOOK (browser->notebook), cur_pos); + if (cur_pos == (gtk_notebook_get_n_pages (GTK_NOTEBOOK (browser->notebook)) - 1)) new_pos = 0; else new_pos = cur_pos + 1; - #ifdef HAVE_GRANITE - granite_widgets_dynamic_notebook_set_tab_position ( - GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser->notebook), - midori_view_get_tab (MIDORI_VIEW (widget)), new_pos); - #else gtk_notebook_reorder_child (GTK_NOTEBOOK (browser->notebook), widget, new_pos); - #endif g_signal_emit (browser, signals[MOVE_TAB], 0, browser->notebook, cur_pos, new_pos); } @@ -4795,8 +4636,8 @@ static void _action_tab_previous_activate (GtkAction* action, MidoriBrowser* browser) { - gint n = midori_browser_get_current_page (browser); - midori_browser_set_current_page (browser, n - 1); + gint n = gtk_notebook_get_current_page (GTK_NOTEBOOK (browser->notebook)); + gtk_notebook_set_current_page (GTK_NOTEBOOK (browser->notebook), n - 1); } static void @@ -4804,10 +4645,10 @@ _action_tab_next_activate (GtkAction* action, MidoriBrowser* browser) { /* Advance one tab or jump to the first one if we are at the last one */ - gint n = midori_browser_get_current_page (browser); - if (n == midori_browser_get_n_pages (browser) - 1) + gint n = gtk_notebook_get_current_page (GTK_NOTEBOOK (browser->notebook)); + if (n == gtk_notebook_get_n_pages (GTK_NOTEBOOK (browser->notebook)) - 1) n = -1; - midori_browser_set_current_page (browser, n + 1); + gtk_notebook_set_current_page (GTK_NOTEBOOK (browser->notebook), n + 1); } static void @@ -4900,33 +4741,6 @@ _action_about_activate_email (GtkAboutDialog* about, } #endif -static gchar* -midori_browser_get_docs (gboolean error) -{ - #ifdef G_OS_WIN32 - gchar* path = midori_paths_get_data_filename ("doc/midori/faq.html", FALSE); - if (g_access (path, F_OK) == 0) - return g_filename_to_uri (path, NULL, NULL); - else - { - #ifdef DOCDIR - if (g_access (DOCDIR "/faq.html", F_OK) == 0) - return g_strdup ("file://" DOCDIR "/faq.html"); - else - #endif - return error ? g_strdup ("error:nodocs share/doc/midori/faq.html") : NULL; - } - g_free (path); - #else - #ifdef DOCDIR - if (g_access (DOCDIR "/faq.html", F_OK) == 0) - return g_strdup ("file://" DOCDIR "/faq.html"); - else - #endif - return error ? g_strdup ("error:nodocs " DOCDIR "/faq.html") : NULL; - #endif -} - static void _action_about_activate (GtkAction* action, MidoriBrowser* browser) @@ -4944,54 +4758,75 @@ _action_about_activate (GtkAction* action, 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 -#ifdef HAVE_GRANITE - gchar* docs = midori_browser_get_docs (FALSE); - granite_widgets_show_about_dialog (GTK_WINDOW (browser), - "translate", "https://translations.xfce.org/projects/p/midori/", - "bug", PACKAGE_BUGREPORT, - "help", docs, - "copyright", "2007-2012 Christian Dywan", -#else gtk_show_about_dialog (GTK_WINDOW (browser), - "wrap-license", TRUE, - "copyright", "Copyright © 2007-2012 Christian Dywan", -#endif "logo-icon-name", gtk_window_get_icon_name (GTK_WINDOW (browser)), - "program-name", PACKAGE_NAME, + "name", PACKAGE_NAME, "version", PACKAGE_VERSION, "comments", comments, - "website", "http://www.midori-browser.org", + "copyright", "Copyright © 2007-2011 Christian Dywan", + "website", "http://www.twotoasts.de", "authors", credits_authors, "documenters", credits_documenters, "artists", credits_artists, "license", license, + "wrap-license", TRUE, "translator-credits", _("translator-credits"), NULL); g_free (comments); - #ifdef HAVE_GRANITE - g_free (docs); - #endif } static void _action_help_link_activate (GtkAction* action, MidoriBrowser* browser) { - const gchar* action_name = gtk_action_get_name (action); - gchar* uri = NULL; - if (!strncmp ("HelpFAQ", action_name, 7)) - uri = midori_browser_get_docs (TRUE); - else if (!strncmp ("HelpBugs", action_name, 8)) + const gchar* action_name; + const gchar* uri; + gint n; + #if defined (G_OS_WIN32) && defined (DOCDIR) + gchar* free_uri = NULL; + #endif + + action_name = gtk_action_get_name (action); + if (!strncmp ("HelpFAQ", action_name, 7)) { - if (!g_spawn_command_line_async ("ubuntu-bug " PACKAGE_NAME, NULL)) - uri = g_strdup (PACKAGE_BUGREPORT); + #ifdef G_OS_WIN32 + { + #ifdef DOCDIR + 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 "/faq.html", F_OK) == 0) + uri = "file://" DOCDIR "/faq.html"; + else + #endif + uri = "error:nodocs share/doc/midori/faq.html"; + #ifdef DOCDIR + } + g_free (path); + #endif + } + #else + #ifdef DOCDIR + uri = "file://" DOCDIR "/faq.html"; + if (g_access (DOCDIR "/faq.html", F_OK) != 0) + #endif + uri = "error:nodocs " DOCDIR "/faq.html"; + #endif } + else if (!strncmp ("HelpBugs", action_name, 8)) + uri = PACKAGE_BUGREPORT; + else + uri = NULL; if (uri) { - gint n = midori_browser_add_uri (browser, uri); + n = midori_browser_add_uri (browser, uri); midori_browser_set_current_page (browser, n); - g_free (uri); + + #if defined (G_OS_WIN32) && defined (DOCDIR) + g_free (free_uri); + #endif } } @@ -5038,7 +4873,7 @@ midori_panel_cycle_child_focus_cb (GtkWidget* hpaned, || !gtk_widget_get_ancestor (focus, GTK_TYPE_PANED)) { g_signal_stop_emission_by_name (hpaned, "cycle-child-focus"); - midori_browser_activate_action (browser, "Location"); + gtk_action_activate (_action_by_name (browser, "Location")); return TRUE; } return FALSE; @@ -5112,52 +4947,60 @@ midori_panel_close_cb (MidoriPanel* panel, } static void -midori_browser_switched_tab (MidoriBrowser* browser, - GtkWidget* old_widget, - MidoriView* new_view, - gint new_page) +gtk_notebook_switch_page_cb (GtkWidget* notebook, + gpointer page, + guint page_num, + MidoriBrowser* browser) { + GtkWidget* widget; GtkAction* action; const gchar* text; - const gchar* uri; - - if (old_widget != NULL) - { - action = _action_by_name (browser, "Location"); - text = midori_location_action_get_text (MIDORI_LOCATION_ACTION (action)); - g_object_set_data_full (G_OBJECT (old_widget), "midori-browser-typed-text", - g_strdup (text), g_free); - } - if (new_view == NULL) - { - g_signal_emit (browser, signals[SWITCH_TAB], 0, old_widget, new_view); + if (!(widget = midori_browser_get_current_tab (browser))) return; - } - g_return_if_fail (MIDORI_IS_VIEW (new_view)); + action = _action_by_name (browser, "Location"); + text = midori_location_action_get_text (MIDORI_LOCATION_ACTION (action)); + g_object_set_data_full (G_OBJECT (widget), "midori-browser-typed-text", + g_strdup (text), g_free); +} + +static void +gtk_notebook_switch_page_after_cb (GtkWidget* notebook, + gpointer page, + guint page_num, + MidoriBrowser* browser) +{ + GtkWidget* widget; + MidoriView* view; + const gchar* uri; + GtkAction* action; + + if (!(widget = midori_browser_get_current_tab (browser))) + return; - uri = g_object_get_data (G_OBJECT (new_view), "midori-browser-typed-text"); + view = MIDORI_VIEW (widget); + uri = g_object_get_data (G_OBJECT (widget), "midori-browser-typed-text"); if (!uri) - uri = midori_view_get_display_uri (new_view); - midori_browser_set_title (browser, midori_view_get_display_title (new_view)); + 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); - if (midori_paths_is_readonly () /* APP, PRIVATE */) - gtk_window_set_icon (GTK_WINDOW (browser), midori_view_get_icon (new_view)); + midori_location_action_set_icon (MIDORI_LOCATION_ACTION (action), + midori_view_get_icon (view)); if (browser->proxy_array) - katze_item_set_meta_integer (KATZE_ITEM (browser->proxy_array), "current", new_page); + katze_item_set_meta_integer (KATZE_ITEM (browser->proxy_array), "current", + midori_browser_get_current_page (browser)); g_object_notify (G_OBJECT (browser), "tab"); - g_signal_emit (browser, signals[SWITCH_TAB], 0, old_widget, new_view); - _midori_browser_set_statusbar_text (browser, new_view, NULL); - _midori_browser_update_interface (browser, new_view); - _midori_browser_update_progress (browser, new_view); + _midori_browser_set_statusbar_text (browser, NULL); + _midori_browser_update_interface (browser); + _midori_browser_update_progress (browser, view); } static void -midori_browser_notebook_page_reordered_cb (GtkWidget* notebook, +midori_browser_notebook_page_reordered_cb (GtkNotebook* notebook, MidoriView* view, guint page_num, MidoriBrowser* browser) @@ -5167,9 +5010,19 @@ midori_browser_notebook_page_reordered_cb (GtkWidget* notebook, g_object_notify (G_OBJECT (browser), "tab"); } +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 (GtkWidget* notebook, - GtkWidget* view, +midori_browser_notebook_create_window_cb (GtkNotebook* notebook, + MidoriView* view, gint x, gint y, MidoriBrowser* browser) @@ -5178,119 +5031,18 @@ midori_browser_notebook_create_window_cb (GtkWidget* notebook, 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); + GtkWidget* new_notebook = katze_object_get_object (new_browser, "notebook"); + g_object_unref (new_notebook); + gtk_window_move (GTK_WINDOW (browser), x, y); return new_notebook; } else /* No MidoriApp, so this is app or private mode */ return NULL; } -#ifdef HAVE_GRANITE -static void -midori_browser_notebook_tab_added_cb (GtkWidget* notebook, - GraniteWidgetsTab* tab, - MidoriBrowser* browser) -{ - GtkWidget* view = midori_view_new_with_item (NULL, browser->settings); - midori_view_set_tab (MIDORI_VIEW (view), tab); - midori_browser_connect_tab (browser, view); - /* FIXME: signal add-tab */ - _midori_browser_update_actions (browser); - midori_view_set_uri (MIDORI_VIEW (view), ""); -} - -static gboolean -midori_browser_notebook_tab_removed_cb (GtkWidget* notebook, - GraniteWidgetsTab* tab, - MidoriBrowser* browser) -{ - MidoriView* view = MIDORI_VIEW (granite_widgets_tab_get_page (tab)); - g_signal_emit (browser, signals[REMOVE_TAB], 0, view); - gtk_widget_destroy (view); - return TRUE; -} - -static void -midori_browser_notebook_tab_switched_cb (GraniteWidgetsDynamicNotebook* notebook, - GraniteWidgetsTab* old_tab, - GraniteWidgetsTab* new_tab, - MidoriBrowser* browser) -{ - gint new_pos = granite_widgets_dynamic_notebook_get_tab_position (notebook, new_tab); - - midori_browser_switched_tab (browser, - old_tab ? granite_widgets_tab_get_page (old_tab) : NULL, - MIDORI_VIEW (granite_widgets_tab_get_page (new_tab)), new_pos); -} - -static void -midori_browser_notebook_tab_moved_cb (GtkWidget* notebook, - GraniteWidgetsTab* tab, - gint old_pos, - gboolean new_window, - gint x, - gint y, - MidoriBrowser* browser) -{ - GtkWidget* view = granite_widgets_tab_get_page (tab); - if (new_window) - { - GtkWidget* notebook = midori_browser_notebook_create_window_cb ( - browser->notebook, view, x, y, browser); - if (notebook != NULL) - { - g_object_ref (tab); - granite_widgets_dynamic_notebook_remove_tab ( - GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser->notebook), tab); - granite_widgets_dynamic_notebook_insert_tab ( - GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (notebook), tab, 0); - g_object_unref (tab); - } - } - else - { - gint new_pos = granite_widgets_dynamic_notebook_get_tab_position ( - GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (notebook), tab); - midori_browser_notebook_page_reordered_cb (notebook, - MIDORI_VIEW (view), new_pos, browser); - } -} -#else -static void -midori_browser_notebook_switch_page_cb (GtkWidget* notebook, - gpointer page, - guint page_num, - MidoriBrowser* browser) -{ - midori_browser_switched_tab (browser, - midori_browser_get_current_tab (browser), - MIDORI_VIEW (midori_browser_get_nth_tab (browser, page_num)), page_num); -} - -static void -midori_browser_notebook_page_removed_cb (GtkWidget* notebook, - GtkWidget* view, - guint page_num, - MidoriBrowser* browser) -{ - _midori_browser_remove_tab (browser, view); - midori_browser_notebook_size_allocate_cb (browser->notebook, NULL, browser); -} - -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 void -midori_browser_menu_item_switch_tab_cb (GtkWidget* menuitem, - MidoriBrowser* browser) +midori_browser_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); @@ -5339,7 +5091,7 @@ midori_browser_notebook_button_press_event_after_cb (GtkNotebook* notebook, 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); + G_CALLBACK (midori_browser_switch_tab_cb), browser); i++; } g_list_free (tabs); @@ -5350,7 +5102,6 @@ midori_browser_notebook_button_press_event_after_cb (GtkNotebook* notebook, return FALSE; } -#endif static void _action_undo_tab_close_activate (GtkAction* action, @@ -5396,16 +5147,16 @@ static const GtkActionEntry entries[] = NULL, "o", N_("Open a file"), G_CALLBACK (_action_open_activate) }, { "SaveAs", GTK_STOCK_SAVE_AS, - N_("_Save Page As…"), "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", NULL, G_CALLBACK (_action_add_speed_dial_activate) }, { "AddDesktopShortcut", NULL, #if HAVE_HILDON - N_("Add Shortcut to the _desktop"), "", + N_("Add Shortcut to the _desktop"), "j", #else - N_("Create _Launcher"), "", + N_("Create _Launcher"), "j", #endif NULL, G_CALLBACK (_action_add_desktop_shortcut_activate) }, { "AddNewsFeed", NULL, @@ -5420,15 +5171,9 @@ static const GtkActionEntry entries[] = { "WindowClose", NULL, N_("C_lose Window"), "w", NULL, G_CALLBACK (_action_window_close_activate) }, - #ifdef HAVE_GRANITE - { "Print", "document-export", - N_("_Share"), "p", - NULL, G_CALLBACK (_action_print_activate) }, - #else { "Print", GTK_STOCK_PRINT, NULL, "p", N_("Print the current page"), G_CALLBACK (_action_print_activate) }, - #endif { "Quit", GTK_STOCK_QUIT, N_("Close a_ll Windows"), "q", NULL, G_CALLBACK (_action_quit_activate) }, @@ -5456,7 +5201,7 @@ static const GtkActionEntry entries[] = NULL, "a", NULL, G_CALLBACK (_action_select_all_activate) }, { "Find", GTK_STOCK_FIND, - N_("_Find…"), "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", @@ -5480,7 +5225,7 @@ static const GtkActionEntry entries[] = NULL, "Escape", N_("Stop loading the current page"), G_CALLBACK (_action_reload_stop_activate) }, { "ReloadStop", GTK_STOCK_STOP, - NULL, "", + NULL, "r", N_("Reload the current page"), G_CALLBACK (_action_reload_stop_activate) }, { "ZoomIn", GTK_STOCK_ZOOM_IN, NULL, "plus", @@ -5513,9 +5258,6 @@ static const GtkActionEntry entries[] = { "ScrollRight", NULL, N_("Scroll _Right"), "l", NULL, G_CALLBACK (_action_scroll_somewhere_activate) }, - { "Readable", NULL, - N_("_Readable"), "R", - NULL, G_CALLBACK (_action_readable_activate) }, { "Go", NULL, N_("_Go") }, { "Back", GTK_STOCK_GO_BACK, @@ -5532,11 +5274,8 @@ static const GtkActionEntry entries[] = NULL, "Right", /* i18n: Visit the following logical page, ie. in a forum or blog */ N_("Go to the next sub-page"), G_CALLBACK (_action_navigation_activate) }, - { "NextForward", GTK_STOCK_MEDIA_NEXT, - NULL, "", - N_("Go to the next sub-page"), G_CALLBACK (_action_navigation_activate) }, - { "Homepage", GTK_STOCK_HOME, - N_("_Homepage"), "Home", + { "Homepage", STOCK_HOMEPAGE, + NULL, "Home", N_("Go to your homepage"), G_CALLBACK (_action_navigation_activate) }, { "TrashEmpty", GTK_STOCK_CLEAR, N_("Empty Trash"), "", @@ -5578,7 +5317,7 @@ static const GtkActionEntry entries[] = { "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 _Current Tab"), "Home", NULL, G_CALLBACK (_action_tab_current_activate) }, { "NextView", NULL, N_("Focus _Next view"), "F6", @@ -5601,12 +5340,12 @@ static const GtkActionEntry entries[] = N_("_Frequent Questions"), "F1", NULL, G_CALLBACK (_action_help_link_activate) }, { "HelpBugs", NULL, - N_("_Report a Problem…"), NULL, + N_("_Report a Problem..."), NULL, NULL, G_CALLBACK (_action_help_link_activate) }, { "About", GTK_STOCK_ABOUT, NULL, "", NULL, G_CALLBACK (_action_about_activate) }, - { "Dummy", NULL, N_("_Tools") }, + { "Dummy", NULL, "Dummy" }, }; static const guint entries_n = G_N_ELEMENTS (entries); @@ -5629,7 +5368,7 @@ static const GtkToggleActionEntry toggle_entries[] = NULL, G_CALLBACK (_action_bookmarkbar_activate), FALSE }, { "Statusbar", NULL, - N_("_Statusbar"), "j", + N_("_Statusbar"), "", NULL, G_CALLBACK (_action_statusbar_activate), FALSE }, }; @@ -5641,10 +5380,7 @@ static const GtkRadioActionEntry encoding_entries[] = N_("_Automatic"), "", NULL, 1 }, { "EncodingChinese", NULL, - N_("Chinese Traditional (BIG5)"), "", - NULL, 1 }, - { "EncodingChineseSimplified", NULL, - N_("Chinese Simplified (GB18030)"), "", + N_("Chinese (BIG5)"), "", NULL, 1 }, { "EncodingJapanese", NULL, /* i18n: A double underscore "__" is used to prevent the mnemonic */ @@ -5663,7 +5399,7 @@ static const GtkRadioActionEntry encoding_entries[] = N_("Western (ISO-8859-1)"), "", NULL, 1 }, { "EncodingCustom", NULL, - N_("Custom…"), "", + N_("Custom..."), "", NULL, 1 }, }; static const guint encoding_entries_n = G_N_ELEMENTS (encoding_entries); @@ -5680,6 +5416,19 @@ midori_browser_window_state_event_cb (MidoriBrowser* browser, 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 @@ -5745,15 +5494,13 @@ midori_browser_destroy_cb (MidoriBrowser* browser) /* Destroy panel first, so panels don't need special care */ gtk_widget_destroy (browser->panel); - #ifndef HAVE_GRANITE + /* 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); - #endif - /* Destroy tabs second, so child widgets don't need special care */ gtk_container_foreach (GTK_CONTAINER (browser->notebook), (GtkCallback) gtk_widget_destroy, NULL); } @@ -5818,7 +5565,6 @@ static const gchar* ui_markup = "" "" "" - "" "" "" "" @@ -5828,7 +5574,6 @@ static const gchar* ui_markup = "" "" "" - "" "" "" "" @@ -5851,7 +5596,6 @@ static const gchar* ui_markup = "" /* For accelerators to work all actions need to be used *somewhere* in the UI definition */ - /* These also show up in Unity's HUD */ "" "" "" @@ -5907,7 +5651,7 @@ midori_browser_realize_cb (GtkStyle* style, if (gtk_icon_theme_has_icon (icon_theme, "midori")) gtk_window_set_icon_name (GTK_WINDOW (browser), "midori"); else - gtk_window_set_icon_name (GTK_WINDOW (browser), STOCK_WEB_BROWSER); + gtk_window_set_icon_name (GTK_WINDOW (browser), "web-browser"); } } @@ -5986,7 +5730,8 @@ midori_browser_accel_switch_tab_activate_cb (GtkAccelGroup* accel_group, /* 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 = midori_browser_get_nth_tab (browser, n < 9 ? n - 1 : -1))) + if ((view = gtk_notebook_get_nth_page (GTK_NOTEBOOK (browser->notebook), + n < 9 ? n - 1 : -1))) midori_browser_set_current_tab (browser, view); } } @@ -6112,15 +5857,15 @@ midori_browser_init (MidoriBrowser* browser) GtkSettings* gtk_settings; GtkWidget* hpaned; GtkWidget* vpaned; + GtkRcStyle* rcstyle; 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->dial = NULL; + browser->speeddial = NULL; /* Setup the window metrics */ g_signal_connect (browser, "realize", @@ -6132,10 +5877,7 @@ midori_browser_init (MidoriBrowser* browser) g_signal_connect (browser, "destroy", G_CALLBACK (midori_browser_destroy_cb), NULL); gtk_window_set_role (GTK_WINDOW (browser), "browser"); - gtk_window_set_icon_name (GTK_WINDOW (browser), STOCK_WEB_BROWSER); - #if GTK_CHECK_VERSION (3, 4, 0) - gtk_window_set_hide_titlebar_when_maximized (GTK_WINDOW (browser), TRUE); - #endif + gtk_window_set_icon_name (GTK_WINDOW (browser), "web-browser"); vbox = gtk_vbox_new (FALSE, 0); gtk_container_add (GTK_CONTAINER (browser), vbox); gtk_widget_show (vbox); @@ -6169,7 +5911,7 @@ midori_browser_init (MidoriBrowser* browser) } /* Hide the 'Dummy' which only holds otherwise unused actions */ - _action_set_visible (browser, "Dummy", FALSE); + g_object_set (_action_by_name (browser, "Dummy"), "visible", FALSE, NULL); action = g_object_new (KATZE_TYPE_SEPARATOR_ACTION, "name", "Separator", @@ -6180,7 +5922,7 @@ midori_browser_init (MidoriBrowser* browser) action = g_object_new (MIDORI_TYPE_LOCATION_ACTION, "name", "Location", - "label", _("_Location…"), + "label", _("_Location..."), "stock-id", GTK_STOCK_JUMP_TO, "tooltip", _("Open a particular location"), NULL); @@ -6204,7 +5946,7 @@ midori_browser_init (MidoriBrowser* browser) action = g_object_new (MIDORI_TYPE_SEARCH_ACTION, "name", "Search", - "label", _("_Web Search…"), + "label", _("_Web Search..."), "stock-id", GTK_STOCK_FIND, "tooltip", _("Run a web search"), NULL); @@ -6244,14 +5986,12 @@ midori_browser_init (MidoriBrowser* browser) 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", dummy_array /* updated, unique */, + "array", browser->proxy_array, /* Use a non-empty array here */ NULL); g_object_connect (action, "signal::populate-folder", @@ -6261,15 +6001,12 @@ midori_browser_init (MidoriBrowser* browser) 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", dummy_array /* updated, unique */, + "array", katze_array_new (KATZE_TYPE_ITEM), NULL); g_object_connect (action, "signal::populate-popup", @@ -6279,7 +6016,6 @@ midori_browser_init (MidoriBrowser* browser) 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", @@ -6315,7 +6051,6 @@ midori_browser_init (MidoriBrowser* browser) 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 (); @@ -6347,6 +6082,7 @@ midori_browser_init (MidoriBrowser* browser) #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); @@ -6369,6 +6105,9 @@ midori_browser_init (MidoriBrowser* browser) 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 _action_set_sensitive (browser, "EncodingCustom", FALSE); _action_set_visible (browser, "LastSession", FALSE); #if !HAVE_HILDON && !defined (GDK_WINDOWING_X11) @@ -6386,7 +6125,9 @@ midori_browser_init (MidoriBrowser* browser) /* Create the navigationbar */ browser->navigationbar = gtk_ui_manager_get_widget ( ui_manager, "/toolbar_navigation"); - katze_widget_add_class (browser->navigationbar, "primary-toolbar"); +#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) @@ -6418,7 +6159,10 @@ midori_browser_init (MidoriBrowser* browser) /* Bookmarkbar */ browser->bookmarkbar = gtk_toolbar_new (); - katze_widget_add_class (browser->bookmarkbar, "secondary-toolbar"); +#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); @@ -6462,51 +6206,23 @@ midori_browser_init (MidoriBrowser* browser) 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 (); - granite_widgets_dynamic_notebook_set_allow_new_window ( - GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser->notebook), TRUE); - /* FIXME: work-around a bug */ - gtk_widget_show_all (browser->notebook); - #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 */ - GtkRcStyle* rcstyle = gtk_rc_style_new (); + rcstyle = gtk_rc_style_new (); rcstyle->xthickness = 0; gtk_widget_modify_style (browser->notebook, rcstyle); g_object_unref (rcstyle); - } - #endif + gtk_notebook_set_scrollable (GTK_NOTEBOOK (browser->notebook), TRUE); gtk_paned_pack1 (GTK_PANED (vpaned), browser->notebook, FALSE, FALSE); - #ifdef HAVE_GRANITE - /* FIXME menu items */ - g_signal_connect (browser->notebook, "tab-added", - G_CALLBACK (midori_browser_notebook_tab_added_cb), - browser); - g_signal_connect (browser->notebook, "tab-removed", - G_CALLBACK (midori_browser_notebook_tab_removed_cb), - browser); - g_signal_connect (browser->notebook, "tab-switched", - G_CALLBACK (midori_browser_notebook_tab_switched_cb), - browser); - g_signal_connect (browser->notebook, "tab-moved", - G_CALLBACK (midori_browser_notebook_tab_moved_cb), - browser); - #else g_signal_connect (browser->notebook, "switch-page", - G_CALLBACK (midori_browser_notebook_switch_page_cb), + G_CALLBACK (gtk_notebook_switch_page_cb), browser); + g_signal_connect_after (browser->notebook, "switch-page", + G_CALLBACK (gtk_notebook_switch_page_after_cb), + browser); 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); @@ -6517,7 +6233,6 @@ midori_browser_init (MidoriBrowser* browser) 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); - #endif gtk_widget_show (browser->notebook); /* Inspector container */ @@ -6570,12 +6285,7 @@ midori_browser_init (MidoriBrowser* browser) gtk_box_pack_start (GTK_BOX (vbox), browser->statusbar, FALSE, FALSE, 0); 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); @@ -6611,7 +6321,7 @@ midori_browser_finalize (GObject* object) katze_object_assign (browser->trash, NULL); katze_object_assign (browser->search_engines, NULL); katze_object_assign (browser->history, NULL); - browser->dial = NULL; + browser->speeddial = NULL; katze_assign (browser->news_aggregator, NULL); @@ -6655,97 +6365,6 @@ _midori_browser_set_toolbar_style (MidoriBrowser* browser, 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, @@ -6765,29 +6384,11 @@ midori_browser_toolbar_item_button_press_event_cb (GtkWidget* toolitem, } else if (MIDORI_EVENT_CONTEXT_MENU (event)) { - 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, - 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)) ? + midori_browser_toolbar_popup_context_menu_cb ( + 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); - } + event->x, event->y, event->button, browser); + return TRUE; } return FALSE; @@ -6877,28 +6478,14 @@ _midori_browser_set_toolbar_items (MidoriBrowser* browser, } 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); @@ -6976,15 +6563,8 @@ _midori_browser_update_settings (MidoriBrowser* browser) "news-aggregator", &browser->news_aggregator, NULL); - #ifdef HAVE_GRANITE - granite_widgets_dynamic_notebook_set_tabs_closable ( - GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser->notebook), close_buttons_on_tabs); - #endif midori_findbar_set_close_button_left (MIDORI_FINDBAR (browser->find), katze_object_get_boolean (browser->settings, "close-buttons-left")); - if (browser->dial != NULL) - midori_speed_dial_set_close_buttons_left (browser->dial, - katze_object_get_boolean (browser->settings, "close-buttons-left")); if (remember_last_window_size) { @@ -7096,21 +6676,29 @@ midori_browser_settings_notify (MidoriWebSettings* web_settings, _toggle_tabbar_smartly (browser, FALSE); else if (name == g_intern_string ("show-menubar")) { - _action_set_active (browser, "Menubar", g_value_get_boolean (&value)); + gtk_toggle_action_set_active ( + GTK_TOGGLE_ACTION (_action_by_name (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)); + gtk_toggle_action_set_active ( + GTK_TOGGLE_ACTION (_action_by_name (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)); + gtk_toggle_action_set_active ( + GTK_TOGGLE_ACTION (_action_by_name (browser, "Bookmarkbar")), + g_value_get_boolean (&value)); } else if (name == g_intern_string ("show-statusbar")) { browser->show_statusbar = g_value_get_boolean (&value); - _action_set_active (browser, "Statusbar", g_value_get_boolean (&value)); + gtk_toggle_action_set_active ( + GTK_TOGGLE_ACTION (_action_by_name (browser, "Statusbar")), + g_value_get_boolean (&value)); } else if (name == g_intern_string ("location-entry-search")) { @@ -7126,8 +6714,6 @@ midori_browser_settings_notify (MidoriWebSettings* web_settings, { midori_findbar_set_close_button_left (MIDORI_FINDBAR (browser->find), g_value_get_boolean (&value)); - midori_speed_dial_set_close_buttons_left (browser->dial, - katze_object_get_boolean (browser->settings, "close-buttons-left")); } else if (!g_object_class_find_property (G_OBJECT_GET_CLASS (web_settings), name)) @@ -7193,7 +6779,6 @@ midori_bookmarkbar_remove_item_cb (KatzeArray* bookmarks, { if (gtk_widget_get_visible (browser->bookmarkbar)) midori_bookmarkbar_populate (browser); - midori_browser_update_history (item, "bookmark", "delete"); } static void @@ -7209,10 +6794,9 @@ midori_bookmarkbar_populate (MidoriBrowser* browser) gtk_separator_tool_item_new (), -1); array = midori_array_query (browser->bookmarks, - "id, parentid, title, uri, desc, app, toolbar, pos_panel, pos_bar", "toolbar = 1", NULL); + "uri, title, desc, app, folder, toolbar", "toolbar = 1", NULL); if (!array) { - g_warning ("midori_array_query returned NULL"); _action_set_sensitive (browser, "BookmarkAdd", FALSE); _action_set_sensitive (browser, "BookmarkFolderAdd", FALSE); return; @@ -7224,22 +6808,10 @@ midori_bookmarkbar_populate (MidoriBrowser* browser) midori_bookmarkbar_insert_item (browser->bookmarkbar, item); else { - gint64 id = katze_item_get_meta_integer (item, "id"); - gchar* parentid = g_strdup_printf ("%" G_GINT64_FORMAT, id); KatzeArray* subfolder = midori_array_query (browser->bookmarks, - "id, parentid, title, uri, desc, app, toolbar, pos_panel, pos_bar", "parentid = %q AND uri != ''", - parentid); - - if (subfolder) - { - katze_item_set_name (KATZE_ITEM (subfolder), katze_item_get_name (item)); - katze_item_set_meta_integer (KATZE_ITEM (subfolder), "id", id); - midori_bookmarkbar_insert_item (browser->bookmarkbar, KATZE_ITEM (subfolder)); - } - else - g_warning ("midori_array_query returned NULL (id='%s')", parentid); - - g_free (parentid); + "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)); } } _action_set_sensitive (browser, "BookmarkAdd", TRUE); @@ -7327,9 +6899,7 @@ midori_browser_set_property (GObject* object, midori_browser_set_current_tab (browser, g_value_get_object (value)); break; case PROP_STATUSBAR_TEXT: - _midori_browser_set_statusbar_text (browser, - MIDORI_VIEW (midori_browser_get_current_tab (browser)), - g_value_get_string (value)); + _midori_browser_set_statusbar_text (browser, g_value_get_string (value)); break; case PROP_SETTINGS: g_signal_handlers_disconnect_by_func (browser->settings, @@ -7342,7 +6912,7 @@ midori_browser_set_property (GObject* object, _midori_browser_update_settings (browser); g_signal_connect (browser->settings, "notify", G_CALLBACK (midori_browser_settings_notify), browser); - midori_browser_foreach (browser, + gtk_container_foreach (GTK_CONTAINER (browser->notebook), (GtkCallback) midori_view_set_settings, browser->settings); break; case PROP_BOOKMARKS: @@ -7390,9 +6960,7 @@ midori_browser_set_property (GObject* object, midori_browser_set_history (browser, g_value_get_object (value)); break; case PROP_SPEED_DIAL: - browser->dial = g_value_get_pointer (value); - g_signal_connect (browser->dial, "refresh", - G_CALLBACK (midori_browser_speed_dial_refresh_cb), browser); + browser->speeddial = g_value_get_pointer (value); break; case PROP_SHOW_TABS: browser->show_tabs = g_value_get_boolean (value); @@ -7464,7 +7032,7 @@ midori_browser_get_property (GObject* object, g_value_set_object (value, browser->history); break; case PROP_SPEED_DIAL: - g_value_set_pointer (value, browser->dial); + g_value_set_pointer (value, browser->speeddial); break; case PROP_SHOW_TABS: g_value_set_boolean (value, browser->show_tabs); @@ -7516,39 +7084,9 @@ midori_browser_add_tab (MidoriBrowser* browser, 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_get_tab_position ( - GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser->notebook), - midori_view_get_tab (MIDORI_VIEW (view))); -#else return gtk_notebook_page_num (GTK_NOTEBOOK (browser->notebook), view); -#endif } - /** * midori_browser_remove_tab: * @browser: a #MidoriBrowser @@ -7565,13 +7103,6 @@ midori_browser_remove_tab (MidoriBrowser* browser, g_return_if_fail (GTK_IS_WIDGET (view)); g_signal_emit (browser, signals[REMOVE_TAB], 0, view); - #ifdef HAVE_GRANITE - granite_widgets_dynamic_notebook_remove_tab ( - GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser->notebook), - midori_view_get_tab (MIDORI_VIEW (view))); - #else - gtk_widget_destroy (view); - #endif } /** @@ -7800,18 +7331,12 @@ midori_browser_set_current_page (MidoriBrowser* browser, g_return_if_fail (MIDORI_IS_BROWSER (browser)); - view = midori_browser_get_nth_tab (browser, n); + view = gtk_notebook_get_nth_page (GTK_NOTEBOOK (browser->notebook), n); g_return_if_fail (view != NULL); - #ifdef HAVE_GRANITE - granite_widgets_dynamic_notebook_set_current ( - GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser->notebook), - midori_view_get_tab (MIDORI_VIEW (view))); - #else gtk_notebook_set_current_page (GTK_NOTEBOOK (browser->notebook), n); - #endif if (midori_view_is_blank (MIDORI_VIEW (view))) - midori_browser_activate_action (browser, "Location"); + gtk_action_activate (_action_by_name (browser, "Location")); else gtk_widget_grab_focus (view); @@ -7836,14 +7361,7 @@ midori_browser_get_current_page (MidoriBrowser* browser) { g_return_val_if_fail (MIDORI_IS_BROWSER (browser), -1); - #ifdef HAVE_GRANITE - GraniteWidgetsTab* tab = granite_widgets_dynamic_notebook_get_current ( - GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser->notebook)); - return tab ? granite_widgets_dynamic_notebook_get_tab_position ( - GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser->notebook), tab) : -1; - #else return gtk_notebook_get_current_page (GTK_NOTEBOOK (browser->notebook)); - #endif } /** @@ -7863,19 +7381,9 @@ GtkWidget* 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_tab_by_index ( - GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser->notebook), page); - return tab != NULL ? granite_widgets_tab_get_page (tab) : NULL; -#else g_return_val_if_fail (MIDORI_IS_BROWSER (browser), NULL); return gtk_notebook_get_nth_page (GTK_NOTEBOOK (browser->notebook), page); -#endif } /** @@ -7898,7 +7406,7 @@ midori_browser_set_current_tab (MidoriBrowser* browser, g_return_if_fail (MIDORI_IS_BROWSER (browser)); g_return_if_fail (GTK_IS_WIDGET (view)); - n = midori_browser_page_num (browser, view); + n = gtk_notebook_page_num (GTK_NOTEBOOK (browser->notebook), view); midori_browser_set_current_page (browser, n); } @@ -7919,22 +7427,15 @@ midori_browser_set_current_tab (MidoriBrowser* browser, GtkWidget* midori_browser_get_current_tab (MidoriBrowser* browser) { - #ifdef HAVE_GRANITE - GraniteWidgetsTab* tab; - #else gint n; - #endif g_return_val_if_fail (MIDORI_IS_BROWSER (browser), NULL); - #ifdef HAVE_GRANITE - tab = granite_widgets_dynamic_notebook_get_current ( - GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser->notebook)); - return tab ? granite_widgets_tab_get_page (tab) : NULL; - #else - n = midori_browser_get_current_page (browser); - return (n >= 0) ? midori_browser_get_nth_tab (browser, n) : NULL; - #endif + n = gtk_notebook_get_current_page (GTK_NOTEBOOK (browser->notebook)); + if (n >= 0) + return gtk_notebook_get_nth_page (GTK_NOTEBOOK (browser->notebook), n); + else + return NULL; } /** diff --git a/midori/midori-browser.h b/midori/midori-browser.h index 320006a3..a3cc979d 100644 --- a/midori/midori-browser.h +++ b/midori/midori-browser.h @@ -152,16 +152,9 @@ GtkWidget* 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); -gint -midori_browser_get_n_pages (MidoriBrowser* browser); - KatzeArray* midori_browser_get_proxy_items (MidoriBrowser* browser); @@ -180,11 +173,6 @@ midori_browser_get_toolbar_actions (MidoriBrowser* browser); MidoriWebSettings* midori_browser_get_settings (MidoriBrowser* browser); -void -midori_browser_update_history (KatzeItem* item, - const gchar* type, - const gchar* event); - G_END_DECLS #endif /* __MIDORI_BROWSER_H__ */ diff --git a/midori/midori-download.vala b/midori/midori-download.vala deleted file mode 100644 index 32d9464b..00000000 --- a/midori/midori-download.vala +++ /dev/null @@ -1,320 +0,0 @@ -/* - 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 - 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 Sokoke { - extern static bool show_uri (Gdk.Screen screen, string uri, uint32 timestamp) throws Error; - extern static bool message_dialog (Gtk.MessageType type, string short, string detailed, bool modal); -} - -namespace Midori { - namespace Download { - public static bool is_finished (WebKit.Download download) { - switch (download.status) { - case WebKit.DownloadStatus.FINISHED: - case WebKit.DownloadStatus.CANCELLED: - case WebKit.DownloadStatus.ERROR: - return true; - default: - return false; - } - } - - public static int get_type (WebKit.Download download) { - return download.get_data ("midori-download-type"); - } - - public static void set_type (WebKit.Download download, int type) { - download.set_data ("midori-download-type", type); - } - - public static double get_progress (WebKit.Download download) { - /* Avoid a bug in WebKit */ - if (download.status == WebKit.DownloadStatus.CREATED) - return 0.0; - return download.progress; - } - - public static string get_tooltip (WebKit.Download download) { - string filename = Path.get_basename (download.destination_uri); - /* i18n: Download tooltip (size): 4KB of 43MB */ - string size = _("%s of %s").printf ( - format_size (download.current_size), - format_size (download.total_size)); - - /* Finished, no speed or remaining time */ - if (is_finished (download) || download.status == WebKit.DownloadStatus.CREATED) - return "%s\n%s".printf (filename, size); - - uint64 total_size = download.total_size, current_size = download.current_size; - double elapsed = download.get_elapsed_time (), - diff = elapsed / current_size, - estimated = (total_size - current_size) * diff; - int hour = 3600, minute = 60; - int hours = (int)(estimated / hour), - minutes = (int)((estimated - (hours * hour)) / minute), - seconds = (int)((estimated - (hours * hour) - (minutes * minute))); - string hours_ = ngettext ("%d hour", "%d hours", hours).printf (hours); - string minutes_ = ngettext ("%d minute", "%d minutes", minutes).printf (minutes); - string seconds_ = ngettext ("%d second", "%d seconds", seconds).printf (seconds); - double last_time = download.get_data ("last-time"); - uint64 last_size = download.get_data ("last-size"); - - string eta = ""; - if (estimated > 0) { - if (hours > 0) - eta = hours_ + ", " + minutes_; - else if (minutes >= 10) - eta = minutes_; - else if (minutes < 10 && minutes > 0) - eta = minutes_ + ", " + seconds_; - else if (seconds > 0) - eta = seconds_; - if (eta != "") - /* i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning */ - eta = _(" - %s remaining").printf (eta); - } - - string speed; - if (elapsed != last_time) { - speed = format_size ((uint64)( - (current_size - last_size) / (elapsed - last_time))); - } - else - /* i18n: Unknown number of bytes, used for transfer rate like ?B/s */ - speed = _("?B"); - /* i18n: Download tooltip (transfer rate): (130KB/s) */ - speed = _(" (%s/s)").printf (speed); - if (elapsed - last_time > 5.0) { - download.set_data ("last-time", (int)elapsed); - download.set_data ("last-size", current_size); - } - - return "%s\n%s %s%s".printf (filename, size, speed, eta); - } - - public static string get_content_type (WebKit.Download download, string? mime_type) { - string? content_type = ContentType.guess (download.suggested_filename, null, null); - if (content_type == null) { - content_type = ContentType.from_mime_type (mime_type); - if (content_type == null) - content_type = ContentType.from_mime_type ("application/octet-stream"); - } - return content_type; - } - - public static bool has_wrong_checksum (WebKit.Download download) { - int status = download.get_data ("checksum-status"); - if (status == 0) { - /* Link Fingerprint */ - string? original_uri = download.network_request.get_data ("midori-original-uri"); - if (original_uri == null) - original_uri = download.get_uri (); - string? fingerprint; - ChecksumType checksum_type = URI.get_fingerprint (original_uri, out fingerprint, null); - /* By default, no wrong checksum */ - status = 2; - if (fingerprint != null) { - try { - string filename = Filename.from_uri (download.destination_uri); - string contents; - size_t length; - bool y = FileUtils.get_contents (filename, out contents, out length); - string checksum = Checksum.compute_for_string (checksum_type, contents, length); - /* Checksums are case-insensitive */ - if (!y || fingerprint.ascii_casecmp (checksum) != 0) - status = 1; /* wrong checksum */ - } - catch (Error error) { - status = 1; /* wrong checksum */ - } - } - download.set_data ("checksum-status", status); - } - return status == 1; - } - - public static bool action_clear (WebKit.Download download, Gtk.Widget widget) throws Error { - switch (download.status) { - case WebKit.DownloadStatus.CREATED: - case WebKit.DownloadStatus.STARTED: - download.cancel (); - break; - case WebKit.DownloadStatus.FINISHED: - if (open (download, widget)) - return true; - break; - case WebKit.DownloadStatus.CANCELLED: - return true; - default: - critical ("action_clear: %d", download.status); - warn_if_reached (); - break; - } - return false; - } - - public static string action_stock_id (WebKit.Download download) { - switch (download.status) { - case WebKit.DownloadStatus.CREATED: - case WebKit.DownloadStatus.STARTED: - return Gtk.Stock.CANCEL; - case WebKit.DownloadStatus.FINISHED: - if (has_wrong_checksum (download)) - return Gtk.Stock.DIALOG_WARNING; - return Gtk.Stock.OPEN; - case WebKit.DownloadStatus.CANCELLED: - return Gtk.Stock.CLEAR; - default: - critical ("action_stock_id: %d", download.status); - warn_if_reached (); - return Gtk.Stock.MISSING_IMAGE; - } - } - - public static bool open (WebKit.Download download, Gtk.Widget widget) throws Error { - if (!has_wrong_checksum (download)) - return Sokoke.show_uri (widget.get_screen (), - download.destination_uri, Gtk.get_current_event_time ()); - - Sokoke.message_dialog (Gtk.MessageType.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); - return false; - } - - public unowned string fallback_extension (string? extension, string mime_type) { - if (extension != null && extension[0] != '\0') - return extension; - if ("css" in mime_type) - return ".css"; - if ("javascript" in mime_type) - return ".js"; - if ("html" in mime_type) - return ".htm"; - if ("plain" in mime_type) - return ".txt"; - return ""; - } - - public string clean_filename (string filename) { - #if HAVE_WIN32 - return filename.delimit ("/\\<>:\"|?*", '_'); - #else - return filename.delimit ("/", '_'); - #endif - } - - public string get_suggested_filename (WebKit.Download download) { - /* https://bugs.webkit.org/show_bug.cgi?id=83161 - https://d19vezwu8eufl6.cloudfront.net/nlp/slides%2F03-01-FormalizingNB.pdf */ - return clean_filename (download.get_suggested_filename ()); - } - - public string get_filename_suggestion_for_uri (string mime_type, string uri) { - /* Try to provide a good default filename, UTF-8 encoded */ - string filename = clean_filename (Soup.URI.decode (uri)); - /* Take the rest of the URI if needed */ - if (filename.has_suffix ("/") || uri.index_of_char ('.') == -1) - return Path.build_filename (filename, fallback_extension (null, mime_type)); - return filename; - } - - public static string? get_extension_for_uri (string uri, out string basename = null) { - if (&basename != null) - basename = null; - /* Find the last slash and the last period *after* the last slash. */ - int last_slash = uri.last_index_of_char ('/'); - /* Huh, URI without slashes? */ - if (last_slash == -1) - return null; - int period = uri.last_index_of_char ('.', last_slash); - if (period == -1) - return null; - /* The extension, or "." if it ended with a period */ - string extension = uri.substring (period, -1); - if (&basename != null) - basename = uri.substring (0, period); - return extension; - - } - - public string get_unique_filename (string filename) { - if (Posix.access (filename, Posix.F_OK) == 0) { - string basename; - string? extension = get_extension_for_uri (filename, out basename); - string? new_filename = null; - int i = 0; - do { - new_filename = "%s-%d%s".printf (basename, i++, extension ?? ""); - } while (Posix.access (new_filename, Posix.F_OK) == 0); - return new_filename; - } - return filename; - } - - public string prepare_destination_uri (WebKit.Download download, string? folder) { - string suggested_filename = get_suggested_filename (download); - string basename = File.new_for_uri (suggested_filename).get_basename (); - string download_dir; - if (folder == null) { - download_dir = Paths.get_tmp_dir (); - Katze.mkdir_with_parents (download_dir, 0700); - } - else - download_dir = folder; - string destination_filename = Path.build_filename (download_dir, basename); - try { - return Filename.to_uri (get_unique_filename (destination_filename)); - } - catch (Error error) { - return "file://" + destination_filename; - } - } - - public static bool has_enough_space (WebKit.Download download, string uri) { - var folder = File.new_for_uri (uri).get_parent (); - bool can_write; - uint64 free_space; - try { - var info = folder.query_filesystem_info ("filesystem::free"); - free_space = info.get_attribute_uint64 ("filesystem::free"); - info = folder.query_info ("access::can-write", 0); - can_write = info.get_attribute_boolean ("access::can-write"); - } - catch (Error error) { - can_write = false; - free_space = 0; - } - - if (free_space < download.total_size || !can_write) { - string message; - string detailed_message; - if (!can_write) { - message = _("The file \"%s\" can't be saved in this folder.").printf ( - Path.get_basename (uri)); - detailed_message = _("You don't have permission to write in this location."); - } - else if (free_space < download.total_size) { - message = _("There is not enough free space to download \"%s\".").printf ( - Path.get_basename (uri)); - detailed_message = _("The file needs %s but only %s are left.").printf ( - format_size (download.total_size), format_size (free_space)); - } - else - assert_not_reached (); - Sokoke.message_dialog (Gtk.MessageType.ERROR, message, detailed_message, false); - return false; - } - return true; - } - } -} diff --git a/midori/midori-extension.c b/midori/midori-extension.c index 01f518cc..7927e72f 100644 --- a/midori/midori-extension.c +++ b/midori/midori-extension.c @@ -14,7 +14,6 @@ #include #include "midori-platform.h" -#include "midori-core.h" #include G_DEFINE_TYPE (MidoriExtension, midori_extension, G_TYPE_OBJECT); @@ -26,7 +25,6 @@ struct _MidoriExtensionPrivate gchar* version; gchar* authors; gchar* website; - gchar* key; MidoriApp* app; gint active; @@ -129,8 +127,7 @@ enum PROP_DESCRIPTION, PROP_VERSION, PROP_AUTHORS, - PROP_WEBSITE, - PROP_KEY + PROP_WEBSITE }; enum { @@ -263,23 +260,6 @@ midori_extension_class_init (MidoriExtensionClass* class) 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)); } @@ -318,10 +298,10 @@ midori_extension_activate_cb (MidoriExtension* extension, strlen (filename) - strlen ("." G_MODULE_SUFFIX)); else filename = g_strdup (filename); - folder = g_build_filename ("extensions", filename, NULL); + folder = g_strconcat ("extensions/", filename, NULL); g_free (filename); katze_assign (config_file, - midori_paths_get_preset_filename (folder, "config")); + sokoke_find_config_filename (folder, "config")); g_free (folder); g_key_file_load_from_file (extension->priv->key_file, config_file, G_KEY_FILE_KEEP_COMMENTS, NULL); @@ -341,32 +321,29 @@ midori_extension_activate_cb (MidoriExtension* extension, if (setting->type == G_TYPE_BOOLEAN) { MESettingBoolean* setting_ = (MESettingBoolean*)setting; - if (extension->priv->key_file - && g_key_file_has_key (extension->priv->key_file, "settings", setting_->name, NULL)) - setting_->value = g_key_file_get_boolean (extension->priv->key_file, - "settings", setting->name, NULL); + if (extension->priv->key_file) + setting_->value = sokoke_key_file_get_boolean_default ( + extension->priv->key_file, + "settings", setting->name, setting_->default_value, NULL); else setting_->value = setting_->default_value; } else if (setting->type == G_TYPE_INT) { MESettingInteger* setting_ = (MESettingInteger*)setting; - if (extension->priv->key_file - && g_key_file_has_key (extension->priv->key_file, "settings", setting_->name, NULL)) - setting_->value = g_key_file_get_integer (extension->priv->key_file, - "settings", setting_->name, NULL); + if (extension->priv->key_file) + setting_->value = sokoke_key_file_get_integer_default ( + extension->priv->key_file, + "settings", setting->name, setting_->default_value, NULL); else setting_->value = setting_->default_value; } else if (setting->type == G_TYPE_STRING) { if (extension->priv->key_file) - { - setting->value = g_key_file_get_string ( - extension->priv->key_file, "settings", setting->name, NULL); - if (setting->value == NULL) - setting->value = setting->default_value; - } + setting->value = sokoke_key_file_get_string_default ( + extension->priv->key_file, + "settings", setting->name, setting->default_value, NULL); else setting->value = g_strdup (setting->default_value); } @@ -375,10 +352,10 @@ midori_extension_activate_cb (MidoriExtension* extension, MESettingStringList* setting_ = (MESettingStringList*)setting; if (extension->priv->key_file) { - setting_->value = g_key_file_get_string_list (extension->priv->key_file, - "settings", setting->name, &setting_->length, NULL); - if (setting_->value == NULL) - setting_->value = g_strdupv (setting_->default_value); + setting_->value = sokoke_key_file_get_string_list_default ( + extension->priv->key_file, + "settings", setting->name, &setting_->length, + setting_->default_value, &setting_->default_length, NULL); } else setting_->value = g_strdupv (setting_->default_value); @@ -423,7 +400,6 @@ midori_extension_finalize (GObject* object) 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); @@ -470,9 +446,6 @@ midori_extension_set_property (GObject* object, 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; @@ -504,9 +477,6 @@ midori_extension_get_property (GObject* object, 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; @@ -649,11 +619,10 @@ midori_extension_get_config_dir (MidoriExtension* extension) if (!extension->priv->config_dir) { gchar* filename = g_object_get_data (G_OBJECT (extension), "filename"); - if (filename != NULL) - extension->priv->config_dir = g_build_filename ( - midori_paths_get_config_dir (), "extensions", filename, NULL); - else - extension->priv->config_dir = NULL; + if (!filename) + return "/"; + extension->priv->config_dir = g_build_filename ( + sokoke_set_config_dir (NULL), "extensions", filename, NULL); } return extension->priv->config_dir; diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c index 5bd0b7da..47d2e3d0 100644 --- a/midori/midori-locationaction.c +++ b/midori/midori-locationaction.c @@ -277,175 +277,43 @@ midori_location_action_create_model (void) } static void -midori_location_action_popup_position (MidoriLocationAction* action, - gint matches) +midori_location_action_popup_position (GtkWidget* popup, + GtkWidget* widget) { - GtkWidget* popup = action->popup; - GtkWidget* widget = action->entry; GdkWindow* window = gtk_widget_get_window (widget); - gint wx, wy, x_border, y_border, items; + gint wx, wy; 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; - - if (!window) - return; + GtkAllocation allocation; - 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; + if (!gtk_widget_get_has_window (widget)) + { + GtkAllocation alloc; + gtk_widget_get_allocation (widget, &alloc); + wx += alloc.x; + wy += alloc.y; + } - 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; + gtk_widget_size_request (popup, &menu_req); + gtk_widget_size_request (widget, &widget_req); - /* Constrain to screen/ window size */ screen = gtk_widget_get_screen (widget); 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; - 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; - #ifndef G_OS_WIN32 - GtkStyle* style; - #endif - - gtk_widget_realize (action->treeview); - #ifndef G_OS_WIN32 - style = gtk_widget_get_style (action->treeview); - #endif - - /* 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, - #ifndef G_OS_WIN32 - BACKGROUND_COL, style ? &style->bg[GTK_STATE_NORMAL] : NULL, - #endif - 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, - #ifndef G_OS_WIN32 - BACKGROUND_COL, style ? &style->bg[GTK_STATE_NORMAL] : NULL, - #endif - 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); - } + gtk_window_move (GTK_WINDOW (popup), wx, wy); + gtk_widget_get_allocation (widget, &allocation); + gtk_window_resize (GTK_WINDOW (popup), allocation.width, 1); } static gboolean @@ -463,9 +331,13 @@ midori_location_action_treeview_button_press_cb (GtkWidget* treeview, 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); - midori_location_action_complete (action, - MIDORI_MOD_NEW_TAB (event->state), uri); + gtk_entry_set_text (GTK_ENTRY (action->entry), uri); + g_signal_emit (action, signals[SUBMIT_URI], 0, uri, + MIDORI_MOD_NEW_TAB (event->state)); g_free (uri); return TRUE; @@ -485,20 +357,28 @@ midori_location_action_popup_timeout_cb (gpointer data) gint result; static sqlite3_stmt* stmt; const gchar* sqlcmd; - gint matches, searches; + gint matches, searches, height, screen_height, browser_height, sep; + MidoriBrowser* browser; + GtkStyle* style; if (!action->entry || !gtk_widget_has_focus (action->entry) || !action->history) return FALSE; /* No completion when typing a search token */ - if (action->search_engines - && katze_array_find_token (action->search_engines, action->key)) + if (action->search_engines != NULL) { - midori_location_action_popdown_completion (action); - return FALSE; + gchar** parts = g_strsplit (action->key, " ", 2); + if (parts && *parts && parts[1] + && katze_array_find_token (action->search_engines, *parts)) + { + g_strfreev (parts); + midori_location_action_popdown_completion (action); + return FALSE; + } + g_strfreev (parts); } - /* Empty string or starting with a space means: no completion */ + /* Empaty string or starting with a space means: no completion */ if (!(action->key && *action->key && *action->key != ' ')) { midori_location_action_popdown_completion (action); @@ -563,8 +443,6 @@ midori_location_action_popup_timeout_cb (gpointer data) 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); @@ -593,8 +471,6 @@ midori_location_action_popup_timeout_cb (gpointer data) 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, @@ -613,6 +489,7 @@ midori_location_action_popup_timeout_cb (gpointer data) 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); @@ -630,11 +507,9 @@ midori_location_action_popup_timeout_cb (gpointer data) 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_desc, YALIGN_COL, 0.25, + URI_COL, uri, TITLE_COL, search_title, YALIGN_COL, 0.25, STYLE_COL, 1, FAVICON_COL, icon, -1); - g_free (search_desc); g_free (search_title); } if (icon != NULL) @@ -643,15 +518,34 @@ midori_location_action_popup_timeout_cb (gpointer data) matches++; result = sqlite3_step (stmt); } + sqlite3_reset (stmt); + sqlite3_clear_bindings (stmt); - if (stmt) + if (action->search_engines) { - sqlite3_reset (stmt); - sqlite3_clear_bindings (stmt); - } + KatzeItem* item; + i = 0; + KATZE_ARRAY_FOREACH_ITEM (item, action->search_engines) + { + gchar* uri; + gchar* title; + GdkPixbuf* icon; - if (action->search_engines) - searches += midori_location_action_add_search_engines (action, store, matches); + uri = midori_uri_for_search (katze_item_get_uri (item), action->key); + title = g_strdup_printf (_("Search with %s"), katze_item_get_name (item)); + 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, title, 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); + if (icon != NULL) + g_object_unref (icon); + i++; + } + searches += i; + } if (!gtk_widget_get_visible (action->popup)) { @@ -659,10 +553,22 @@ midori_location_action_popup_timeout_cb (gpointer data) 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_widget_show_all (action->popup); + gtk_tree_view_columns_autosize (GTK_TREE_VIEW (action->treeview)); } - midori_location_action_popup_position (action, matches + searches); + 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); return FALSE; } @@ -822,31 +728,15 @@ midori_location_action_activate (GtkAction* action) GTK_ACTION_CLASS (midori_location_action_parent_class)->activate (action); } -static void -midori_location_action_entry_drag_data_get_cb (GtkWidget* entry, - GdkDragContext* context, - GtkSelectionData* data, - guint info, - guint32 time, - GtkAction* action) -{ - if (gtk_entry_get_current_icon_drag_source (GTK_ENTRY (entry)) == GTK_ENTRY_ICON_PRIMARY) - { - const gchar* uri = gtk_entry_get_text (GTK_ENTRY (entry)); - gchar** uris = g_strsplit (uri, uri, 1); - gtk_selection_data_set_uris (data, uris); - g_strfreev (uris); - } -} - static GtkWidget* midori_location_action_create_tool_item (GtkAction* action) { GtkWidget* toolitem; GtkWidget* alignment; GtkWidget* entry; - - GtkTargetList *targetlist; + #if HAVE_HILDON + HildonGtkInputMode mode; + #endif toolitem = GTK_WIDGET (gtk_tool_item_new ()); gtk_tool_item_set_expand (GTK_TOOL_ITEM (toolitem), TRUE); @@ -855,21 +745,48 @@ midori_location_action_create_tool_item (GtkAction* action) gtk_widget_show (alignment); gtk_container_add (GTK_CONTAINER (toolitem), alignment); + #if HAVE_HILDON + entry = gtk_entry_new (); + mode = hildon_gtk_entry_get_input_mode (GTK_ENTRY (entry)); + mode &= ~HILDON_GTK_INPUT_MODE_AUTOCAP; + hildon_gtk_entry_set_input_mode (GTK_ENTRY (entry), mode); + #else entry = gtk_icon_entry_new (); + 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, TRUE); + GTK_ICON_ENTRY_PRIMARY, FALSE); gtk_icon_entry_set_icon_highlight (GTK_ICON_ENTRY (entry), GTK_ICON_ENTRY_SECONDARY, TRUE); - - targetlist = gtk_target_list_new (NULL, 0); - gtk_target_list_add_uri_targets (targetlist, 0); - gtk_entry_set_icon_drag_source (GTK_ENTRY (entry), GTK_ENTRY_ICON_PRIMARY, targetlist, GDK_ACTION_ASK | GDK_ACTION_COPY | GDK_ACTION_LINK); - gtk_target_list_unref (targetlist); - g_signal_connect (entry, "drag-data-get", - G_CALLBACK (midori_location_action_entry_drag_data_get_cb), action); + #endif gtk_widget_show (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; } @@ -953,30 +870,27 @@ midori_location_action_key_press_event_cb (GtkEntry* entry, 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) - 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_signal_emit (action, signals[SUBMIT_URI], 0, uri, + MIDORI_MOD_NEW_TAB (event->state)); g_free (uri); return TRUE; } - midori_location_action_popdown_completion (location_action); } - 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)); + 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)); break; case GDK_KEY_Escape: { @@ -992,6 +906,10 @@ midori_location_action_key_press_event_cb (GtkEntry* entry, /* Return FALSE to allow Escape to stop loading */ return FALSE; } + 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_KEY_Delete: case GDK_KEY_KP_Delete: { @@ -1040,12 +958,7 @@ midori_location_action_key_press_event_cb (GtkEntry* entry, case GDK_KEY_KP_Up: case GDK_KEY_Tab: case GDK_KEY_ISO_Left_Tab: - case GDK_KEY_Page_Down: - case GDK_KEY_Page_Up: { - if ((event->keyval == GDK_KEY_Page_Up || event->keyval == GDK_KEY_Page_Down) && - !(location_action->popup && gtk_widget_get_visible (location_action->popup))) - return TRUE; if (location_action->popup && gtk_widget_get_visible (location_action->popup)) { GtkTreeModel* model = location_action->completion_model; @@ -1055,62 +968,35 @@ midori_location_action_key_press_event_cb (GtkEntry* entry, gint selected = location_action->completion_index; if (event->keyval == GDK_KEY_Down || event->keyval == GDK_KEY_KP_Down - || ((event->keyval == GDK_KEY_Tab || event->keyval == GDK_KEY_ISO_Left_Tab) - && !(event->state & GDK_SHIFT_MASK))) - { - selected = selected + 1; - if (selected == matches) - selected = -1; - } - else if (event->keyval == GDK_KEY_Up || event->keyval == GDK_KEY_KP_Up - || ((event->keyval == GDK_KEY_Tab || event->keyval == GDK_KEY_ISO_Left_Tab) - && (event->state & GDK_SHIFT_MASK))) + || event->keyval == GDK_KEY_Tab || event->keyval == GDK_KEY_ISO_Left_Tab) + selected = MIN (selected + 1, matches -1); + else if (event->keyval == GDK_KEY_Up || event->keyval == GDK_KEY_KP_Up) { if (selected == -1) selected = matches - 1; else - selected = selected - 1; + selected = MAX (selected - 1, 0); } else if (event->keyval == GDK_KEY_Page_Down) - { - if (selected == -1) - selected = 0; - else if (selected < matches - 1) - selected = MIN (selected + 14, matches -1); - else - selected = -1; - } + selected = MIN (selected + 14, matches -1); else if (event->keyval == GDK_KEY_Page_Up) - { - if (selected == -1) - selected = matches - 1; - else if (selected > 0) - selected = MAX (selected - 14, 0); - else - selected = -1; - } + selected = MAX (selected - 14, 0); else if (event->keyval != GDK_KEY_KP_Delete && event->keyval != GDK_KEY_Delete) g_assert_not_reached (); - if (selected != -1) - { - path = gtk_tree_path_new_from_indices (selected, -1); - gtk_tree_view_set_cursor (GTK_TREE_VIEW (location_action->treeview), - path, NULL, FALSE); - gtk_tree_path_free (path); + path = gtk_tree_path_new_from_indices (selected, -1); + gtk_tree_view_set_cursor (GTK_TREE_VIEW (location_action->treeview), + path, NULL, FALSE); + gtk_tree_path_free (path); - if (gtk_tree_model_iter_nth_child (model, &iter, NULL, selected)) - { - gchar* uri; - gtk_tree_model_get (model, &iter, URI_COL, &uri, -1); - /* Update the layout without actually changing the text */ - pango_layout_set_text (gtk_entry_get_layout (entry), uri, -1); - g_free (uri); - } + if (gtk_tree_model_iter_nth_child (model, &iter, NULL, selected)) + { + gchar* uri; + gtk_tree_model_get (model, &iter, URI_COL, &uri, -1); + /* Update the layout without actually changing the text */ + pango_layout_set_text (gtk_entry_get_layout (entry), uri, -1); + g_free (uri); } - else - gtk_tree_selection_unselect_all (gtk_tree_view_get_selection (GTK_TREE_VIEW (location_action->treeview))); - location_action->completion_index = selected; return TRUE; } @@ -1174,237 +1060,12 @@ midori_location_action_focus_out_event_cb (GtkWidget* widget, return FALSE; } -#ifdef HAVE_GCR - #define GCR_API_SUBJECT_TO_CHANGE - #include -#endif - -#if defined (HAVE_LIBSOUP_2_34_0) -static GHashTable* message_map = NULL; -void -midori_map_add_message (SoupMessage* message) -{ - SoupURI* uri = soup_message_get_uri (message); - if (message_map == NULL) - message_map = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref); - g_return_if_fail (uri && uri->host); - g_hash_table_insert (message_map, g_strdup (uri->host), g_object_ref (message)); -} - -SoupMessage* -midori_map_get_message (SoupMessage* message) -{ - SoupURI* uri = soup_message_get_uri (message); - SoupMessage* full; - g_return_val_if_fail (uri && uri->host, message); - full = g_hash_table_lookup (message_map, uri->host); - g_return_val_if_fail (full, message); - return full; -} - -#ifdef HAVE_GCR -typedef enum { - MIDORI_CERT_TRUST, - MIDORI_CERT_REVOKE, - MIDORI_CERT_EXPORT, -} MidoriCertTrust; - -static void -midori_location_action_cert_response_cb (GtkWidget* dialog, - gint response, - GcrCertificate* gcr_cert) -{ - gchar* peer = g_object_get_data (G_OBJECT (gcr_cert), "peer"); - GError* error = NULL; - if (response == MIDORI_CERT_TRUST) - gcr_trust_add_pinned_certificate (gcr_cert, GCR_PURPOSE_SERVER_AUTH, peer, NULL, &error); - else if (response == MIDORI_CERT_REVOKE) - gcr_trust_remove_pinned_certificate (gcr_cert, GCR_PURPOSE_SERVER_AUTH, peer, NULL, &error); - else if (response == MIDORI_CERT_EXPORT) - { - /* FIXME: Would be nice if GcrCertificateExporter became public */ - gchar* filename = g_strconcat (peer, ".crt", NULL); - GtkWidget* dialog = sokoke_file_chooser_dialog_new (_("Export certificate"), - NULL, GTK_FILE_CHOOSER_ACTION_SAVE); - gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE); - gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog), filename); - g_free (filename); - - if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK) - { - gsize n_data; - gconstpointer data = gcr_certificate_get_der_data (gcr_cert, &n_data); - g_return_if_fail (data); - filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); - g_file_set_contents (filename, data, n_data, NULL); - g_free (filename); - } - gtk_widget_destroy (dialog); - } - if (error != NULL) - { - g_warning ("Error %s trust: %s", response == MIDORI_CERT_TRUST ? - "granting" : "revoking", error->message); - g_error_free (error); - } - gtk_widget_destroy (dialog); -} -#endif - -const gchar* -midori_location_action_tls_flags_to_string (GTlsCertificateFlags tls_flags) -{ - const gchar* tls_error; - if (tls_flags & G_TLS_CERTIFICATE_UNKNOWN_CA) - tls_error = _("The signing certificate authority is not known."); - else if (tls_flags & G_TLS_CERTIFICATE_BAD_IDENTITY) - tls_error = _("The certificate does not match the expected identity of the site that it was retrieved from."); - else if(tls_flags & G_TLS_CERTIFICATE_NOT_ACTIVATED) - tls_error = _("The certificate's activation time is still in the future."); - else if (tls_flags & G_TLS_CERTIFICATE_EXPIRED) - tls_error = _("The certificate has expired"); - else if (tls_flags & G_TLS_CERTIFICATE_REVOKED) - tls_error = _("The certificate has been revoked according to the GTlsConnection's certificate revocation list."); - else if (tls_flags & G_TLS_CERTIFICATE_INSECURE) - tls_error = _("The certificate's algorithm is considered insecure."); - else if (tls_flags & G_TLS_CERTIFICATE_GENERIC_ERROR) - tls_error = _("Some other error occurred validating the certificate."); - else - tls_error = "Unknown GTLSCertificateFlags value"; - return tls_error; -} - -void -midori_location_action_show_page_info (GtkWidget* widget, - GtkBox* box, - GtkWidget* dialog) -{ - MidoriBrowser* browser = midori_browser_get_for_widget (widget); - MidoriView* view = MIDORI_VIEW (midori_browser_get_current_tab (browser)); - WebKitWebView* web_view = WEBKIT_WEB_VIEW (midori_view_get_web_view (view)); - WebKitWebFrame* web_frame = webkit_web_view_get_main_frame (web_view); - WebKitWebDataSource* source = webkit_web_frame_get_data_source (web_frame); - WebKitNetworkRequest* request = webkit_web_data_source_get_request (source); - SoupMessage* message = midori_map_get_message (webkit_network_request_get_message (request)); - GTlsCertificate* tls_cert; - GTlsCertificateFlags tls_flags; - - g_return_if_fail (message); - g_object_get (message, "tls-certificate", &tls_cert, "tls-errors", &tls_flags, NULL); - - if (tls_cert == NULL) - return; - - #ifdef HAVE_GCR - GByteArray* der_cert; - GcrCertificate* gcr_cert; - GtkWidget* details; - SoupURI* uri = soup_message_get_uri (message); - - g_object_get (tls_cert, "certificate", &der_cert, NULL); - gcr_cert = gcr_simple_certificate_new ( - der_cert->data, der_cert->len); - g_byte_array_unref (der_cert); - details = (GtkWidget*)gcr_certificate_details_widget_new (gcr_cert); - gtk_widget_show (details); - gtk_container_add (GTK_CONTAINER (box), details); - if (gcr_trust_is_certificate_pinned (gcr_cert, GCR_PURPOSE_SERVER_AUTH, uri->host, NULL, NULL)) - gtk_dialog_add_buttons (GTK_DIALOG (dialog), - ("_Don't trust this website"), MIDORI_CERT_REVOKE, NULL); - else if (tls_flags > 0) - gtk_dialog_add_buttons (GTK_DIALOG (dialog), - ("_Trust this website"), MIDORI_CERT_TRUST, NULL); - gtk_container_child_set (GTK_CONTAINER (gtk_dialog_get_action_area (GTK_DIALOG (dialog))), - gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Export certificate"), MIDORI_CERT_EXPORT), - "secondary", TRUE, NULL); - - g_object_set_data_full (G_OBJECT (gcr_cert), "peer", g_strdup (uri->host), (GDestroyNotify)g_free); - g_object_set_data_full (G_OBJECT (dialog), "gcr-cert", gcr_cert, (GDestroyNotify)g_object_unref); - g_signal_connect (dialog, "response", - G_CALLBACK (midori_location_action_cert_response_cb), gcr_cert); - /* With GTK+2 the scrolled contents can't communicate a natural size to the window */ - #if !GTK_CHECK_VERSION (3, 0, 0) - gtk_window_set_default_size (GTK_WINDOW (dialog), 250, 200); - #endif - #else - const gchar* tls_error = midori_location_action_tls_flags_to_string (tls_flags); - - if (!g_tls_certificate_get_issuer (tls_cert)) - gtk_box_pack_start (box, gtk_label_new (_("Self-signed")), FALSE, FALSE, 0); - - gtk_box_pack_start (box, gtk_label_new (tls_error), FALSE, FALSE, 0); - #endif - - g_object_unref (tls_cert); -} -#endif - -#ifndef HAVE_GRANITE -static gboolean -midori_location_action_dialog_focus_out_cb (GtkWidget* dialog, - GdkEvent* event, - gpointer user_data) -{ - gtk_widget_destroy (dialog); - return TRUE; -} -#endif - static void midori_location_action_icon_released_cb (GtkWidget* widget, GtkIconEntryPosition icon_pos, gint button, GtkAction* action) { - /* The dialog should "toggle" like a menu, as far as users go - FIXME: Half-working: the dialog closes but re-opens */ - static GtkWidget* dialog = NULL; - if (icon_pos == GTK_ICON_ENTRY_PRIMARY && dialog != NULL) - gtk_widget_destroy (dialog); - - if (icon_pos == GTK_ICON_ENTRY_PRIMARY) - { - const gchar* title = _("Security details"); - GtkWidget* content_area; - GtkWidget* hbox; - #ifdef HAVE_GRANITE - gint root_x, root_y; - GdkRectangle icon_rect; - /* FIXME: granite: should return GtkWidget* like GTK+ */ - dialog = (GtkWidget*)granite_widgets_pop_over_new (); - gchar* markup = g_strdup_printf ("%s", title); - GtkWidget* label = gtk_label_new (markup); - content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); - g_free (markup); - gtk_label_set_use_markup (GTK_LABEL (label), TRUE); - gtk_box_pack_start (GTK_BOX (content_area), label, FALSE, FALSE, 0); - gtk_entry_get_icon_area (GTK_ENTRY (widget), icon_pos, &icon_rect); - gdk_window_get_root_coords (gtk_widget_get_window (widget), - icon_rect.x + icon_rect.width / 2, icon_rect.y + icon_rect.height, - &root_x, &root_y); - granite_widgets_pop_over_move_to_coords (GRANITE_WIDGETS_POP_OVER (dialog), - root_x, root_y, TRUE); - #else - dialog = gtk_dialog_new_with_buttons (title, GTK_WINDOW (gtk_widget_get_toplevel (widget)), - GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, NULL, NULL); - /* FIXME: check focus-in on the transient-for window instead of - focus-out-event */ - g_signal_connect (dialog, "focus-out-event", - G_CALLBACK (midori_location_action_dialog_focus_out_cb), NULL); - content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); - #endif - hbox = gtk_hbox_new (FALSE, 0); - gtk_box_pack_start (GTK_BOX (hbox), gtk_image_new_from_gicon ( - gtk_entry_get_icon_gicon (GTK_ENTRY (widget), icon_pos), GTK_ICON_SIZE_DIALOG), FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (hbox), - gtk_label_new (gtk_icon_entry_get_tooltip (GTK_ICON_ENTRY (widget), icon_pos)), FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, FALSE, 0); - #if defined (HAVE_LIBSOUP_2_34_0) - midori_location_action_show_page_info (widget, GTK_BOX (content_area), dialog); - #endif - g_signal_connect (dialog, "destroy", G_CALLBACK (gtk_widget_destroyed), &dialog); - gtk_widget_show_all (dialog); - } if (icon_pos == GTK_ICON_ENTRY_SECONDARY) { gboolean result; @@ -1758,7 +1419,7 @@ midori_location_action_get_text (MidoriLocationAction* location_action) * @location_action: a #MidoriLocationAction * @text: a string * - * Sets the entry text to @text. + * Sets the entry text to @text and, if applicable, updates the icon. * * Since: 0.2.0 **/ @@ -1767,6 +1428,7 @@ midori_location_action_set_text (MidoriLocationAction* location_action, const gchar* text) { GSList* proxies; + GdkPixbuf* icon; g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action)); g_return_if_fail (text != NULL); @@ -1779,12 +1441,21 @@ midori_location_action_set_text (MidoriLocationAction* location_action, 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)) { 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); } /** @@ -1794,12 +1465,33 @@ midori_location_action_set_text (MidoriLocationAction* location_action, * * Sets the icon shown on the left hand side. * - * Deprecated: 0.4.6: The left hand icon only shows security status. + * Note: Since 0.1.8 %NULL can be passed to indicate that the + * visible URI refers to a target, not the current location. **/ void midori_location_action_set_icon (MidoriLocationAction* location_action, GdkPixbuf* icon) { + #if !HAVE_HILDON + GSList* proxies; + + 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)) + { + GtkWidget* entry = midori_location_action_entry_for_proxy (proxies->data); + 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 @@ -1812,42 +1504,58 @@ midori_location_action_add_uri (MidoriLocationAction* location_action, katze_assign (location_action->uri, g_strdup (uri)); } -/** - * 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; + #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)) + { + GtkWidget* entry = midori_location_action_entry_for_proxy (proxies->data); + 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) { - midori_location_action_set_icon (location_action, icon); + #if !HAVE_HILDON + GSList* proxies; + #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)) + { + GtkWidget* entry = midori_location_action_entry_for_proxy (proxies->data); + gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY (entry), + GTK_ICON_ENTRY_PRIMARY, icon); + } + #endif } /** @@ -1901,15 +1609,6 @@ midori_location_action_set_progress (MidoriLocationAction* location_action, } } -/** - * 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) @@ -1920,6 +1619,7 @@ midori_location_action_set_secondary_icon (MidoriLocationAction* location_action 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)); @@ -1930,12 +1630,8 @@ midori_location_action_set_secondary_icon (MidoriLocationAction* location_action if (GTK_IS_TOOL_ITEM (proxies->data)) { 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); + gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (entry), + GTK_ICON_ENTRY_SECONDARY, stock_id); } #endif } @@ -1963,30 +1659,77 @@ midori_location_action_set_security_hint (MidoriLocationAction* location_action, for (; proxies != NULL; proxies = g_slist_next (proxies)) if (GTK_IS_TOOL_ITEM (proxies->data)) { + const gchar* bg_color = NULL; + const gchar* fg_color = NULL; 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) { - gchar* icon_names[] = { "channel-insecure-symbolic", "lock-insecure", "dialog-information", NULL }; - gtk_entry_set_icon_from_gicon (GTK_ENTRY (entry), GTK_ICON_ENTRY_PRIMARY, - g_themed_icon_new_from_names (icon_names, -1)); + bg_color = "#ef7070"; + fg_color = "#000"; + #if !HAVE_HILDON + 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_SECONDARY, "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_SECONDARY, "lock-insecure"); + else + gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (entry), + GTK_ICON_ENTRY_SECONDARY, GTK_STOCK_INFO); gtk_icon_entry_set_tooltip (GTK_ICON_ENTRY (entry), - GTK_ICON_ENTRY_PRIMARY, _("Not verified")); + GTK_ICON_ENTRY_SECONDARY, _("Not verified")); + #endif } else if (hint == MIDORI_SECURITY_TRUSTED) { - gchar* icon_names[] = { "channel-secure-symbolic", "lock-secure", "locked", NULL }; - gtk_entry_set_icon_from_gicon (GTK_ENTRY (entry), GTK_ICON_ENTRY_PRIMARY, - g_themed_icon_new_from_names (icon_names, -1)); + bg_color = "#d1eeb9"; + fg_color = "#000"; + #if !HAVE_HILDON + 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_SECONDARY, "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_SECONDARY, "lock-secure"); + else + gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (entry), + GTK_ICON_ENTRY_SECONDARY, GTK_STOCK_DIALOG_AUTHENTICATION); gtk_icon_entry_set_tooltip (GTK_ICON_ENTRY (entry), - GTK_ICON_ENTRY_PRIMARY, _("Verified and encrypted connection")); + GTK_ICON_ENTRY_SECONDARY, _("Verified and encrypted connection")); + #endif } else if (hint == MIDORI_SECURITY_NONE) - { - gtk_entry_set_icon_from_gicon (GTK_ENTRY (entry), GTK_ICON_ENTRY_PRIMARY, - g_themed_icon_new_with_default_fallbacks ("text-html-symbolic")); gtk_icon_entry_set_tooltip (GTK_ICON_ENTRY (entry), - GTK_ICON_ENTRY_PRIMARY, _("Open, unencrypted connection")); + GTK_ICON_ENTRY_SECONDARY, NULL); + + { + #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 --git a/midori/midori-panedaction.c b/midori/midori-panedaction.c new file mode 100644 index 00000000..e858b8a5 --- /dev/null +++ b/midori/midori-panedaction.c @@ -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 --git a/midori/midori-panedaction.h b/midori/midori-panedaction.h new file mode 100644 index 00000000..58444735 --- /dev/null +++ b/midori/midori-panedaction.h @@ -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 --git a/midori/midori-panedaction.vala b/midori/midori-panedaction.vala deleted file mode 100644 index dd7ecde3..00000000 --- a/midori/midori-panedaction.vala +++ /dev/null @@ -1,79 +0,0 @@ -/* - 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. -*/ - -namespace Midori { - public class PanedAction : Gtk.Action { - Gtk.HPaned? hpaned = null; - Gtk.ToolItem? toolitem = null; - Child child1 = new Child(); - Child child2 = new Child(); - - private struct Child { - protected Gtk.Widget widget; - string name; - bool resize; - bool shrink; - } - - public override unowned Gtk.Widget create_tool_item () { - Gtk.Alignment alignment = new Gtk.Alignment (0.0f, 0.5f, 1.0f, 0.1f); - hpaned = new Gtk.HPaned (); - toolitem = new Gtk.ToolItem (); - toolitem.set_expand (true); - toolitem.add (alignment); - alignment.add (hpaned); - - hpaned.pack1 (child1.widget, child1.resize, child1.shrink); - hpaned.pack2 (child2.widget, child2.resize, child2.shrink); - toolitem.show_all (); - return toolitem; - } - - public void set_child1 (Gtk.Widget widget, string name, bool resize, bool shrink) { - child1.widget = widget; - child1.name = name; - child1.resize = resize; - child1.shrink = shrink; - } - - public void set_child2 (Gtk.Widget widget, string name, bool resize, bool shrink) { - child2.widget = widget; - child2.name = name; - child2.resize = resize; - child2.shrink = shrink; - } - - public Gtk.Widget? get_child1 () { - return child1.widget; - } - - public Gtk.Widget? get_child2 () { - return child2.widget; - } - - public Gtk.Widget? get_child_by_name (string name) { - if (name == child1.name) - return child1.widget; - else if (name == child2.name) - return child2.widget; - return null; - } - - public string get_child1_name () { - return child1.name; - } - - public string get_child2_name () { - return child2.name; - } - } -} - diff --git a/midori/midori-panel.c b/midori/midori-panel.c index 22ec10c7..ffe110e6 100644 --- a/midori/midori-panel.c +++ b/midori/midori-panel.c @@ -253,6 +253,36 @@ static GtkWidget* _midori_panel_child_for_scrolled (MidoriPanel* panel, GtkWidget* scrolled); +static gboolean +midori_panel_detached_window_delete_event_cb (GtkWidget* window, + GdkEvent* event, + MidoriPanel* panel) +{ + /* FIXME: The panel will not end up at its original position */ + /* FIXME: The menuitem may be mispositioned */ + GtkWidget* vbox = gtk_bin_get_child (GTK_BIN (window)); + GtkWidget* scrolled = g_object_get_data (G_OBJECT (window), "scrolled"); + GtkWidget* toolbar = g_object_get_data (G_OBJECT (scrolled), "panel-toolbar"); + GtkWidget* menuitem = g_object_get_data (G_OBJECT (scrolled), "panel-menuitem"); + GtkWidget* viewable = _midori_panel_child_for_scrolled (panel, scrolled); + GtkToolItem* toolitem; + gint n; + + g_object_ref (toolbar); + gtk_container_remove (GTK_CONTAINER (vbox), toolbar); + gtk_container_add (GTK_CONTAINER (panel->toolbook), toolbar); + g_object_unref (toolbar); + g_object_ref (scrolled); + gtk_container_remove (GTK_CONTAINER (vbox), scrolled); + n = gtk_notebook_append_page (GTK_NOTEBOOK (panel->notebook), scrolled, NULL); + g_object_unref (scrolled); + toolitem = midori_panel_construct_tool_item (panel, MIDORI_VIEWABLE (viewable)); + if (menuitem) + g_object_set_data (G_OBJECT (menuitem), "toolitem", toolitem); + midori_panel_set_current_page (panel, n); + return FALSE; +} + static void midori_panel_widget_destroy_cb (GtkWidget* viewable, GtkWidget* widget) @@ -262,6 +292,57 @@ midori_panel_widget_destroy_cb (GtkWidget* viewable, viewable, midori_panel_widget_destroy_cb, widget); } +static void +midori_panel_detach_page (MidoriPanel* panel, + gint n) +{ + GtkToolItem* toolitem = gtk_toolbar_get_nth_item ( + GTK_TOOLBAR (panel->toolbar), n); + const gchar* title = gtk_tool_button_get_label (GTK_TOOL_BUTTON (toolitem)); + GtkWidget* toolbar = gtk_notebook_get_nth_page ( + GTK_NOTEBOOK (panel->toolbook), n); + GtkWidget* scrolled = gtk_notebook_get_nth_page ( + GTK_NOTEBOOK (panel->notebook), n); + GtkWidget* vbox = gtk_vbox_new (FALSE, 0); + #if HAVE_HILDON + GtkWidget* window = hildon_window_new (); + hildon_program_add_window (hildon_program_get_instance (), HILDON_WINDOW (window)); + #else + GtkWidget* window = gtk_window_new (GTK_WINDOW_TOPLEVEL); + gtk_window_set_skip_taskbar_hint (GTK_WINDOW (window), TRUE); + gtk_window_set_default_size (GTK_WINDOW (window), 250, 400); + gtk_window_set_transient_for (GTK_WINDOW (window), + GTK_WINDOW (gtk_widget_get_toplevel (panel->notebook))); + #endif + gtk_widget_show (vbox); + gtk_container_add (GTK_CONTAINER (window), vbox); + g_object_set_data (G_OBJECT (window), "scrolled", scrolled); + gtk_window_set_title (GTK_WINDOW (window), title); + g_signal_handlers_disconnect_by_func ( + _midori_panel_child_for_scrolled (panel, scrolled), + midori_panel_widget_destroy_cb, toolitem); + gtk_container_remove (GTK_CONTAINER (panel->toolbar), GTK_WIDGET (toolitem)); + g_object_ref (toolbar); + gtk_container_remove (GTK_CONTAINER (panel->toolbook), toolbar); + #if HAVE_HILDON + hildon_window_add_toolbar (HILDON_WINDOW (window), GTK_TOOLBAR (toolbar)); + #else + gtk_box_pack_start (GTK_BOX (vbox), toolbar, FALSE, FALSE, 0); + #endif + g_object_unref (toolbar); + g_object_set_data (G_OBJECT (scrolled), "panel-toolbar", toolbar); + g_object_ref (scrolled); + gtk_container_remove (GTK_CONTAINER (panel->notebook), scrolled); + gtk_box_pack_start (GTK_BOX (vbox), scrolled, TRUE, TRUE, 0); + g_object_unref (scrolled); + 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); + 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_align_clicked_cb (GtkWidget* toolitem, MidoriPanel* panel) @@ -300,7 +381,6 @@ midori_panel_init (MidoriPanel* panel) /* Create the titlebar */ labelbar = gtk_toolbar_new (); - katze_widget_add_class (labelbar, "secondary-toolbar"); panel->labelbar = labelbar; gtk_toolbar_set_icon_size (GTK_TOOLBAR (labelbar), GTK_ICON_SIZE_MENU); gtk_toolbar_set_style (GTK_TOOLBAR (labelbar), GTK_TOOLBAR_ICONS); @@ -346,7 +426,6 @@ midori_panel_init (MidoriPanel* panel) /* Create the notebook */ panel->notebook = gtk_notebook_new (); - katze_widget_add_class (panel->notebook, "content-view"); gtk_notebook_set_show_border (GTK_NOTEBOOK (panel->notebook), FALSE); gtk_notebook_set_show_tabs (GTK_NOTEBOOK (panel->notebook), FALSE); panel->frame = gtk_frame_new (NULL); @@ -491,15 +570,13 @@ midori_panel_set_right_aligned (MidoriPanel* panel, /* Private function, used by MidoriBrowser */ /* static */ GtkWidget* midori_panel_construct_menu_item (MidoriPanel* panel, - MidoriViewable* viewable, - gboolean popup) + MidoriViewable* viewable) { GtkAction* action; GtkWidget* menuitem; action = g_object_get_data (G_OBJECT (viewable), "midori-panel-action"); - menuitem = popup ? sokoke_action_create_popup_menu_item (action) - : gtk_action_create_menu_item (action); + menuitem = gtk_action_create_menu_item (action); g_object_set_data (G_OBJECT (menuitem), "page", viewable); if (gtk_widget_get_visible (GTK_WIDGET (viewable))) @@ -561,9 +638,24 @@ midori_panel_action_activate_cb (GtkRadioAction* action, GtkWidget* viewable = g_object_get_data (G_OBJECT (action), "viewable"); gint n = midori_panel_page_num (panel, viewable); - midori_panel_set_current_page (panel, n); - g_signal_emit (panel, signals[SWITCH_PAGE], 0, n); - gtk_widget_show (GTK_WIDGET (panel)); + /* If the panel is detached, focus the window */ + if (n == -1) + { + GtkWidget* toplevel = gtk_widget_get_toplevel (viewable); + gtk_window_present (GTK_WINDOW (toplevel)); + return; + } + + if (panel->open_panels_in_windows + && gtk_radio_action_get_current_value (action) + == katze_object_get_int (action, "value")) + midori_panel_detach_page (panel, n); + else + { + midori_panel_set_current_page (panel, n); + g_signal_emit (panel, signals[SWITCH_PAGE], 0, n); + gtk_widget_show (GTK_WIDGET (panel)); + } } /** @@ -618,7 +710,7 @@ midori_panel_append_page (MidoriPanel* panel, { scrolled = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), - GTK_POLICY_NEVER, + GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_widget_set_can_focus (scrolled, TRUE); gtk_widget_show (scrolled); diff --git a/midori/midori-panel.h b/midori/midori-panel.h index c5cd2756..87166674 100644 --- a/midori/midori-panel.h +++ b/midori/midori-panel.h @@ -12,7 +12,11 @@ #ifndef __MIDORI_PANEL_H__ #define __MIDORI_PANEL_H__ -#include "midori-core.h" +#include + +#include + +#include "midori-viewable.h" G_BEGIN_DECLS diff --git a/midori/midori-platform.h b/midori/midori-platform.h index b74339af..e974ed81 100644 --- a/midori/midori-platform.h +++ b/midori/midori-platform.h @@ -33,11 +33,15 @@ #endif #define MIDORI_EVENT_NEW_TAB(evt) \ - (evt != NULL \ - && ((((GdkEventButton*)evt)->button == 1 \ - && MIDORI_MOD_NEW_TAB(((GdkEventButton*)evt)->state)) \ - || (((GdkEventButton*)evt)->button == 2))) + ((((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 -#define MIDORI_MODULE_PREFIX "lib" #endif /* !__MIDORI_PLATFORM_H__ */ diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index cbdf69bb..6bfe1218 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -11,8 +11,6 @@ #include "midori-preferences.h" -#include "midori-app.h" -#include "midori-core.h" #include "midori-platform.h" #include @@ -294,7 +292,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences, #define SPANNED_ADD(__widget) \ katze_preferences_add_widget (_preferences, __widget, "spanned") /* Page "General" */ - if (!midori_paths_is_readonly ()) + if (!sokoke_is_app_or_private ()) { PAGE_NEW (GTK_STOCK_HOME, _("Startup")); FRAME_NEW (NULL); @@ -302,8 +300,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences, INDENTED_ADD (label); button = katze_property_proxy (settings, "load-on-startup", NULL); SPANNED_ADD (button); - label = gtk_label_new (_("Homepage:")); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + label = katze_property_label (settings, "homepage"); INDENTED_ADD (label); entry = katze_property_proxy (settings, "homepage", "address"); SPANNED_ADD (entry); @@ -353,8 +350,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences, button = katze_property_proxy (settings, "enforce-font-family", NULL); INDENTED_ADD (button); #endif - label = gtk_label_new (_("Preferred Encoding")); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + label = katze_property_label (settings, "preferred-encoding"); INDENTED_ADD (label); button = katze_property_proxy (settings, "preferred-encoding", "custom-default-encoding"); SPANNED_ADD (button); @@ -364,14 +360,12 @@ midori_preferences_set_settings (MidoriPreferences* preferences, FRAME_NEW (NULL); #if !HAVE_HILDON button = katze_property_proxy (settings, "auto-load-images", NULL); - gtk_button_set_label (GTK_BUTTON (button), _("Load images automatically")); INDENTED_ADD (button); button = katze_property_proxy (settings, "enable-spell-checking", NULL); - gtk_button_set_label (GTK_BUTTON (button), _("Enable Spell Checking")); SPANNED_ADD (button); /* Disable spell check option if there are no enchant modules */ { - gchar* enchant_path = midori_paths_get_lib_path ("enchant"); + gchar* enchant_path = sokoke_find_lib_path ("enchant"); if (enchant_path == NULL) { gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), FALSE); @@ -381,15 +375,11 @@ midori_preferences_set_settings (MidoriPreferences* preferences, g_free (enchant_path); } button = katze_property_proxy (settings, "enable-scripts", NULL); - gtk_button_set_label (GTK_BUTTON (button), _("Enable scripts")); INDENTED_ADD (button); button = katze_property_proxy (settings, "enable-plugins", NULL); - gtk_button_set_label (GTK_BUTTON (button), _("Enable Netscape plugins")); - gtk_widget_set_sensitive (button, midori_web_settings_has_plugin_support ()); SPANNED_ADD (button); #endif button = katze_property_proxy (settings, "zoom-text-and-images", NULL); - gtk_button_set_label (GTK_BUTTON (button), _("Zoom Text and Images")); INDENTED_ADD (button); button = katze_property_proxy (settings, "javascript-can-open-windows-automatically", NULL); gtk_button_set_label (GTK_BUTTON (button), _("Allow scripts to open popups")); @@ -397,42 +387,23 @@ midori_preferences_set_settings (MidoriPreferences* preferences, SPANNED_ADD (button); if (katze_widget_has_touchscreen_mode (parent ? GTK_WIDGET (parent) : GTK_WIDGET (preferences))) - { button = katze_property_proxy (settings, "kinetic-scrolling", NULL); - gtk_button_set_label (GTK_BUTTON (button), _("Kinetic scrolling")); - gtk_widget_set_tooltip_text (button, _("Whether scrolling should kinetically move according to speed")); - } else - { button = katze_property_proxy (settings, "middle-click-opens-selection", NULL); - gtk_button_set_label (GTK_BUTTON (button), _("Middle click opens Selection")); - gtk_widget_set_tooltip_text (button, _("Load an address from the selection via middle click")); - } INDENTED_ADD (button); - if (katze_object_has_property (settings, "enable-webgl")) - { - button = katze_property_proxy (settings, "enable-webgl", NULL); - gtk_button_set_label (GTK_BUTTON (button), _("Enable WebGL support")); - SPANNED_ADD (button); - } - #ifndef G_OS_WIN32 button = katze_property_proxy (settings, "flash-window-on-new-bg-tabs", NULL); - gtk_button_set_label (GTK_BUTTON (button), _("Flash window on background tabs")); - INDENTED_ADD (button); - #endif - + SPANNED_ADD (button); FRAME_NEW (NULL); - button = gtk_label_new (_("Preferred languages")); - gtk_misc_set_alignment (GTK_MISC (button), 0.0, 0.5); + button = katze_property_label (settings, "preferred-languages"); INDENTED_ADD (button); entry = katze_property_proxy (settings, "preferred-languages", "languages"); - gtk_widget_set_tooltip_text (entry, _("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\"")); SPANNED_ADD (entry); - label = gtk_label_new (_("Save downloaded files to:")); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + #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, _("Browsing")); @@ -450,51 +421,45 @@ midori_preferences_set_settings (MidoriPreferences* preferences, INDENTED_ADD (label); button = katze_property_proxy (settings, "open-new-pages-in", NULL); SPANNED_ADD (button); - button = katze_property_proxy (settings, "close-buttons-on-tabs", NULL); - gtk_button_set_label (GTK_BUTTON (button), _("Close Buttons on Tabs")); - INDENTED_ADD (button); - #ifndef HAVE_GRANITE + #if !HAVE_HILDON button = katze_property_proxy (settings, "always-show-tabbar", NULL); - gtk_button_set_label (GTK_BUTTON (button), _("Always Show Tabbar")); + INDENTED_ADD (button); + button = katze_property_proxy (settings, "close-buttons-on-tabs", NULL); SPANNED_ADD (button); #endif button = katze_property_proxy (settings, "open-tabs-next-to-current", NULL); - gtk_button_set_label (GTK_BUTTON (button), _("Open Tabs next to Current")); - gtk_widget_set_tooltip_text (button, _("Whether to open new tabs next to the current tab or after the last one")); INDENTED_ADD (button); button = katze_property_proxy (settings, "open-tabs-in-the-background", NULL); - gtk_button_set_label (GTK_BUTTON (button), _("Open tabs in the background")); SPANNED_ADD (button); - + #if !HAVE_HILDON INDENTED_ADD (gtk_label_new (NULL)); - label = gtk_label_new (_("Text Editor")); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + label = katze_property_label (settings, "text-editor"); INDENTED_ADD (label); entry = katze_property_proxy (settings, "text-editor", "application-text/plain"); SPANNED_ADD (entry); - label = gtk_label_new (_("News Aggregator")); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + label = katze_property_label (settings, "news-aggregator"); INDENTED_ADD (label); entry = katze_property_proxy (settings, "news-aggregator", "application-News"); SPANNED_ADD (entry); + #endif /* Page "Network" */ PAGE_NEW (GTK_STOCK_NETWORK, _("Network")); FRAME_NEW (NULL); - label = gtk_label_new (_("Proxy server")); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + #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", "address"); + 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); - label = gtk_label_new (_("Port")); + 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, "http-proxy-port", NULL); @@ -502,14 +467,13 @@ midori_preferences_set_settings (MidoriPreferences* preferences, 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, 3, 11) if (soup_session_get_feature (webkit_get_default_session (), SOUP_TYPE_CACHE)) { - label = gtk_label_new (_("Web Cache")); - gtk_widget_set_tooltip_text (label, _("The maximum size of cached pages on disk")); + label = katze_property_label (settings, "maximum-cache-size"); INDENTED_ADD (label); button = katze_property_proxy (settings, "maximum-cache-size", NULL); - gtk_widget_set_tooltip_text (button, _("The maximum size of cached pages on disk")); SPANNED_ADD (button); label = gtk_label_new (_("MB")); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); diff --git a/midori/midori-searchaction.c b/midori/midori-searchaction.c index 7d01734c..00425812 100644 --- a/midori/midori-searchaction.c +++ b/midori/midori-searchaction.c @@ -311,7 +311,7 @@ midori_search_action_create_tool_item (GtkAction* action) GtkWidget* alignment; toolitem = GTK_WIDGET (gtk_tool_item_new ()); - entry = sokoke_search_entry_new (NULL); + entry = gtk_icon_entry_new (); 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); @@ -432,7 +432,7 @@ midori_search_action_get_icon (KatzeItem* item, else if (gtk_icon_theme_has_icon (icon_theme, "edit-find-option")) *icon_name = "edit-find-option"; else - *icon_name = STOCK_EDIT_FIND; + *icon_name = "edit-find"; return NULL; } @@ -876,189 +876,21 @@ midori_search_action_editor_name_changed_cb (GtkWidget* entry, GTK_RESPONSE_ACCEPT, text && *text); } -gchar* -midori_search_action_token_for_uri (const gchar* uri) +static inline const gchar* +STR_NON_NULL (const gchar* string) { - guint len, i; - gchar** parts; - gchar* hostname = NULL, *path = NULL; - - path = midori_uri_parse_hostname (uri, NULL); - parts = g_strsplit (path, ".", -1); - g_free (path); - - len = g_strv_length (parts); - if (len > 2) - { - for (i = len; i == 0; i--) - { - if (parts[i] && *parts[i]) - if (strlen (parts[i]) > 3) - { - hostname = g_strdup (parts[i]); - break; - } - } - } - else - hostname = g_strdup (parts[0]); - - if (!hostname) - hostname = g_strdup (parts[1]); - - g_strfreev (parts); - - if (strlen (hostname) > 4) - { - GString* str = g_string_new (NULL); - int j, count = 0; - - for (j = 0; count < 4; j++) - { - if (hostname[j] == 'a' - || hostname[j] == 'e' - || hostname[j] == 'i' - || hostname[j] == 'o' - || hostname[j] == 'u') - continue; - else - { - g_string_append_c (str, hostname[j]); - count++; - } - } - return g_string_free (str, FALSE); - } - return g_strdup (hostname); + return string ? string : ""; } -KatzeItem* -midori_search_action_get_engine_for_form (WebKitWebView* web_view, - PangoEllipsizeMode ellipsize) -{ - #if WEBKIT_CHECK_VERSION (1, 5, 0) - WebKitDOMDocument* doc; - WebKitDOMHTMLFormElement* active_form; - WebKitDOMHTMLCollection* form_nodes; - WebKitDOMElement* active_element; - gchar* token_element; - const gchar* title; - GString* uri_str; - gulong form_len; - const gchar* action; - guint i; - KatzeItem* item; - gchar** parts; - - #if WEBKIT_CHECK_VERSION (1, 9, 5) - doc = webkit_web_frame_get_dom_document (web_view); - #else - if (webkit_web_view_get_focused_frame (web_view) != webkit_web_view_get_main_frame (web_view)) - return NULL; - doc = webkit_web_view_get_dom_document (web_view); - #endif - - active_element = webkit_dom_html_document_get_active_element ((WebKitDOMHTMLDocument*)doc); - active_form = webkit_dom_html_input_element_get_form ((WebKitDOMHTMLInputElement*)active_element); - - if (!active_form) - return NULL; - - token_element = webkit_dom_element_get_attribute (active_element, "name"); - - form_nodes = webkit_dom_html_form_element_get_elements (active_form); - form_len = webkit_dom_html_form_element_get_length (active_form); - - /* action NULL or "": relative path */ - if ((action = webkit_dom_html_form_element_get_action (active_form)) && *action) - uri_str = g_string_new (action); - else - { - gchar* hostname = midori_uri_parse_hostname (webkit_web_view_get_uri (web_view), NULL); - uri_str = g_string_new ("http://"); - g_string_append (uri_str, hostname); - g_free (hostname); - } - g_string_append_c (uri_str, '?'); - - for (i = 0; i < form_len; i++) - { - WebKitDOMNode* form_node = webkit_dom_html_collection_item (form_nodes, i); - WebKitDOMElement* form_element = (WebKitDOMElement*) form_node; - gchar* name = webkit_dom_element_get_attribute (form_element, "name"); - - if (name && *name) - { - if (!g_strcmp0 (token_element, name)) - g_string_append_printf (uri_str, "%s=%s&", name, "\%s"); - else - { - gchar* value; - if (!g_strcmp0 (webkit_dom_element_get_tag_name (form_element), "SELECT")) - { - WebKitDOMHTMLSelectElement* select_element = (WebKitDOMHTMLSelectElement*) form_element; - gulong pos = webkit_dom_html_select_element_get_selected_index (select_element); - WebKitDOMNode* selected_node = webkit_dom_html_select_element_item (select_element, pos); - WebKitDOMElement* selected_element = (WebKitDOMElement*) selected_node; - - value = webkit_dom_element_get_attribute (selected_element, "value"); - } - else - value = webkit_dom_element_get_attribute (form_element, "value"); - - g_string_append_printf (uri_str, "%s=%s&", name, value); - g_free (value); - } - g_free (name); - } - } - - title = webkit_web_view_get_title (web_view); - - item = katze_item_new (); - item->uri = g_string_free (uri_str, FALSE); - item->token = midori_search_action_token_for_uri (webkit_web_view_get_uri (web_view)); - - if (strstr (title, " - ")) - parts = g_strsplit (title, " - ", 2); - else if (strstr (title, ": ")) - parts = g_strsplit (title, ": ", 2); - else - parts = NULL; - if (parts != NULL) - { - /* See midori_view_set_title: title can be first or last */ - if (ellipsize == PANGO_ELLIPSIZE_END) - { - item->name = g_strdup (parts[0]); - item->text = g_strdup (parts[1]); - } - else - { - item->name = g_strdup (parts[1]); - item->text = g_strdup (parts[2]); - } - g_strfreev (parts); - } - else - item->name = g_strdup (title); - - g_free (token_element); - return item; - #else - return NULL; - #endif -} - -void +static void midori_search_action_get_editor (MidoriSearchAction* search_action, - KatzeItem* item, gboolean new_engine) { GtkWidget* toplevel; GtkWidget* dialog; GtkWidget* content_area; GtkSizeGroup* sizegroup; + KatzeItem* item; GtkWidget* hbox; GtkWidget* label; GtkTreeModel* liststore; @@ -1067,6 +899,7 @@ midori_search_action_get_editor (MidoriSearchAction* search_action, GtkWidget* entry_name; GtkWidget* entry_description; GtkWidget* entry_uri; + GtkWidget* entry_icon; GtkWidget* entry_token; toplevel = gtk_widget_get_toplevel (search_action->treeview); @@ -1086,6 +919,7 @@ midori_search_action_get_editor (MidoriSearchAction* search_action, if (new_engine) { + item = katze_item_new (); gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT, FALSE); } @@ -1106,8 +940,9 @@ midori_search_action_get_editor (MidoriSearchAction* search_action, g_signal_connect (entry_name, "changed", G_CALLBACK (midori_search_action_editor_name_changed_cb), dialog); gtk_entry_set_activates_default (GTK_ENTRY (entry_name), TRUE); - gtk_entry_set_text (GTK_ENTRY (entry_name), - katze_str_non_null (katze_item_get_name (item))); + if (!new_engine) + gtk_entry_set_text (GTK_ENTRY (entry_name), + 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 (content_area), hbox); gtk_widget_show_all (hbox); @@ -1119,8 +954,9 @@ midori_search_action_get_editor (MidoriSearchAction* search_action, gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); entry_description = gtk_entry_new (); gtk_entry_set_activates_default (GTK_ENTRY (entry_description), TRUE); - gtk_entry_set_text (GTK_ENTRY (entry_description) - , katze_str_non_null (katze_item_get_text (item))); + if (!new_engine) + gtk_entry_set_text (GTK_ENTRY (entry_description) + , 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 (content_area), hbox); gtk_widget_show_all (hbox); @@ -1136,14 +972,28 @@ midori_search_action_get_editor (MidoriSearchAction* search_action, #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); - gtk_entry_set_text (GTK_ENTRY (entry_uri), - katze_str_non_null (katze_item_get_uri (item))); + if (!new_engine) + gtk_entry_set_text (GTK_ENTRY (entry_uri) + , 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 (content_area), hbox); gtk_widget_show_all (hbox); + hbox = gtk_hbox_new (FALSE, 8); + gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); + label = gtk_label_new_with_mnemonic (_("_Icon:")); + gtk_size_group_add_widget (sizegroup, label); + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); + entry_icon = gtk_entry_new (); + 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))); + gtk_box_pack_start (GTK_BOX (hbox), entry_icon, 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), 5); label = gtk_label_new_with_mnemonic (_("_Token:")); @@ -1151,8 +1001,9 @@ midori_search_action_get_editor (MidoriSearchAction* search_action, gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); entry_token = gtk_entry_new (); gtk_entry_set_activates_default (GTK_ENTRY (entry_token), TRUE); - gtk_entry_set_text (GTK_ENTRY (entry_token) - , katze_str_non_null (katze_item_get_token (item))); + if (!new_engine) + gtk_entry_set_text (GTK_ENTRY (entry_token) + , 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 (content_area), hbox); gtk_widget_show_all (hbox); @@ -1164,6 +1015,7 @@ midori_search_action_get_editor (MidoriSearchAction* search_action, "name", gtk_entry_get_text (GTK_ENTRY (entry_name)), "text", gtk_entry_get_text (GTK_ENTRY (entry_description)), "uri", gtk_entry_get_text (GTK_ENTRY (entry_uri)), + "icon", gtk_entry_get_text (GTK_ENTRY (entry_icon)), "token", gtk_entry_get_text (GTK_ENTRY (entry_token)), NULL); @@ -1188,7 +1040,7 @@ midori_search_action_activate_edit_cb (GtkTreeView *treeview, selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)); if (gtk_tree_selection_get_selected (selection, NULL, NULL)) - midori_search_action_get_editor (search_action, NULL, FALSE); + midori_search_action_get_editor (search_action, FALSE); } @@ -1196,7 +1048,7 @@ static void midori_search_action_dialog_add_cb (GtkWidget* widget, MidoriSearchAction* search_action) { - midori_search_action_get_editor (search_action, katze_item_new (), TRUE); + midori_search_action_get_editor (search_action, TRUE); } static void @@ -1209,7 +1061,7 @@ midori_search_action_dialog_edit_cb (GtkWidget* widget, treeview = search_action->treeview; selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)); if (gtk_tree_selection_get_selected (selection, NULL, NULL)) - midori_search_action_get_editor (search_action, NULL, FALSE); + midori_search_action_get_editor (search_action, FALSE); } static void @@ -1457,8 +1309,6 @@ midori_search_action_get_dialog (MidoriSearchAction* search_action) GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, #endif NULL); - katze_widget_add_class (gtk_dialog_get_widget_for_response ( - GTK_DIALOG (dialog), GTK_RESPONSE_HELP), "help_button"); g_signal_connect (dialog, "destroy", G_CALLBACK (gtk_widget_destroyed), &search_action->dialog); gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_PROPERTIES); @@ -1493,11 +1343,6 @@ midori_search_action_get_dialog (MidoriSearchAction* search_action) gtk_tree_view_column_set_cell_data_func (column, renderer_pixbuf, (GtkTreeCellDataFunc)midori_search_action_dialog_render_tick_cb, 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_search_action_dialog_render_token, - treeview, NULL); 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, @@ -1508,6 +1353,11 @@ midori_search_action_get_dialog (MidoriSearchAction* search_action) gtk_tree_view_column_set_cell_data_func (column, renderer_text, (GtkTreeCellDataFunc)midori_search_action_dialog_render_text, treeview, NULL); + renderer_text = gtk_cell_renderer_text_new (); + gtk_tree_view_column_pack_start (column, renderer_text, TRUE); + gtk_tree_view_column_set_cell_data_func (column, renderer_text, + (GtkTreeCellDataFunc)midori_search_action_dialog_render_token, + treeview, NULL); gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column); scrolled = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), diff --git a/midori/midori-searchaction.h b/midori/midori-searchaction.h index 1f1d2200..c8d0ed88 100644 --- a/midori/midori-searchaction.h +++ b/midori/midori-searchaction.h @@ -13,7 +13,6 @@ #define __MIDORI_SEARCH_ACTION_H__ #include -#include G_BEGIN_DECLS @@ -73,15 +72,6 @@ midori_search_action_set_default_item (MidoriSearchAction* search_action, GtkWidget* midori_search_action_get_dialog (MidoriSearchAction* search_action); -void -midori_search_action_get_editor (MidoriSearchAction* search_action, - KatzeItem* item, - gboolean new_engine); - -KatzeItem* -midori_search_action_get_engine_for_form (WebKitWebView* web_view, - PangoEllipsizeMode ellipsize); - G_END_DECLS #endif /* __MIDORI_SEARCH_ACTION_H__ */ diff --git a/midori/midori-settings.vala b/midori/midori-settings.vala deleted file mode 100644 index 70d213c2..00000000 --- a/midori/midori-settings.vala +++ /dev/null @@ -1,109 +0,0 @@ -/* - Copyright (C) 2008-2012 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 - 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 Midori { - [CCode (cprefix = "MIDORI_WINDOW_")] - public enum WindowState { - NORMAL, - MINIMIZED, - MAXIMIZED, - FULLSCREEN - } - /* Since: 0.1.3 */ - - public class Settings : WebKit.WebSettings { - public bool remember_last_window_size { get; set; default = true; } - public int last_window_width { get; set; default = 0; } - public int last_window_height { get; set; default = 0; } - public int last_panel_position { get; set; default = 0; } - public int last_panel_page { get; set; default = 0; } - public int last_web_search { get; set; default = 0; } - /* Since: 0.4.3 */ - // [IntegerType (min = 10, max = int.max)] - public int search_width { get; set; default = 200; } - /* Since: 0.4.7 */ - public bool last_inspector_attached { get; set; default = false; } - /* Since: 0.1.3 */ - public WindowState last_window_state { get; set; default = WindowState.NORMAL; } - - public string? location_entry_search { get; set; default = null; } - /* Since: 0.1.7 */ - public int clear_private_data { get; set; default = 0; } - /* Since: 0.2.9 */ - public string? clear_data { get; set; default = null; } - - public bool compact_sidepanel { get; set; default = false; } - /* Since: 0.2.2 */ - public bool open_panels_in_windows { get; set; default = false; } - /* Since: 0.1.3 */ - public bool right_align_sidepanel { get; set; default = false; } - - public bool show_menubar { get; set; default = false; } - public bool show_navigationbar { get; set; default = true; } - public bool show_bookmarkbar { get; set; default = false; } - public bool show_panel { get; set; default = false; } - public bool show_statusbar { get; set; default = true; } - /* Since: 0.1.2 */ - public bool show_crash_dialog { get; set; default = true; } - public string toolbar_items { get; set; default = - "TabNew,Back,NextForward,ReloadStop,BookmarkAdd,Location,Search,Trash,CompactMenu"; } - /* Since: 0.1.4 */ - // [Deprecated (since = "0.4.7")] - public bool find_while_typing { get; set; default = false; } - - public bool open_popups_in_tabs { get; set; default = true; } - /* Since: 0.1.3 */ - public bool zoom_text_and_images { get; set; default = true; } - /* Since: 0.2.0 */ - public bool kinetic_scrolling { get; set; default = true; } - public bool middle_click_opens_selection { get; set; default = true; } - public bool flash_window_on_new_bg_tabs { get; set; default = false; } - - public bool close_buttons_on_tabs { get; set; default = true; } - public bool open_tabs_in_the_background { get; set; default = true; } - public bool open_tabs_next_to_current { get; set; default = true; } - public bool always_show_tabbar { get; set; default = true; } - - public string homepage { get; set; default = "http://www.google.com"; } - static string default_download_folder () { - return Environment.get_user_special_dir (UserDirectory.DOWNLOAD) - ?? Environment.get_home_dir (); - } - public string download_folder { get; set; default = default_download_folder (); } - public string? text_editor { get; set; default = null; } - /* Since: 0.1.6 */ - public string? news_aggregator { get; set; default = null; } - - public string http_proxy { get; set; default = null; } - /* Since: 0.4.2 */ - // [IntegerType (min = 1, max = 65535)] - public int http_proxy_port { get; set; default = 8080; } - /* Since: 0.3.4 */ - // [IntegerType (min = 0, int.max)] - public int maximum_cache_size { get; set; default = 100; } - /* Since: 0.3.4 */ - public bool strip_referer { get; set; default = false; } - /* Since: 0.4.2 */ - public bool first_party_cookies_only { get; set; default = true; } - // [IntegerType (min = 0, int.max)] - public int maximum_cookie_age { get; set; default = 30; } - // [IntegerType (min = 0, int.max)] - public int maximum_history_age { get; set; default = 30; } - - /* Since: 0.4.7 */ - public bool delay_saving (string property) { - return property.has_prefix ("last-") - || property == "user-stylesheet-uri" - || property.has_suffix ("-width"); - } - } -} diff --git a/midori/midori-speeddial.vala b/midori/midori-speeddial.vala deleted file mode 100644 index 392257d3..00000000 --- a/midori/midori-speeddial.vala +++ /dev/null @@ -1,401 +0,0 @@ -/* - Copyright (C) 2011-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. - - See the file COPYING for the full license text. -*/ - -namespace Katze { - extern static string mkdir_with_parents (string pathname, int mode); -} - -namespace Sokoke { - extern static string js_script_eval (void* ctx, string script, void* error); -} - -namespace Midori { - public errordomain SpeedDialError { - INVALID_MESSAGE, - NO_ACTION, - NO_ID, - NO_URL, - NO_TITLE, - NO_ID2, - INVALID_ACTION, - } - - public class SpeedDial : GLib.Object { - string filename; - string? html = null; - List thumb_queue = null; - WebKit.WebView thumb_view = null; - Spec? spec = null; - - public GLib.KeyFile keyfile; - public bool close_buttons_left { get; set; default = false; } - public signal void refresh (); - - public class Spec { - public string dial_id; - public string uri; - public Spec (string dial_id, string uri) { - this.dial_id = dial_id; - this.uri = uri; - } - } - - public SpeedDial (string new_filename, string? fallback = null) { - filename = new_filename; - keyfile = new GLib.KeyFile (); - try { - keyfile.load_from_file (filename, GLib.KeyFileFlags.NONE); - } - catch (GLib.Error io_error) { - string json; - size_t len; - try { - FileUtils.get_contents (fallback ?? (filename + ".json"), - out json, out len); - } - catch (GLib.Error fallback_error) { - json = "'{}'"; - len = 4; - } - - var script = new StringBuilder.sized (len); - script.append ("var json = JSON.parse ("); - script.append_len (json, (ssize_t)len); - script.append (""" - ); - 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; - """); - - try { - keyfile.load_from_data ( - Sokoke.js_script_eval (null, script.str, null), - -1, 0); - } - catch (GLib.Error eval_error) { - GLib.critical ("Failed to parse %s as speed dial JSON: %s", - fallback ?? (filename + ".json"), eval_error.message); - } - Katze.mkdir_with_parents ( - Path.build_path (Path.DIR_SEPARATOR_S, - Environment.get_user_cache_dir (), - "midori", "thumbnails"), 0700); - - foreach (string tile in keyfile.get_groups ()) { - try { - string img = keyfile.get_string (tile, "img"); - keyfile.remove_key (tile, "img"); - string uri = keyfile.get_string (tile, "uri"); - if (img != null && uri[0] != '\0' && uri[0] != '#') { - uchar[] decoded = Base64.decode (img); - FileUtils.set_data (build_thumbnail_path (uri), decoded); - } - } - catch (GLib.Error img_error) { - /* img and uri can be missing */ - } - } - } - } - - public string get_next_free_slot (out uint count = null) { - uint slot_count = 0; - foreach (string tile in keyfile.get_groups ()) { - try { - if (keyfile.has_key (tile, "uri")) - slot_count++; - } - catch (KeyFileError error) { } - } - if (&count != null) - count = slot_count; - - uint slot = 1; - while (slot <= slot_count) { - string tile = "Dial %u".printf (slot); - if (!keyfile.has_group (tile)) - return tile; - slot++; - } - - return "Dial %u".printf (slot_count + 1); - } - - public void add (string uri, string title, Gdk.Pixbuf img) { - string id = get_next_free_slot (); - add_with_id (id, uri, title, img); - } - - public void add_with_id (string id, string uri, string title, Gdk.Pixbuf img) { - keyfile.set_string (id, "uri", uri); - keyfile.set_string (id, "title", title); - - Katze.mkdir_with_parents (Path.build_path (Path.DIR_SEPARATOR_S, - Paths.get_cache_dir (), "thumbnails"), 0700); - string filename = build_thumbnail_path (uri); - try { - img.save (filename, "png", null, "compression", "7", null); - } - catch (Error error) { - critical ("Failed to save speed dial thumbnail: %s", error.message); - } - save (); - } - - string build_thumbnail_path (string filename) { - string thumbnail = Checksum.compute_for_string (ChecksumType.MD5, filename) + ".png"; - return Path.build_filename (Paths.get_cache_dir (), "thumbnails", thumbnail); - } - - public unowned string get_html () throws Error { - bool load_missing = true; - - if (html != null) - return html; - - string? head = null; - string filename = Paths.get_res_filename ("speeddial-head.html"); - if (keyfile != null - && FileUtils.get_contents (filename, out head, null)) { - string header = head.replace ("{title}", _("Speed Dial")). - replace ("{click_to_add}", _("Click to add a shortcut")). - replace ("{enter_shortcut_address}", _("Enter shortcut address")). - replace ("{enter_shortcut_name}", _("Enter shortcut title")). - replace ("{are_you_sure}", _("Are you sure you want to delete this shortcut?")); - var markup = new StringBuilder (header); - - uint slot_count = 1; - string dial_id = get_next_free_slot (out slot_count); - uint next_slot = dial_id.substring (5, -1).to_int (); - - /* Try to guess the best X by X grid size */ - uint grid_index = 3; - while ((grid_index * grid_index) < slot_count) - grid_index++; - - /* Percent width size of one slot */ - uint slot_size = (100 / grid_index); - - /* No editing in private/ app mode or without scripts */ - markup.append_printf ( - "%s%s" + - "\n", - Paths.is_readonly () ? "" : "", - 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 */ - uint div_factor; - if (slot_size * grid_index >= 100 && grid_index > 4) - div_factor = 8; - else - div_factor = 2; - uint margin = (100 - ((slot_size - 4) * grid_index)) / div_factor; - if (margin > 9) - margin = margin % 10; - - markup.append_printf ( - "", margin); - if (close_buttons_left) - markup.append_printf ( - ""); - - foreach (string tile in keyfile.get_groups ()) { - try { - string uri = keyfile.get_string (tile, "uri"); - if (uri != null && uri.str ("://") != null && tile.has_prefix ("Dial ")) { - string title = keyfile.get_string (tile, "title"); - string thumb_filename = build_thumbnail_path (uri); - uint slot = tile.substring (5, -1).to_int (); - string encoded; - try { - uint8[] thumb; - FileUtils.get_data (thumb_filename, out thumb); - encoded = Base64.encode (thumb); - } - catch (FileError error) { - encoded = null; - if (load_missing) - get_thumb (tile, uri); - } - markup.append_printf (""" -
    - - -
    %s
    - """, - slot, uri, encoded ?? "", title, title ?? ""); - } - else if (tile != "settings") - keyfile.remove_group (tile); - } - catch (KeyFileError error) { } - } - - markup.append_printf (""" -
    - -
    %s
    - """, - next_slot, _("Click to add a shortcut")); - markup.append_printf ("
    \n\n\n"); - html = markup.str; - } - else - html = ""; - - return html; - } - - public void save_message (string message) throws Error { - if (!message.has_prefix ("speed_dial-save-")) - throw new SpeedDialError.INVALID_MESSAGE ("Invalid message '%s'", message); - - string msg = message.substring (16, -1); - string[] parts = msg.split (" ", 4); - if (parts[0] == null) - throw new SpeedDialError.NO_ACTION ("No action."); - string action = parts[0]; - - if (parts[1] == null) - throw new SpeedDialError.NO_ID ("No ID argument."); - string dial_id = "Dial " + parts[1]; - - if (action == "delete") { - string uri = keyfile.get_string (dial_id, "uri"); - string file_path = build_thumbnail_path (uri); - keyfile.remove_group (dial_id); - FileUtils.unlink (file_path); - } - else if (action == "add") { - if (parts[2] == null) - throw new SpeedDialError.NO_URL ("No URL argument."); - keyfile.set_string (dial_id, "uri", parts[2]); - get_thumb (dial_id, parts[2]); - } - else if (action == "rename") { - if (parts[2] == null) - throw new SpeedDialError.NO_TITLE ("No title argument."); - string title = parts[2]; - keyfile.set_string (dial_id, "title", title); - } - else if (action == "swap") { - if (parts[2] == null) - throw new SpeedDialError.NO_ID2 ("No ID2 argument."); - string dial2_id = "Dial " + parts[2]; - - string uri = keyfile.get_string (dial_id, "uri"); - string title = keyfile.get_string (dial_id, "title"); - string uri2 = keyfile.get_string (dial2_id, "uri"); - string title2 = keyfile.get_string (dial2_id, "title"); - - keyfile.set_string (dial_id, "uri", uri2); - keyfile.set_string (dial2_id, "uri", uri); - keyfile.set_string (dial_id, "title", title2); - keyfile.set_string (dial2_id, "title", title); - } - else - throw new SpeedDialError.INVALID_ACTION ("Invalid action '%s'", action); - - save (); - } - - void save () { - html = null; - - try { - FileUtils.set_contents (filename, keyfile.to_data ()); - } - catch (Error error) { - critical ("Failed to update speed dial: %s", error.message); - } - refresh (); - } - - void load_status (GLib.Object thumb_view_, ParamSpec pspec) { - if (thumb_view.load_status != WebKit.LoadStatus.FINISHED) - return; - - return_if_fail (spec != null); - #if HAVE_OFFSCREEN - var img = (thumb_view.parent as Gtk.OffscreenWindow).get_pixbuf (); - var pixbuf_scaled = img.scale_simple (240, 160, Gdk.InterpType.TILES); - img = pixbuf_scaled; - #else - thumb_view.realize (); - var img = midori_view_web_view_get_snapshot (thumb_view, 240, 160); - #endif - unowned string title = thumb_view.get_title (); - add_with_id (spec.dial_id, spec.uri, title ?? spec.uri, img); - - thumb_queue.remove (spec); - if (thumb_queue != null && thumb_queue.data != null) { - spec = thumb_queue.data; - thumb_view.load_uri (spec.uri); - } - else - /* disconnect_by_func (thumb_view, load_status) */; - } - - void get_thumb (string dial_id, string uri) { - if (thumb_view == null) { - thumb_view = new WebKit.WebView (); - var settings = new WebKit.WebSettings (); - settings. set ("enable-scripts", false, - "enable-plugins", false, - "auto-load-images", true, - "enable-html5-database", false, - "enable-html5-local-storage", false); - if (settings.get_class ().find_property ("enable-java-applet") != null) - settings.set ("enable-java-applet", false); - thumb_view.settings = settings; - #if HAVE_OFFSCREEN - var offscreen = new Gtk.OffscreenWindow (); - offscreen.add (thumb_view); - thumb_view.set_size_request (800, 600); - offscreen.show_all (); - #else - /* What we are doing here is a bit of a hack. In order to render a - thumbnail we need a new view and load the url in it. But it has - to be visible and packed in a container. So we secretly pack it - into the notebook of the parent browser. */ - notebook.add (thumb_view); - thumb_view.destroy.connect (Gtk.widget_destroyed); - /* We use an empty label. It's not invisible but hard to spot. */ - notebook.set_tab_label (thumb_view, new Gtk.EventBox ()); - thumb_view.show (); - #endif - } - - thumb_queue.append (new Spec (dial_id, uri)); - if (thumb_queue.nth_data (1) != null) - return; - - spec = thumb_queue.data; - thumb_view.notify["load-status"].connect (load_status); - thumb_view.load_uri (spec.uri); - } - } -} - diff --git a/midori/midori-stock.h b/midori/midori-stock.h index a28d3edf..7fe9f127 100644 --- a/midori/midori-stock.h +++ b/midori/midori-stock.h @@ -12,28 +12,42 @@ #ifndef __MIDORI_STOCK_H__ #define __MIDORI_STOCK_H__ 1 -/* Stock items */ +/* Custom stock items + We should distribute these + Names should match with epiphany and/ or xdg spec */ + +#define STOCK_BOOKMARK "stock_bookmark" #define STOCK_BOOKMARKS "user-bookmarks" +#define STOCK_CONSOLE "terminal" #define STOCK_EXTENSION "extension" +#define STOCK_EXTENSIONS "extension" #define STOCK_HISTORY "document-open-recent" #define STOCK_WEB_BROWSER "web-browser" -#define STOCK_NEWS_FEED "internet-news-reader" -#define STOCK_STYLE "preferences-desktop-theme" +#define STOCK_NEWS_FEED "news-feed" +#define STOCK_STYLE "gnome-settings-theme" #define STOCK_TRANSFER "package" -#define STOCK_PLUGINS "application-x-shockwave-flash" +#define STOCK_TRANSFERS "package" +#define STOCK_PLUGINS "gnome-mime-application-x-shockwave-flash" + #define STOCK_BOOKMARK_ADD "bookmark-new" -#define STOCK_IMAGE "image-x-generic" +#define STOCK_HOMEPAGE "go-home" +#define STOCK_IMAGE "gnome-mime-image" #define STOCK_NETWORK_OFFLINE "network-offline" -#define STOCK_SCRIPT "text-x-javascript" -#define STOCK_SEND "mail-send" -#define STOCK_TAB_NEW "tab-new" -#define STOCK_USER_TRASH "user-trash" -#define STOCK_WINDOW_NEW "window-new" -#define STOCK_FOLDER_NEW "folder-new" -#define STOCK_EDIT_CLEAR "edit-clear" -#define STOCK_EDIT_FIND "edit-find" -#define STOCK_STOP "stop" -#define STOCK_URL "text-html" +#define STOCK_SCRIPT "stock_script" +#define STOCK_SCRIPTS "gnome-settings-theme" +#define STOCK_SEND "stock_mail-send" +#define STOCK_TAB_NEW "stock_new-tab" +#define STOCK_USER_TRASH "gnome-stock-trash" +#define STOCK_WINDOW_NEW "stock_new-window" + +#if defined (HAVE_HILDON) && HAVE_HILDON + #undef STOCK_BOOKMARKS + #define STOCK_BOOKMARKS "general_mybookmarks_folder" + #undef STOCK_NEWS_FEED + #define STOCK_NEWS_FEED "general_rss" + #undef STOCK_WEB_BROWSER + #define STOCK_WEB_BROWSER "general_web" +#endif #endif /* !__MIDORI_STOCK_H__ */ diff --git a/midori/midori-view.c b/midori/midori-view.c index b3b6634b..b82939c0 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -13,27 +13,11 @@ #include "midori-view.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 - -#ifdef HAVE_GRANITE -#include -#endif - -#ifdef HAVE_GCR - #define GCR_API_SUBJECT_TO_CHANGE - #include - -SoupMessage* -midori_map_get_message (SoupMessage* message); -#endif - #include #include #include @@ -42,14 +26,10 @@ midori_map_get_message (SoupMessage* message); #include #include +#include #if HAVE_UNISTD_H #include #endif - -#include -#include -#include - #ifndef G_OS_WIN32 #include #endif @@ -77,14 +57,10 @@ midori_view_web_view_get_snapshot (GtkWidget* web_view, gint width, gint height); -static gboolean -midori_view_display_error (MidoriView* view, - const gchar* uri, - const gchar* title, - const gchar* message, - const gchar* description, - const gchar* try_again, - WebKitWebFrame* web_frame); +static void +midori_view_speed_dial_get_thumb (MidoriView* view, + gchar* dial_id, + gchar* url); struct _MidoriView { @@ -103,7 +79,6 @@ struct _MidoriView gchar* statusbar_text; WebKitHitTestResult* hit_test; gchar* link_uri; - gboolean button_press_handled; gboolean has_selection; gchar* selected_text; MidoriWebSettings* settings; @@ -118,25 +93,15 @@ struct _MidoriView gint alerts; GtkWidget* menu_item; - PangoEllipsizeMode ellipsize; - #ifdef HAVE_GRANITE - GraniteWidgetsTab* tab; - #else GtkWidget* tab_label; GtkWidget* tab_icon; GtkWidget* tab_title; GtkWidget* tab_close; - #endif KatzeItem* item; gint scrollh, scrollv; gboolean back_forward_set; + GHashTable* memory; GtkWidget* scrolled_window; - - #if GTK_CHECK_VERSION (3, 2, 0) - GtkWidget* overlay; - GtkWidget* overlay_label; - GtkWidget* overlay_find; - #endif }; struct _MidoriViewClass @@ -219,6 +184,10 @@ enum { 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); @@ -243,6 +212,10 @@ midori_view_settings_notify_cb (MidoriWebSettings* settings, GParamSpec* pspec, MidoriView* view); +static void +midori_view_speed_dial_save (MidoriView* view, + const gchar* message); + static void midori_view_class_init (MidoriViewClass* class) { @@ -519,7 +492,7 @@ midori_view_class_init (MidoriViewClass* class) "mime-type", "MIME Type", "The MIME type of the currently loaded page", - NULL, + "text/html", G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (gobject_class, @@ -653,8 +626,12 @@ midori_view_set_title (MidoriView* view, const gchar* title) #endif display_title = midori_view_get_display_title (view); + if (view->tab_label) + { /* If the title starts with the presumed name of the website, we ellipsize differently, to emphasize the subtitle */ + if (gtk_label_get_angle (GTK_LABEL (view->tab_title)) == 0.0) + { SoupURI* uri = soup_uri_new (view->uri); const gchar* host = uri ? (uri->host ? uri->host : "") : ""; const gchar* name = g_str_has_prefix (host, "www.") ? &host[4] : host; @@ -663,25 +640,16 @@ midori_view_set_title (MidoriView* view, const gchar* title) if (name[i] == '.') break; if (!g_ascii_strncasecmp (display_title, name, i)) - view->ellipsize = PANGO_ELLIPSIZE_START; + gtk_label_set_ellipsize (GTK_LABEL (view->tab_title), PANGO_ELLIPSIZE_START); else - view->ellipsize = PANGO_ELLIPSIZE_END; + gtk_label_set_ellipsize (GTK_LABEL (view->tab_title), PANGO_ELLIPSIZE_END); if (uri) soup_uri_free (uri); - #ifdef HAVE_GRANITE - if (view->tab) - g_object_set (view->tab, - "label", display_title, "ellipsize-mode", view->ellipsize, NULL); - #else - if (view->tab_label) - { + } 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 (gtk_label_get_angle (GTK_LABEL (view->tab_title)) == 0.0) - gtk_label_set_ellipsize (GTK_LABEL (view->tab_title), view->ellipsize); } - #endif if (view->menu_item) gtk_label_set_text (GTK_LABEL (gtk_bin_get_child (GTK_BIN ( view->menu_item))), display_title); @@ -694,16 +662,9 @@ midori_view_apply_icon (MidoriView* view, const gchar* icon_name) { 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"); - #ifdef HAVE_GRANITE - if (view->tab) - g_object_set (view->tab, "icon", icon, NULL); - #else if (view->tab_icon) { if (icon_name && !strchr (icon_name, '/')) @@ -713,82 +674,120 @@ midori_view_apply_icon (MidoriView* view, katze_throbber_set_static_pixbuf (KATZE_THROBBER (view->tab_icon), view->icon); } - #endif if (view->menu_item) { - GtkWidget* image = katze_item_get_image (view->item); + GtkWidget* image; + if (icon_name && !strchr (icon_name, '/')) + image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU); + else + image = gtk_image_new_from_pixbuf (view->icon); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (view->menu_item), image); } } +static gboolean +midori_view_mime_icon (MidoriView* view, + GtkIconTheme* icon_theme, + const gchar* format, + const gchar* part1, + const gchar* part2) +{ + gchar* icon_name; + GdkPixbuf* icon; + + icon_name = part2 ? g_strdup_printf (format, part1, part2) + : g_strdup_printf (format, part1); + if (!(icon = gtk_icon_theme_load_icon (icon_theme, icon_name, 16, 0, NULL))) + { + g_free (icon_name); + return FALSE; + } + + g_object_ref (icon); + midori_view_apply_icon (view, icon, icon_name); + g_free (icon_name); + return TRUE; +} + static void -midori_view_unset_icon (MidoriView* view) +midori_view_update_icon (MidoriView* view, + GdkPixbuf* icon) { GdkScreen* screen; - GtkIconTheme* icon_theme; - GIcon* icon; - gchar** icon_names; - GdkPixbuf* pixbuf = NULL; - - if (!((screen = gtk_widget_get_screen (view->web_view)) - && (icon_theme = gtk_icon_theme_get_for_screen (screen)))) - return; + GtkIconTheme* theme; + gchar** parts = NULL; - if (view->mime_type != NULL) + if (icon) { - gchar* content_type = g_content_type_from_mime_type (view->mime_type); - icon = g_content_type_get_icon (content_type); - g_free (content_type); - g_themed_icon_append_name (G_THEMED_ICON (icon), "text-html"); + midori_view_apply_icon (view, icon, view->icon_uri); + return; } - else - icon = g_themed_icon_new ("text-html"); - if ((icon_names = (gchar**)g_themed_icon_get_names (G_THEMED_ICON (icon)))) - while (*icon_names) + if (!((screen = gtk_widget_get_screen (GTK_WIDGET (view))) + && (theme = gtk_icon_theme_get_for_screen (screen)))) + return; + if (view->mime_type == NULL) + return; + + if (!((parts = g_strsplit (view->mime_type, "/", 2)) && (*parts && parts[1]))) { - if ((pixbuf = gtk_icon_theme_load_icon (icon_theme, *icon_names, 16, 0, NULL))) - break; - icon_names++; + /* 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); + midori_view_apply_icon (view, icon, GTK_STOCK_FILE); + goto free_parts; } - g_object_unref (icon); - midori_view_apply_icon (view, pixbuf, GTK_STOCK_FILE); + if (midori_view_mime_icon (view, theme, "%s-%s", *parts, parts[1])) + goto free_parts; + if (midori_view_mime_icon (view, theme, "gnome-mime-%s-%s", *parts, parts[1])) + goto free_parts; + if (midori_view_mime_icon (view, theme, "%s-x-generic", *parts, NULL)) + goto free_parts; + if (midori_view_mime_icon (view, theme, "gnome-mime-%s-x-generic", *parts, NULL)) + goto free_parts; + + icon = gtk_widget_render_icon (GTK_WIDGET (view), + GTK_STOCK_FILE, GTK_ICON_SIZE_MENU, NULL); + midori_view_apply_icon (view, icon, NULL); + +free_parts: + g_strfreev (parts); } -#if !WEBKIT_CHECK_VERSION (1, 8, 0) -static void -katze_net_object_maybe_unref (gpointer object) +typedef struct { - if (object) - g_object_unref (object); -} + gchar* icon_file; + gchar* icon_uri; + MidoriView* view; +} KatzeNetIconPriv; -static GHashTable* -midori_view_get_memory (void) +static void +katze_net_icon_priv_free (KatzeNetIconPriv* priv) { - 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 (memory); + g_free (priv->icon_file); + g_free (priv->icon_uri); + g_slice_free (KatzeNetIconPriv, priv); } static gboolean katze_net_icon_status_cb (KatzeNetRequest* request, - MidoriView* view) + KatzeNetIconPriv* priv) { switch (request->status) { case KATZE_NET_VERIFIED: if (request->mime_type && strncmp (request->mime_type, "image/", 6)) { + katze_net_icon_priv_free (priv); return FALSE; } break; case KATZE_NET_MOVED: break; default: + katze_net_icon_priv_free (priv); return FALSE; } return TRUE; @@ -796,7 +795,7 @@ katze_net_icon_status_cb (KatzeNetRequest* request, static void katze_net_icon_transfer_cb (KatzeNetRequest* request, - MidoriView* view) + KatzeNetIconPriv* priv) { GdkPixbuf* pixbuf; FILE* fp; @@ -811,62 +810,61 @@ katze_net_icon_transfer_cb (KatzeNetRequest* request, pixbuf = NULL; if (request->data) { - gchar* icon_file = katze_net_get_cached_path (NULL, view->icon_uri, "icons"); - if ((fp = fopen (icon_file, "wb"))) + if ((fp = fopen (priv->icon_file, "wb"))) { ret = fwrite (request->data, 1, request->length, fp); fclose (fp); if ((ret - request->length != 0)) { g_warning ("Error writing to file %s " - "in katze_net_icon_transfer_cb()", icon_file); + "in katze_net_icon_transfer_cb()", priv->icon_file); } + pixbuf = gdk_pixbuf_new_from_file (priv->icon_file, NULL); } - g_free (icon_file); - - pixbuf = katze_pixbuf_new_from_buffer ((guchar*)request->data, + 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); } if (!pixbuf) { - midori_view_unset_icon (view); + midori_view_update_icon (priv->view, NULL); + katze_net_icon_priv_free (priv); return; } - g_hash_table_insert (midori_view_get_memory (), g_strdup (view->icon_uri), pixbuf); - settings = gtk_widget_get_settings (view->web_view); + 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); - midori_view_apply_icon (view, pixbuf_scaled, view->icon_uri); + + g_object_unref (pixbuf); + + katze_assign (priv->view->icon_uri, g_strdup (priv->icon_uri)); + midori_view_update_icon (priv->view, pixbuf_scaled); + katze_net_icon_priv_free (priv); } -#endif static void _midori_web_view_load_icon (MidoriView* view) { - GdkPixbuf* pixbuf = NULL; + GdkPixbuf* pixbuf; + gchar* icon_file; gint icon_width, icon_height; - GtkSettings* settings; - - #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; + GtkSettings* settings; - if (!midori_uri_is_http (view->icon_uri)) - katze_assign (view->icon_uri, NULL); + pixbuf = NULL; - if (midori_uri_is_http (view->uri) || g_str_has_prefix (view->uri, "file://")) + if (midori_uri_is_http (view->icon_uri) || midori_uri_is_http (view->uri)) { - gchar* icon_file = NULL; - if (!view->icon_uri) + gchar* icon_uri = g_strdup (view->icon_uri); + if (!icon_uri) { guint i = 8; while (view->uri[i] != '\0' && view->uri[i] != '/') @@ -874,33 +872,42 @@ _midori_web_view_load_icon (MidoriView* view) if (view->uri[i] == '/') { gchar* path = g_strndup (view->uri, i); - view->icon_uri = g_strdup_printf ("%s/favicon.ico", path); + icon_uri = g_strdup_printf ("%s/favicon.ico", path); g_free (path); } else - view->icon_uri = g_strdup_printf ("%s/favicon.ico", view->uri); + icon_uri = g_strdup_printf ("%s/favicon.ico", view->uri); } - if (g_hash_table_lookup_extended (midori_view_get_memory (), - view->icon_uri, NULL, (gpointer)&pixbuf)) + icon_file = katze_net_get_cached_path (NULL, icon_uri, "icons"); + if (g_hash_table_lookup_extended (view->memory, + icon_file, NULL, (gpointer)&pixbuf)) { - g_warn_if_fail (pixbuf != NULL); - g_object_ref (pixbuf); + g_free (icon_file); + if (pixbuf) + { + g_object_ref (pixbuf); + katze_assign (view->icon_uri, icon_uri); + } } - else if ((icon_file = katze_net_get_cached_path (NULL, view->icon_uri, "icons")) && - (pixbuf = gdk_pixbuf_new_from_file (icon_file, NULL))) + else if ((pixbuf = gdk_pixbuf_new_from_file (icon_file, NULL))) { - g_hash_table_insert (midori_view_get_memory (), - g_strdup (view->icon_uri), g_object_ref (pixbuf)); + g_free (icon_file); + katze_assign (view->icon_uri, icon_uri); } else if (!view->special) { - katze_net_load_uri (NULL, view->icon_uri, + KatzeNetIconPriv* priv; + + priv = g_slice_new (KatzeNetIconPriv); + priv->icon_file = icon_file; + priv->icon_uri = icon_uri; + priv->view = view; + + katze_net_load_uri (NULL, icon_uri, (KatzeNetStatusCb)katze_net_icon_status_cb, - (KatzeNetTransferCb)katze_net_icon_transfer_cb, view); + (KatzeNetTransferCb)katze_net_icon_transfer_cb, priv); } - - g_free (icon_file); } if (pixbuf) @@ -912,9 +919,9 @@ _midori_web_view_load_icon (MidoriView* view) icon_height, GDK_INTERP_BILINEAR); g_object_unref (pixbuf); pixbuf = pixbuf_scaled; - midori_view_apply_icon (view, pixbuf, view->icon_uri); } - #endif + + midori_view_update_icon (view, pixbuf); } static void @@ -930,15 +937,9 @@ midori_view_update_load_status (MidoriView* view, view->load_status = load_status; g_object_notify (G_OBJECT (view), "load-status"); - #ifdef HAVE_GRANITE - if (view->tab) - g_object_set (view->tab, "working", - midori_view_get_progress (view) > 0.0, NULL); - #else if (view->tab_icon) katze_throbber_set_animated (KATZE_THROBBER (view->tab_icon), - midori_view_get_progress (view) > 0.0); - #endif + view->load_status != MIDORI_LOAD_FINISHED); } static gboolean @@ -959,7 +960,7 @@ midori_view_web_view_navigation_decision_cb (WebKitWebView* web_view g_free (new_uri); return TRUE; } - else if (sokoke_external_uri (uri)) + 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)) @@ -968,61 +969,6 @@ midori_view_web_view_navigation_decision_cb (WebKitWebView* web_view return TRUE; } } - else if (g_str_has_prefix (uri, "data:image/")) - { - /* For security reasons, main content served as data: is limited to images - http://lcamtuf.coredump.cx/switch/ */ - webkit_web_policy_decision_ignore (decision); - return TRUE; - } - #ifdef HAVE_GCR - else if (/* view->special && */ !strncmp (uri, "https", 5)) - { - /* We show an error page if the certificate is invalid. - If a "special", unverified page loads a form, it must be that page. - if (webkit_web_navigation_action_get_reason (action) == WEBKIT_WEB_NAVIGATION_REASON_FORM_SUBMITTED) - FIXME: Verify more stricly that this cannot be eg. a simple Reload */ - if (webkit_web_navigation_action_get_reason (action) == WEBKIT_WEB_NAVIGATION_REASON_RELOAD) - { - SoupMessage* message = webkit_network_request_get_message (request); - if (!(soup_message_get_flags (message) & SOUP_MESSAGE_CERTIFICATE_TRUSTED)) - { - SoupURI* soup_uri = soup_message_get_uri (message); - GTlsCertificate* tls_cert; - GcrCertificate* gcr_cert; - GByteArray* der_cert; - - message = midori_map_get_message (message); - g_object_get (message, "tls-certificate", &tls_cert, NULL); - g_return_val_if_fail (tls_cert != NULL, FALSE); - g_object_get (tls_cert, "certificate", &der_cert, NULL); - gcr_cert = gcr_simple_certificate_new (der_cert->data, der_cert->len); - g_byte_array_unref (der_cert); - if (soup_uri && soup_uri->host && !gcr_trust_is_certificate_pinned (gcr_cert, GCR_PURPOSE_SERVER_AUTH, soup_uri->host, NULL, NULL)) - { - GError* error = NULL; - gcr_trust_add_pinned_certificate (gcr_cert, GCR_PURPOSE_SERVER_AUTH, soup_uri->host, NULL, &error); - if (error != NULL) - { - gchar* slots = g_strjoinv (" , ", (gchar**)gcr_pkcs11_get_trust_lookup_uris ()); - gchar* title = g_strdup_printf ("Error granting trust: %s", error->message); - midori_view_stop_loading (view); - midori_view_display_error (view, view->uri, - view->title ? view->title : view->uri, title, slots, - _("Trust this website"), NULL); - g_free (title); - g_free (slots); - g_error_free (error); - } - } - else - g_warn_if_reached (); - g_object_unref (gcr_cert); - g_object_unref (tls_cert); - } - } - } - #endif view->special = FALSE; /* Remove link labels */ @@ -1064,11 +1010,6 @@ webkit_web_view_load_started_cb (WebKitWebView* web_view, g_object_thaw_notify (G_OBJECT (view)); } -#ifdef HAVE_GCR -const gchar* -midori_location_action_tls_flags_to_string (GTlsCertificateFlags flags); -#endif - static void webkit_web_view_load_committed_cb (WebKitWebView* web_view, WebKitWebFrame* web_frame, @@ -1077,9 +1018,6 @@ webkit_web_view_load_committed_cb (WebKitWebView* web_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)); uri = webkit_web_frame_get_uri (web_frame); @@ -1105,7 +1043,7 @@ webkit_web_view_load_committed_cb (WebKitWebView* web_view, g_object_notify (G_OBJECT (view), "uri"); g_object_set (view, "title", NULL, NULL); - midori_view_unset_icon (view); + midori_view_update_icon (view, NULL); if (!strncmp (uri, "https", 5)) { @@ -1121,40 +1059,6 @@ webkit_web_view_load_committed_cb (WebKitWebView* web_view, if (message && soup_message_get_flags (message) & SOUP_MESSAGE_CERTIFICATE_TRUSTED) view->security = MIDORI_SECURITY_TRUSTED; - #ifdef HAVE_GCR - else if (!view->special && message != NULL) - { - GTlsCertificate* tls_cert; - GcrCertificate* gcr_cert; - GByteArray* der_cert; - SoupURI* soup_uri; - - message = midori_map_get_message (message); - g_object_get (message, "tls-certificate", &tls_cert, NULL); - g_return_if_fail (tls_cert != NULL); - g_object_get (tls_cert, "certificate", &der_cert, NULL); - gcr_cert = gcr_simple_certificate_new (der_cert->data, der_cert->len); - g_byte_array_unref (der_cert); - soup_uri = soup_message_get_uri (message); - if (gcr_trust_is_certificate_pinned (gcr_cert, GCR_PURPOSE_SERVER_AUTH, soup_uri->host, NULL, NULL)) - view->security = MIDORI_SECURITY_TRUSTED; - else - { - GTlsCertificateFlags tls_flags; - view->security = MIDORI_SECURITY_UNKNOWN; - g_object_get (message, "tls-errors", &tls_flags, NULL); - midori_view_stop_loading (view); - midori_view_display_error ( - view, view->uri, view->title ? view->title : view->uri, - _("Security unknown"), - midori_location_action_tls_flags_to_string (tls_flags), - _("Trust this website"), - NULL); - } - g_object_unref (tls_cert); - g_object_unref (gcr_cert); - } - #endif else #endif view->security = MIDORI_SECURITY_UNKNOWN; @@ -1190,12 +1094,12 @@ midori_view_web_view_resource_request_cb (WebKitWebView* web_view, const gchar* uri = webkit_network_request_get_uri (request); /* Only apply custom URIs to special pages for security purposes */ - if (!view->special && !midori_view_is_blank (view)) + if (!view->special) return; if (g_str_has_prefix (uri, "res://")) { - gchar* filepath = midori_paths_get_res_filename (&uri[6]); + 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); @@ -1211,14 +1115,10 @@ midori_view_web_view_resource_request_cb (WebKitWebView* web_view, gint real_icon_size; GtkIconInfo* icon_info; const gchar* icon_filename; - static gint icon_size_large_dialog = 0; - - if (!icon_size_large_dialog) - icon_size_large_dialog = gtk_icon_size_register ("large-dialog", 64, 64); if (g_ascii_isalpha (icon_name[0])) icon_size = strstr (icon_name, "dialog") ? - icon_size_large_dialog : GTK_ICON_SIZE_BUTTON; + GTK_ICON_SIZE_DIALOG : GTK_ICON_SIZE_BUTTON; else if (g_ascii_isdigit (icon_name[0])) { guint i = 0; @@ -1298,8 +1198,7 @@ midori_view_infobar_response_cb (GtkWidget* infobar, { void (*response_cb) (GtkWidget*, gint, gpointer); response_cb = g_object_get_data (G_OBJECT (infobar), "midori-infobar-cb"); - if (response_cb != NULL) - response_cb (infobar, response, data_object); + response_cb (infobar, response, data_object); gtk_widget_destroy (infobar); } #else @@ -1311,8 +1210,7 @@ midori_view_info_bar_button_cb (GtkWidget* 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"); - if (response_cb != NULL) - response_cb (infobar, response, data_object); + response_cb (infobar, response, data_object); gtk_widget_destroy (infobar); } #endif @@ -1352,6 +1250,7 @@ midori_view_add_info_bar (MidoriView* view, 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); @@ -1428,32 +1327,15 @@ midori_view_web_view_database_quota_exceeded_cb (WebKitWebView* web_view, 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); - } - } + 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) @@ -1466,7 +1348,6 @@ midori_view_location_response_cb (GtkWidget* infobar, webkit_geolocation_policy_allow (decision); else webkit_geolocation_policy_deny (decision); - g_object_unref (decision); } static gboolean @@ -1479,9 +1360,8 @@ midori_view_web_view_geolocation_decision_cb (WebKitWebView* w 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), + message, G_CALLBACK (midori_view_location_response_cb), decision, _("_Deny"), GTK_RESPONSE_REJECT, _("_Allow"), GTK_RESPONSE_ACCEPT, NULL); g_free (hostname); @@ -1513,7 +1393,7 @@ midori_view_display_error (MidoriView* view, const gchar* try_again, WebKitWebFrame* web_frame) { - gchar* path = midori_paths_get_res_filename ("error.html"); + gchar* path = sokoke_find_data_filename ("error.html", TRUE); gchar* template; if (g_file_get_contents (path, &template, NULL, NULL)) @@ -1525,8 +1405,6 @@ midori_view_display_error (MidoriView* view, title_escaped = g_markup_escape_text (title, -1); icon = katze_item_get_icon (view->item); result = sokoke_replace_variables (template, - "{dir}", gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL ? - "rtl" : "ltr", "{title}", title_escaped, "{icon}", icon ? icon : "", "{message}", message, @@ -1561,15 +1439,13 @@ webkit_web_view_load_error_cb (WebKitWebView* web_view, gchar* message; gboolean result; - /* The unholy trinity; also ignored in Webkit's default error handler */ switch (error->code) { case WEBKIT_PLUGIN_ERROR_WILL_HANDLE_LOAD: /* A plugin will take over. That's expected, it's not fatal. */ + return FALSE; 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; } @@ -1616,97 +1492,63 @@ webkit_web_view_load_finished_cb (WebKitWebView* web_view, midori_view_apply_scroll_position (view); - if (web_frame == webkit_web_view_get_main_frame (web_view)) + view->progress = 1.0; + g_object_notify (G_OBJECT (view), "progress"); + midori_view_update_load_status (view, MIDORI_LOAD_FINISHED); + + if (1) { JSContextRef js_context = webkit_web_frame_get_global_context (web_frame); - /* Icon: URI, News Feed: $URI|title, Search: :URI|title */ + /* Join news feeds into like this: URI1|title1,URI2|title2 */ gchar* value = sokoke_js_script_eval (js_context, - "(function (l) { var f = new Array (); for (var i in l) " + "(function (l) { var f = new Array (); for (i in l) " "{ var t = l[i].type; var r = l[i].rel; " "if (t && (t.indexOf ('rss') != -1 || t.indexOf ('atom') != -1)) " - "f.push ('$' + l[i].href + '|' + l[i].title);" - "else if (r == 'search' && t == 'application/opensearchdescription+xml') " - "f.push (':' + l[i].href + '|' + l[i].title); " + "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); - gchar** current_item = items; + guint i = 0; gchar* default_uri = 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) + if (items != NULL) + while (items[i] != NULL) { - const gchar* uri_and_title = *current_item; - if (uri_and_title[0] == '$') + gchar** parts = g_strsplit (items[i], "|", 2); + if (parts == NULL) + ; + else if (*parts && parts[1]) { - 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); + KatzeItem* item = g_object_new (KATZE_TYPE_ITEM, + "uri", parts[0], "name", parts[1], NULL); katze_array_add_item (view->news_feeds, item); g_object_unref (item); if (!default_uri) - 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); */ + default_uri = g_strdup (parts[0]); } #if !WEBKIT_CHECK_VERSION (1, 1, 18) else - katze_assign (view->icon_uri, g_strdup (uri_and_title)); + katze_assign (view->icon_uri, g_strdup (*parts)); #endif - news_feeds_continue: - current_item++; + g_strfreev (parts); + i++; } g_strfreev (items); - g_object_set_data_full (G_OBJECT (view), "news-feeds", default_uri, g_free); g_free (value); - - #if !WEBKIT_CHECK_VERSION (1, 4, 3) - _midori_web_view_load_icon (view); - #endif + /* Ensure load-status is notified again, whether it changed or not */ + g_object_notify (G_OBJECT (view), "load-status"); } - view->progress = 1.0; - g_object_notify (G_OBJECT (view), "progress"); - midori_view_update_load_status (view, MIDORI_LOAD_FINISHED); + _midori_web_view_load_icon (view); g_object_thaw_notify (G_OBJECT (view)); } @@ -1780,13 +1622,6 @@ webkit_web_view_hovering_over_link_cb (WebKitWebView* web_view, 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:") || g_str_has_prefix (uri, "mailto:"); -} - static void midori_view_ensure_link_uri (MidoriView* view, gint *x, @@ -1825,9 +1660,9 @@ midori_view_ensure_link_uri (MidoriView* view, | GDK_MOD1_MASK | GDK_META_MASK | GDK_SUPER_MASK | GDK_HYPER_MASK ) static gboolean -midori_view_web_view_button_press_event_cb (WebKitWebView* web_view, - GdkEventButton* event, - MidoriView* view) +gtk_widget_button_press_event_cb (WebKitWebView* web_view, + GdkEventButton* event, + MidoriView* view) { GtkClipboard* clipboard; gchar* uri; @@ -1838,17 +1673,12 @@ midori_view_web_view_button_press_event_cb (WebKitWebView* web_view, 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 */ @@ -1856,32 +1686,31 @@ midori_view_web_view_button_press_event_cb (WebKitWebView* web_view, 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; } - if (view->middle_click_opens_selection) + 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) { gboolean is_editable; WebKitHitTestResult* result; @@ -1891,63 +1720,55 @@ midori_view_web_view_button_press_event_cb (WebKitWebView* web_view, context = katze_object_get_int (result, "context"); is_editable = context & WEBKIT_HIT_TEST_RESULT_CONTEXT_EDITABLE; g_object_unref (result); - if (!is_editable) + 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))) { - clipboard = gtk_clipboard_get_for_display ( - gtk_widget_get_display (GTK_WIDGET (view)), - GDK_SELECTION_PRIMARY); - if ((uri = gtk_clipboard_wait_for_text (clipboard))) + 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) { - 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) + new_uri = sokoke_magic_uri (uri); + if (!new_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); + 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)) + { + 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; case 3: if (event->state & GDK_CONTROL_MASK) @@ -1957,17 +1778,14 @@ midori_view_web_view_button_press_event_cb (WebKitWebView* web_view, 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; 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. @@ -1977,8 +1795,8 @@ midori_view_web_view_button_press_event_cb (WebKitWebView* web_view, * accidentally being interpreted as first button clicks. */ case 11: + return TRUE; case 12: - view->button_press_handled = TRUE; return TRUE; } @@ -1988,17 +1806,6 @@ midori_view_web_view_button_press_event_cb (WebKitWebView* web_view, return FALSE; } -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, @@ -2011,183 +1818,128 @@ midori_view_inspector_window_key_press_event_cb (GtkWidget* window, return FALSE; } -static void -handle_link_hints (WebKitWebView* web_view, - GdkEventKey* event, - MidoriView* view) -{ - gint digit = g_ascii_digit_value (event->keyval); - gunichar uc = gdk_keyval_to_unicode (event->keyval); - gchar* result = NULL; - WebKitWebFrame* web_frame = webkit_web_view_get_main_frame (web_view); - JSContextRef js_context = webkit_web_frame_get_global_context (web_frame); - - if (view->find_links < 0) - { - /* Links are currently off, turn them on */ - 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 (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; /* Links are now on */ - g_free (result); - return; - } - - if (event->keyval == '.') - { - /* Pressed '.' with links on, so turn them off */ - 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; - } - - /* Links are already on at this point, so process the input character */ - - if (digit != -1 && event->keyval != GDK_KEY_Return && event->keyval != GDK_KEY_Escape) - { - /* Got a digit, add it to the link count/ number */ - if (view->find_links > 0) - view->find_links *= 10; - view->find_links += digit; - return; - } - - if (event->keyval == GDK_KEY_Escape) - { - // Clear the link count/number - view->find_links = 0; - return; - } - - if (g_unichar_isalpha (uc)) - { - /* letter pressed if we have a corresponding accessKey and grab URI */ - gchar* script = NULL; - gchar* utf8 = NULL; - gulong sz = g_unichar_to_utf8 (uc, NULL); - - utf8 = g_malloc0 (sz); - g_unichar_to_utf8 (uc, utf8); - script = g_strdup_printf ( - "var l = 'undefined';" - "for (i in document.links) {" - " if ( document.links[i].href &&" - " document.links[i].accessKey == \"%s\" )" - " {" - " l = document.links[i].href;" - " break;" - " }" - "}" - "if (l != 'undefined') { l; }" - , utf8 - ); - g_free (utf8); - result = sokoke_js_script_eval (js_context, script, NULL); - g_free (script); - } - else if (event->keyval == GDK_KEY_Return) - { - /* Return pressed, grab URI if we have a link with the entered number */ - gchar* 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); - g_free (script); - } - - /* Check the URI we grabbed to see if it's valid, if so go there */ - 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); - view->find_links = -1; /* Turn off link mode */ - } - else /* Invalid URI, start over... */ - view->find_links = 0; - - if (result) - g_free (result); - return; -} - 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 == '=') + if (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 ) + if (event->keyval == '.' + || (view->find_links > -1 + && (digit != -1 || event->keyval == GDK_KEY_Return || event->keyval == GDK_KEY_Escape))) { - handle_link_hints (web_view, event, view); - return FALSE; - } + 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 (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; + } /* Find inline */ if (event->keyval == ',' || event->keyval == '/' || event->keyval == GDK_KEY_KP_Divide) @@ -2203,12 +1955,7 @@ gtk_widget_key_press_event_cb (WebKitWebView* web_view, && !webkit_web_view_can_paste_clipboard (web_view)) { 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; } @@ -2256,31 +2003,23 @@ midori_web_view_menu_link_copy_activate_cb (GtkWidget* widget, MidoriView* view) { if (g_str_has_prefix (view->link_uri, "mailto:")) - sokoke_widget_copy_clipboard (widget, view->link_uri + 7, NULL, NULL); + sokoke_widget_copy_clipboard (widget, view->link_uri + 7); else - sokoke_widget_copy_clipboard (widget, view->link_uri, NULL, NULL); + sokoke_widget_copy_clipboard (widget, view->link_uri); } static void -midori_view_download_uri (MidoriView* view, - MidoriDownloadType type, - const gchar* uri) +midori_web_view_menu_save_activate_cb (GtkWidget* widget, + MidoriView* view) { - WebKitNetworkRequest* request = webkit_network_request_new (uri); + WebKitNetworkRequest* request = webkit_network_request_new (view->link_uri); WebKitDownload* download = webkit_download_new (request); gboolean handled; g_object_unref (request); - midori_download_set_type (download, type); + g_object_set_data (G_OBJECT (download), "save-as-download", (void*)0xdeadbeef); g_signal_emit (view, signals[DOWNLOAD_REQUESTED], 0, download, &handled); } -static void -midori_web_view_menu_save_activate_cb (GtkWidget* widget, - MidoriView* view) -{ - midori_view_download_uri (view, MIDORI_DOWNLOAD_SAVE_AS, view->link_uri); -} - static void midori_web_view_menu_image_new_tab_activate_cb (GtkWidget* widget, MidoriView* view) @@ -2291,73 +2030,12 @@ midori_web_view_menu_image_new_tab_activate_cb (GtkWidget* widget, g_free (uri); } -static GString* -midori_view_get_data_for_uri (MidoriView* view, - const gchar* uri) -{ - WebKitWebView* web_view = WEBKIT_WEB_VIEW (view->web_view); - WebKitWebFrame* frame = webkit_web_view_get_main_frame (web_view); - WebKitWebDataSource* data_source = webkit_web_frame_get_data_source (frame); - GList* resources = webkit_web_data_source_get_subresources (data_source); - GList* list; - GString* result; - - for (list = resources; list; list = g_list_next (list)) - { - WebKitWebResource* resource = WEBKIT_WEB_RESOURCE (list->data); - GString* data = webkit_web_resource_get_data (resource); - if (!g_strcmp0 (webkit_web_resource_get_uri (resource), uri)) - { - result = data; - break; - } - } - g_list_free (resources); - return result; -} - -static void -midori_view_clipboard_get_image_cb (GtkClipboard* clipboard, - GtkSelectionData* selection_data, - guint info, - gpointer user_data) -{ - MidoriView* view = MIDORI_VIEW (g_object_get_data (user_data, "view")); - WebKitHitTestResult* hit_test = user_data; - gchar* uri = katze_object_get_string (hit_test, "image-uri"); - /* if (gtk_selection_data_targets_include_image (selection_data, TRUE)) */ - { - GString* data = midori_view_get_data_for_uri (view, uri); - if (data != NULL) - { - GInputStream* stream = g_memory_input_stream_new_from_data (data->str, data->len, NULL); - GError* error = NULL; - GdkPixbuf* pixbuf = gdk_pixbuf_new_from_stream (stream, NULL, &error); - g_object_unref (stream); - if (error != NULL) - { - g_critical ("Error copying pixbuf: %s\n", error->message); - g_error_free (error); - } - gtk_selection_data_set_pixbuf (selection_data, pixbuf); - g_object_unref (pixbuf); - } - else - g_warn_if_reached (); - } - /* if (gtk_selection_data_targets_include_text (selection_data)) */ - gtk_selection_data_set_text (selection_data, uri, -1); - g_free (uri); -} - static void midori_web_view_menu_image_copy_activate_cb (GtkWidget* widget, MidoriView* view) { gchar* uri = katze_object_get_string (view->hit_test, "image-uri"); - g_object_set_data (G_OBJECT (view->hit_test), "view", view); - sokoke_widget_copy_clipboard (widget, - uri, midori_view_clipboard_get_image_cb, view->hit_test); + sokoke_widget_copy_clipboard (widget, uri); g_free (uri); } @@ -2366,16 +2044,12 @@ midori_web_view_menu_image_save_activate_cb (GtkWidget* widget, MidoriView* view) { gchar* uri = katze_object_get_string (view->hit_test, "image-uri"); - midori_view_download_uri (view, MIDORI_DOWNLOAD_SAVE_AS, uri); - g_free (uri); -} - -static void -midori_web_view_open_in_viewer_cb (GtkWidget* widget, - MidoriView* view) -{ - gchar* uri = katze_object_get_string (view->hit_test, "image-uri"); - midori_view_download_uri (view, MIDORI_DOWNLOAD_OPEN_IN_VIEWER, 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), "save-as-download", (void*)0xdeadbeef); + g_signal_emit (view, signals[DOWNLOAD_REQUESTED], 0, download, &handled); g_free (uri); } @@ -2384,7 +2058,7 @@ midori_web_view_menu_video_copy_activate_cb (GtkWidget* widget, MidoriView* view) { gchar* uri = katze_object_get_string (view->hit_test, "media-uri"); - sokoke_widget_copy_clipboard (widget, uri, NULL, NULL); + sokoke_widget_copy_clipboard (widget, uri); g_free (uri); } @@ -2393,7 +2067,12 @@ midori_web_view_menu_video_save_activate_cb (GtkWidget* widget, MidoriView* view) { gchar* uri = katze_object_get_string (view->hit_test, "media-uri"); - midori_view_download_uri (view, MIDORI_DOWNLOAD_SAVE_AS, 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), "save-as-download", (void*)0xdeadbeef); + g_signal_emit (view, signals[DOWNLOAD_REQUESTED], 0, download, &handled); g_free (uri); } @@ -2459,7 +2138,7 @@ static void midori_web_view_menu_copy_activate_cb (GtkWidget* widget, MidoriView* view) { - sokoke_widget_copy_clipboard (widget, view->selected_text, NULL, NULL); + sokoke_widget_copy_clipboard (widget, view->selected_text); } static void @@ -2470,15 +2149,6 @@ midori_view_tab_label_menu_window_new_cb (GtkWidget* menuitem, midori_view_get_display_uri (MIDORI_VIEW (view))); } -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) @@ -2493,19 +2163,6 @@ midori_web_view_menu_inspect_element_activate_cb (GtkWidget* widget, webkit_web_inspector_show (inspector); } -#if WEBKIT_CHECK_VERSION (1, 5, 0) -static void -midori_view_menu_add_search_engine_cb (GtkWidget* widget, - MidoriView* view) -{ - MidoriBrowser* browser = midori_browser_get_for_widget (view->web_view); - GtkActionGroup* actions = midori_browser_get_action_group (browser); - GtkAction* action = gtk_action_group_get_action (actions, "Search"); - KatzeItem* item = g_object_get_data (G_OBJECT (widget), "item"); - midori_search_action_get_editor (MIDORI_SEARCH_ACTION (action), item, TRUE); -} -#endif - static GtkWidget* midori_view_insert_menu_item (GtkMenuShell* menu, gint position, @@ -2567,7 +2224,6 @@ midori_view_populate_popup (MidoriView* view, 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; @@ -2589,8 +2245,7 @@ midori_view_populate_popup (MidoriView* view, context = katze_object_get_int (view->hit_test, "context"); has_selection = context & WEBKIT_HIT_TEST_RESULT_CONTEXT_SELECTION; /* Ensure view->selected_text */ - if (!midori_view_has_selection (view)) - has_selection = false; + midori_view_has_selection (view); 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; @@ -2611,23 +2266,6 @@ midori_view_populate_popup (MidoriView* view, gtk_widget_set_sensitive (menuitem, webkit_web_view_can_undo (web_view)); gtk_menu_shell_prepend (menu_shell, menuitem); - - #if WEBKIT_CHECK_VERSION (1, 5, 0) - { - KatzeItem* item = midori_search_action_get_engine_for_form ( - WEBKIT_WEB_VIEW (view->web_view), view->ellipsize); - if (item != NULL) - { - menuitem = midori_view_insert_menu_item (menu_shell, -1, - _("Add _search engine..."), NULL, - G_CALLBACK (midori_view_menu_add_search_engine_cb), widget); - g_object_set_data (G_OBJECT (menuitem), "item", item); - gtk_menu_shell_append (menu_shell, menuitem); - gtk_widget_show (menuitem); - } - } - #endif - if (manual) { menuitem = sokoke_action_create_popup_menu_item ( @@ -2712,8 +2350,6 @@ midori_view_populate_popup (MidoriView* view, } 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); @@ -2728,18 +2364,12 @@ midori_view_populate_popup (MidoriView* view, 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, NULL, GTK_STOCK_SAVE_AS, G_CALLBACK (midori_web_view_menu_save_activate_cb), widget); - } } if (is_image) @@ -2750,14 +2380,11 @@ midori_view_populate_popup (MidoriView* view, _("Open _Image in New Tab"), STOCK_TAB_NEW, G_CALLBACK (midori_web_view_menu_image_new_tab_activate_cb), widget); midori_view_insert_menu_item (menu_shell, -1, - _("Copy Im_age"), NULL, + _("Copy Image _Address"), NULL, G_CALLBACK (midori_web_view_menu_image_copy_activate_cb), widget); midori_view_insert_menu_item (menu_shell, -1, _("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_in_viewer_cb), widget); } if (is_media) @@ -2826,15 +2453,11 @@ midori_view_populate_popup (MidoriView* view, 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); - /* FIXME: choose 3 most frequently */ g_strstrip (view->selected_text); if (midori_uri_is_valid (view->selected_text)) { - /* :// and @ together would mean login credentials */ - if (g_str_has_prefix (view->selected_text, "mailto:") - || (strchr (view->selected_text, '@') != NULL - && strstr (view->selected_text, "://") == NULL)) + 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, @@ -2894,12 +2517,6 @@ midori_view_populate_popup (MidoriView* view, 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); @@ -2924,7 +2541,6 @@ midori_view_populate_popup (MidoriView* view, static const GtkActionEntry encodings[] = { { "EncodingAutomatic" }, { "EncodingChinese" }, - { "EncodingChineseSimplified" }, { "EncodingJapanese" }, { "EncodingKorean" }, { "EncodingRussian" }, @@ -2961,7 +2577,7 @@ midori_view_populate_popup (MidoriView* view, gtk_action_group_get_action (actions, "BookmarkAdd")); gtk_menu_shell_append (menu_shell, menuitem); - if (!midori_view_is_blank (view) && !midori_paths_is_readonly ()) + 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")); @@ -2998,6 +2614,7 @@ midori_view_populate_popup (MidoriView* view, g_object_set_data (G_OBJECT (menuitem), "y", GINT_TO_POINTER (y)); } + GdkWindowState state = gdk_window_get_state (gtk_widget_get_window (GTK_WIDGET (browser))); if (state & GDK_WINDOW_STATE_FULLSCREEN) { menuitem = sokoke_action_create_popup_menu_item ( @@ -3050,8 +2667,8 @@ static gboolean 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. */ @@ -3087,8 +2704,6 @@ webkit_web_view_create_web_view_cb (GtkWidget* web_view, g_signal_connect (new_view->web_view, "web-view-ready", G_CALLBACK (webkit_web_view_web_view_ready_cb), view); } - g_object_set_data_full (G_OBJECT (new_view), "opener-uri", - g_strdup (webkit_web_frame_get_uri (web_frame)), g_free); return new_view->web_view; } @@ -3100,6 +2715,27 @@ webkit_web_view_mime_type_decision_cb (GtkWidget* web_view, WebKitWebPolicyDecision* decision, MidoriView* view) { + GtkWidget* dialog; + gchar* content_type; + gchar* description; + gchar* file_type; + WebKitWebDataSource* datasource; + 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; + + 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)) { gboolean view_source = FALSE; @@ -3107,120 +2743,61 @@ webkit_web_view_mime_type_decision_cb (GtkWidget* web_view, if (midori_view_is_blank (view)) view_source = webkit_web_view_get_view_source_mode (WEBKIT_WEB_VIEW (web_view)); + /* Render raw XML, including news feeds, as source */ + if (!view_source && (!strcmp (mime_type, "application/xml") + || !strcmp (mime_type, "text/xml"))) + view_source = TRUE; webkit_web_view_set_view_source_mode (WEBKIT_WEB_VIEW (web_view), view_source); - if (web_frame == webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (web_view))) - { - katze_assign (view->mime_type, g_strdup (mime_type)); - katze_item_set_meta_string (view->item, "mime-type", mime_type); - midori_view_unset_icon (view); - g_object_notify (G_OBJECT (view), "mime-type"); - } + katze_assign (view->mime_type, g_strdup (mime_type)); + midori_view_update_icon (view, NULL); + 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; -} - -static gboolean -webkit_web_view_download_requested_cb (GtkWidget* web_view, - WebKitDownload* download, - MidoriView* view) -{ - gchar* opener_uri; - gchar* hostname; - GtkWidget* dialog; - gchar* content_type; - gchar* description; - WebKitWebFrame* web_frame; - WebKitWebDataSource* datasource; - GString* details; - GIcon* icon; - GtkWidget* image; - gchar* title; - GdkScreen* screen; - GtkIconTheme* icon_theme; - gint response; - gboolean handled; - /* Opener may differ from displaying view: - http://lcamtuf.coredump.cx/fldl/ http://lcamtuf.coredump.cx/switch/ */ - opener_uri = g_object_get_data (G_OBJECT (view), "opener-uri"); - hostname = midori_uri_parse_hostname ( - opener_uri ? opener_uri : midori_view_get_display_uri (view), NULL); - dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, - _("Open or download file from %s"), hostname); - g_free (hostname); - content_type = midori_download_get_content_type (download, - g_object_get_data (G_OBJECT (view), "download-mime-type")); + 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); + #if GTK_CHECK_VERSION (2, 14, 0) icon = g_content_type_get_icon (content_type); - g_themed_icon_append_name (G_THEMED_ICON (icon), "text-html"); + 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); gtk_message_dialog_set_image (GTK_MESSAGE_DIALOG (dialog), image); - - details = g_string_sized_new (20 * 4); - g_string_append_printf (details, _("File Name: %s"), - webkit_download_get_suggested_filename (download)); - g_string_append_c (details, '\n'); - - if (g_strrstr (description, content_type)) - g_string_append_printf (details, _("File Type: '%s'"), content_type); + #endif + g_free (content_type); + if (g_strrstr (description, mime_type)) + file_type = g_strdup_printf (_("File Type: '%s'"), mime_type); else - g_string_append_printf (details, _("File Type: %s ('%s')"), description, content_type); - g_string_append_c (details, '\n'); + file_type = g_strdup_printf (_("File Type: %s ('%s')"), description, mime_type); g_free (description); - g_free (content_type); /* 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) - { - gchar* fingerprint; - gchar* fplabel; - WebKitNetworkRequest* original_request = webkit_web_data_source_get_initial_request (datasource); - const gchar* original_uri = webkit_network_request_get_uri (original_request); - midori_uri_get_fingerprint (original_uri, &fingerprint, &fplabel); - if (fplabel && fingerprint) - { - WebKitNetworkRequest* request = webkit_download_get_network_request (download); - - g_string_append (details, fplabel); - g_string_append_c (details, ' '); - g_string_append (details, fingerprint); - g_string_append_c (details, '\n'); - - /* 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); - } - g_free (fplabel); - g_free (fingerprint); - - } - - if (webkit_download_get_total_size (download) > webkit_download_get_current_size (download)) - { - gchar* total = g_format_size (webkit_download_get_total_size (download)); - g_string_append_printf (details, _("Size: %s"), total); - g_string_append_c (details, '\n'); - g_free (total); - } - + 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); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), - "%s", details->str); - g_string_free (details, TRUE); + "%s\n%s %s", file_type, fplabel ? fplabel : "", fingerprint ? fingerprint : ""); + g_free (fingerprint); + g_free (fplabel); + 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" */ - title = g_strdup_printf (_("Open %s"), webkit_download_get_uri (download)); + title = g_strdup_printf (_("Open %s"), + webkit_network_request_get_uri (request)); gtk_window_set_title (GTK_WINDOW (dialog), title); g_free (title); screen = gtk_widget_get_screen (dialog); @@ -3233,18 +2810,58 @@ webkit_web_view_download_requested_cb (GtkWidget* web_view, gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_OPEN); } gtk_dialog_add_buttons (GTK_DIALOG (dialog), - GTK_STOCK_SAVE, MIDORI_DOWNLOAD_SAVE, - GTK_STOCK_SAVE_AS, MIDORI_DOWNLOAD_SAVE_AS, - GTK_STOCK_CANCEL, MIDORI_DOWNLOAD_CANCEL, - GTK_STOCK_OPEN, MIDORI_DOWNLOAD_OPEN, + GTK_STOCK_SAVE, 1, + GTK_STOCK_SAVE_AS, 4, + GTK_STOCK_CANCEL, 2, + GTK_STOCK_OPEN, 3, NULL); - response = gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); - if (response == GTK_RESPONSE_DELETE_EVENT) - response = MIDORI_DOWNLOAD_CANCEL; - midori_download_set_type (download, response); + 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: + 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; + } +} +static gboolean +webkit_web_view_download_requested_cb (GtkWidget* web_view, + WebKitDownload* download, + MidoriView* view) +{ + gboolean handled; + /* Propagate original URI to make it available when the download finishes */ + WebKitWebFrame* web_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (web_view)); + WebKitWebDataSource* datasource = webkit_web_frame_get_provisional_data_source (web_frame); + WebKitNetworkRequest* original_request = webkit_web_data_source_get_initial_request (datasource); + const gchar* original_uri = webkit_network_request_get_uri (original_request); + WebKitNetworkRequest* request = webkit_download_get_network_request (download); + g_object_set_data_full (G_OBJECT (request), "midori-original-uri", + g_strdup (original_uri), g_free); + 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; } @@ -3261,17 +2878,7 @@ webkit_web_view_console_message_cb (GtkWidget* web_view, return FALSE; if (!strncmp (message, "speed_dial-save", 13)) - { - MidoriBrowser* browser = midori_browser_get_for_widget (GTK_WIDGET (view)); - MidoriSpeedDial* dial = katze_object_get_object (browser, "speed-dial"); - GError* error = NULL; - midori_speed_dial_save_message (dial, message, &error); - if (error != NULL) - { - g_critical ("Failed speed dial message: %s\n", error->message); - g_error_free (error); - } - } + midori_view_speed_dial_save (view, message); else g_signal_emit (view, signals[CONSOLE_MESSAGE], 0, message, line, source_id); return TRUE; @@ -3388,6 +2995,23 @@ midori_view_notify_vadjustment_cb (MidoriView* view, G_CALLBACK (midori_view_vadjustment_notify_value_cb), view); } +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) { @@ -3397,6 +3021,7 @@ midori_view_init (MidoriView* view) view->mime_type = NULL; view->icon = NULL; view->icon_uri = NULL; + view->memory = midori_view_get_memory (); view->progress = 0.0; view->load_status = MIDORI_LOAD_FINISHED; view->minimized = FALSE; @@ -3422,32 +3047,7 @@ midori_view_init (MidoriView* view) view->scrolled_window = katze_scrolled_new (NULL, NULL); gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (view->scrolled_window), GTK_SHADOW_NONE); - - #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 */ - { - GtkWidget* frame = gtk_frame_new (NULL); - view->overlay_label = gtk_label_new (NULL); - gtk_widget_show (view->overlay_label); - gtk_container_add (GTK_CONTAINER (frame), view->overlay_label); - gtk_widget_set_halign (frame, GTK_ALIGN_START); - gtk_widget_set_valign (frame, GTK_ALIGN_END); - gtk_overlay_add_overlay (GTK_OVERLAY (view->overlay), frame); - } - 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); @@ -3477,6 +3077,12 @@ midori_view_finalize (GObject* object) katze_object_assign (view->icon, NULL); katze_assign (view->icon_uri, NULL); + 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); @@ -3511,15 +3117,8 @@ midori_view_set_property (GObject* object, view->minimized ? 1 : -1); g_signal_handlers_unblock_by_func (view->item, midori_view_item_meta_data_changed, view); - #ifdef HAVE_GRANITE - if (view->tab) - g_object_set (view->tab, "label", - "fixed", view->minimized, NULL); - //view->minimized ? NULL : midori_view_get_display_title(view), NULL); - #else if (view->tab_label) sokoke_widget_set_visible (view->tab_title, !view->minimized); - #endif break; case PROP_ZOOM_LEVEL: midori_view_set_zoom_level (view, g_value_get_float (value)); @@ -3730,10 +3329,8 @@ midori_view_settings_notify_cb (MidoriWebSettings* settings, else if (name == g_intern_string ("close-buttons-on-tabs")) { view->close_buttons_on_tabs = g_value_get_boolean (&value); - #ifndef HAVE_GRANITE sokoke_widget_set_visible (view->tab_close, view->close_buttons_on_tabs); - #endif } else if (name == g_intern_string ("open-new-pages-in")) view->open_new_pages_in = g_value_get_enum (&value); @@ -3803,14 +3400,7 @@ midori_view_get_progress (MidoriView* view) { g_return_val_if_fail (MIDORI_IS_VIEW (view), 0.0); - /* When we are finished, we don't want to *see* progress anymore */ - if (view->load_status == MIDORI_LOAD_FINISHED) - return 0.0; - /* Full progress but not finished: presumably all loaded */ - if (view->progress == 1.0) - return 0.0; - /* When loading we want to see at minimum 10% progress */ - return CLAMP (view->progress, 0.1, 1.0); + return view->progress; } static void @@ -3820,21 +3410,21 @@ midori_view_web_inspector_construct_window (gpointer inspector, MidoriView* view) { gchar* title; - const gchar* label; + gchar* label; GtkWidget* window; GtkWidget* toplevel; GdkScreen* screen; gint width, height; - const gchar* icon_name; GtkIconTheme* icon_theme; GdkPixbuf* icon; GdkPixbuf* gray_icon; - label = midori_view_get_display_title (view); + label = g_strdup (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); + g_free (label); toplevel = gtk_widget_get_toplevel (GTK_WIDGET (view)); if (gtk_widget_is_toplevel (toplevel)) @@ -3848,10 +3438,9 @@ midori_view_web_inspector_construct_window (gpointer inspector, } /* 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, icon_name, 32, + icon = gtk_icon_theme_load_icon (icon_theme, "midori", 32, GTK_ICON_LOOKUP_USE_BUILTIN, NULL); if (icon) { @@ -3865,12 +3454,9 @@ midori_view_web_inspector_construct_window (gpointer inspector, g_object_unref (icon); } else - 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_window_set_icon_name (GTK_WINDOW (window), "midori"); gtk_container_add (GTK_CONTAINER (window), inspector_view); - gtk_widget_show_all (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); @@ -3902,13 +3488,7 @@ midori_view_web_inspector_show_window_cb (WebKitWebInspector* inspector, GtkWidget* window = gtk_widget_get_toplevel (GTK_WIDGET (inspector_view)); if (!window) return FALSE; - if (katze_object_get_boolean (view->settings, "last-inspector-attached")) - g_signal_emit_by_name (inspector, "attach-window"); - else - { - gtk_widget_show (window); - gtk_window_present (GTK_WINDOW (window)); - } + gtk_window_present (GTK_WINDOW (window)); return TRUE; } @@ -3959,7 +3539,7 @@ midori_view_construct_web_view (MidoriView* view) view->web_view = webkit_web_view_new (); /* Load something to avoid a bug where WebKit might not set a main frame */ - webkit_web_view_load_uri (WEBKIT_WEB_VIEW (view->web_view), ""); + webkit_web_view_open (WEBKIT_WEB_VIEW (view->web_view), ""); #if HAVE_HILDON gtk_widget_tap_and_hold_setup (view->web_view, NULL, NULL, 0); @@ -4001,9 +3581,7 @@ midori_view_construct_web_view (MidoriView* view) "signal::hovering-over-link", webkit_web_view_hovering_over_link_cb, view, "signal::button-press-event", - midori_view_web_view_button_press_event_cb, view, - "signal::button-release-event", - midori_view_web_view_button_release_event_cb, view, + gtk_widget_button_press_event_cb, view, "signal-after::key-press-event", gtk_widget_key_press_event_cb, view, "signal::scroll-event", @@ -4053,22 +3631,20 @@ midori_view_construct_web_view (MidoriView* view) NULL); } -static void -list_netscape_plugins (GString* ns_plugins, - JSContextRef js_context) +static gchar* list_netscape_plugins () { - if (!midori_web_settings_has_plugin_support ()) - return; - + 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); /* 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) " + "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; - g_string_append (ns_plugins, "

    Netscape Plugins:

    "); + GString* ns_plugins = g_string_new (NULL); if (items != NULL) while (items[i] != NULL) { @@ -4086,83 +3662,155 @@ list_netscape_plugins (GString* ns_plugins, } if (g_str_has_prefix (value, "undefined")) g_string_append (ns_plugins, ""); - g_string_append (ns_plugins, "
    No plugins found
    "); g_strfreev (items); g_free (value); -} - -static void -list_geolocation (GString* markup) -{ - g_string_append (markup, - "" - "" - ""); + gtk_widget_destroy (web_view); + return g_string_free (ns_plugins, FALSE); } static gchar* -list_video_formats (JSContextRef js_context) +list_video_formats () { + 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); 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\"') + ']' " + "return !!video.canPlayType && video.canPlayType (format) != 'no' };" + "' 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); + gtk_widget_destroy (web_view); return value; } -static const gchar* valid_about_uris[] = { - "about:widgets", - "about:private", - "error:nodocs", - "http://.invalid", - "about:geolocation", - "about:paths", -}; +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); -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]); + 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); } @@ -4188,30 +3836,28 @@ midori_view_set_uri (MidoriView* view, g_warning ("Calling %s() before adding the view to a browser. This " "breaks extensions that monitor page loading.", G_STRFUNC); - if (!midori_debug ("unarmed")) + if (g_getenv ("MIDORI_UNARMED") == NULL) { if (!uri || !strcmp (uri, "") || !strcmp (uri, "about:blank")) { - MidoriBrowser* browser = midori_browser_get_for_widget (GTK_WIDGET (view)); - MidoriSpeedDial* dial = katze_object_get_object (browser, "speed-dial"); - const gchar* html; #ifdef G_ENABLE_DEBUG GTimer* timer = NULL; - if (midori_debug ("startup")) + if (g_getenv ("MIDORI_STARTTIME") != NULL) timer = g_timer_new (); #endif katze_assign (view->uri, NULL); - katze_assign (view->mime_type, NULL); - katze_item_set_meta_string (view->item, "mime-type", NULL); - katze_item_set_meta_integer (view->item, "delay", -1); + katze_assign (view->mime_type, g_strdup ("text/html")); - html = midori_speed_dial_get_html (dial, NULL); - midori_view_load_alternate_string (view, html, "about:blank", NULL); + if (speeddial_markup == NULL) + speeddial_markup = prepare_speed_dial_html (view, TRUE); + + midori_view_load_alternate_string (view, + speeddial_markup ? speeddial_markup : "", "about:blank", NULL); #ifdef G_ENABLE_DEBUG - if (midori_debug ("startup")) + if (g_getenv ("MIDORI_STARTTIME") != NULL) { g_debug ("Speed Dial: \t%fs", g_timer_elapsed (timer, NULL)); g_timer_destroy (timer); @@ -4250,10 +3896,8 @@ midori_view_set_uri (MidoriView* view, "

    ", "

    demo", "

    demo", - "

    ", - "

    ", + "

    ", "

    ", - "

    ", "", "

    ", "", @@ -4262,7 +3906,7 @@ midori_view_set_uri (MidoriView* view, "", "", "", - "Lorem ipsum doloret sit amet…", + "Lorem ipsum doloret sit amet...", "", "", "", @@ -4271,158 +3915,84 @@ midori_view_set_uri (MidoriView* view, }; guint i; GString* demo = g_string_new (""); g_string_append_printf (demo, "%s

    %s

    ", uri, uri); - g_string_append (demo, "
    "); + g_string_append (demo, "
    "); + g_string_append (demo, "
    "); + 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:paths")) - { - gchar* res_dir = midori_paths_get_res_filename (""); - gchar* lib_dir = midori_paths_get_lib_path (PACKAGE_NAME); - data = g_strdup_printf ("

    %s

    " - "

    config: %s

    " - "

    res: %s

    " - "

    lib: %s

    " - "

    cache: %s

    " - "

    tmp: %s

    " - "", - uri, midori_paths_get_config_dir (), res_dir, - lib_dir, midori_paths_get_cache_dir (), midori_paths_get_tmp_dir ()); - g_free (res_dir); - g_free (lib_dir); - katze_assign (view->uri, g_strdup (uri)); - } else if (!strcmp (uri, "about:") || !strcmp (uri, "about:version")) { - gchar* command_line = midori_paths_get_command_line_str (); + 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"); - 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)", - "gcr%s", - "granite%s", - "libnotify%s", - "single instance%s", - "Platform%s ", "%s ", "%s", - "Identification%s", - "Video Formats%s", - }; - gchar const* version_strings[] = { - LIBSOUP_VERSION, - CAIRO_VERSION_STRING, cairo_version_string (), - GCR_VERSION, - 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, - }; - gsize i = 0; - GString * tmp = g_string_new (""); - GString* more = g_string_new (""); - list_netscape_plugins (more, js_context); - list_about_uris (more); + gchar* netscape_plugins = list_netscape_plugins (); + gchar* video_formats = list_video_formats (); katze_assign (view->uri, g_strdup (uri)); - g_string_append_printf (tmp, + data = g_strdup_printf ( "about:version" "

    about:version

    " "

    %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)", + "
    Command line%s
    Midori%s
    WebKitGTK+%d.%d.%d (%d.%d.%d)
    GTK+%d.%d.%d (%d.%d.%d)
    Glib%d.%d.%d (%d.%d.%d)
    libsoup%s
    cairo%s (%s)
    libnotify%s
    libunique%s
    libhildon%s
    Platform%s %s %s
    Identification%s
    Video Formats%s
    " + "

    Netscape Plugins:

    %s
    " + "", _("Version numbers in brackets show the version used at runtime."), command_line, - PACKAGE_VERSION, midori_app_get_name (NULL), + PACKAGE_VERSION, + WEBKIT_MAJOR_VERSION, WEBKIT_MINOR_VERSION, WEBKIT_MICRO_VERSION, + webkit_major_version (), + webkit_minor_version (), + webkit_micro_version (), 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, - 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); - + LIBSOUP_VERSION, + CAIRO_VERSION_STRING, cairo_version_string (), + LIBNOTIFY_VERSION, + UNIQUE_VERSION, + HAVE_HILDON ? "Yes" : "No", + platform, sys_name, architecture ? architecture : "", ident, + video_formats, netscape_plugins); g_free (command_line); + g_free (arguments); g_free (ident); + g_free (netscape_plugins); g_free (video_formats); - g_string_free (more, TRUE); } else { @@ -4437,7 +4007,6 @@ midori_view_set_uri (MidoriView* view, webkit_web_view_load_html_string ( WEBKIT_WEB_VIEW (view->web_view), data, view->uri); g_free (data); - 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"); @@ -4445,7 +4014,7 @@ midori_view_set_uri (MidoriView* view, else if (katze_item_get_meta_boolean (view->item, "delay")) { katze_assign (view->uri, g_strdup (uri)); - katze_item_set_meta_integer (view->item, "delay", -2); + katze_item_set_meta_integer (view->item, "delay", -1); midori_view_display_error ( view, view->uri, view->title ? view->title : view->uri, _("Page loading delayed"), @@ -4469,7 +4038,7 @@ midori_view_set_uri (MidoriView* view, g_free (exception); } } - else if (sokoke_external_uri (uri)) + else if (g_str_has_prefix (uri, "mailto:") || sokoke_external_uri (uri)) { sokoke_show_uri (NULL, uri, GDK_CURRENT_TIME, NULL); } @@ -4478,40 +4047,12 @@ midori_view_set_uri (MidoriView* view, 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); - katze_assign (view->title, NULL); g_object_notify (G_OBJECT (view), "uri"); - webkit_web_view_load_uri (WEBKIT_WEB_VIEW (view->web_view), uri); + webkit_web_view_open (WEBKIT_WEB_VIEW (view->web_view), uri); } } } -/** - * 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 (gtk_widget_get_parent (view->overlay_label)); - else - { - gtk_label_set_text (GTK_LABEL (view->overlay_label), text); - gtk_widget_show (gtk_widget_get_parent (view->overlay_label)); - } - #endif -} - /** * midori_view_is_blank: * @view: a #MidoriView @@ -4816,7 +4357,7 @@ midori_view_browser_close_tabs_cb (GtkWidget* view, { GtkWidget* remaining_view = data; if (view != remaining_view) - midori_browser_remove_tab (midori_browser_get_for_widget (view), view); + gtk_widget_destroy (view); } static void @@ -4838,7 +4379,7 @@ static void midori_view_tab_label_menu_close_cb (GtkWidget* menuitem, GtkWidget* view) { - midori_browser_remove_tab (midori_browser_get_for_widget (view), view); + gtk_widget_destroy (view); } /** @@ -4857,7 +4398,6 @@ midori_view_get_tab_menu (MidoriView* view) { MidoriBrowser* browser; GtkActionGroup* actions; - gint pages; GtkWidget* menu; GtkWidget* menuitem; @@ -4865,7 +4405,6 @@ midori_view_get_tab_menu (MidoriView* view) browser = midori_browser_get_for_widget (GTK_WIDGET (view)); actions = midori_browser_get_action_group (browser); - pages = midori_browser_get_n_pages (browser); menu = gtk_menu_new (); menuitem = sokoke_action_create_popup_menu_item ( @@ -4892,12 +4431,10 @@ midori_view_get_tab_menu (MidoriView* view) G_CALLBACK (midori_view_tab_label_menu_minimize_tab_cb), view); menuitem = gtk_separator_menu_item_new (); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); - menuitem = gtk_menu_item_new_with_mnemonic ( - g_dngettext (NULL, "Close Ot_her Tab", "Close Ot_her Tabs", pages - 1)); + menuitem = gtk_menu_item_new_with_mnemonic (_("Close ot_her Tabs")); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); g_signal_connect (menuitem, "activate", G_CALLBACK (midori_view_tab_label_menu_close_other_tabs_cb), view); - gtk_widget_set_sensitive (menuitem, pages > 1); menuitem = gtk_image_menu_item_new_from_stock (GTK_STOCK_CLOSE, NULL); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); g_signal_connect (menuitem, "activate", @@ -4907,30 +4444,6 @@ midori_view_get_tab_menu (MidoriView* view) return menu; } -#ifdef HAVE_GRANITE -GraniteWidgetsTab* -midori_view_get_tab (MidoriView* view) -{ - if (view->tab == NULL) - view->tab = granite_widgets_tab_new ( - midori_view_get_display_title (view), G_ICON (view->icon), GTK_WIDGET (view)); - return view->tab; -} - -void -midori_view_set_tab (MidoriView* view, - GraniteWidgetsTab* tab) -{ - g_return_if_fail (view->tab == NULL); - - view->tab = tab; - g_object_set (tab, - "label", midori_view_get_display_title (view), - "icon", G_ICON (view->icon), - "page", GTK_WIDGET (view), - NULL); -} -#else static gboolean midori_view_tab_label_button_press_event (GtkWidget* tab_label, GdkEventButton* event, @@ -4939,7 +4452,7 @@ midori_view_tab_label_button_press_event (GtkWidget* tab_label, if (event->button == 2) { /* Close the widget on middle click */ - midori_browser_remove_tab (midori_browser_get_for_widget (widget), widget); + gtk_widget_destroy (widget); return TRUE; } else if (MIDORI_EVENT_CONTEXT_MENU (event)) @@ -4959,7 +4472,7 @@ static void midori_view_tab_close_clicked (GtkWidget* tab_close, GtkWidget* widget) { - midori_browser_remove_tab (midori_browser_get_for_widget (widget), widget); + gtk_widget_destroy (widget); } #if !GTK_CHECK_VERSION (3, 0, 0) @@ -4974,14 +4487,20 @@ midori_view_tab_icon_style_set_cb (GtkWidget* tab_close, #endif static void -midori_view_update_tab_title (MidoriView* view, - gdouble angle) +midori_view_update_tab_title (GtkWidget* label, + gint size, + gdouble angle) { - if (angle == 0.0) - gtk_label_set_ellipsize (GTK_LABEL (view->tab_title), view->ellipsize); + if (angle == 0.0 || angle == 360.0) + { + if (gtk_label_get_ellipsize (GTK_LABEL (label)) != PANGO_ELLIPSIZE_START) + gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END); + } else - gtk_label_set_ellipsize (GTK_LABEL (view->tab_title), PANGO_ELLIPSIZE_NONE); - gtk_label_set_angle (GTK_LABEL (view->tab_title), angle); + { + gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_NONE); + } + gtk_label_set_angle (GTK_LABEL (label), angle); } static void @@ -5065,12 +4584,33 @@ midori_view_tab_label_parent_set (GtkWidget* tab_label, gtk_widget_show (box); } - midori_view_update_tab_title (view, angle); + midori_view_update_tab_title (view->tab_title, 10, angle); /* FIXME: Connect orientation notification */ } } +/** + * midori_view_get_label_ellipsize: + * @view: a #MidoriView + * + * Determines how labels representing the view should be + * ellipsized, which is helpful for alternative labels. + * + * Return value: how to ellipsize the label + * + * Since: 0.1.9 + **/ +PangoEllipsizeMode +midori_view_get_label_ellipsize (MidoriView* view) +{ + g_return_val_if_fail (MIDORI_IS_VIEW (view), PANGO_ELLIPSIZE_END); + + if (view->tab_label) + return gtk_label_get_ellipsize (GTK_LABEL (view->tab_title)); + return PANGO_ELLIPSIZE_END; +} + static void midori_view_tab_label_data_received (GtkWidget* widget, GdkDragContext* context, gint x, @@ -5119,8 +4659,19 @@ midori_view_get_proxy_tab_label (MidoriView* view) { GtkWidget* event_box; GtkWidget* hbox; - #if !GTK_CHECK_VERSION (3, 0, 0) 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" @@ -5149,12 +4700,18 @@ midori_view_get_proxy_tab_label (MidoriView* view) gtk_event_box_set_visible_window (GTK_EVENT_BOX (event_box), FALSE); hbox = gtk_hbox_new (FALSE, 1); gtk_container_add (GTK_CONTAINER (event_box), GTK_WIDGET (hbox)); - midori_view_update_tab_title (view, 0.0); + midori_view_update_tab_title (view->tab_title, 10, 0.0); 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); - #if !GTK_CHECK_VERSION (3, 0, 0) + #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", @@ -5186,8 +4743,6 @@ midori_view_get_proxy_tab_label (MidoriView* view) 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); @@ -5212,26 +4767,6 @@ midori_view_get_proxy_tab_label (MidoriView* view) } return view->tab_label; } -#endif - -/** - * midori_view_get_label_ellipsize: - * @view: a #MidoriView - * - * Determines how labels representing the view should be - * ellipsized, which is helpful for alternative labels. - * - * Return value: how to ellipsize the label - * - * Since: 0.1.9 - **/ -PangoEllipsizeMode -midori_view_get_label_ellipsize (MidoriView* view) -{ - g_return_val_if_fail (MIDORI_IS_VIEW (view), PANGO_ELLIPSIZE_END); - - return view->ellipsize; -} static void midori_view_item_meta_data_changed (KatzeItem* item, @@ -5260,7 +4795,7 @@ midori_view_item_meta_data_changed (KatzeItem* item, * Retrieves a proxy item that can be used for bookmark storage as * well as session management. * - * The item reflects changes to title (name), URI and MIME type (mime-type). + * The item reflects changes to the title and uri automatically. * * Return value: the proxy #KatzeItem **/ @@ -5341,12 +4876,7 @@ midori_view_can_view_source (MidoriView* view) return FALSE; content_type = g_content_type_from_mime_type (view->mime_type); -#ifdef _WIN32 - /* On Win32 text/plain maps to ".txt" but is_a expects "text" */ - text_type = g_strdup ("text"); -#else text_type = g_content_type_from_mime_type ("text/plain"); -#endif is_text = g_content_type_is_a (content_type, text_type); g_free (content_type); g_free (text_type); @@ -5390,72 +4920,19 @@ midori_view_can_save (MidoriView* view) return FALSE; } -/** - * 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_download_get_extension_for_uri (uri, NULL); - unique_filename = g_strdup_printf ("%s/%uXXXXXX%s", midori_paths_get_tmp_dir (), - g_str_hash (uri), midori_download_fallback_extension (extension, view->mime_type)); - g_free (extension); - katze_mkdir_with_parents (midori_paths_get_tmp_dir (), 0700); - 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) \ +{ \ + g_return_val_if_fail (MIDORI_IS_VIEW (view), FALSE); \ +\ + return view->web_view != NULL; \ } +can_do (reload) +can_do (print) +can_do (find) + /** * midori_view_reload: * @view: a #MidoriView @@ -5561,48 +5038,6 @@ midori_view_go_forward (MidoriView* view) webkit_web_view_go_forward (WEBKIT_WEB_VIEW (view->web_view)); } -/** - * midori_view_go_back_or_forward - * @view: a #MidoriView - * @steps: number of steps to jump in history - * - * Goes back or forward in history. - * - * 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 - * - * Determines whether the view can go back or forward by number of steps. - * - * Since: 0.4.5 - **/ -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, @@ -5772,15 +5207,6 @@ midori_view_search_text (MidoriView* view, { 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); @@ -5999,41 +5425,241 @@ midori_view_get_web_view (MidoriView* view) } /** - * midori_view_get_for_widget: - * @widget: a #GtkWidget - * - * Determines the view appropriate for the specified widget. + * midori_view_get_security + * @view: a #MidoriView * - * Return value: a #MidoriView + * Returns: The #MidoriSecurity for this view * - * Since 0.4.5 + * Since: 0.2.5 **/ -MidoriView* -midori_view_get_for_widget (GtkWidget* web_view) +MidoriSecurity +midori_view_get_security (MidoriView* view) +{ + g_return_val_if_fail (MIDORI_IS_VIEW (view), MIDORI_SECURITY_NONE); + + return view->security; +} + +static void +thumb_view_load_status_cb (WebKitWebView* thumb_view_, + GParamSpec* pspec, + MidoriView* 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); + GdkPixbuf* img; + #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 (webkit_web_view_get_load_status (thumb_view_) != WEBKIT_LOAD_FINISHED) + return; + + 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 - GtkWidget* view = gtk_widget_get_parent (scrolled); + 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 (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_get_thumb + * @view: a #MidoriView + * @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_get_thumb (MidoriView* view, + gchar* dial_id, + gchar* url) +{ + WebKitWebSettings* settings; + GtkWidget* browser; + #if !HAVE_OFFSCREEN + GtkWidget* notebook; + GtkWidget* label; + + browser = gtk_widget_get_toplevel (GTK_WIDGET (view)); + if (!GTK_IS_WINDOW (browser)) + return; + + /* What we are doing here is a bit of a hack. In order to render a + thumbnail we need a new view and load the url in it. But it has + to be visible and packed in a container. So we secretly pack it + into the notebook of the parent browser. */ + notebook = katze_object_get_object (browser, "notebook"); + if (!notebook) + return; + #endif + + if (!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), thumb_view, label); + gtk_widget_show (thumb_view); + #endif + } + #if !HAVE_OFFSCREEN + g_object_unref (notebook); #endif - return MIDORI_VIEW (view); + + 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_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); + webkit_web_view_open (WEBKIT_WEB_VIEW (thumb_view), url); } /** - * midori_view_get_security + * midori_view_speed_dial_save * @view: a #MidoriView + * @message: message from JavaScript * - * Returns: The #MidoriSecurity for this view + * Save speed_dial settings * - * Since: 0.2.5 **/ -MidoriSecurity -midori_view_get_security (MidoriView* view) +static void +midori_view_speed_dial_save (MidoriView* view, + const gchar* message) { - g_return_val_if_fail (MIDORI_IS_VIEW (view), MIDORI_SECURITY_NONE); + 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); - return view->security; + 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")) + { + 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); + } + + g_free (dial_id); + } + + midori_view_save_speed_dial_config (view, key_file); + + g_free (msg); + g_free (action); } +void +midori_view_save_speed_dial_config (MidoriView* view, + GKeyFile* key_file) +{ + 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 --git a/midori/midori-view.h b/midori/midori-view.h index 22d98e84..fcc20abd 100644 --- a/midori/midori-view.h +++ b/midori/midori-view.h @@ -16,10 +16,6 @@ #include -#ifdef HAVE_GRANITE - #include -#endif - G_BEGIN_DECLS #define MIDORI_LOAD_PROVISIONAL WEBKIT_LOAD_PROVISIONAL @@ -57,15 +53,6 @@ midori_security_get_type (void) G_GNUC_CONST; #define MIDORI_TYPE_SECURITY \ (midori_security_get_type ()) -typedef enum -{ - MIDORI_DOWNLOAD_CANCEL, - MIDORI_DOWNLOAD_OPEN, - MIDORI_DOWNLOAD_SAVE, - MIDORI_DOWNLOAD_SAVE_AS, - MIDORI_DOWNLOAD_OPEN_IN_VIEWER, -} MidoriDownloadType; - #define MIDORI_VIEW(obj) \ (G_TYPE_CHECK_INSTANCE_CAST ((obj), MIDORI_TYPE_VIEW, MidoriView)) #define MIDORI_VIEW_CLASS(klass) \ @@ -109,10 +96,6 @@ void 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); @@ -155,17 +138,8 @@ midori_view_get_tab_menu (MidoriView* view); PangoEllipsizeMode midori_view_get_label_ellipsize (MidoriView* view); -#ifdef HAVE_GRANITE -GraniteWidgetsTab* -midori_view_get_tab (MidoriView* view); - -void -midori_view_set_tab (MidoriView* view, - GraniteWidgetsTab* tab); -#else GtkWidget* midori_view_get_proxy_tab_label (MidoriView* view); -#endif KatzeItem* midori_view_get_proxy_item (MidoriView* view); @@ -183,6 +157,9 @@ void midori_view_set_zoom_level (MidoriView* view, gfloat zoom_level); +gboolean +midori_view_can_reload (MidoriView* view); + void midori_view_reload (MidoriView* view, gboolean from_cache); @@ -202,20 +179,15 @@ midori_view_can_go_forward (MidoriView* view); 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); const gchar* midori_view_get_next_page (MidoriView* view); +gboolean +midori_view_can_print (MidoriView* view); + void midori_view_print (MidoriView* view); @@ -225,10 +197,8 @@ 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 midori_view_unmark_text_matches (MidoriView* view); @@ -261,9 +231,6 @@ midori_view_get_snapshot (MidoriView* view, GtkWidget* midori_view_get_web_view (MidoriView* view); -MidoriView* -midori_view_get_for_widget (GtkWidget* web_view); - MidoriSecurity midori_view_get_security (MidoriView* view); @@ -281,9 +248,9 @@ midori_view_add_info_bar (MidoriView* view, const gchar* first_button_text, ...); -const gchar* -midori_view_fallback_extension (MidoriView* view, - const gchar* extension); +void +midori_view_save_speed_dial_config (MidoriView* view, + GKeyFile* key_file); G_END_DECLS diff --git a/midori/midori-viewable.c b/midori/midori-viewable.c new file mode 100644 index 00000000..f17c305a --- /dev/null +++ b/midori/midori-viewable.c @@ -0,0 +1,163 @@ +/* + 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 "midori-viewable.h" + +#include + +enum { + POPULATE_OPTION_MENU, + + LAST_SIGNAL +}; + +static guint signals[LAST_SIGNAL]; + +static void +midori_viewable_base_init (MidoriViewableIface* iface); + +static void +midori_viewable_base_finalize (MidoriViewableIface* iface); + +GType +midori_viewable_get_type (void) +{ + static GType viewable_type = 0; + + if (!viewable_type) + { + const GTypeInfo viewable_info = + { + sizeof (MidoriViewableIface), + (GBaseInitFunc) midori_viewable_base_init, + (GBaseFinalizeFunc) midori_viewable_base_finalize, + }; + + viewable_type = g_type_register_static (G_TYPE_INTERFACE, + "MidoriViewable", + &viewable_info, 0); + g_type_interface_add_prerequisite (viewable_type, GTK_TYPE_WIDGET); + } + + return viewable_type; +} + +static const gchar* +midori_viewable_default_get_stock_id (MidoriViewable* viewable) +{ + return NULL; +} + +static const gchar* +midori_viewable_default_get_label (MidoriViewable* viewable) +{ + return NULL; +} + +static GtkWidget* +midori_viewable_default_get_toolbar (MidoriViewable* viewable) +{ + return NULL; +} + +static void +midori_viewable_base_init (MidoriViewableIface* iface) +{ + static gboolean initialized = FALSE; + + if (initialized) + return; + + /** + * MidoriViewable::populate-option-menu: + * @viewable: the object on which the signal is emitted + * @menu: the #GtkMenu to populate + * + * Emitted when an Option menu is displayed, for instance + * when the user clicks the Options button in the panel. + * + * Deprecated: 0.2.3 + */ + signals[POPULATE_OPTION_MENU] = g_signal_new ( + "populate-option-menu", + G_TYPE_FROM_INTERFACE (iface), + (GSignalFlags)(G_SIGNAL_RUN_LAST), + 0, + 0, + NULL, + g_cclosure_marshal_VOID__OBJECT, + G_TYPE_NONE, 1, + GTK_TYPE_MENU); + + iface->get_stock_id = midori_viewable_default_get_stock_id; + iface->get_label = midori_viewable_default_get_label; + iface->get_toolbar = midori_viewable_default_get_toolbar; + + initialized = TRUE; +} + +static void +midori_viewable_base_finalize (MidoriViewableIface* iface) +{ +} + +/** + * midori_viewable_get_stock_id: + * @viewable: a #MidoriViewable + * + * Retrieves the stock ID of the viewable. + * + * Return value: a stock ID + **/ +const gchar* +midori_viewable_get_stock_id (MidoriViewable* viewable) +{ + g_return_val_if_fail (MIDORI_IS_VIEWABLE (viewable), NULL); + + return MIDORI_VIEWABLE_GET_IFACE (viewable)->get_stock_id (viewable); +} + +/** + * midori_viewable_get_label: + * @viewable: a #MidoriViewable + * + * Retrieves the label of the viewable. + * + * Return value: a label string + **/ +const gchar* +midori_viewable_get_label (MidoriViewable* viewable) +{ + g_return_val_if_fail (MIDORI_IS_VIEWABLE (viewable), NULL); + + return MIDORI_VIEWABLE_GET_IFACE (viewable)->get_label (viewable); +} + +/** + * midori_viewable_get_toolbar: + * @viewable: a #MidoriViewable + * + * Retrieves the toolbar of the viewable. + * + * Return value: a toolbar + **/ +GtkWidget* +midori_viewable_get_toolbar (MidoriViewable* viewable) +{ + GtkWidget* toolbar; + + g_return_val_if_fail (MIDORI_IS_VIEWABLE (viewable), NULL); + + toolbar = MIDORI_VIEWABLE_GET_IFACE (viewable)->get_toolbar (viewable); + if (!toolbar) + toolbar = gtk_toolbar_new (); + return toolbar; +} diff --git a/midori/midori-viewable.h b/midori/midori-viewable.h new file mode 100644 index 00000000..7e36c7b0 --- /dev/null +++ b/midori/midori-viewable.h @@ -0,0 +1,61 @@ +/* + 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_VIEWABLE_H__ +#define __MIDORI_VIEWABLE_H__ + +#include + +G_BEGIN_DECLS + +#define MIDORI_TYPE_VIEWABLE \ + (midori_viewable_get_type ()) +#define MIDORI_VIEWABLE(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), MIDORI_TYPE_VIEWABLE, MidoriViewable)) +#define MIDORI_IS_VIEWABLE(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MIDORI_TYPE_VIEWABLE)) +#define MIDORI_VIEWABLE_GET_IFACE(inst) \ + (G_TYPE_INSTANCE_GET_INTERFACE ((inst), MIDORI_TYPE_VIEWABLE, \ + MidoriViewableIface)) + +typedef struct _MidoriViewable MidoriViewable; +typedef struct _MidoriViewableIface MidoriViewableIface; + +struct _MidoriViewableIface +{ + GTypeInterface base_iface; + + /* Virtual functions */ + const gchar* + (*get_stock_id) (MidoriViewable* viewable); + + const gchar* + (*get_label) (MidoriViewable* viewable); + + GtkWidget* + (*get_toolbar) (MidoriViewable* viewable); +}; + +GType +midori_viewable_get_type (void) G_GNUC_CONST; + +const gchar* +midori_viewable_get_stock_id (MidoriViewable* viewable); + +const gchar* +midori_viewable_get_label (MidoriViewable* viewable); + +GtkWidget* +midori_viewable_get_toolbar (MidoriViewable* viewable); + +G_END_DECLS + +#endif /* __MIDORI_VIEWABLE_H__ */ diff --git a/midori/midori-viewable.vala b/midori/midori-viewable.vala deleted file mode 100644 index 3fa177ec..00000000 --- a/midori/midori-viewable.vala +++ /dev/null @@ -1,23 +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. -*/ - -namespace Midori { - public interface Viewable { - public abstract unowned string get_stock_id (); - public abstract unowned string get_label (); - public abstract Gtk.Widget get_toolbar (); - /* Emitted when an Option menu is displayed, for instance - * when the user clicks the Options button in the panel. - * Deprecated: 0.2.3 */ - public signal void populate_option_menu (Gtk.Menu menu); - } -} - diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c index e0549b61..83ad7fef 100644 --- a/midori/midori-websettings.c +++ b/midori/midori-websettings.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2008-2012 Christian Dywan + Copyright (C) 2008-2010 Christian Dywan Copyright (C) 2011 Peter Hatina This library is free software; you can redistribute it and/or @@ -12,9 +12,7 @@ #include "midori-websettings.h" -#include "midori-app.h" #include "sokoke.h" -#include /* Vala API */ #include #include @@ -27,35 +25,72 @@ #if defined (G_OS_UNIX) #include #endif -#if defined(__FreeBSD__) - #include - #include -#endif struct _MidoriWebSettings { - MidoriSettings parent_instance; - + WebKitWebSettings parent_instance; + + gboolean remember_last_window_size : 1; + MidoriWindowState last_window_state : 2; + gboolean show_menubar : 1; + gboolean show_navigationbar : 1; + gboolean show_bookmarkbar : 1; + gboolean show_panel : 1; + gboolean show_statusbar : 1; MidoriToolbarStyle toolbar_style : 3; + gboolean compact_sidepanel : 1; + gboolean right_align_sidepanel : 1; + gboolean open_panels_in_windows : 1; MidoriStartup load_on_startup : 2; + gboolean show_crash_dialog : 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; + gboolean middle_click_opens_selection : 1; + gboolean open_tabs_in_the_background : 1; + gboolean open_tabs_next_to_current : 1; + gboolean open_popups_in_tabs : 1; + gboolean zoom_text_and_images : 1; + gboolean find_while_typing : 1; + gboolean kinetic_scrolling : 1; gboolean first_party_cookies_only : 1; + gboolean remember_last_visited_pages : 1; MidoriProxy proxy_type : 2; MidoriIdentity identify_as : 3; + gint last_window_width; + gint last_window_height; + gint last_panel_position; + gint last_panel_page; + gint last_web_search; + gint maximum_cookie_age; + gint maximum_history_age; + gint search_width; + + gchar* toolbar_items; + gchar* homepage; + gchar* download_folder; + 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* accept; 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; @@ -63,38 +98,107 @@ struct _MidoriWebSettings struct _MidoriWebSettingsClass { - MidoriSettingsClass parent_class; + WebKitWebSettingsClass parent_class; }; -G_DEFINE_TYPE (MidoriWebSettings, midori_web_settings, MIDORI_TYPE_SETTINGS); +G_DEFINE_TYPE (MidoriWebSettings, midori_web_settings, WEBKIT_TYPE_WEB_SETTINGS) enum { PROP_0, + PROP_REMEMBER_LAST_WINDOW_SIZE, + PROP_LAST_WINDOW_WIDTH, + PROP_LAST_WINDOW_HEIGHT, + PROP_LAST_WINDOW_STATE, + PROP_LAST_PANEL_POSITION, + PROP_LAST_PANEL_PAGE, + PROP_LAST_WEB_SEARCH, + + PROP_SHOW_MENUBAR, + PROP_SHOW_NAVIGATIONBAR, + PROP_SHOW_BOOKMARKBAR, + PROP_SHOW_PANEL, + PROP_SHOW_STATUSBAR, + PROP_TOOLBAR_STYLE, + PROP_TOOLBAR_ITEMS, + PROP_COMPACT_SIDEPANEL, + PROP_RIGHT_ALIGN_SIDEPANEL, + PROP_OPEN_PANELS_IN_WINDOWS, PROP_LOAD_ON_STARTUP, + PROP_HOMEPAGE, + PROP_SHOW_CRASH_DIALOG, + PROP_DOWNLOAD_FOLDER, + PROP_TEXT_EDITOR, + PROP_NEWS_AGGREGATOR, + PROP_LOCATION_ENTRY_SEARCH, PROP_PREFERRED_ENCODING, + PROP_ALWAYS_SHOW_TABBAR, + PROP_CLOSE_BUTTONS_ON_TABS, PROP_CLOSE_BUTTONS_LEFT, PROP_OPEN_NEW_PAGES_IN, - PROP_ENABLE_FULLSCREEN, - + 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_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, PROP_ENABLE_PAGE_CACHE, + PROP_ZOOM_TEXT_AND_IMAGES, + PROP_FIND_WHILE_TYPING, + PROP_KINETIC_SCROLLING, + PROP_MAXIMUM_COOKIE_AGE, + PROP_FIRST_PARTY_COOKIES_ONLY, + + PROP_MAXIMUM_HISTORY_AGE, PROP_PROXY_TYPE, + PROP_HTTP_PROXY, + PROP_HTTP_PROXY_PORT, + PROP_MAXIMUM_CACHE_SIZE, PROP_IDENTIFY_AS, PROP_USER_AGENT, PROP_PREFERRED_LANGUAGES, - PROP_SITE_DATA_RULES, + PROP_CLEAR_PRIVATE_DATA, + PROP_CLEAR_DATA, PROP_ENABLE_DNS_PREFETCHING, + PROP_STRIP_REFERER, PROP_ENFORCE_FONT_FAMILY, PROP_USER_STYLESHEET_URI, + + PROP_SEARCH_WIDTH, }; +GType +midori_window_state_get_type (void) +{ + static GType type = 0; + if (!type) + { + static const GEnumValue values[] = { + { MIDORI_WINDOW_NORMAL, "MIDORI_WINDOW_NORMAL", "Normal" }, + { MIDORI_WINDOW_MINIMIZED, "MIDORI_WINDOW_MINIMIZED", "Minimized" }, + { MIDORI_WINDOW_MAXIMIZED, "MIDORI_WINDOW_MAXIMIZED", "Maximized" }, + { MIDORI_WINDOW_FULLSCREEN, "MIDORI_WINDOW_FULLSCREEN", "Fullscreen" }, + { 0, NULL, NULL } + }; + type = g_enum_register_static ("MidoriWindowState", values); + } + return type; +} + GType midori_startup_get_type (void) { @@ -120,8 +224,7 @@ midori_preferred_encoding_get_type (void) if (!type) { static const GEnumValue values[] = { - { MIDORI_ENCODING_CHINESE, "MIDORI_ENCODING_CHINESE", N_("Chinese Traditional (BIG5)") }, - { MIDORI_ENCODING_CHINESE_SIMPLIFIED, "MIDORI_ENCODING_CHINESE_SIMPLIFIED", N_("Chinese Simplified (GB18030)") }, + { MIDORI_ENCODING_CHINESE, "MIDORI_ENCODING_CHINESE", N_("Chinese (BIG5)") }, { MIDORI_ENCODING_JAPANESE, "MIDORI_ENCODING_JAPANESE", N_("Japanese (SHIFT_JIS)") }, { MIDORI_ENCODING_KOREAN, "MIDORI_ENCODING_KOREAN", N_("Korean (EUC-KR)") }, { MIDORI_ENCODING_RUSSIAN, "MIDORI_ENCODING_RUSSIAN", N_("Russian (KOI8-R)") }, @@ -198,7 +301,6 @@ midori_identity_get_type (void) static const GEnumValue values[] = { { MIDORI_IDENT_MIDORI, "MIDORI_IDENT_MIDORI", N_("_Automatic") }, { MIDORI_IDENT_GENUINE, "MIDORI_IDENT_GENUINE", N_("Midori") }, - { MIDORI_IDENT_CHROME, "MIDORI_IDENT_CHROME", N_("Chrome") }, { MIDORI_IDENT_SAFARI, "MIDORI_IDENT_SAFARI", N_("Safari") }, { MIDORI_IDENT_IPHONE, "MIDORI_IDENT_IPHONE", N_("iPhone") }, { MIDORI_IDENT_FIREFOX, "MIDORI_IDENT_FIREFOX", N_("Firefox") }, @@ -226,36 +328,16 @@ midori_web_settings_get_property (GObject* object, GValue* value, GParamSpec* pspec); -static gboolean -midori_web_settings_low_memory_profile () +static const gchar* +midori_get_download_dir (void) { -#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* dir = g_get_user_special_dir (G_USER_DIRECTORY_DOWNLOAD); + if (dir) { - const gchar* value = katze_skip_whitespace (total + 9); - gdouble mem_total = g_ascii_strtoll (value, NULL, 0); - return mem_total / 1024.0 < 352 + 1; + katze_mkdir_with_parents (dir, 0700); + return dir; } -#endif - return FALSE; + return g_get_home_dir (); } static void @@ -271,6 +353,125 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS; + g_object_class_install_property (gobject_class, + PROP_REMEMBER_LAST_WINDOW_SIZE, + g_param_spec_boolean ( + "remember-last-window-size", + _("Remember last window size"), + _("Whether to save the last window size"), + TRUE, + flags)); + + g_object_class_install_property (gobject_class, + PROP_LAST_WINDOW_WIDTH, + g_param_spec_int ( + "last-window-width", + _("Last window width"), + _("The last saved window width"), + 0, G_MAXINT, 0, + flags | MIDORI_PARAM_DELAY_SAVING)); + + g_object_class_install_property (gobject_class, + PROP_LAST_WINDOW_HEIGHT, + g_param_spec_int ( + "last-window-height", + _("Last window height"), + _("The last saved window height"), + 0, G_MAXINT, 0, + flags | MIDORI_PARAM_DELAY_SAVING)); + + /** + * MidoriWebSettings:last-window-state: + * + * The last saved window state. + * + * Since: 0.1.3 + */ + g_object_class_install_property (gobject_class, + PROP_LAST_WINDOW_STATE, + g_param_spec_enum ( + "last-window-state", + "Last window state", + "The last saved window state", + MIDORI_TYPE_WINDOW_STATE, + MIDORI_WINDOW_NORMAL, + flags | MIDORI_PARAM_DELAY_SAVING)); + + g_object_class_install_property (gobject_class, + PROP_LAST_PANEL_POSITION, + g_param_spec_int ( + "last-panel-position", + _("Last panel position"), + _("The last saved panel position"), + 0, G_MAXINT, 0, + flags | MIDORI_PARAM_DELAY_SAVING)); + + g_object_class_install_property (gobject_class, + PROP_LAST_PANEL_PAGE, + g_param_spec_int ( + "last-panel-page", + /* i18n: The internal index of the last opened panel */ + _("Last panel page"), + _("The last saved panel page"), + 0, G_MAXINT, 0, + flags | MIDORI_PARAM_DELAY_SAVING)); + + g_object_class_install_property (gobject_class, + PROP_LAST_WEB_SEARCH, + g_param_spec_int ( + "last-web-search", + _("Last Web search"), + _("The last saved Web search"), + 0, G_MAXINT, 0, + flags)); + + + g_object_class_install_property (gobject_class, + PROP_SHOW_MENUBAR, + g_param_spec_boolean ( + "show-menubar", + _("Show Menubar"), + _("Whether to show the menubar"), + FALSE, + flags)); + + g_object_class_install_property (gobject_class, + PROP_SHOW_NAVIGATIONBAR, + g_param_spec_boolean ( + "show-navigationbar", + _("Show Navigationbar"), + _("Whether to show the navigationbar"), + TRUE, + flags)); + + g_object_class_install_property (gobject_class, + PROP_SHOW_BOOKMARKBAR, + g_param_spec_boolean ( + "show-bookmarkbar", + _("Show Bookmarkbar"), + _("Whether to show the bookmarkbar"), + FALSE, + flags)); + + g_object_class_install_property (gobject_class, + PROP_SHOW_PANEL, + g_param_spec_boolean ( + "show-panel", + _("Show Panel"), + _("Whether to show the panel"), + FALSE, + flags)); + + g_object_class_install_property (gobject_class, + PROP_SHOW_STATUSBAR, + g_param_spec_boolean ( + "show-statusbar", + _("Show Statusbar"), + _("Whether to show the statusbar"), + TRUE, + flags)); + + g_object_class_install_property (gobject_class, PROP_TOOLBAR_STYLE, g_param_spec_enum ( @@ -281,26 +482,164 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) MIDORI_TOOLBAR_DEFAULT, 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,BookmarkAdd,Location,Search,Trash,CompactMenu", + flags)); + + g_object_class_install_property (gobject_class, + PROP_COMPACT_SIDEPANEL, + g_param_spec_boolean ( + "compact-sidepanel", + _("Compact Sidepanel"), + _("Whether to make the sidepanel compact"), + FALSE, + flags)); + + /** + * MidoriWebSettings:right-sidepanel: + * + * Whether to align the sidepanel on the right. + * + * Since: 0.1.3 + */ + g_object_class_install_property (gobject_class, + PROP_RIGHT_ALIGN_SIDEPANEL, + g_param_spec_boolean ( + "right-align-sidepanel", + _("Align sidepanel on the right"), + _("Whether to align the sidepanel on the right"), + FALSE, + flags)); + + /** + * MidoriWebSettings:open-panels-in-window: + * + * Whether to open panels in separate windows. + * + * Since: 0.2.2 + */ + g_object_class_install_property (gobject_class, + PROP_OPEN_PANELS_IN_WINDOWS, + g_param_spec_boolean ( + "open-panels-in-windows", + _("Open panels in separate windows"), + _("Whether to always open panels in separate windows"), + FALSE, + flags)); + + g_object_class_install_property (gobject_class, PROP_LOAD_ON_STARTUP, g_param_spec_enum ( "load-on-startup", _("When Midori starts:"), - "What to do when Midori starts", + _("What to do when Midori starts"), MIDORI_TYPE_STARTUP, MIDORI_STARTUP_LAST_OPEN_PAGES, flags)); + g_object_class_install_property (gobject_class, + PROP_HOMEPAGE, + g_param_spec_string ( + "homepage", + _("Homepage:"), + _("The homepage"), + "http://www.google.com", + flags)); + + /** + * MidoriWebSettings:show-crash-dialog: + * + * Show a dialog after Midori crashed. + * + * Since: 0.1.2 + */ + g_object_class_install_property (gobject_class, + PROP_SHOW_CRASH_DIALOG, + g_param_spec_boolean ( + "show-crash-dialog", + _("Show crash dialog"), + _("Show a dialog after Midori crashed"), + TRUE, + flags)); + + g_object_class_install_property (gobject_class, + PROP_DOWNLOAD_FOLDER, + g_param_spec_string ( + "download-folder", + _("Save downloaded files to:"), + _("The folder downloaded files are saved to"), + midori_get_download_dir (), + flags)); + + g_object_class_install_property (gobject_class, + PROP_TEXT_EDITOR, + g_param_spec_string ( + "text-editor", + _("Text Editor"), + _("An external text editor"), + NULL, + flags)); + + /** + * MidoriWebSettings:news-aggregator: + * + * An external news aggregator. + * + * Since: 0.1.6 + */ + g_object_class_install_property (gobject_class, + PROP_NEWS_AGGREGATOR, + g_param_spec_string ( + "news-aggregator", + _("News Aggregator"), + _("An external news aggregator"), + NULL, + flags)); + + g_object_class_install_property (gobject_class, + PROP_LOCATION_ENTRY_SEARCH, + g_param_spec_string ( + "location-entry-search", + _("Location entry Search"), + _("The search to perform inside the location entry"), + NULL, + flags)); + g_object_class_install_property (gobject_class, PROP_PREFERRED_ENCODING, g_param_spec_enum ( "preferred-encoding", - "Preferred Encoding", - "The preferred character encoding", + _("Preferred Encoding"), + _("The preferred character encoding"), MIDORI_TYPE_PREFERRED_ENCODING, MIDORI_ENCODING_WESTERN, flags)); + + g_object_class_install_property (gobject_class, + PROP_ALWAYS_SHOW_TABBAR, + g_param_spec_boolean ( + "always-show-tabbar", + _("Always Show Tabbar"), + _("Always show the tabbar"), + FALSE, + flags)); + + g_object_class_install_property (gobject_class, + PROP_CLOSE_BUTTONS_ON_TABS, + g_param_spec_boolean ( + "close-buttons-on-tabs", + _("Close Buttons on Tabs"), + _("Whether tabs have close buttons"), + TRUE, + flags)); + /** * MidoriWebSettings:close-buttons-left: * @@ -323,39 +662,222 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) g_param_spec_enum ( "open-new-pages-in", _("Open new pages in:"), - "Where to open new pages", + _("Where to open new 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", + _("Middle click opens Selection"), + _("Load an address from the selection via middle click"), + TRUE, + flags)); + + g_object_class_install_property (gobject_class, + PROP_OPEN_TABS_IN_THE_BACKGROUND, + g_param_spec_boolean ( + "open-tabs-in-the-background", + _("Open tabs in the background"), + _("Whether to open new tabs in the background"), + FALSE, + flags)); + + g_object_class_install_property (gobject_class, + PROP_OPEN_TABS_NEXT_TO_CURRENT, + g_param_spec_boolean ( + "open-tabs-next-to-current", + _("Open Tabs next to Current"), + _("Whether to open new tabs next to the current tab or after the last one"), + TRUE, + flags)); + + g_object_class_install_property (gobject_class, + PROP_OPEN_POPUPS_IN_TABS, + g_param_spec_boolean ( + "open-popups-in-tabs", + _("Open popups in tabs"), + _("Whether to open popup windows in tabs"), + TRUE, + flags)); + + + /* Override properties to localize them for preference proxies */ + g_object_class_install_property (gobject_class, + PROP_AUTO_LOAD_IMAGES, + g_param_spec_boolean ( + "auto-load-images", + _("Load images automatically"), + _("Load and display images automatically"), + TRUE, + flags)); + g_object_class_install_property (gobject_class, + PROP_ENABLE_SCRIPTS, + g_param_spec_boolean ( + "enable-scripts", + _("Enable scripts"), + _("Enable embedded scripting languages"), + TRUE, + flags)); g_object_class_install_property (gobject_class, PROP_ENABLE_PLUGINS, g_param_spec_boolean ( "enable-plugins", - "Enable Netscape plugins", - "Enable embedded Netscape plugin objects", + _("Enable Netscape plugins"), + _("Enable embedded Netscape plugin objects"), + #ifdef G_OS_WIN32 + FALSE, + G_PARAM_READABLE)); + #else TRUE, flags)); - + #endif + /* Override properties to override defaults */ + g_object_class_install_property (gobject_class, + PROP_ENABLE_DEVELOPER_EXTRAS, + g_param_spec_boolean ( + "enable-developer-extras", + "Enable developer tools", + "Enable special extensions for developers", + TRUE, + flags)); + 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", + _("Enable HTML5 database support"), + _("Whether to enable HTML5 database support"), + FALSE, + flags)); + g_object_class_install_property (gobject_class, + PROP_ENABLE_HTML5_LOCAL_STORAGE, + g_param_spec_boolean ("enable-html5-local-storage", + _("Enable HTML5 local storage support"), + _("Whether to enable HTML5 local storage support"), + FALSE, + flags)); + g_object_class_install_property (gobject_class, + PROP_ENABLE_OFFLINE_WEB_APPLICATION_CACHE, + g_param_spec_boolean ("enable-offline-web-application-cache", + _("Enable offline web application cache"), + _("Whether to enable offline web application cache"), + FALSE, + flags)); #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", - !midori_web_settings_low_memory_profile (), + TRUE, flags)); #endif - if (g_object_class_find_property (gobject_class, "enable-fullscreen")) g_object_class_install_property (gobject_class, - PROP_ENABLE_FULLSCREEN, + PROP_FLASH_WINDOW_ON_BG_TABS, g_param_spec_boolean ( - "enable-fullscreen", - "Enable Fullscreen", - "Allow experimental fullscreen API", + "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)); + + /** + * MidoriWebSettings:zoom-text-and-images: + * + * Whether to zoom text and images. + * + * Since: 0.1.3 + */ + g_object_class_install_property (gobject_class, + PROP_ZOOM_TEXT_AND_IMAGES, + g_param_spec_boolean ( + "zoom-text-and-images", + _("Zoom Text and Images"), + _("Whether to zoom text and images"), + FALSE, + flags)); + + /** + * MidoriWebSettings:find-while-typing: + * + * Whether to automatically find inline while typing something. + * + * Since: 0.1.4 + */ + g_object_class_install_property (gobject_class, + PROP_FIND_WHILE_TYPING, + g_param_spec_boolean ( + "find-while-typing", + _("Find inline while typing"), + _("Whether to automatically find inline while typing"), + FALSE, + flags)); + + /** + * MidoriWebSettings:kinetic-scrolling: + * + * Whether scrolling should kinetically move according to speed. + * + * Since: 0.2.0 + */ + g_object_class_install_property (gobject_class, + PROP_KINETIC_SCROLLING, + g_param_spec_boolean ( + "kinetic-scrolling", + _("Kinetic scrolling"), + _("Whether scrolling should kinetically move according to speed"), TRUE, flags)); + g_object_class_install_property (gobject_class, + PROP_MAXIMUM_COOKIE_AGE, + g_param_spec_int ( + "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", + _("Delete pages from history after:"), + _("The maximum number of days to save the history for"), + 0, G_MAXINT, 30, + flags)); + /** * MidoriWebSettings:proxy-type: * @@ -367,12 +889,56 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) PROP_PROXY_TYPE, g_param_spec_enum ( "proxy-type", - "Proxy server", - "The type of proxy server to use", + _("Proxy server"), + _("The type of proxy server to use"), MIDORI_TYPE_PROXY, MIDORI_PROXY_AUTOMATIC, flags)); + g_object_class_install_property (gobject_class, + PROP_HTTP_PROXY, + g_param_spec_string ( + "http-proxy", + _("HTTP Proxy Server"), + _("The proxy server used for HTTP connections"), + NULL, + 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: * @@ -402,8 +968,8 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) PROP_USER_AGENT, g_param_spec_string ( "user-agent", - "Identification string", - "The application identification string", + _("Identification string"), + _("The application identification string"), NULL, flags)); @@ -419,25 +985,40 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) PROP_PREFERRED_LANGUAGES, g_param_spec_string ( "preferred-languages", - "Preferred languages", - "A comma separated list of languages", + _("Preferred languages"), + _("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\""), NULL, flags)); /** - * MidoriWebSettings:site-data-rules: + * MidoriWebSettings:clear-private-data: + * + * The core data selected for deletion. + * + * Since: 0.1.7 + */ + g_object_class_install_property (gobject_class, + PROP_CLEAR_PRIVATE_DATA, + g_param_spec_int ( + "clear-private-data", + _("Clear private data"), + _("The private data selected for deletion"), + 0, G_MAXINT, 0, + flags)); + + /** + * MidoriWebSettings:clear-data: * - * Rules for accepting, denying and preserving cookies and other data. - * See midori_web_settings_get_site_data_policy() for details. + * The data selected for deletion, including extensions. * - * Since: 0.4.4 + * Since: 0.2.9 */ g_object_class_install_property (gobject_class, - PROP_SITE_DATA_RULES, + PROP_CLEAR_DATA, 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", + "clear-data", + _("Clear data"), + _("The data selected for deletion"), NULL, flags)); #if !WEBKIT_CHECK_VERSION (1, 3, 13) @@ -458,6 +1039,23 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) 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: * @@ -481,7 +1079,23 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) "User stylesheet URI", "Load stylesheets from a local URI", NULL, - flags)); + 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 @@ -498,8 +1112,6 @@ notify_default_encoding_cb (GObject* object, 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")) @@ -526,6 +1138,10 @@ notify_default_font_family_cb (GObject* object, static void midori_web_settings_init (MidoriWebSettings* web_settings) { + web_settings->download_folder = g_strdup (midori_get_download_dir ()); + web_settings->http_proxy = NULL; + web_settings->open_popups_in_tabs = TRUE; + web_settings->kinetic_scrolling = TRUE; web_settings->user_stylesheet_uri = web_settings->user_stylesheet_uri_cached = NULL; web_settings->user_stylesheets = NULL; @@ -535,14 +1151,6 @@ midori_web_settings_init (MidoriWebSettings* web_settings) "* { -webkit-box-shadow: none !important; }"); #endif - #if defined (_WIN32) && WEBKIT_CHECK_VERSION (1, 7, 1) && !GTK_CHECK_VERSION (3, 0, 0) - /* 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", @@ -556,8 +1164,13 @@ midori_web_settings_finalize (GObject* object) web_settings = MIDORI_WEB_SETTINGS (object); - katze_assign (web_settings->http_accept_language, NULL); - katze_assign (web_settings->accept, NULL); + katze_assign (web_settings->toolbar_items, NULL); + katze_assign (web_settings->homepage, NULL); + katze_assign (web_settings->download_folder, 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); @@ -567,73 +1180,6 @@ midori_web_settings_finalize (GObject* object) G_OBJECT_CLASS (midori_web_settings_parent_class)->finalize (object); } -/** - * 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) -{ - #if !WEBKIT_CHECK_VERSION (1, 8, 2) && defined G_OS_WIN32 - return FALSE; - #else - return !midori_debug ("unarmed") && 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 (gchar** architecture) @@ -734,11 +1280,8 @@ generate_ident_string (MidoriWebSettings* web_settings, return g_strdup_printf ("Mozilla/5.0 (%s %s) AppleWebKit/%d.%d+ %s", platform, os, webcore_major, webcore_minor, appname); case MIDORI_IDENT_MIDORI: - case MIDORI_IDENT_CHROME: - return g_strdup_printf ("Mozilla/5.0 (%s %s) AppleWebKit/%d.%d " - "(KHTML, like Gecko) Chrome/18.0.1025.133 Safari/%d.%d %s", - platform, os, webcore_major, webcore_minor, webcore_major, webcore_minor, appname); case MIDORI_IDENT_SAFARI: + 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); @@ -757,121 +1300,6 @@ generate_ident_string (MidoriWebSettings* web_settings, } } -/* Provide a new way for SoupSession to assume an 'Accept-Language' - string automatically from the return value of g_get_language_names(), - properly formatted according to RFC2616. - Copyright (C) 2009 Mario Sanchez Prada - Copyright (C) 2009 Dan Winship - Mostly copied from libSoup 2.29, coding style adjusted */ - -/* Converts a language in POSIX format and to be RFC2616 compliant */ -/* Based on code from epiphany-webkit (ephy_langs_append_languages()) */ - -static gchar * -sokoke_posix_lang_to_rfc2616 (const gchar *language) -{ - if (!strchr (language, '.') && !strchr (language, '@') && language[0] != 'C') - /* change to lowercase and '_' to '-' */ - return g_strdelimit (g_ascii_strdown (language, -1), "_", '-'); - - return NULL; -} - -/* Adds a quality value to a string (any value between 0 and 1). */ -static gchar * -sokoke_add_quality_value (const gchar *str, - float qvalue) -{ - if ((qvalue >= 0.0) && (qvalue <= 1.0)) - { - int qv_int = (qvalue * 1000 + 0.5); - return g_strdup_printf ("%s;q=%d.%d", - str, (int) (qv_int / 1000), qv_int % 1000); - } - - return g_strdup (str); -} - -/* Returns a RFC2616 compliant languages list from system locales */ -static gchar * -sokoke_accept_languages (const gchar* const * lang_names) -{ - GArray *langs_garray = NULL; - char *cur_lang = NULL; - char *prev_lang = NULL; - char **langs_array; - char *langs_str; - float delta; - int i, n_lang_names; - - /* Calculate delta for setting the quality values */ - n_lang_names = g_strv_length ((gchar **)lang_names); - delta = 0.999 / (n_lang_names - 1); - - /* Build the array of languages */ - langs_garray = g_array_new (TRUE, FALSE, sizeof (char*)); - for (i = 0; lang_names[i] != NULL; i++) - { - cur_lang = sokoke_posix_lang_to_rfc2616 (lang_names[i]); - - /* Apart from getting a valid RFC2616 compliant - language, also get rid of extra variants */ - if (cur_lang && (!prev_lang || - (!strcmp (prev_lang, cur_lang) || !strstr (prev_lang, cur_lang)))) - { - - gchar *qv_lang = NULL; - - /* Save reference for further comparison */ - prev_lang = cur_lang; - - /* Add the quality value and append it */ - qv_lang = sokoke_add_quality_value (cur_lang, 1 - i * delta); - g_array_append_val (langs_garray, qv_lang); - } - } - - /* Fallback: add "en" if list is empty */ - if (langs_garray->len == 0) - { - gchar* fallback = g_strdup ("en"); - g_array_append_val (langs_garray, fallback); - } - - langs_array = (char **) g_array_free (langs_garray, FALSE); - langs_str = g_strjoinv (", ", langs_array); - - return langs_str; -} - - -static void -midori_web_settings_update_accept_language (MidoriWebSettings* settings) -{ - gchar* languages = settings->http_accept_language; - /* Empty, use the system locales */ - if (!(languages && *languages)) - katze_assign (settings->accept, sokoke_accept_languages (g_get_language_names ())); - /* No =, no ., looks like a list of language names */ - else if (!(strchr (languages, '=') && strchr (languages, '.'))) - { - gchar ** lang_names = g_strsplit_set (languages, ",; ", -1); - katze_assign (settings->accept, sokoke_accept_languages ((const gchar* const *)lang_names)); - g_strfreev (lang_names); - } - /* Presumably a well formatted list including priorities */ - else - katze_assign (settings->accept, g_strdup (languages)); -} - -const gchar* -midori_web_settings_get_accept_language (MidoriWebSettings* settings) -{ - if (!settings->accept) - midori_web_settings_update_accept_language (settings); - return settings->accept; -} - static void midori_web_settings_process_stylesheets (MidoriWebSettings* settings, gint delta_len); @@ -890,13 +1318,81 @@ midori_web_settings_set_property (GObject* object, switch (prop_id) { + case PROP_REMEMBER_LAST_WINDOW_SIZE: + web_settings->remember_last_window_size = g_value_get_boolean (value); + break; + case PROP_LAST_WINDOW_WIDTH: + web_settings->last_window_width = g_value_get_int (value); + break; + case PROP_LAST_WINDOW_HEIGHT: + web_settings->last_window_height = g_value_get_int (value); + break; + case PROP_LAST_WINDOW_STATE: + web_settings->last_window_state = g_value_get_enum (value); + break; + case PROP_LAST_PANEL_POSITION: + web_settings->last_panel_position = g_value_get_int (value); + break; + case PROP_LAST_PANEL_PAGE: + web_settings->last_panel_page = g_value_get_int (value); + break; + case PROP_LAST_WEB_SEARCH: + web_settings->last_web_search = g_value_get_int (value); + break; + + case PROP_SHOW_MENUBAR: + web_settings->show_menubar = g_value_get_boolean (value); + break; + case PROP_SHOW_NAVIGATIONBAR: + web_settings->show_navigationbar = g_value_get_boolean (value); + break; + case PROP_SHOW_BOOKMARKBAR: + web_settings->show_bookmarkbar = g_value_get_boolean (value); + break; + case PROP_SHOW_PANEL: + web_settings->show_panel = g_value_get_boolean (value); + break; + case PROP_SHOW_STATUSBAR: + web_settings->show_statusbar = g_value_get_boolean (value); + break; + case PROP_TOOLBAR_STYLE: web_settings->toolbar_style = g_value_get_enum (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_RIGHT_ALIGN_SIDEPANEL: + web_settings->right_align_sidepanel = g_value_get_boolean (value); + break; + case PROP_OPEN_PANELS_IN_WINDOWS: + web_settings->open_panels_in_windows = g_value_get_boolean (value); + break; case PROP_LOAD_ON_STARTUP: web_settings->load_on_startup = g_value_get_enum (value); break; + case PROP_HOMEPAGE: + katze_assign (web_settings->homepage, g_value_dup_string (value)); + break; + case PROP_SHOW_CRASH_DIALOG: + web_settings->show_crash_dialog = g_value_get_boolean (value); + break; + case PROP_DOWNLOAD_FOLDER: + katze_assign (web_settings->download_folder, g_value_dup_string (value)); + break; + case PROP_TEXT_EDITOR: + katze_assign (web_settings->text_editor, g_value_dup_string (value)); + break; + case PROP_NEWS_AGGREGATOR: + katze_assign (web_settings->news_aggregator, g_value_dup_string (value)); + break; + case PROP_LOCATION_ENTRY_SEARCH: + katze_assign (web_settings->location_entry_search, g_value_dup_string (value)); + break; case PROP_PREFERRED_ENCODING: web_settings->preferred_encoding = g_value_get_enum (value); switch (web_settings->preferred_encoding) @@ -904,9 +1400,6 @@ midori_web_settings_set_property (GObject* object, 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; @@ -927,10 +1420,36 @@ midori_web_settings_set_property (GObject* object, } break; + case PROP_ALWAYS_SHOW_TABBAR: + web_settings->always_show_tabbar = g_value_get_boolean (value); + break; + case PROP_CLOSE_BUTTONS_ON_TABS: + web_settings->close_buttons_on_tabs = g_value_get_boolean (value); + break; case PROP_OPEN_NEW_PAGES_IN: web_settings->open_new_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; + case PROP_OPEN_TABS_IN_THE_BACKGROUND: + web_settings->open_tabs_in_the_background = g_value_get_boolean (value); + break; + case PROP_OPEN_TABS_NEXT_TO_CURRENT: + web_settings->open_tabs_next_to_current = g_value_get_boolean (value); + break; + case PROP_OPEN_POPUPS_IN_TABS: + web_settings->open_popups_in_tabs = g_value_get_boolean (value); + break; + case PROP_AUTO_LOAD_IMAGES: + g_object_set (web_settings, "WebKitWebSettings::auto-load-images", + g_value_get_boolean (value), NULL); + break; + case PROP_ENABLE_SCRIPTS: + g_object_set (web_settings, "WebKitWebSettings::enable-scripts", + g_value_get_boolean (value), NULL); + break; case PROP_ENABLE_PLUGINS: g_object_set (web_settings, "WebKitWebSettings::enable-plugins", g_value_get_boolean (value), @@ -939,16 +1458,66 @@ midori_web_settings_set_property (GObject* object, #endif NULL); break; + case PROP_ENABLE_DEVELOPER_EXTRAS: + g_object_set (web_settings, "WebKitWebSettings::enable-developer-extras", + g_value_get_boolean (value), NULL); + break; + 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); + break; + case PROP_ENABLE_HTML5_LOCAL_STORAGE: + g_object_set (web_settings, "WebKitWebSettings::enable-html5-local-storage", + g_value_get_boolean (value), NULL); + break; + 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; #if WEBKIT_CHECK_VERSION (1, 1, 18) case PROP_ENABLE_PAGE_CACHE: g_object_set (web_settings, "WebKitWebSettings::enable-page-cache", g_value_get_boolean (value), NULL); break; #endif + case PROP_ZOOM_TEXT_AND_IMAGES: + web_settings->zoom_text_and_images = g_value_get_boolean (value); + break; + case PROP_FIND_WHILE_TYPING: + web_settings->find_while_typing = g_value_get_boolean (value); + break; + case PROP_KINETIC_SCROLLING: + web_settings->kinetic_scrolling = g_value_get_boolean (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_PROXY_TYPE: web_settings->proxy_type = g_value_get_enum (value); break; + 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) @@ -968,16 +1537,21 @@ midori_web_settings_set_property (GObject* object, 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); - midori_web_settings_update_accept_language (web_settings); break; - case PROP_SITE_DATA_RULES: - katze_assign (web_settings->site_data_rules, g_value_dup_string (value)); + 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; #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))) { @@ -997,9 +1571,8 @@ midori_web_settings_set_property (GObject* object, else midori_web_settings_remove_style (web_settings, "enforce-font-family"); break; - case PROP_ENABLE_FULLSCREEN: - g_object_set (web_settings, "WebKitWebSettings::enable-fullscreen", - g_value_get_boolean (value), NULL); + case PROP_FLASH_WINDOW_ON_BG_TABS: + web_settings->flash_window_on_bg_tabs = g_value_get_boolean (value); break; case PROP_USER_STYLESHEET_URI: { @@ -1022,6 +1595,9 @@ midori_web_settings_set_property (GObject* object, 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; @@ -1038,17 +1614,91 @@ midori_web_settings_get_property (GObject* object, switch (prop_id) { + case PROP_REMEMBER_LAST_WINDOW_SIZE: + g_value_set_boolean (value, web_settings->remember_last_window_size); + break; + case PROP_LAST_WINDOW_WIDTH: + g_value_set_int (value, web_settings->last_window_width); + break; + case PROP_LAST_WINDOW_HEIGHT: + g_value_set_int (value, web_settings->last_window_height); + break; + case PROP_LAST_WINDOW_STATE: + g_value_set_enum (value, web_settings->last_window_state); + break; + case PROP_LAST_PANEL_POSITION: + g_value_set_int (value, web_settings->last_panel_position); + break; + case PROP_LAST_PANEL_PAGE: + g_value_set_int (value, web_settings->last_panel_page); + break; + case PROP_LAST_WEB_SEARCH: + g_value_set_int (value, web_settings->last_web_search); + break; + + case PROP_SHOW_MENUBAR: + g_value_set_boolean (value, web_settings->show_menubar); + break; + case PROP_SHOW_NAVIGATIONBAR: + g_value_set_boolean (value, web_settings->show_navigationbar); + break; + case PROP_SHOW_BOOKMARKBAR: + g_value_set_boolean (value, web_settings->show_bookmarkbar); + break; + case PROP_SHOW_PANEL: + g_value_set_boolean (value, web_settings->show_panel); + break; + case PROP_SHOW_STATUSBAR: + g_value_set_boolean (value, web_settings->show_statusbar); + break; + case PROP_TOOLBAR_STYLE: g_value_set_enum (value, web_settings->toolbar_style); 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_RIGHT_ALIGN_SIDEPANEL: + g_value_set_boolean (value, web_settings->right_align_sidepanel); + break; + case PROP_OPEN_PANELS_IN_WINDOWS: + g_value_set_boolean (value, web_settings->open_panels_in_windows); + break; case PROP_LOAD_ON_STARTUP: g_value_set_enum (value, web_settings->load_on_startup); break; + case PROP_HOMEPAGE: + g_value_set_string (value, web_settings->homepage); + break; + case PROP_SHOW_CRASH_DIALOG: + g_value_set_boolean (value, web_settings->show_crash_dialog); + break; + case PROP_DOWNLOAD_FOLDER: + g_value_set_string (value, web_settings->download_folder); + break; + case PROP_TEXT_EDITOR: + g_value_set_string (value, web_settings->text_editor); + break; + case PROP_NEWS_AGGREGATOR: + g_value_set_string (value, web_settings->news_aggregator); + break; + case PROP_LOCATION_ENTRY_SEARCH: + g_value_set_string (value, web_settings->location_entry_search); + break; case PROP_PREFERRED_ENCODING: g_value_set_enum (value, web_settings->preferred_encoding); break; + case PROP_ALWAYS_SHOW_TABBAR: + g_value_set_boolean (value, web_settings->always_show_tabbar); + break; + 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); @@ -1062,7 +1712,7 @@ midori_web_settings_get_property (GObject* object, 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 = midori_paths_get_data_filename (theme_file, FALSE); + 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) @@ -1090,21 +1740,91 @@ midori_web_settings_get_property (GObject* object, case PROP_OPEN_NEW_PAGES_IN: g_value_set_enum (value, web_settings->open_new_pages_in); break; + case PROP_MIDDLE_CLICK_OPENS_SELECTION: + g_value_set_boolean (value, web_settings->middle_click_opens_selection); + break; + case PROP_OPEN_TABS_IN_THE_BACKGROUND: + g_value_set_boolean (value, web_settings->open_tabs_in_the_background); + break; + case PROP_OPEN_TABS_NEXT_TO_CURRENT: + g_value_set_boolean (value, web_settings->open_tabs_next_to_current); + break; + case PROP_OPEN_POPUPS_IN_TABS: + g_value_set_boolean (value, web_settings->open_popups_in_tabs); + break; + case PROP_AUTO_LOAD_IMAGES: + g_value_set_boolean (value, katze_object_get_boolean (web_settings, + "WebKitWebSettings::auto-load-images")); + break; + case PROP_ENABLE_SCRIPTS: + g_value_set_boolean (value, katze_object_get_boolean (web_settings, + "WebKitWebSettings::enable-scripts")); + break; case PROP_ENABLE_PLUGINS: g_value_set_boolean (value, katze_object_get_boolean (web_settings, "WebKitWebSettings::enable-plugins")); break; + case PROP_ENABLE_DEVELOPER_EXTRAS: + g_value_set_boolean (value, katze_object_get_boolean (web_settings, + "WebKitWebSettings::enable-developer-extras")); + break; + 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")); + break; + case PROP_ENABLE_HTML5_LOCAL_STORAGE: + g_value_set_boolean (value, katze_object_get_boolean (web_settings, + "WebKitWebSettings::enable-html5-local-storage")); + break; + 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; #if WEBKIT_CHECK_VERSION (1, 1, 18) case PROP_ENABLE_PAGE_CACHE: g_value_set_boolean (value, katze_object_get_boolean (web_settings, "WebKitWebSettings::enable-page-cache")); break; #endif + case PROP_ZOOM_TEXT_AND_IMAGES: + g_value_set_boolean (value, web_settings->zoom_text_and_images); + break; + case PROP_FIND_WHILE_TYPING: + g_value_set_boolean (value, web_settings->find_while_typing); + break; + case PROP_KINETIC_SCROLLING: + g_value_set_boolean (value, web_settings->kinetic_scrolling); + 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_PROXY_TYPE: g_value_set_enum (value, web_settings->proxy_type); break; + 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; @@ -1119,25 +1839,33 @@ midori_web_settings_get_property (GObject* object, case PROP_PREFERRED_LANGUAGES: g_value_set_string (value, web_settings->http_accept_language); break; - case PROP_SITE_DATA_RULES: - g_value_set_string (value, web_settings->site_data_rules); + 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; #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_ENABLE_FULLSCREEN: - g_value_set_boolean (value, katze_object_get_boolean (web_settings, - "WebKitWebSettings::enable-fullscreen")); + case PROP_FLASH_WINDOW_ON_BG_TABS: + g_value_set_boolean (value, web_settings->flash_window_on_bg_tabs); 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; diff --git a/midori/midori-websettings.h b/midori/midori-websettings.h index 9907895d..e11ffef3 100644 --- a/midori/midori-websettings.h +++ b/midori/midori-websettings.h @@ -34,6 +34,8 @@ G_BEGIN_DECLS typedef struct _MidoriWebSettings MidoriWebSettings; typedef struct _MidoriWebSettingsClass MidoriWebSettingsClass; +#define MIDORI_PARAM_DELAY_SAVING (1 << 8) + enum { MIDORI_CLEAR_NONE = 0, @@ -47,6 +49,20 @@ enum MIDORI_CLEAR_SESSION = 128, }; +typedef enum +{ + MIDORI_WINDOW_NORMAL, + MIDORI_WINDOW_MINIMIZED, + MIDORI_WINDOW_MAXIMIZED, + MIDORI_WINDOW_FULLSCREEN, +} MidoriWindowState; + +GType +midori_window_state_get_type (void) G_GNUC_CONST; + +#define MIDORI_TYPE_WINDOW_STATE \ + (midori_window_state_get_type ()) + /* values >= MIDORI_STARTUP_LAST_OPEN_PAGES mean session is saved */ typedef enum { @@ -64,8 +80,7 @@ midori_startup_get_type (void) G_GNUC_CONST; typedef enum { - MIDORI_ENCODING_CHINESE /* Traditional */, - MIDORI_ENCODING_CHINESE_SIMPLIFIED, + MIDORI_ENCODING_CHINESE, MIDORI_ENCODING_JAPANESE, MIDORI_ENCODING_KOREAN, MIDORI_ENCODING_RUSSIAN, @@ -126,7 +141,6 @@ typedef enum { MIDORI_IDENT_MIDORI /* Automatic */, MIDORI_IDENT_GENUINE /* Midori */, - MIDORI_IDENT_CHROME, MIDORI_IDENT_SAFARI, MIDORI_IDENT_IPHONE, MIDORI_IDENT_FIREFOX, @@ -159,24 +173,6 @@ 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); - -const gchar* -midori_web_settings_get_accept_language (MidoriWebSettings* settings); - G_END_DECLS #endif /* __MIDORI_WEB_SETTINGS_H__ */ diff --git a/midori/midori.h b/midori/midori.h index 2dace3d6..02af3671 100644 --- a/midori/midori.h +++ b/midori/midori.h @@ -14,7 +14,6 @@ #include "midori-app.h" #include "midori-array.h" -#include "midori-bookmarks.h" #include "midori-browser.h" #include "midori-extension.h" #include "midori-locationaction.h" @@ -22,6 +21,7 @@ #include "midori-preferences.h" #include "midori-searchaction.h" #include "midori-view.h" +#include "midori-viewable.h" #include "midori-websettings.h" #include "midori-platform.h" #include /* Vala API */ diff --git a/midori/midori.vapi b/midori/midori.vapi index 1042d0a8..0f92c1f4 100644 --- a/midori/midori.vapi +++ b/midori/midori.vapi @@ -14,19 +14,19 @@ namespace Midori { [NoAccessorMethod] public string name { get; set; } [NoAccessorMethod] - public Midori.WebSettings settings { owned get; set; } + public Midori.WebSettings settings { get; set; } [NoAccessorMethod] - public Katze.Array bookmarks { get; set; } + public GLib.Object bookmarks { get; set; } [NoAccessorMethod] - public Katze.Array trash { get; set; } + public GLib.Object trash { get; set; } [NoAccessorMethod] - public Katze.Array search_engines { get; set; } + public GLib.Object search_engines { get; set; } [NoAccessorMethod] - public Katze.Array history { get; set; } + public GLib.Object history { get; set; } [NoAccessorMethod] - public Katze.Array extensions { get; set; } + public GLib.Object extensions { get; set; } [NoAccessorMethod] - public Katze.Array browsers { get; } + public GLib.Object browsers { get; } public Browser? browser { get; } [HasEmitter] @@ -35,20 +35,18 @@ namespace Midori { [HasEmitter] public signal void quit (); } - - [CCode (cheader_filename = "midori/midori.h")] public class Browser : Gtk.Window { public Browser (); - public int add_item (Katze.Item item); + public int add_item (GLib.Object item); 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 static unowned Browser get_for_widget (Gtk.Widget widget); + public unowned Browser get_for_widget (Gtk.Widget widget); public unowned string[] get_toolbar_actions (); - public unowned Katze.Array get_proxy_items (); + public unowned GLib.Object get_proxy_items (); [NoAccessorMethod] public Gtk.MenuBar menubar { owned get; } @@ -69,13 +67,13 @@ namespace Midori { public string statusbar_text { owned get; set; } public Midori.WebSettings settings { get; set; } [NoAccessorMethod] - public Katze.Array? bookmarks { owned get; set; } + public GLib.Object bookmarks { owned get; set; } [NoAccessorMethod] - public Katze.Array? trash { owned get; set; } + public GLib.Object trash { owned get; set; } [NoAccessorMethod] - public Katze.Array? search_engines { owned get; set; } + public GLib.Object search_engines { owned get; set; } [NoAccessorMethod] - public Katze.Array? history { owned get; set; } + public GLib.Object history { owned get; set; } [NoAccessorMethod] public bool show_tabs { get; set; } @@ -84,10 +82,9 @@ namespace Midori { public signal void add_tab (View tab); [HasEmitter] public signal void remove_tab (View tab); - public signal void switch_tab (View? old_view, View? new_view); [HasEmitter] public signal void activate_action (string name); - public signal void add_download (WebKit.Download download); + public signal void add_download (GLib.Object download); public signal void populate_tool_menu (Gtk.Menu menu); [HasEmitter] public signal void quit (); @@ -118,17 +115,12 @@ namespace Midori { 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 (); } - [CCode (cheader_filename = "midori/midori.h")] public class View : Gtk.VBox { [CCode (type = "GtkWidget*")] public View (GLib.Object net); @@ -146,8 +138,9 @@ namespace Midori { public Gtk.Menu get_tab_menu (); public Pango.EllipsizeMode get_label_ellipsize (); public Gtk.Label get_proxy_tab_label (); - public Katze.Item get_proxy_item (); + public GLib.Object get_proxy_item (); public bool can_view_source (); + public bool can_find (); public void search_text (string text, bool case_sensitive, bool forward); public void mark_text_matches (string text, bool case_sensitive); public void set_highlight_text_matches (bool highlight); @@ -155,7 +148,6 @@ namespace Midori { public Gdk.Pixbuf get_snapshot (int width, int height); public unowned WebKit.WebView get_web_view (); public void populate_popup (Gtk.Menu menu, bool manual); - public void reload (bool from_cache); public string uri { get; } public string title { get; } @@ -166,42 +158,15 @@ namespace Midori { public double progress { get; set; } public bool minimized { get; } public float zoom_level { get; } - public Katze.Array news_feeds { get; } + public GLib.Object news_feeds { get; } public string statusbar_text { get; } public WebSettings settings { get; set; } public GLib.Object net { get; } - [HasEmitter] - public signal bool download_requested (WebKit.Download download); - - } - - [CCode (cheader_filename = "midori/midori.h")] - public class SearchAction : Gtk.Action { - public static Katze.Item? get_engine_for_form (WebKit.WebView web_view, Pango.EllipsizeMode ellipsize); - } - - [CCode (cheader_filename = "midori/midori-view.h", cprefix = "MIDORI_DOWNLOAD_")] - public enum DownloadType { - CANCEL, - OPEN, - SAVE, - SAVE_AS, - OPEN_IN_VIEWER } public class WebSettings : WebKit.WebSettings { public WebSettings (); - [NoAccessorMethod] - public MidoriStartup load_on_startup { get; set; } - } - - [CCode (cheader_filename = "midori/midori-websettings.h", cprefix = "MIDORI_STARTUP_")] - public enum MidoriStartup { - BLANK_PAGE, - HOMEPAGE, - LAST_OPEN_PAGES, - DELAYED_PAGES } [CCode (cheader_filename = "midori/sokoke.h", lower_case_cprefix = "sokoke_")] diff --git a/midori/socket.c b/midori/socket.c index 73b5cfdf..2971834c 100644 --- a/midori/socket.c +++ b/midori/socket.c @@ -54,6 +54,9 @@ #endif #include "socket.h" +#if USE_SSL +# include +#endif #ifdef G_ENABLE_DEBUG # define debug_print g_debug @@ -559,6 +562,10 @@ gboolean sock_has_read_data(SockInfo *sock) #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()); @@ -588,6 +595,22 @@ static gboolean sock_check(GSource *source) 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); @@ -624,6 +647,19 @@ guint sock_add_watch(SockInfo *sock, GIOCondition condition, SockFunc func, 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); } @@ -1339,6 +1375,10 @@ gint sock_read(SockInfo *sock, gchar *buf, gint len) { 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); } @@ -1354,10 +1394,44 @@ gint fd_read(gint fd, gchar *buf, gint len) #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); } @@ -1385,10 +1459,34 @@ gint fd_write(gint fd, const gchar *buf, gint len) #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); } @@ -1408,6 +1506,24 @@ gint fd_write_all(gint fd, const gchar *buf, gint len) 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 @@ -1454,10 +1570,38 @@ gint fd_gets(gint fd, gchar *buf, gint len) 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); } @@ -1486,11 +1630,42 @@ gint fd_getline(gint fd, gchar **line) 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); } @@ -1504,10 +1679,44 @@ gint sock_puts(SockInfo *sock, const gchar *buf) } /* 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); } @@ -1518,6 +1727,11 @@ gint sock_close(SockInfo *sock) 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); @@ -1545,4 +1759,13 @@ gint fd_close(gint fd) #endif } +#if USE_SSL +void ssl_done_socket(SockInfo *sockinfo) +{ + if (sockinfo->ssl) { + SSL_free(sockinfo->ssl); + } +} +#endif + #endif diff --git a/midori/socket.h b/midori/socket.h index d4054f44..45ae384e 100644 --- a/midori/socket.h +++ b/midori/socket.h @@ -20,6 +20,10 @@ typedef struct _SockInfo SockInfo; +#if USE_SSL +# include +#endif + typedef enum { CONN_READY, @@ -38,6 +42,11 @@ typedef gboolean (*SockFunc) (SockInfo *sock, struct _SockInfo { gint sock; +#if USE_SSL + SSL *ssl; +#else + gpointer ssl; +#endif GIOChannel *sock_ch; gchar *hostname; @@ -102,4 +111,15 @@ gint fd_gets (gint sock, gchar *buf, gint len); 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 --git a/midori/sokoke.c b/midori/sokoke.c index a303bfbf..39ea28eb 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -15,7 +15,6 @@ #include "midori-core.h" #include "midori-platform.h" -#include "midori-app.h" #include #if HAVE_UNISTD_H @@ -32,7 +31,6 @@ #include #include #include -#include #ifdef HAVE_HILDON_FM #include @@ -64,20 +62,15 @@ sokoke_js_script_eval (JSContextRef js_context, const gchar* script, gchar** exception) { - JSGlobalContextRef temporary_context = NULL; 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); - if (!js_context) - js_context = temporary_context = JSGlobalContextCreateInGroup (NULL, NULL); - - js_script = JSStringCreateWithUTF8CString (script); - js_value = JSEvaluateScript (js_context, js_script, + JSStringRef js_script = JSStringCreateWithUTF8CString (script); + JSValueRef js_exception = NULL; + JSValueRef js_value = JSEvaluateScript (js_context, js_script, JSContextGetGlobalObject (js_context), NULL, 0, &js_exception); JSStringRelease (js_script); @@ -85,8 +78,6 @@ sokoke_js_script_eval (JSContextRef js_context, { JSStringRef js_message = JSValueToStringCopy (js_context, js_exception, NULL); - g_return_val_if_fail (js_message != NULL, NULL); - value = sokoke_js_string_utf8 (js_message); if (exception) *exception = value; @@ -96,16 +87,12 @@ sokoke_js_script_eval (JSContextRef js_context, g_free (value); } JSStringRelease (js_message); - if (temporary_context) - JSGlobalContextRelease (temporary_context); return NULL; } js_value_string = JSValueToStringCopy (js_context, js_value, NULL); value = sokoke_js_string_utf8 (js_value_string); JSStringRelease (js_value_string); - if (temporary_context) - JSGlobalContextRelease (temporary_context); return value; } @@ -206,6 +193,7 @@ sokoke_show_uri_with_mime_type (GdkScreen* screen, !g_str_has_prefix (uri, "file://")); 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 @@ -213,6 +201,9 @@ sokoke_show_uri_with_mime_type (GdkScreen* screen, #endif gdk_app_launch_context_set_screen (context, screen); gdk_app_launch_context_set_timestamp (context, timestamp); + #else + context = g_app_launch_context_new (); + #endif success = g_app_info_launch (app_info, files, context, error); @@ -233,7 +224,7 @@ sokoke_open_with_response_cb (GtkWidget* dialog, { const gchar* command = gtk_entry_get_text (entry); const gchar* uri = g_object_get_data (G_OBJECT (dialog), "uri"); - sokoke_spawn_program (command, FALSE, uri, TRUE); + sokoke_spawn_program (command, uri); } gtk_widget_destroy (dialog); } @@ -293,12 +284,71 @@ sokoke_show_uri (GdkScreen* screen, 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; - return ShellExecuteEx (&info); + const gchar* fallbacks [] = { "explorer" }; + gsize i; + GAppInfo *app_info; + GFile *file; + gchar *free_uri; + + g_return_val_if_fail (GDK_IS_SCREEN (screen) || !screen, FALSE); + g_return_val_if_fail (uri != NULL, FALSE); + g_return_val_if_fail (!error || !*error, 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; + #else #if !GLIB_CHECK_VERSION (2, 28, 0) @@ -319,8 +369,13 @@ sokoke_show_uri (GdkScreen* screen, sokoke_recursive_fork_protection (uri, TRUE); + #if GTK_CHECK_VERSION (2, 14, 0) if (gtk_show_uri (screen, uri, timestamp, error)) return TRUE; + #else + if (g_app_info_launch_default_for_uri (uri, NULL, NULL)) + return TRUE; + #endif #if !GLIB_CHECK_VERSION (2, 28, 0) info = sokoke_default_for_uri (uri, &scheme); @@ -379,122 +434,117 @@ sokoke_show_uri (GdkScreen* screen, #endif } -/** - * sokoke_prepare_command: - * @command: the command, properly quoted - * @argument: any arguments, properly quoted - * @quote_command: if %TRUE, @command will be quoted - * @quote_argument: if %TRUE, @argument will be quoted, ie. a URI or filename - * - * If @command contains %s, @argument will be quoted and inserted into - * @command, which is left unquoted regardless of @quote_command. - * - * Return value: the command prepared for spawning - **/ -gchar* -sokoke_prepare_command (const gchar* command, - gboolean quote_command, - const gchar* argument, - gboolean quote_argument) +gboolean +sokoke_spawn_program (const gchar* command, + const gchar* argument) { + GError* error; + g_return_val_if_fail (command != NULL, FALSE); g_return_val_if_fail (argument != NULL, FALSE); - if (midori_debug ("paths")) - g_print ("Preparing command: %s %d %s %d\n", - command, quote_command, argument, quote_argument); - + if (!g_strstr_len (argument, 8, "://") + && !g_str_has_prefix (argument, "about:")) { - gchar* uri_format; - gchar* real_command; - gchar* command_ready; - - /* .desktop files accept %u, %U, %f, %F as URI/ filename, we treat it like %s */ - real_command = g_strdup (command); - if ((uri_format = strstr (real_command, "%u")) - || (uri_format = strstr (real_command, "%U")) - || (uri_format = strstr (real_command, "%f")) - || (uri_format = strstr (real_command, "%F"))) - uri_format[1] = 's'; + gboolean success; + #if HAVE_HILDON + osso_context_t* osso; + DBusConnection* dbus; - if (strstr (real_command, "%s")) + osso = osso_initialize (PACKAGE_NAME, PACKAGE_VERSION, FALSE, NULL); + if (!osso) { - gchar* argument_quoted = quote_argument ? g_shell_quote (argument) : g_strdup (argument); - command_ready = g_strdup_printf (real_command, argument_quoted); - g_free (argument_quoted); + sokoke_message_dialog (GTK_MESSAGE_ERROR, + _("Could not run external program."), + "Failed to initialize libosso", FALSE); + return FALSE; } - else if (quote_argument) + + dbus = (DBusConnection *) osso_get_dbus_connection (osso); + if (!dbus) { - gchar* quoted_command = quote_command ? g_shell_quote (real_command) : g_strdup (real_command); - gchar* argument_quoted = g_shell_quote (argument); - command_ready = g_strconcat (quoted_command, " ", argument_quoted, NULL); - g_free (argument_quoted); - g_free (quoted_command); + osso_deinitialize (osso); + sokoke_message_dialog (GTK_MESSAGE_ERROR, + _("Could not run external program."), + "Failed to get dbus connection from osso context", FALSE); + return FALSE; } - else + + error = NULL; + /* FIXME: This is not correct, find a proper way to do this */ + success = (osso_application_top (osso, command, argument) == OSSO_OK); + osso_deinitialize (osso); + #else + GAppInfo* info; + GFile* file; + GList* files; + + info = g_app_info_create_from_commandline (command, + NULL, G_APP_INFO_CREATE_NONE, NULL); + file = g_file_new_for_commandline_arg (argument); + files = g_list_append (NULL, file); + + error = NULL; + success = g_app_info_launch (info, files, NULL, &error); + g_object_unref (file); + g_list_free (files); + #endif + + if (!success) { - gchar* quoted_command = quote_command ? g_shell_quote (real_command) : g_strdup (real_command); - command_ready = g_strconcat (quoted_command, " ", argument, NULL); - g_free (quoted_command); + sokoke_message_dialog (GTK_MESSAGE_ERROR, + _("Could not run external program."), + error ? error->message : "", FALSE); + if (error) + g_error_free (error); + return FALSE; } - g_free (real_command); - return command_ready; } -} - -/** - * sokoke_spawn_program: - * @command: the command, properly quoted - * @argument: any arguments, properly quoted - * @quote_command: if %TRUE, @command will be quoted - * @quote_argument: if %TRUE, @argument will be quoted, ie. a URI or filename - * - * If @command contains %s, @argument will be quoted and inserted into - * @command, which is left unquoted regardless of @quote_command. - * - * Return value: %TRUE on success, %FALSE if an error occurred - **/ -gboolean -sokoke_spawn_program (const gchar* command, - gboolean quote_command, - const gchar* argument, - gboolean quote_argument) -{ - GError* error; - gchar* command_ready; - gchar** argv; + else + { + /* FIXME: Implement Hildon specific version */ + gchar* uri_format; + gchar* argument_quoted; + gchar* command_ready; + gchar** argv; - g_return_val_if_fail (command != NULL, FALSE); - g_return_val_if_fail (argument != NULL, FALSE); + if ((uri_format = strstr (command, "%u"))) + uri_format[1] = 's'; - command_ready = sokoke_prepare_command (command, quote_command, argument, quote_argument); - g_print ("Launching command: %s\n", command_ready); + argument_quoted = g_shell_quote (argument); + if (strstr (command, "%s")) + command_ready = g_strdup_printf (command, argument_quoted); + else + 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, FALSE); - g_error_free (error); + 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, FALSE); + g_error_free (error); + g_free (command_ready); + return FALSE; + } g_free (command_ready); - return FALSE; - } - g_free (command_ready); - error = NULL; - if (!g_spawn_async (NULL, argv, NULL, - (GSpawnFlags)G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD, - NULL, NULL, NULL, &error)) - { - sokoke_message_dialog (GTK_MESSAGE_ERROR, - _("Could not run external program."), - error->message, FALSE); - g_error_free (error); + error = NULL; + if (!g_spawn_async (NULL, argv, NULL, + (GSpawnFlags)G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD, + NULL, NULL, NULL, &error)) + { + sokoke_message_dialog (GTK_MESSAGE_ERROR, + _("Could not run external program."), + error->message, FALSE); + g_error_free (error); + } + + g_strfreev (argv); } - g_strfreev (argv); return TRUE; } @@ -502,20 +552,24 @@ void sokoke_spawn_app (const gchar* uri, gboolean private) { - const gchar* executable = midori_paths_get_command_line (NULL)[0]; - gchar* uri_quoted = g_shell_quote (uri); - gchar* argument; + 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* config_quoted = g_shell_quote (midori_paths_get_config_dir ()); - argument = g_strconcat ("-c ", config_quoted, - " -p ", uri_quoted, NULL); + gchar* quoted_config = g_shell_quote (sokoke_set_config_dir (NULL)); + command = g_strconcat (quoted, " -c ", quoted_config, + " -p", NULL); + g_free (quoted_config); } else - argument = g_strconcat ("-a ", uri_quoted, NULL); - g_free (uri_quoted); - sokoke_spawn_program (executable, TRUE, argument, FALSE); - g_free (argument); + command = g_strconcat (quoted, " -a", NULL); + g_free (quoted); + sokoke_spawn_program (command, uri); + g_free (command); } static void @@ -595,7 +649,7 @@ sokoke_magic_uri (const gchar* uri) /* Add file:// if we have a local path */ if (g_path_is_absolute (uri)) - return g_filename_to_uri (uri, NULL, NULL); + return g_strconcat ("file://", uri, NULL); /* Parse geo URI geo:48.202778,16.368472;crs=wgs84;u=40 as a location */ if (!strncmp (uri, "geo:", 4)) { @@ -630,7 +684,7 @@ sokoke_magic_uri (const gchar* uri) search = NULL; if (!strchr (uri, ' ') && ((search = strchr (uri, ':')) || (search = strchr (uri, '@'))) && - search[0] && g_ascii_isdigit (search[1])) + search[0] && !g_ascii_isalpha (search[1])) return g_strconcat ("http://", uri, NULL); if ((!strcmp (uri, "localhost") || strchr (uri, '/')) && sokoke_resolve_hostname (uri)) @@ -688,29 +742,26 @@ sokoke_get_desktop (void) } else { - /* Are we running in Xfce <= 4.6? */ - GdkDisplay* display = gdk_display_get_default (); - if (GDK_IS_X11_DISPLAY (display)) - { - Display* xdisplay = GDK_DISPLAY_XDISPLAY (display); - Window root_window = RootWindow (xdisplay, 0); - Atom save_mode_atom = gdk_x11_get_xatom_by_name_for_display ( - display, "_DT_SAVE_MODE"); - Atom actual_type; - int actual_format; - unsigned long n_items, bytes; - gchar* value; - int status = XGetWindowProperty (xdisplay, root_window, - save_mode_atom, 0, (~0L), - False, AnyPropertyType, &actual_type, &actual_format, - &n_items, &bytes, (unsigned char**)&value); - if (status == Success) - { - if (n_items == 6 && !strncmp (value, "xfce4", 6)) - desktop = SOKOKE_DESKTOP_XFCE; - XFree (value); - } - } + /* 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); + Atom save_mode_atom = gdk_x11_get_xatom_by_name_for_display ( + display, "_DT_SAVE_MODE"); + Atom actual_type; + int actual_format; + unsigned long n_items, bytes; + gchar* value; + int status = XGetWindowProperty (xdisplay, root_window, + save_mode_atom, 0, (~0L), + False, AnyPropertyType, &actual_type, &actual_format, + &n_items, &bytes, (unsigned char**)&value); + if (status == Success) + { + if (n_items == 6 && !strncmp (value, "xfce4", 6)) + desktop = SOKOKE_DESKTOP_XFCE; + XFree (value); + } } } @@ -742,6 +793,7 @@ sokoke_xfce_header_new (const gchar* icon, if (sokoke_get_desktop () == SOKOKE_DESKTOP_XFCE) { GtkWidget* entry; + GtkStyle* style; gchar* markup; GtkWidget* xfce_heading; GtkWidget* hbox; @@ -752,7 +804,9 @@ sokoke_xfce_header_new (const gchar* icon, xfce_heading = gtk_event_box_new (); entry = gtk_entry_new (); - + style = gtk_widget_get_style (entry); + gtk_widget_modify_bg (xfce_heading, GTK_STATE_NORMAL, + &style->base[GTK_STATE_NORMAL]); hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (hbox), 6); if (icon) @@ -762,6 +816,8 @@ sokoke_xfce_header_new (const gchar* icon, 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 + , &style->text[GTK_STATE_NORMAL]); markup = g_strdup_printf ("%s", title); gtk_label_set_markup (GTK_LABEL (label), markup); @@ -770,16 +826,6 @@ sokoke_xfce_header_new (const gchar* icon, 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); @@ -791,6 +837,72 @@ sokoke_xfce_header_new (const gchar* icon, return NULL; } +gchar* +sokoke_key_file_get_string_default (GKeyFile* key_file, + const gchar* group, + const gchar* key, + const gchar* default_value, + GError** error) +{ + gchar* value = g_key_file_get_string (key_file, group, key, error); + return value == NULL ? g_strdup (default_value) : value; +} + +gint +sokoke_key_file_get_integer_default (GKeyFile* key_file, + const gchar* group, + const gchar* key, + const gint default_value, + GError** error) +{ + if (!g_key_file_has_key (key_file, group, key, NULL)) + return default_value; + return g_key_file_get_integer (key_file, group, key, error); +} + +gdouble +sokoke_key_file_get_double_default (GKeyFile* key_file, + const gchar* group, + const gchar* key, + const gdouble default_value, + GError** error) +{ + if (!g_key_file_has_key (key_file, group, key, NULL)) + return default_value; + return g_key_file_get_double (key_file, group, key, error); +} + +gboolean +sokoke_key_file_get_boolean_default (GKeyFile* key_file, + const gchar* group, + const gchar* key, + const gboolean default_value, + GError** error) +{ + if (!g_key_file_has_key (key_file, group, key, NULL)) + return default_value; + return g_key_file_get_boolean (key_file, group, key, error); +} + +gchar** +sokoke_key_file_get_string_list_default (GKeyFile* key_file, + const gchar* group, + const gchar* key, + gsize* length, + gchar** default_value, + gsize* default_length, + GError* error) +{ + gchar** value = g_key_file_get_string_list (key_file, group, key, length, NULL); + if (!value) + { + value = g_strdupv (default_value); + if (length) + *length = *default_length; + } + return value; +} + gboolean sokoke_key_file_save_to_file (GKeyFile* key_file, const gchar* filename, @@ -917,6 +1029,73 @@ sokoke_time_t_to_julian (const time_t* timestamp) return julian; } +/** + * 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_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* +sokoke_set_config_dir (const gchar* new_config_dir) +{ + static gchar* config_dir = NULL; + + if (config_dir) + return config_dir; + + if (!new_config_dir) + config_dir = g_build_filename (g_get_user_config_dir (), + PACKAGE_NAME, NULL); + else + { + g_return_val_if_fail (g_path_is_absolute (new_config_dir), NULL); + katze_assign (config_dir, g_strdup (new_config_dir)); + } + + return config_dir; +} + +gboolean +sokoke_is_app_or_private (void) +{ + return !strcmp ("/", sokoke_set_config_dir (NULL)); +} + /** * sokoke_remove_path: * @path: an absolute path @@ -956,6 +1135,150 @@ sokoke_remove_path (const gchar* path, return TRUE; } +/** + * sokoke_find_config_filename: + * @folder: a subfolder + * @filename: a filename or relative path + * + * Looks for the specified filename in the system config + * directories, depending on the platform. + * + * Return value: a full path + **/ +gchar* +sokoke_find_config_filename (const gchar* folder, + const gchar* filename) +{ + const gchar* const* config_dirs = g_get_system_config_dirs (); + guint i = 0; + const gchar* config_dir; + gchar* path; + + if (!folder) + folder = ""; + + while ((config_dir = config_dirs[i++])) + { + path = g_build_filename (config_dir, PACKAGE_NAME, folder, filename, NULL); + if (g_access (path, F_OK) == 0) + return path; + g_free (path); + } + + #ifdef G_OS_WIN32 + config_dir = g_win32_get_package_installation_directory_of_module (NULL); + path = g_build_filename (config_dir, "etc", "xdg", PACKAGE_NAME, folder, filename, NULL); + if (g_access (path, F_OK) == 0) + return path; + g_free (path); + #endif + + return g_build_filename (SYSCONFDIR, "xdg", PACKAGE_NAME, folder, filename, NULL); +} + +/** + * 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 + * + * Looks for the specified filename in the system data + * directories, depending on the platform. + * + * Return value: a newly allocated full path + **/ +gchar* +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; + + #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, res1, res2, filename, NULL); + if (g_access (path, F_OK) == 0) + return path; + g_free (path); + } + return g_build_filename (MDATADIR, res1, res2, filename, NULL); +} + +/** + * sokoke_get_argv: + * @argument_vector: %NULL + * + * Retrieves the argument vector passed at program startup. + * + * Return value: the argument vector + **/ +gchar** +sokoke_get_argv (gchar** argument_vector) +{ + static gchar** stored_argv = NULL; + + if (!stored_argv) + stored_argv = g_strdupv (argument_vector); + + return stored_argv; +} + gchar* sokoke_replace_variables (const gchar* template, const gchar* variable_first, ...) @@ -1178,6 +1501,92 @@ sokoke_recursive_fork_protection (const gchar* uri, return g_strcmp0 (fork_uri, uri) == 0 ? FALSE : TRUE; } +/* Provide a new way for SoupSession to assume an 'Accept-Language' + string automatically from the return value of g_get_language_names(), + properly formatted according to RFC2616. + Copyright (C) 2009 Mario Sanchez Prada + Copyright (C) 2009 Dan Winship + Mostly copied from libSoup 2.29, coding style adjusted */ + +/* Converts a language in POSIX format and to be RFC2616 compliant */ +/* Based on code from epiphany-webkit (ephy_langs_append_languages()) */ +static gchar * +sokoke_posix_lang_to_rfc2616 (const gchar *language) +{ + if (!strchr (language, '.') && !strchr (language, '@') && language[0] != 'C') + /* change to lowercase and '_' to '-' */ + return g_strdelimit (g_ascii_strdown (language, -1), "_", '-'); + + return NULL; +} + +/* Adds a quality value to a string (any value between 0 and 1). */ +static gchar * +sokoke_add_quality_value (const gchar *str, + float qvalue) +{ + if ((qvalue >= 0.0) && (qvalue <= 1.0)) + { + int qv_int = (qvalue * 1000 + 0.5); + return g_strdup_printf ("%s;q=%d.%d", + str, (int) (qv_int / 1000), qv_int % 1000); + } + + return g_strdup (str); +} + +/* Returns a RFC2616 compliant languages list from system locales */ +gchar * +sokoke_accept_languages (const gchar* const * lang_names) +{ + GArray *langs_garray = NULL; + char *cur_lang = NULL; + char *prev_lang = NULL; + char **langs_array; + char *langs_str; + float delta; + int i, n_lang_names; + + /* Calculate delta for setting the quality values */ + n_lang_names = g_strv_length ((gchar **)lang_names); + delta = 0.999 / (n_lang_names - 1); + + /* Build the array of languages */ + langs_garray = g_array_new (TRUE, FALSE, sizeof (char*)); + for (i = 0; lang_names[i] != NULL; i++) + { + cur_lang = sokoke_posix_lang_to_rfc2616 (lang_names[i]); + + /* Apart from getting a valid RFC2616 compliant + language, also get rid of extra variants */ + if (cur_lang && (!prev_lang || + (!strcmp (prev_lang, cur_lang) || !strstr (prev_lang, cur_lang)))) + { + + gchar *qv_lang = NULL; + + /* Save reference for further comparison */ + prev_lang = cur_lang; + + /* Add the quality value and append it */ + qv_lang = sokoke_add_quality_value (cur_lang, 1 - i * delta); + g_array_append_val (langs_garray, qv_lang); + } + } + + /* Fallback: add "en" if list is empty */ + if (langs_garray->len == 0) + { + gchar* fallback = g_strdup ("en"); + g_array_append_val (langs_garray, fallback); + } + + langs_array = (char **) g_array_free (langs_garray, FALSE); + langs_str = g_strjoinv (", ", langs_array); + + return langs_str; +} + /** * sokoke_register_privacy_item: * @name: the name of the privacy item @@ -1212,113 +1621,113 @@ sokoke_register_privacy_item (const gchar* name, return NULL; } -static void -sokoke_widget_clipboard_owner_clear_func (GtkClipboard* clipboard, - gpointer user_data) -{ - g_object_unref (user_data); -} - void -sokoke_widget_copy_clipboard (GtkWidget* widget, - const gchar* text, - GtkClipboardGetFunc get_cb, - gpointer owner) +sokoke_widget_copy_clipboard (GtkWidget* widget, + const gchar* text) { GdkDisplay* display = gtk_widget_get_display (widget); GtkClipboard* clipboard; - g_return_if_fail (text != NULL); - - clipboard = gtk_clipboard_get_for_display (display, GDK_SELECTION_PRIMARY); - gtk_clipboard_set_text (clipboard, text, -1); - clipboard = gtk_clipboard_get_for_display (display, GDK_SELECTION_CLIPBOARD); - if (get_cb == NULL) - gtk_clipboard_set_text (clipboard, text, -1); - else - { - GtkTargetList* target_list = gtk_target_list_new (NULL, 0); - GtkTargetEntry* targets; - gint n_targets; - gtk_target_list_add_text_targets (target_list, 0); - gtk_target_list_add_image_targets (target_list, 0, TRUE); - targets = gtk_target_table_new_from_list (target_list, &n_targets); - gtk_clipboard_set_with_owner (clipboard, targets, n_targets, get_cb, - sokoke_widget_clipboard_owner_clear_func, owner); - gtk_target_table_free (targets, n_targets); - gtk_target_list_unref (target_list); - } + 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); } -static gboolean -sokoke_entry_has_placeholder_text (GtkEntry* entry) +gchar* +sokoke_build_thumbnail_path (const gchar* name) { - 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; -} + 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); -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); -} + path = g_build_filename (g_get_user_cache_dir (), "midori", "thumbnails", + filename, NULL); -static gboolean -sokoke_entry_focus_out_event_cb (GtkEditable* editable, - GdkEventFocus* event, - GtkEntry* entry) -{ - sokoke_entry_changed_cb (editable, entry); - return FALSE; + g_free (filename); + g_free (checksum); + } + return path; } -static void -sokoke_entry_icon_released_cb (GtkEntry* entry, - GtkIconEntryPosition icon_pos, - GdkEvent* event, - gpointer user_data) +gchar* +midori_download_prepare_tooltip_text (WebKitDownload* download) { - if (icon_pos != GTK_ICON_ENTRY_SECONDARY) - return; + 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")); - gtk_entry_set_text (entry, ""); - gtk_widget_grab_focus (GTK_WIDGET (entry)); -} + /* i18n: Download tooltip (transfer rate): (130KB/s) */ + g_string_append_printf (tooltip, _(" (%s/s)"), download_speed); + g_free (download_speed); -GtkWidget* -sokoke_search_entry_new (const gchar* placeholder_text) -{ - GtkWidget* entry = gtk_entry_new (); - gtk_entry_set_placeholder_text (GTK_ENTRY (entry), placeholder_text); - gtk_entry_set_icon_from_stock (GTK_ENTRY (entry), - GTK_ENTRY_ICON_PRIMARY, GTK_STOCK_FIND); - gtk_icon_entry_set_icon_highlight (GTK_ENTRY (entry), - GTK_ENTRY_ICON_SECONDARY, TRUE); + 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) { - 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, GTK_ENTRY (entry)); + *last_time = time_elapsed; + *last_size = current_size; } - return entry; + + return g_string_free (tooltip, FALSE); } diff --git a/midori/sokoke.h b/midori/sokoke.h index b322f4f8..db7aa28a 100644 --- a/midori/sokoke.h +++ b/midori/sokoke.h @@ -14,7 +14,6 @@ #define __SOKOKE_H__ 1 #include -#include #include #include @@ -42,17 +41,9 @@ sokoke_show_uri (GdkScreen* screen, guint32 timestamp, GError** error); -gchar* -sokoke_prepare_command (const gchar* command, - gboolean quote_command, - const gchar* argument, - gboolean quote_argument); - gboolean sokoke_spawn_program (const gchar* command, - gboolean quote_command, - const gchar* argument, - gboolean quote_argument); + const gchar* argument); void sokoke_spawn_app (const gchar* uri, @@ -72,6 +63,47 @@ GtkWidget* sokoke_xfce_header_new (const gchar* icon, const gchar* title); +void +sokoke_entry_set_default_text (GtkEntry* entry, + const gchar* default_text); + +gchar* +sokoke_key_file_get_string_default (GKeyFile* key_file, + const gchar* group, + const gchar* key, + const gchar* default_value, + GError** error); + +gint +sokoke_key_file_get_integer_default (GKeyFile* key_file, + const gchar* group, + const gchar* key, + const gint default_value, + GError** error); + +gdouble +sokoke_key_file_get_double_default (GKeyFile* key_file, + const gchar* group, + const gchar* key, + gdouble default_value, + GError** error); + +gboolean +sokoke_key_file_get_boolean_default (GKeyFile* key_file, + const gchar* group, + const gchar* key, + gboolean default_value, + GError** error); + +gchar** +sokoke_key_file_get_string_list_default (GKeyFile* key_file, + const gchar* group, + const gchar* key, + gsize* length, + gchar** default_value, + gsize* default_length, + GError* error); + gboolean sokoke_key_file_save_to_file (GKeyFile* key_file, const gchar* filename, @@ -89,10 +121,34 @@ sokoke_action_create_popup_menu_item (GtkAction* action); gint64 sokoke_time_t_to_julian (const time_t* timestamp); +gint +sokoke_days_between (const time_t* day1, + const time_t* day2); + +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); +gchar* +sokoke_find_config_filename (const gchar* folder, + const gchar* filename); + +gchar* +sokoke_find_lib_path (const gchar* folder); + +gchar* +sokoke_find_data_filename (const gchar* filename, + gboolean res); + +gchar** +sokoke_get_argv (gchar** argument_vector); + gchar* sokoke_replace_variables (const gchar* template, const gchar* variable_first, ...); @@ -117,6 +173,9 @@ sokoke_prefetch_uri (MidoriWebSettings* settings, gboolean sokoke_resolve_hostname (const gchar* hostname); +gchar * +sokoke_accept_languages (const gchar* const * lang_names); + gboolean sokoke_recursive_fork_protection (const gchar* uri, gboolean set_uri); @@ -134,12 +193,13 @@ sokoke_register_privacy_item (const gchar* name, GCallback clear); void -sokoke_widget_copy_clipboard (GtkWidget* widget, - const gchar* text, - GtkClipboardGetFunc get_cb, - gpointer owner); +sokoke_widget_copy_clipboard (GtkWidget* widget, + const gchar* text); -GtkWidget* -sokoke_search_entry_new (const gchar* placeholder_text); +gchar* +sokoke_build_thumbnail_path (const gchar* name); + +gchar* +midori_download_prepare_tooltip_text (WebKitDownload* download); #endif /* !__SOKOKE_H__ */ diff --git a/midori/wscript_build b/midori/wscript_build index 52c3337b..45b3486c 100644 --- a/midori/wscript_build +++ b/midori/wscript_build @@ -7,10 +7,10 @@ import platform progressive = True libs = 'M UNIQUE LIBSOUP GMODULE GTHREAD LIBIDN GIO GTK SQLITE ' \ - 'LIBNOTIFY WEBKIT JAVASCRIPTCOREGTK LIBXML X11 XSS WS2_32 HILDON' \ - 'HILDON_FM GCR GRANITE ZEITGEIST' + 'LIBNOTIFY WEBKIT JAVASCRIPTCOREGTK LIBXML X11 XSS WS2_32 OPENSSL HILDON' \ + 'HILDON_FM' -if progressive: +if progressive or Options.commands['check']: obj = bld.new_task_gen ('cc', 'staticlib') obj.target = 'midori-core' obj.includes = '.. ../katze . ../toolbars' @@ -18,14 +18,10 @@ if progressive: obj.uselib = libs obj.add_marshal_file ('marshal.list', 'midori_cclosure_marshal') obj.install_path = None - obj.vapi_dirs = '../midori ../katze' - obj.packages = 'glib-2.0 gio-2.0 libsoup-2.4 posix' - if bld.env['HAVE_GTK3']: - obj.packages += ' gtk+-3.0 webkitgtk-3.0' - else: - obj.packages += ' gtk+-2.0 webkit-1.0' + obj.packages = 'glib-2.0 gio-2.0 gtk+-2.0 libsoup-2.4 webkit-1.0' bld.add_group () +if progressive: obj = bld.new_task_gen ('cc', 'program') obj.target = 'midori' obj.includes = '.. ../katze . ../panels' @@ -34,3 +30,12 @@ if progressive: obj.uselib_local = 'midori-core' if bld.env['WINRC']: obj.source += ' ../data/midori.rc' +else: + obj = bld.new_task_gen ('cc', 'program') + obj.target = 'midori' + 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']: + obj.source += ' ../data/midori.rc' diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c index 39b4950a..dd5291f5 100644 --- a/panels/midori-bookmarks.c +++ b/panels/midori-bookmarks.c @@ -16,7 +16,7 @@ #include "midori-browser.h" #include "midori-platform.h" #include "midori-view.h" -#include "midori-core.h" +#include "midori-viewable.h" #include #include @@ -29,8 +29,7 @@ gboolean midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, KatzeItem* bookmark, gboolean new_bookmark, - gboolean is_folder, - GtkWidget* proxy); + gboolean is_folder); void midori_browser_open_bookmark (MidoriBrowser* browser, @@ -120,87 +119,66 @@ midori_bookmarks_get_stock_id (MidoriViewable* viewable) return STOCK_BOOKMARKS; } -/* TODO: Function never used */ void -midori_bookmarks_export_array_db (sqlite3* db, - KatzeArray* array, - gint64 parentid) +midori_bookmarks_export_array_db (sqlite3* db, + KatzeArray* array, + const gchar* folder) { KatzeArray* root_array; KatzeArray* subarray; KatzeItem* item; GList* list; - gchar* parent_id; - parent_id = g_strdup_printf ("%" G_GINT64_FORMAT, parentid); - if (!(root_array = midori_array_query (array, "*", "parentid = %q", parent_id))) - { - g_free (parent_id); + 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)) { subarray = katze_array_new (KATZE_TYPE_ARRAY); katze_item_set_name (KATZE_ITEM (subarray), katze_item_get_name (item)); - midori_bookmarks_export_array_db (db, subarray, - katze_item_get_meta_integer (item, "parentid")); + midori_bookmarks_export_array_db (db, subarray, katze_item_get_name (item)); katze_array_add_item (array, subarray); } else katze_array_add_item (array, item); } - - g_free (parent_id); g_list_free (list); } void -midori_bookmarks_import_array_db (sqlite3* db, - KatzeArray* array, - gint64 parentid) +midori_bookmarks_import_array_db (sqlite3* db, + KatzeArray* array, + const gchar* folder) { GList* list; KatzeItem* item; - gint64 id; if (!db) return; KATZE_ARRAY_FOREACH_ITEM_L (item, array, list) { - id = midori_bookmarks_insert_item_db (db, item, parentid); if (KATZE_IS_ARRAY (item)) - midori_bookmarks_import_array_db (db, KATZE_ARRAY (item), id); + midori_bookmarks_import_array_db (db, KATZE_ARRAY (item), folder); + midori_bookmarks_insert_item_db (db, item, folder); } g_list_free (list); } static KatzeArray* midori_bookmarks_read_from_db (MidoriBookmarks* bookmarks, - gint64 parentid, + const gchar* folder, const gchar* keyword) { KatzeArray* array; if (keyword && *keyword) array = midori_array_query (bookmarks->array, - "id, parentid, title, uri, desc, app, toolbar, pos_panel, pos_bar", "title LIKE '%%%q%%'", keyword); + "uri, title, desc, app, toolbar, folder", "title LIKE '%%%q%%'", keyword); else - { - if (parentid > 0) - { - gchar* parent_id = g_strdup_printf ("%" G_GINT64_FORMAT, parentid); - array = midori_array_query (bookmarks->array, - "id, parentid, title, uri, desc, app, toolbar, pos_panel, pos_bar", "parentid = %q", parent_id); - - g_free (parent_id); - } - else - array = midori_array_query (bookmarks->array, - "id, parentid, title, uri, desc, app, toolbar, pos_panel, pos_bar", "parentid IS NULL", NULL); - } + array = midori_array_query (bookmarks->array, + "uri, title, desc, app, toolbar, folder", "folder = '%q'", folder); return array ? array : katze_array_new (KATZE_TYPE_ITEM); } @@ -208,7 +186,7 @@ static void midori_bookmarks_read_from_db_to_model (MidoriBookmarks* bookmarks, GtkTreeStore* model, GtkTreeIter* parent, - gint64 parentid, + const gchar* folder, const gchar* keyword) { KatzeArray* array; @@ -216,7 +194,7 @@ midori_bookmarks_read_from_db_to_model (MidoriBookmarks* bookmarks, KatzeItem* item; GtkTreeIter child; - array = midori_bookmarks_read_from_db (bookmarks, parentid, keyword); + array = midori_bookmarks_read_from_db (bookmarks, folder, keyword); katze_bookmark_populate_tree_view (array, model, parent); /* Remove invisible dummy row */ last = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (model), parent); @@ -230,30 +208,23 @@ midori_bookmarks_read_from_db_to_model (MidoriBookmarks* bookmarks, g_object_unref (item); } -gint64 -midori_bookmarks_insert_item_db (sqlite3* db, - KatzeItem* item, - gint64 parentid) +void +midori_bookmarks_insert_item_db (sqlite3* db, + KatzeItem* item, + const gchar* folder) { gchar* sqlcmd; char* errmsg = NULL; KatzeItem* old_parent; - gchar* new_parentid; - gchar* id = NULL; + const gchar* parent; const gchar* uri = NULL; const gchar* desc = NULL; - gint64 seq = 0; /* Bookmarks must have a name, import may produce invalid items */ - g_return_val_if_fail (katze_item_get_name (item), seq); + g_return_if_fail (katze_item_get_name (item)); if (!db) - return seq; - - if (katze_item_get_meta_integer (item, "id") > 0) - id = g_strdup_printf ("%" G_GINT64_FORMAT, katze_item_get_meta_integer(item, "id")); - else - id = g_strdup_printf ("NULL"); + return; if (KATZE_ITEM_IS_BOOKMARK (item)) uri = katze_item_get_uri (item); @@ -263,57 +234,30 @@ midori_bookmarks_insert_item_db (sqlite3* db, /* Use folder, otherwise fallback to parent folder */ old_parent = katze_item_get_parent (item); - if (parentid > 0) - new_parentid = g_strdup_printf ("%" G_GINT64_FORMAT, parentid); - else if (old_parent && katze_item_get_meta_integer (old_parent, "id") > 0) - new_parentid = g_strdup_printf ("%" G_GINT64_FORMAT, katze_item_get_meta_integer (old_parent, "id")); + if (folder && *folder) + parent = folder; + else if (old_parent && katze_item_get_name (old_parent)) + parent = katze_item_get_name (old_parent); else - new_parentid = g_strdup_printf ("NULL"); + parent = ""; sqlcmd = sqlite3_mprintf ( - "INSERT INTO bookmarks (id, parentid, title, uri, desc, toolbar, app) " - "VALUES (%q, %q, '%q', '%q', '%q', %d, %d)", - id, - new_parentid, + "INSERT into bookmarks (uri, title, desc, folder, toolbar, app) values" + " ('%q', '%q', '%q', '%q', %d, %d)", + uri ? uri : "", katze_item_get_name (item), - katze_str_non_null (uri), - katze_str_non_null (desc), + desc ? desc : "", + parent, katze_item_get_meta_boolean (item, "toolbar"), katze_item_get_meta_boolean (item, "app")); - if (sqlite3_exec (db, sqlcmd, NULL, NULL, &errmsg) == SQLITE_OK) - { - /* Get insert id */ - if (g_str_equal (id, "NULL")) - { - KatzeArray* seq_array; - - sqlite3_free (sqlcmd); - sqlcmd = sqlite3_mprintf ( - "SELECT seq FROM sqlite_sequence WHERE name = 'bookmarks'"); - - seq_array = katze_array_from_sqlite (db, sqlcmd); - if (katze_array_get_nth_item (seq_array, 0)) - { - KatzeItem* seq_item = katze_array_get_nth_item (seq_array, 0); - - seq = katze_item_get_meta_integer (seq_item, "seq"); - katze_item_set_meta_integer (item, "id", seq); - } - g_object_unref (seq_array); - } - } - else + if (sqlite3_exec (db, sqlcmd, NULL, NULL, &errmsg) != SQLITE_OK) { g_printerr (_("Failed to add bookmark item: %s\n"), errmsg); sqlite3_free (errmsg); } sqlite3_free (sqlcmd); - g_free (new_parentid); - g_free (id); - - return seq; } static void @@ -323,9 +267,15 @@ midori_bookmarks_add_item_cb (KatzeArray* array, { GtkTreeModel* model; 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, 0, bookmarks->filter); + 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 @@ -336,7 +286,7 @@ midori_bookmarks_remove_item_cb (KatzeArray* array, 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, 0, bookmarks->filter); + GTK_TREE_STORE (model), NULL, NULL, bookmarks->filter); } static void @@ -346,7 +296,7 @@ midori_bookmarks_update_cb (KatzeArray* array, 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, 0, bookmarks->filter); + GTK_TREE_STORE (model), NULL, NULL, bookmarks->filter); } @@ -359,7 +309,7 @@ midori_bookmarks_row_changed_cb (GtkTreeModel* model, KatzeItem* item; GtkTreeIter parent; KatzeItem* new_parent = NULL; - gint64 parentid; + const gchar* parent_name; gtk_tree_model_get (model, iter, 0, &item, -1); @@ -369,15 +319,15 @@ midori_bookmarks_row_changed_cb (GtkTreeModel* model, /* Bookmarks must not be moved into non-folder items */ if (!KATZE_ITEM_IS_FOLDER (new_parent)) - parentid = 0; + parent_name = ""; else - parentid = katze_item_get_meta_integer (new_parent, "id"); + parent_name = katze_item_get_name (new_parent); } else - parentid = 0; + parent_name = ""; katze_array_remove_item (bookmarks->array, item); - katze_item_set_meta_integer (item, "parentid", parentid); + katze_item_set_meta_string (item, "folder", parent_name); katze_array_add_item (bookmarks->array, item); g_object_unref (item); @@ -391,9 +341,9 @@ midori_bookmarks_add_clicked_cb (GtkWidget* toolitem) 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, toolitem); + midori_browser_edit_bookmark_dialog_new (browser, NULL, TRUE, TRUE); else - midori_browser_edit_bookmark_dialog_new (browser, NULL, TRUE, FALSE, toolitem); + midori_browser_edit_bookmark_dialog_new (browser, NULL, TRUE, FALSE); } static void @@ -408,24 +358,14 @@ midori_bookmarks_edit_clicked_cb (GtkWidget* toolitem, { KatzeItem* item; MidoriBrowser* browser; - gint64 parentid; gtk_tree_model_get (model, &iter, 0, &item, -1); g_assert (!KATZE_ITEM_IS_SEPARATOR (item)); browser = midori_browser_get_for_widget (bookmarks->treeview); - parentid = katze_item_get_meta_integer (item, "parentid"); midori_browser_edit_bookmark_dialog_new ( - browser, item, FALSE, KATZE_ITEM_IS_FOLDER (item), NULL); - - if (katze_item_get_meta_integer (item, "parentid") != parentid) - { - gtk_tree_store_clear (GTK_TREE_STORE (model)); - midori_bookmarks_read_from_db_to_model (bookmarks, GTK_TREE_STORE (model), - NULL, 0, NULL); - } - + browser, item, FALSE, KATZE_ITEM_IS_FOLDER (item)); g_object_unref (item); } } @@ -441,47 +381,6 @@ midori_bookmarks_toolbar_update (MidoriBookmarks *bookmarks) gtk_widget_set_sensitive (GTK_WIDGET (bookmarks->edit), selected); } -gboolean -midori_bookmarks_update_item_db (sqlite3* db, - KatzeItem* item) -{ - gchar* sqlcmd; - char* errmsg = NULL; - gchar* parentid; - gboolean updated; - - if (katze_item_get_meta_integer (item, "parentid") > 0) - parentid = g_strdup_printf ("%" G_GINT64_FORMAT, - katze_item_get_meta_integer (item, "parentid")); - else - parentid = g_strdup_printf ("NULL"); - - sqlcmd = sqlite3_mprintf ( - "UPDATE bookmarks SET " - "parentid=%q, title='%q', uri='%q', desc='%q', toolbar=%d, app=%d " - "WHERE id = %" G_GINT64_FORMAT ";", - parentid, - katze_item_get_name (item), - katze_str_non_null (katze_item_get_uri (item)), - katze_str_non_null (katze_item_get_meta_string (item, "desc")), - katze_item_get_meta_boolean (item, "toolbar"), - katze_item_get_meta_boolean (item, "app"), - katze_item_get_meta_integer (item, "id")); - - updated = TRUE; - if (sqlite3_exec (db, sqlcmd, NULL, NULL, &errmsg) != SQLITE_OK) - { - updated = FALSE; - g_printerr (_("Failed to update bookmark : %s\n"), errmsg); - sqlite3_free (errmsg); - } - - sqlite3_free (sqlcmd); - g_free (parentid); - - return updated; -} - static void midori_bookmarks_delete_clicked_cb (GtkWidget* toolitem, MidoriBookmarks* bookmarks) @@ -521,7 +420,7 @@ midori_bookmarks_get_toolbar (MidoriViewable* viewable) 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 (STOCK_BOOKMARK_ADD); + toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_ADD); gtk_widget_set_name (GTK_WIDGET (toolitem), "BookmarkAdd"); gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem), _("Add a new bookmark")); @@ -552,7 +451,7 @@ midori_bookmarks_get_toolbar (MidoriViewable* viewable) gtk_tool_item_set_expand (toolitem, TRUE); gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); gtk_widget_show (GTK_WIDGET (toolitem)); - toolitem = gtk_tool_button_new_from_stock (STOCK_FOLDER_NEW); + toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_DIRECTORY); gtk_widget_set_name (GTK_WIDGET (toolitem), "BookmarkFolderAdd"); gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem), _("Add a new folder")); @@ -596,8 +495,8 @@ midori_bookmarks_set_app (MidoriBookmarks* bookmarks, g_object_ref (app); bookmarks->array = katze_object_get_object (app, "bookmarks"); - midori_bookmarks_read_from_db_to_model (bookmarks, GTK_TREE_STORE (model), NULL, 0, NULL); - g_signal_connect_after (bookmarks->array, "add-item", + 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); @@ -663,8 +562,6 @@ midori_bookmarks_treeview_render_icon_cb (GtkTreeViewColumn* column, 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); @@ -688,11 +585,8 @@ midori_bookmarks_treeview_render_text_cb (GtkTreeViewColumn* column, gtk_tree_model_get (model, iter, 0, &item, -1); if (item && katze_item_get_name (item)) - { g_object_set (renderer, "markup", NULL, - "ellipsize", PANGO_ELLIPSIZE_END, "text", katze_item_get_name (item), NULL); - } else g_object_set (renderer, "markup", _("Separator"), NULL); @@ -790,9 +684,7 @@ midori_bookmarks_open_in_tab_activate_cb (GtkWidget* menuitem, KatzeItem* child; KatzeArray* array; - array = midori_bookmarks_read_from_db (bookmarks, - katze_item_get_meta_integer (item, "parentid"), NULL); - + array = midori_bookmarks_read_from_db (bookmarks, katze_item_get_name (item), NULL); g_return_if_fail (KATZE_IS_ARRAY (array)); KATZE_ARRAY_FOREACH_ITEM (child, array) { @@ -948,7 +840,7 @@ midori_bookmarks_row_expanded_cb (GtkTreeView* treeview, model = gtk_tree_view_get_model (GTK_TREE_VIEW (treeview)); gtk_tree_model_get (model, iter, 0, &item, -1); midori_bookmarks_read_from_db_to_model (bookmarks, GTK_TREE_STORE (model), - iter, katze_item_get_meta_integer (item, "id"), NULL); + iter, katze_item_get_name (item), NULL); g_object_unref (item); } @@ -990,7 +882,7 @@ midori_bookmarks_filter_timeout_cb (gpointer data) gtk_tree_store_clear (treestore); midori_bookmarks_read_from_db_to_model (bookmarks, - treestore, NULL, 0, bookmarks->filter); + treestore, NULL, NULL, bookmarks->filter); return FALSE; } @@ -1001,16 +893,21 @@ midori_bookmarks_filter_entry_changed_cb (GtkEntry* entry, { if (bookmarks->filter_timeout) g_source_remove (bookmarks->filter_timeout); - - if (!g_object_get_data (G_OBJECT (entry), "sokoke_has_default")) - katze_assign (bookmarks->filter, g_strdup (gtk_entry_get_text (entry))); - else - katze_assign (bookmarks->filter, NULL); - + katze_assign (bookmarks->filter, g_strdup (gtk_entry_get_text (entry))); bookmarks->filter_timeout = g_timeout_add (COMPLETION_DELAY, midori_bookmarks_filter_timeout_cb, bookmarks); } +static void +midori_bookmarks_filter_entry_clear_cb (GtkEntry* entry, + gint icon_pos, + gint button, + MidoriBookmarks* bookmarks) +{ + if (icon_pos == GTK_ICON_ENTRY_SECONDARY) + gtk_entry_set_text (entry, ""); +} + static void midori_bookmarks_init (MidoriBookmarks* bookmarks) { @@ -1024,8 +921,18 @@ midori_bookmarks_init (MidoriBookmarks* bookmarks) GtkTreeSelection* selection; /* Create the filter entry */ - entry = sokoke_search_entry_new (_("Search Bookmarks")); - g_signal_connect_after (entry, "changed", + 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); + g_signal_connect (entry, "icon-release", + G_CALLBACK (midori_bookmarks_filter_entry_clear_cb), bookmarks); + g_signal_connect (entry, "changed", G_CALLBACK (midori_bookmarks_filter_entry_changed_cb), bookmarks); box = gtk_hbox_new (FALSE, 0); gtk_box_pack_start (GTK_BOX (box), entry, TRUE, TRUE, 3); @@ -1038,14 +945,14 @@ midori_bookmarks_init (MidoriBookmarks* bookmarks) 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_expand (column, TRUE); + 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, (GtkTreeCellDataFunc)midori_bookmarks_treeview_render_icon_cb, treeview, NULL); renderer_text = gtk_cell_renderer_text_new (); - gtk_tree_view_column_pack_start (column, renderer_text, TRUE); + gtk_tree_view_column_pack_start (column, renderer_text, FALSE); gtk_tree_view_column_set_cell_data_func (column, renderer_text, (GtkTreeCellDataFunc)midori_bookmarks_treeview_render_text_cb, treeview, NULL); diff --git a/panels/midori-bookmarks.h b/panels/midori-bookmarks.h index cf56dea9..1be04121 100644 --- a/panels/midori-bookmarks.h +++ b/panels/midori-bookmarks.h @@ -40,19 +40,15 @@ midori_bookmarks_get_type (void); GtkWidget* midori_bookmarks_new (void); -gint64 -midori_bookmarks_insert_item_db (sqlite3* db, - KatzeItem* item, - gint64 parentid); - void -midori_bookmarks_import_array_db (sqlite3* db, - KatzeArray* array, - gint64 parentid); +midori_bookmarks_insert_item_db (sqlite3* db, + KatzeItem* item, + const gchar* folder); -gboolean -midori_bookmarks_update_item_db (sqlite3* db, - KatzeItem* item); +void +midori_bookmarks_import_array_db (sqlite3* db, + KatzeArray* array, + const gchar* folder); G_END_DECLS diff --git a/panels/midori-extensions.c b/panels/midori-extensions.c index f9100d1c..0aec2be0 100644 --- a/panels/midori-extensions.c +++ b/panels/midori-extensions.c @@ -14,6 +14,7 @@ #include "midori-app.h" #include "midori-extension.h" #include "midori-platform.h" +#include "midori-viewable.h" #include "midori-core.h" #include @@ -93,7 +94,7 @@ midori_extensions_get_label (MidoriViewable* viewable) static const gchar* midori_extensions_get_stock_id (MidoriViewable* viewable) { - return STOCK_EXTENSION; + return STOCK_EXTENSIONS; } static GtkWidget* @@ -284,7 +285,6 @@ midori_extensions_treeview_render_text_cb (GtkTreeViewColumn* column, g_object_set (renderer, "markup", text, - "ellipsize", PANGO_ELLIPSIZE_END, "sensitive", midori_extension_is_prepared (extension), NULL); @@ -305,17 +305,13 @@ midori_extensions_treeview_row_activated_cb (GtkTreeView* treeview, if (gtk_tree_model_get_iter (model, &iter, path)) { MidoriExtension* extension; - KatzeArray* array = katze_object_get_object (extensions->app, "extensions"); gtk_tree_model_get (model, &iter, 0, &extension, -1); if (midori_extension_is_active (extension)) midori_extension_deactivate (extension); else if (midori_extension_is_prepared (extension)) g_signal_emit_by_name (extension, "activate", extensions->app); - /* Make it easy for listeners to see that extensions changed */ - katze_array_update (array); - g_object_unref (array); g_object_unref (extension); } } @@ -332,17 +328,13 @@ midori_extensions_cell_renderer_toggled_cb (GtkCellRendererToggle* renderer, if (gtk_tree_model_get_iter_from_string (model, &iter, path)) { MidoriExtension* extension; - KatzeArray* array = katze_object_get_object (extensions->app, "extensions"); gtk_tree_model_get (model, &iter, 0, &extension, -1); if (midori_extension_is_active (extension)) midori_extension_deactivate (extension); else if (midori_extension_is_prepared (extension)) g_signal_emit_by_name (extension, "activate", extensions->app); - /* Make it easy for listeners to see that extensions changed */ - katze_array_update (array); - g_object_unref (array); g_object_unref (extension); } } @@ -462,9 +454,10 @@ midori_extensions_init (MidoriExtensions* extensions) 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_expand (column, TRUE); + 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, TRUE); + 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); diff --git a/panels/midori-history.c b/panels/midori-history.c index c1bb1816..712dc70c 100644 --- a/panels/midori-history.c +++ b/panels/midori-history.c @@ -16,7 +16,7 @@ #include "midori-browser.h" #include "midori-platform.h" #include "midori-view.h" -#include "midori-core.h" +#include "midori-viewable.h" #include #include @@ -28,8 +28,7 @@ void midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, KatzeItem* bookmark, gboolean new_bookmark, - gboolean is_folder, - GtkWidget* proxy); + gboolean is_folder); struct _MidoriHistory @@ -117,59 +116,18 @@ midori_history_get_stock_id (MidoriViewable* viewable) 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; - #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 + gint64 day; 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 */ @@ -189,7 +147,6 @@ midori_history_format_date (KatzeItem *item) sdate = g_strdup (_("Today")); else sdate = g_strdup (_("Yesterday")); - #endif return sdate; } @@ -374,7 +331,6 @@ midori_history_bookmark_add_cb (GtkWidget* menuitem, GtkTreeIter iter; 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)) @@ -382,11 +338,11 @@ midori_history_bookmark_add_cb (GtkWidget* menuitem, if (KATZE_IS_ITEM (item) && katze_item_get_uri (item)) { - midori_browser_edit_bookmark_dialog_new (browser, item, TRUE, FALSE, proxy); + midori_browser_edit_bookmark_dialog_new (browser, item, TRUE, FALSE); g_object_unref (item); } else - midori_browser_edit_bookmark_dialog_new (browser, NULL, TRUE, FALSE, proxy); + midori_browser_edit_bookmark_dialog_new (browser, NULL, TRUE, FALSE); } static GtkWidget* @@ -456,8 +412,9 @@ midori_history_add_item_cb (KatzeArray* array, GtkTreeModel* model = gtk_tree_view_get_model (treeview); GtkTreeIter iter; KatzeItem* today; - time_t current_time = time (NULL); + time_t current_time; + current_time = time (NULL); if (gtk_tree_model_iter_children (model, &iter, NULL)) { gint64 day; @@ -466,18 +423,7 @@ midori_history_add_item_cb (KatzeArray* array, 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) { @@ -594,8 +540,6 @@ midori_history_treeview_render_icon_cb (GtkTreeViewColumn* column, 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 @@ -624,14 +568,11 @@ midori_history_treeview_render_text_cb (GtkTreeViewColumn* column, if (KATZE_ITEM_IS_BOOKMARK (item)) g_object_set (renderer, "markup", NULL, - "ellipsize", PANGO_ELLIPSIZE_END, "text", katze_item_get_name (item), NULL); else if (KATZE_ITEM_IS_FOLDER (item)) { gchar* formatted = midori_history_format_date (item); - g_object_set (renderer, "markup", NULL, "text", formatted, - "ellipsize", PANGO_ELLIPSIZE_END, - NULL); + g_object_set (renderer, "markup", NULL, "text", formatted, NULL); g_free (formatted); } else @@ -967,11 +908,17 @@ midori_history_filter_entry_changed_cb (GtkEntry* entry, g_source_remove (history->filter_timeout); history->filter_timeout = g_timeout_add (COMPLETION_DELAY, midori_history_filter_timeout_cb, history); + katze_assign (history->filter, g_strdup (gtk_entry_get_text (entry))); +} - if (!g_object_get_data (G_OBJECT (entry), "sokoke_has_default")) - katze_assign (history->filter, g_strdup (gtk_entry_get_text (entry))); - else - katze_assign (history->filter, NULL); +static void +midori_history_filter_entry_clear_cb (GtkEntry* entry, + gint icon_pos, + gint button, + MidoriHistory* history) +{ + if (icon_pos == GTK_ICON_ENTRY_SECONDARY) + gtk_entry_set_text (entry, ""); } static void @@ -994,8 +941,19 @@ midori_history_init (MidoriHistory* history) GtkTreeSelection* selection; /* Create the filter entry */ - entry = sokoke_search_entry_new (_("Search History")); - g_signal_connect_after (entry, "changed", + 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); + g_signal_connect (entry, "icon-release", + G_CALLBACK (midori_history_filter_entry_clear_cb), history); + g_signal_connect (entry, "changed", G_CALLBACK (midori_history_filter_entry_changed_cb), history); box = gtk_hbox_new (FALSE, 0); gtk_box_pack_start (GTK_BOX (box), entry, TRUE, TRUE, 3); @@ -1008,14 +966,14 @@ midori_history_init (MidoriHistory* history) 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_expand (column, TRUE); + 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, (GtkTreeCellDataFunc)midori_history_treeview_render_icon_cb, treeview, NULL); renderer_text = gtk_cell_renderer_text_new (); - gtk_tree_view_column_pack_start (column, renderer_text, TRUE); + gtk_tree_view_column_pack_start (column, renderer_text, FALSE); gtk_tree_view_column_set_cell_data_func (column, renderer_text, (GtkTreeCellDataFunc)midori_history_treeview_render_text_cb, treeview, NULL); diff --git a/panels/midori-transfers.c b/panels/midori-transfers.c index c7dc45a7..d24577e0 100644 --- a/panels/midori-transfers.c +++ b/panels/midori-transfers.c @@ -15,7 +15,6 @@ #include "midori-browser.h" #include "midori-platform.h" #include "midori-view.h" -#include "midori-core.h" #include @@ -90,7 +89,7 @@ midori_transfers_get_label (MidoriViewable* viewable) static const gchar* midori_transfers_get_stock_id (MidoriViewable* viewable) { - return STOCK_TRANSFER; + return STOCK_TRANSFERS; } static void @@ -104,10 +103,13 @@ midori_transfers_button_clear_clicked_cb (GtkToolItem* toolitem, while ((gtk_tree_model_iter_nth_child (model, &iter, NULL, n++))) { WebKitDownload* download; + WebKitDownloadStatus status; gtk_tree_model_get (model, &iter, 1, &download, -1); - if (midori_download_is_finished (download)) + status = webkit_download_get_status (download); + if (status == WEBKIT_DOWNLOAD_STATUS_FINISHED + || status == WEBKIT_DOWNLOAD_STATUS_CANCELLED) { gtk_list_store_remove (GTK_LIST_STORE (model), &iter); n--; /* Decrement n since we just removed it */ @@ -238,21 +240,9 @@ midori_transfers_treeview_render_icon_cb (GtkTreeViewColumn* column, GtkTreeIter* iter, GtkWidget* treeview) { - WebKitDownload* download; - gchar* content_type; - GIcon* icon; - - gtk_tree_model_get (model, iter, 1, &download, -1); - content_type = midori_download_get_content_type (download, NULL); - icon = g_content_type_get_icon (content_type); - g_themed_icon_append_name (G_THEMED_ICON (icon), "text-html"); - - g_object_set (renderer, "gicon", icon, + g_object_set (renderer, "stock-id", STOCK_TRANSFER, "stock-size", GTK_ICON_SIZE_DND, "xpad", 1, "ypad", 12, NULL); - g_free (content_type); - g_object_unref (icon); - g_object_unref (download); } static void @@ -263,17 +253,32 @@ midori_transfers_treeview_render_text_cb (GtkTreeViewColumn* column, GtkWidget* treeview) { WebKitDownload* download; - gchar* tooltip; + gchar* current; + gchar* total; + gchar* size_text; + gchar* text; gdouble progress; gtk_tree_model_get (model, iter, 1, &download, -1); - tooltip = midori_download_get_tooltip (download); - progress = midori_download_get_progress (download); - g_object_set (renderer, "text", tooltip, + /* FIXME: Ellipsize filename */ + 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); + g_free (size_text); + /* Avoid a bug in WebKit */ + if (webkit_download_get_status (download) != WEBKIT_DOWNLOAD_STATUS_CREATED) + progress = webkit_download_get_progress (download); + else + progress = 0.0; + g_object_set (renderer, "text", text, "value", (gint)(progress * 100), "xpad", 1, "ypad", 6, NULL); - g_free (tooltip); + g_free (text); g_object_unref (download); } @@ -289,7 +294,17 @@ midori_transfers_treeview_render_button_cb (GtkTreeViewColumn* column, gtk_tree_model_get (model, iter, 1, &download, -1); - stock_id = midori_download_action_stock_id (download); + switch (webkit_download_get_status (download)) + { + case WEBKIT_DOWNLOAD_STATUS_STARTED: + stock_id = GTK_STOCK_CANCEL; + break; + case WEBKIT_DOWNLOAD_STATUS_FINISHED: + stock_id = GTK_STOCK_OPEN; + break; + default: + stock_id = GTK_STOCK_CLEAR; + } g_object_set (renderer, "stock-id", stock_id, "stock-size", GTK_ICON_SIZE_MENU, NULL); @@ -310,8 +325,25 @@ midori_transfers_treeview_row_activated_cb (GtkTreeView* treeview, gtk_tree_model_get (model, &iter, 1, &download, -1); - if (midori_download_action_clear (download, GTK_WIDGET (treeview), NULL)) - gtk_list_store_remove (GTK_LIST_STORE (model), &iter); + switch (webkit_download_get_status (download)) + { + case WEBKIT_DOWNLOAD_STATUS_STARTED: + webkit_download_cancel (download); + break; + case WEBKIT_DOWNLOAD_STATUS_FINISHED: + { + const gchar* uri; + + uri = webkit_download_get_destination_uri (download); + sokoke_show_uri (gtk_widget_get_screen (GTK_WIDGET ( + treeview)), uri, gtk_get_current_event_time (), NULL); + break; + } + case WEBKIT_DOWNLOAD_STATUS_CANCELLED: + /* FIXME: Remove this item from the model */ + default: + break; + } g_object_unref (download); } } @@ -496,7 +528,7 @@ midori_transfers_init (MidoriTransfers* transfers) 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_expand (column, TRUE); + 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, diff --git a/panels/midori-transfers.h b/panels/midori-transfers.h index 1174ac9c..97787115 100644 --- a/panels/midori-transfers.h +++ b/panels/midori-transfers.h @@ -12,7 +12,11 @@ #ifndef __MIDORI_TRANSFERS_H__ #define __MIDORI_TRANSFERS_H__ -#include "midori-core.h" +#include + +#include + +#include "midori-viewable.h" G_BEGIN_DECLS diff --git a/po/POTFILES.in b/po/POTFILES.in index 6f26ccaa..904a67d4 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -9,11 +9,8 @@ midori/midori-browser.c midori/midori-extension.c midori/midori-locationaction.c midori/midori-panel.c -midori/midori-settings.vala midori/midori-websettings.c midori/midori-view.c -midori/midori-download.vala -midori/midori-speeddial.vala midori/midori-preferences.c midori/midori-searchaction.c midori/sokoke.c @@ -30,8 +27,6 @@ katze/katze-item.c katze/katze-array.c katze/katze-arrayaction.c katze/katze-preferences.c -katze/midori-uri.vala -katze/midori-paths.vala extensions/adblock.c extensions/addons.c extensions/colorful-tabs.c @@ -44,9 +39,7 @@ 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/formhistory.c -extensions/formhistory/formhistory-gdom-frontend.c -extensions/formhistory/formhistory-js-frontend.c +extensions/formhistory.c extensions/history-list.vala extensions/mouse-gestures.c extensions/shortcuts.c diff --git a/po/ar.po b/po/ar.po index 0e47e847..4168e79e 100644 --- a/po/ar.po +++ b/po/ar.po @@ -1,362 +1,308 @@ # 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. +# FIRST AUTHOR , YEAR. +# msgid "" msgstr "" "Project-Id-Version: midori\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-20 18:39+0000\n" -"PO-Revision-Date: 2012-05-21 00:13+0300\n" -"Last-Translator: mohammad \n" -"Language-Team: http://www.vertaal.com.ar/files/factory/ar/list/\n" -"Language: ar\n" +"POT-Creation-Date: 2011-08-12 04:19+0000\n" +"PO-Revision-Date: 2011-08-09 05:21-0000\n" +"Last-Translator: كريم أولاد الشلحة \n" +"Language-Team: Arabic Xfce Translation Team \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.1\n" +"Plural-Forms: Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : n>=3 && n<=10 ? 2 : 3\n" "X-Poedit-Language: Arabic\n" "X-Poedit-Country: MOROCCO\n" #: ../data/midori.desktop.in.h:1 -msgid "Browse the Web" -msgstr "تصفّح الإنترنت" +msgid "Lightweight web browser" +msgstr "منصفح الوب الخفيف" -#: ../data/midori.desktop.in.h:2 -msgid "Internet;WWW;Explorer" -msgstr "شبكة الإنترنت؛WWW؛إكسبلورر" - -#: ../data/midori.desktop.in.h:3 ../midori/main.c:1972 ../midori/main.c:1996 -#: ../midori/main.c:2010 ../midori/midori-websettings.c:313 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1431 ../midori/main.c:2005 +#: ../midori/main.c:2029 ../midori/main.c:2045 +#: ../midori/midori-websettings.c:291 msgid "Midori" msgstr "ميدوري" -#: ../data/midori.desktop.in.h:4 +#: ../data/midori.desktop.in.h:3 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:4223 -msgid "Private Browsing" -msgstr "التصفح الخاص" - -#: ../midori/main.c:97 ../midori/main.c:103 +#: ../midori/main.c:106 ../midori/main.c:112 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "لا يمكن تحميل الإعدادات: %s\n" -#: ../midori/main.c:151 +#: ../midori/main.c:160 #, c-format msgid "Value '%s' is invalid for %s" -msgstr "القيمة '%s' غبر صالحة ل %s" +msgstr "القيمة '%s' غبر سليمة لـ %s" -#: ../midori/main.c:156 ../midori/main.c:260 +#: ../midori/main.c:165 ../midori/main.c:258 #, c-format msgid "Invalid configuration value '%s'" -msgstr "قيمة الإعدادات '%s' غبر صالحة" +msgstr "قيمة الإعدادات '%s' غبر سليمة" -#: ../midori/main.c:381 +#: ../midori/main.c:363 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "فشل تحميل أدوات البحث. %s\n" -#: ../midori/main.c:435 +#: ../midori/main.c:417 #, c-format msgid "Failed to clear history: %s\n" msgstr "فشل محو السجل: %s\n" -#: ../midori/main.c:455 ../extensions/formhistory/formhistory.c:531 +#: ../midori/main.c:437 ../midori/main.c:558 ../extensions/formhistory.c:388 #, 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:525 +#: ../midori/main.c:501 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "فشل حذف العناصر القديمة للسجل: %s\n" -#: ../midori/main.c:547 +#: ../midori/main.c:541 ../panels/midori-history.c:193 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "فشل حذف عنصر السجل: %s\n" + +#: ../midori/main.c:588 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "لا يمكن حفظ العلامات. %s" + +#: ../midori/main.c:622 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "لا يمكن حفظ الإعدادات. %s" -#: ../midori/main.c:582 +#: ../midori/main.c:657 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "لا يمكن حفظ أدوات البحث. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:619 +#: ../midori/main.c:683 ../midori/main.c:703 #, c-format msgid "The trash couldn't be saved. %s" msgstr "لا يمكن حفظ المهملات. %s" -#: ../midori/main.c:660 ../panels/midori-extensions.c:91 +#: ../midori/main.c:737 ../panels/midori-extensions.c:93 msgid "Extensions" msgstr "إمتدادات" -#: ../midori/main.c:674 +#: ../midori/main.c:751 msgid "Privacy" msgstr "الخصوصية" -#: ../midori/main.c:686 -msgid "" -"Cookies store login data, saved games, or user profiles for advertisement " -"purposes." -msgstr "" -"الكوكيز تخزن بيانات تسجيل الدخول والألعاب المحفوظة ، أو تعريف المستخدم " -"لأغراض الإعلان." +#: ../midori/main.c:759 +msgid "Cookies store login data, saved games, or user profiles for advertisement purposes." +msgstr "الكوكيز تخزن بيانات تسجيل الدخول والألعاب المحفوظة ، أو تعريف المستخدم لأغراض الإعلان." -#: ../midori/main.c:742 +#: ../midori/main.c:823 #, c-format msgid "The session couldn't be saved. %s" msgstr "لا يمكن حفظ الجلسة. %s" -#: ../midori/main.c:960 -msgid "" -"No root certificate file is available. SSL certificates cannot be verified." +#: ../midori/main.c:1017 +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:1079 +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:1055 +#: ../midori/main.c:1098 msgid "Modify _preferences" msgstr "تحرير ال_تفضيلات" -#: ../midori/main.c:1059 +#: ../midori/main.c:1102 msgid "Disable all _extensions" msgstr "تعطيل كل الإمتدادات" -#: ../midori/main.c:1072 +#: ../midori/main.c:1115 msgid "Discard old tabs" msgstr "تجاهل العلامات القديمة" -#: ../midori/main.c:1073 ../midori/midori-websettings.c:221 +#: ../midori/main.c:1116 ../midori/midori-websettings.c:201 msgid "Show last tabs without loading" -msgstr "أظهر أخر تبويب بدون تحميل" +msgstr "أظهر أخر لبويبات بدون تحميل" -#: ../midori/main.c:1074 ../midori/midori-websettings.c:220 +#: ../midori/main.c:1117 ../midori/midori-websettings.c:200 msgid "Show last open tabs" -msgstr "أظهر اخر التبويبات المفتوحة" +msgstr "أظهر اخر تبويبات المفتوحة" -#: ../midori/main.c:1321 ../midori/main.c:2399 +#: ../midori/main.c:1310 ../midori/main.c:2366 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "لا يمكن تحميل الجلسة: %s\n" -#: ../midori/main.c:1459 +#: ../midori/main.c:1431 +msgid "No filename specified" +msgstr "لم يتم تحديد إسم الملف" + +#: ../midori/main.c:1450 +msgid "An unknown error occured." +msgstr "حدث خطأ مجهول." + +#: ../midori/main.c:1479 #, c-format msgid "Snapshot saved to: %s\n" msgstr "حفظ لقطة في : %s\n" -#: ../midori/main.c:1875 +#: ../midori/main.c:1889 msgid "Run ADDRESS as a web application" -msgstr "شغل العنوان كتطبيق وب" +msgstr "شغل العنوان كتطبيق الوب" -#: ../midori/main.c:1875 +#: ../midori/main.c:1889 msgid "ADDRESS" msgstr "عنوان" -#: ../midori/main.c:1878 +#: ../midori/main.c:1892 msgid "Use FOLDER as configuration folder" msgstr "إستعمل المجلد كمجلد إعدادات" -#: ../midori/main.c:1878 +#: ../midori/main.c:1892 msgid "FOLDER" msgstr "مجلد" -#: ../midori/main.c:1881 +#: ../midori/main.c:1895 msgid "Private browsing, no changes are saved" msgstr "التصفح الخاص ، لا يتم حفظ أية تغييرات" -#: ../midori/main.c:1883 +#: ../midori/main.c:1897 msgid "Show a diagnostic dialog" msgstr "يظهر حوار التشخيص" -#: ../midori/main.c:1885 +#: ../midori/main.c:1899 msgid "Run the specified filename as javascript" msgstr "تشغيل ملف جافا سكريبت على النحو المحدد" -#: ../midori/main.c:1887 +#: ../midori/main.c:1901 msgid "Take a snapshot of the specified URI" msgstr "أخذ لقطة للعنوان المحدد" -#: ../midori/main.c:1889 +#: ../midori/main.c:1903 msgid "Execute the specified command" msgstr "تنفيذ الأمر المحدد" -#: ../midori/main.c:1891 +#: ../midori/main.c:1905 msgid "List available commands to execute with -e/ --execute" msgstr "قائمة الأوامر المتوفرة لتنفيذ مع -e/ --execute" -#: ../midori/main.c:1893 +#: ../midori/main.c:1907 msgid "Display program version" msgstr "إظهار نسخة البرنامج" -#: ../midori/main.c:1895 +#: ../midori/main.c:1909 msgid "Addresses" msgstr "عناوين" -#: ../midori/main.c:1897 +#: ../midori/main.c:1911 msgid "Block URIs according to regular expression PATTERN" msgstr "كتلة محددات وفقا للنمط التعبير العادي" -#: ../midori/main.c:1897 +#: ../midori/main.c:1911 msgid "PATTERN" msgstr "نموذج" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1901 +#: ../midori/main.c:1915 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "إعادة ميدوري ثانية بعد ثوان من الخمول" -#: ../midori/main.c:1901 +#: ../midori/main.c:1915 msgid "SECONDS" msgstr "ثواني" -#: ../midori/main.c:1904 +#: ../midori/main.c:1918 msgid "Redirects console warnings to the specified FILENAME" msgstr "الموجهات التحذيرات حدة لتحديد FILENAME" -#: ../midori/main.c:1904 +#: ../midori/main.c:1918 msgid "FILENAME" msgstr "إسم الملف" -#: ../midori/main.c:1969 +#: ../midori/main.c:2002 msgid "[Addresses]" -msgstr "[عناوين]" +msgstr "ٍِ[عناوينٍ]" + +#: ../midori/main.c:2016 +msgid "The specified configuration folder is invalid." +msgstr "تكوين المجلد المحدد غير صالح." -#: ../midori/main.c:2011 +#: ../midori/main.c:2046 msgid "Please report comments, suggestions and bugs to:" -msgstr "الرجاء الإبلاغ عن التعليقات والاقتراحات والعلل إلى:" +msgstr "الرجاء الإبلاغ عن التعليقات والاقتراحات والعلل إلى :" -#: ../midori/main.c:2013 +#: ../midori/main.c:2048 msgid "Check for new versions at:" -msgstr "تحقق من توفر نسخ جديدة في:" +msgstr "تحقق من توفر نسخ جديدة في :" + +#: ../midori/main.c:2115 +msgid "Website icons" +msgstr "أيقونات الموقع" #. i18n: Logins and passwords in websites and web forms -#: ../midori/main.c:2108 +#: ../midori/main.c:2118 msgid "Saved logins and _passwords" msgstr "الحسابات و_كلمات السر المحفوظة" -#: ../midori/main.c:2110 -msgid "Cookies and Website data" -msgstr "ملفات تعريف الارتباط وبيانات المواقع" +#: ../midori/main.c:2120 +msgid "Cookies" +msgstr "كعكات" + +#: ../midori/main.c:2123 +msgid "'Flash' Cookies" +msgstr "'فلاش'كعكات" + +#: ../midori/main.c:2126 +msgid "HTML5 _Databases" +msgstr "HTML5 _Databases" -#. 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 +#: ../midori/main.c:2129 ../midori/midori-websettings.c:877 +#: ../extensions/web-cache.c:478 ../extensions/web-cache.c:487 msgid "Web Cache" msgstr "ملفات الوب المؤقتة" -#: ../midori/main.c:2117 -msgid "Website icons" -msgstr "أيقونات الموقع" +#: ../midori/main.c:2133 +msgid "Offline Application Cache" +msgstr "ذاكرة التطبيقات بدون اتصال" -#: ../midori/main.c:2223 -msgid "An unknown error occured" -msgstr "حدث خطأ مجهول" - -#: ../midori/main.c:2330 +#: ../midori/main.c:2297 msgid "An instance of Midori is already running but not responding.\n" -msgstr "هناك مثيل لميدوري قيد التشغيل بالفعل ولكن لا يستجيب.\n" +msgstr "ميدوري مثيل قيد التشغيل بالفعل ولكن لا يستجيب.\n" -#: ../midori/main.c:2366 +#: ../midori/main.c:2333 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "لا يمكن تحميل العلامات: %s\n" -#: ../midori/main.c:2414 +#: ../midori/main.c:2381 #, c-format msgid "The trash couldn't be loaded: %s\n" -msgstr "لا يمكن تحميل المهلملات: %s\n" +msgstr "لا يمكن تحميل المهلملات: %s\n" -#: ../midori/main.c:2427 +#: ../midori/main.c:2394 #, c-format msgid "The history couldn't be loaded: %s\n" -msgstr "لا يمكن تحميل التاريخ: %s\n" +msgstr "لا يمكن التاريخ: %s\n" -#: ../midori/main.c:2443 +#: ../midori/main.c:2410 msgid "The following errors occured:" -msgstr "حدثت الأخطاء التالية:" +msgstr "حدثت الأخطاء التالية :" -#: ../midori/main.c:2459 +#: ../midori/main.c:2426 msgid "_Ignore" msgstr "_تجاهل" -#: ../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 "لم يتم العثور على ملف." @@ -368,718 +314,875 @@ msgstr "وثيقة مشوهة." #: ../midori/midori-array.c:628 msgid "Unrecognized bookmark format." -msgstr "علامات غير معتمدة الصيغة." +msgstr "علامات غير معتمدة الصيغة" -#: ../midori/midori-array.c:915 +#: ../midori/midori-array.c:916 msgid "Writing failed." msgstr "فشل الكتابة." -#: ../midori/midori-browser.c:350 ../midori/midori-browser.c:5300 -#: ../midori/midori-browser.c:5309 +#: ../midori/midori-browser.c:329 ../midori/midori-browser.c:5168 +#: ../midori/midori-browser.c:5177 msgid "Reload the current page" msgstr "تحديث الصفحة الحالية" -#: ../midori/midori-browser.c:359 ../midori/midori-browser.c:5306 +#: ../midori/midori-browser.c:340 ../midori/midori-browser.c:5174 msgid "Stop loading the current page" msgstr "إيقاف تحميل الصفحة الحالية" -#: ../midori/midori-browser.c:476 +#: ../midori/midori-browser.c:467 #, c-format msgid "Failed to update title: %s\n" msgstr "فشل تحديث عنوان: %s\n" -#: ../midori/midori-browser.c:489 +#: ../midori/midori-browser.c:480 #, c-format msgid "Unexpected action '%s'." msgstr "حدث غير متوقع'%s'." -#: ../midori/midori-browser.c:569 +#: ../midori/midori-browser.c:581 #, 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 +#: ../midori/midori-browser.c:721 msgid "New folder" msgstr "مجلد جديد" -#: ../midori/midori-browser.c:774 +#: ../midori/midori-browser.c:721 msgid "Edit folder" msgstr "تحرير المجلد" -#: ../midori/midori-browser.c:776 +#: ../midori/midori-browser.c:723 msgid "New bookmark" msgstr "علامة حديدة" -#: ../midori/midori-browser.c:776 +#: ../midori/midori-browser.c:723 msgid "Edit bookmark" msgstr "تحرير العلامة" -#: ../midori/midori-browser.c:818 +#: ../midori/midori-browser.c:754 msgid "_Title:" msgstr "_عنوان:" -#: ../midori/midori-browser.c:838 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:774 ../midori/midori-searchaction.c:967 #: ../extensions/feed-panel/main.c:377 msgid "_Address:" -msgstr "_عنوان:" +msgstr "ع_نوان:" -#: ../midori/midori-browser.c:861 ../midori/midori-browser.c:4328 +#: ../midori/midori-browser.c:807 ../midori/midori-browser.c:4233 msgid "_Folder:" msgstr "_مجلد:" -#: ../midori/midori-browser.c:877 +#: ../midori/midori-browser.c:817 ../midori/midori-browser.c:905 +#: ../midori/midori-browser.c:4238 ../midori/midori-browser.c:4266 +msgid "Toplevel folder" +msgstr "مجلد المستوي عالي" + +#: ../midori/midori-browser.c:848 msgid "Add to _Speed Dial" msgstr "أضف إلى _الحوار السريع" -#: ../midori/midori-browser.c:890 +#: ../midori/midori-browser.c:861 msgid "Show in the tool_bar" msgstr "أظهر في شريط الأدوات" -#: ../midori/midori-browser.c:905 +#: ../midori/midori-browser.c:876 msgid "Run as _web application" msgstr "تشغيل كتطبيق انترنت" -#: ../midori/midori-browser.c:976 +#: ../midori/midori-browser.c:949 #, c-format msgid "The file \"%s\" can't be saved in this folder." msgstr "الملف \"%s\" لا يمكن حفظها في هذا المجلد." -#: ../midori/midori-browser.c:978 +#: ../midori/midori-browser.c:951 #, c-format msgid "You don't have permission to write in this location." msgstr "ليس لديك إذن الكتابة في هذا الموقع." -#: ../midori/midori-browser.c:985 +#: ../midori/midori-browser.c:958 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "لا توجد مساحة حرة كافية لتحميل \"%s\"." -#: ../midori/midori-browser.c:988 +#: ../midori/midori-browser.c:961 #, c-format msgid "The file needs %s but only %s are left." msgstr "الملف يحتاجج %s ولكن فقط %s مساحة حرة." -#: ../midori/midori-browser.c:1026 ../midori/midori-browser.c:4397 +#: ../midori/midori-browser.c:1003 ../midori/midori-browser.c:4317 msgid "Save file as" msgstr "حفظ الملف في" -#: ../midori/midori-browser.c:1320 +#: ../midori/midori-browser.c:1301 msgid "New Window" msgstr "نافذة جديدة" -#: ../midori/midori-browser.c:1320 +#: ../midori/midori-browser.c:1301 msgid "A new window has been opened" msgstr "تم فتح نافذة جديدة" -#: ../midori/midori-browser.c:1323 +#: ../midori/midori-browser.c:1304 msgid "New Tab" msgstr "تبويب جديد" -#: ../midori/midori-browser.c:1323 +#: ../midori/midori-browser.c:1304 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 +#: ../midori/midori-browser.c:1341 msgid "Save file" msgstr "حفظ الملف" -#: ../midori/midori-browser.c:2367 +#: ../midori/midori-browser.c:2222 msgid "Open file" msgstr "فتح الملف" -#: ../midori/midori-browser.c:2499 +#: ../midori/midori-browser.c:2339 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" -"ويمكنك أيضاً الذهاب الى الافضليات، تطبيقات في ميدوري، وحدد مجمع الخبر. المرة " -"التالية التي تقوم فوق رمز الأخبار تغذية، ستضاف تلقائيا." +"لإستعمال URI أعلاه إفتح مجمع الأخبار. عادة ما يكون هناك قائمة أو زر\"إشتراك جديد\",\r\n" +"\"جديد أخبار التغذية\" أو مشابه.\n" +"يدلا من ذلك إذهب إلى تفضيلات, تطبيقات في ميدوري, و حدد مجمع الأخبار. في المرة القادمة عنذما تضغط على أيقونة تغدية الأخبار, سيتم إضافتها تلقائيا." -#: ../midori/midori-browser.c:2505 ../extensions/feed-panel/main.c:365 +#: ../midori/midori-browser.c:2345 ../extensions/feed-panel/main.c:365 msgid "New feed" msgstr "تغدية جديدة" -#: ../midori/midori-browser.c:2548 ../midori/midori-browser.c:5369 -#: ../panels/midori-bookmarks.c:427 +#: ../midori/midori-browser.c:2388 ../midori/midori-browser.c:5237 +#: ../panels/midori-bookmarks.c:466 msgid "Add a new bookmark" msgstr "أضف علامة جديدة" -#: ../midori/midori-browser.c:3047 ../midori/midori-searchaction.c:488 +#: ../midori/midori-browser.c:2947 ../midori/midori-searchaction.c:488 msgid "Empty" msgstr "فارغ" -#: ../midori/midori-browser.c:3469 -msgid "Toggle text cursor navigation" -msgstr "تبديل مؤشر ملاحة النص" - -#: ../midori/midori-browser.c:3784 ../midori/midori-browser.c:5759 +#: ../midori/midori-browser.c:3735 ../midori/midori-browser.c:5647 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "فشل في إدراج التاريخ : %s\n" -#: ../midori/midori-browser.c:4116 ../panels/midori-bookmarks.c:745 -#: ../panels/midori-history.c:803 +#: ../midori/midori-browser.c:4065 ../panels/midori-bookmarks.c:782 +#: ../panels/midori-history.c:751 msgid "Open all in _Tabs" -msgstr "فتح الكل في تبويبات" +msgstr "فتح كل في الت_بويبات" -#: ../midori/midori-browser.c:4123 ../panels/midori-bookmarks.c:751 -#: ../panels/midori-history.c:809 ../extensions/feed-panel/feed-panel.c:528 +#: ../midori/midori-browser.c:4072 ../panels/midori-bookmarks.c:788 +#: ../panels/midori-history.c:757 ../extensions/feed-panel/feed-panel.c:533 msgid "Open in New _Tab" msgstr "فتح في تبو_يب جديد" -#: ../midori/midori-browser.c:4126 ../midori/midori-view.c:2690 -#: ../midori/midori-view.c:4778 ../panels/midori-bookmarks.c:753 -#: ../panels/midori-history.c:811 ../extensions/feed-panel/feed-panel.c:530 +#: ../midori/midori-browser.c:4075 ../midori/midori-view.c:2534 +#: ../midori/midori-view.c:4390 ../panels/midori-bookmarks.c:790 +#: ../panels/midori-history.c:759 ../extensions/feed-panel/feed-panel.c:535 msgid "Open in New _Window" msgstr "افتح في _نافذة جديدة" -#: ../midori/midori-browser.c:4215 +#: ../midori/midori-browser.c:4155 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4216 +#: ../midori/midori-browser.c:4156 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4217 +#: ../midori/midori-browser.c:4157 msgid "Opera" msgstr "أوبيرا" -#: ../midori/midori-browser.c:4218 +#: ../midori/midori-browser.c:4158 msgid "Konqueror" msgstr "كُنكَرر" -#: ../midori/midori-browser.c:4219 +#: ../midori/midori-browser.c:4159 msgid "Epiphany" msgstr "إبِفَني" -#: ../midori/midori-browser.c:4220 -#, c-format -msgid "Firefox (%s)" -msgstr "فيَرفُكس (%s)" +#: ../midori/midori-browser.c:4184 +msgid "Import bookmarks..." +msgstr "إستورد العلامات..." -#: ../midori/midori-browser.c:4241 -msgid "Import bookmarks…" -msgstr "يتم الأن إستيراد العلامات…" - -#: ../midori/midori-browser.c:4244 ../midori/midori-browser.c:5374 +#: ../midori/midori-browser.c:4187 ../midori/midori-browser.c:5242 msgid "_Import bookmarks" -msgstr "_إستورد العلامات" +msgstr "إستورد العلامات" -#: ../midori/midori-browser.c:4255 +#: ../midori/midori-browser.c:4198 msgid "_Application:" msgstr "_تطبيق:" -#: ../midori/midori-browser.c:4320 +#: ../midori/midori-browser.c:4225 msgid "Import from XBEL or HTML file" msgstr "استيراد من ملف HTML أو XBEL" -#: ../midori/midori-browser.c:4355 +#: ../midori/midori-browser.c:4274 msgid "Import from a file" -msgstr "استيراد من ملفّ" +msgstr "إستراد من ملف" -#: ../midori/midori-browser.c:4367 +#: ../midori/midori-browser.c:4286 msgid "Failed to import bookmarks" msgstr "فشل إستراد العلامات" -#: ../midori/midori-browser.c:4402 +#: ../midori/midori-browser.c:4322 msgid "XBEL Bookmarks" msgstr "العلامات XBEL" -#: ../midori/midori-browser.c:4407 +#: ../midori/midori-browser.c:4327 msgid "Netscape Bookmarks" -msgstr "مفضلة نتسكيب" +msgstr "نتسكيب المفضلة" -#: ../midori/midori-browser.c:4421 +#: ../midori/midori-browser.c:4341 msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)" -msgstr "يمكن لميدوري تصدير فقط XBEL (*.xbel) ونتسكيب (*.html)" +msgstr "يمكن لميدوري التصدير فقط XBEL (*.xbel) ونتسكيب (*.html)" -#: ../midori/midori-browser.c:4436 +#: ../midori/midori-browser.c:4357 msgid "Failed to export bookmarks" msgstr "فشل تصدير العلامات" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4558 +#: ../midori/midori-browser.c:4483 msgid "Clear Private Data" msgstr "حذف البيانات الخاصة" -#: ../midori/midori-browser.c:4562 +#: ../midori/midori-browser.c:4487 msgid "_Clear private data" -msgstr "_حذف البيانات الخاصة" +msgstr "حذف البيانات ال_خاصة" -#: ../midori/midori-browser.c:4575 +#: ../midori/midori-browser.c:4500 msgid "Clear the following data:" -msgstr "حذف البيانات التالية:" +msgstr "حذف البيانات التالية :" -#: ../midori/midori-browser.c:4585 +#: ../midori/midori-browser.c:4510 msgid "Last open _tabs" msgstr "أظهر آخر التبويبات المفتوحة" -#: ../midori/midori-browser.c:4611 +#. i18n: Browsing history, visited web pages +#: ../midori/midori-browser.c:4516 ../midori/sokoke.c:1516 +msgid "_History" +msgstr "_سجل" + +#: ../midori/midori-browser.c:4521 ../midori/sokoke.c:1522 +msgid "_Closed Tabs" +msgstr "التبويبات المغ_لقة" + +#: ../midori/midori-browser.c:4541 msgid "Clear private data when _quitting Midori" msgstr "مسح البيانات الخاصة عند الخروج من ميدوري" -#: ../midori/midori-browser.c:4806 +#: ../midori/midori-browser.c:4715 msgid "A lightweight web browser." -msgstr "متصفح الويب الخفيف." +msgstr "متصفح الويب الخفيف" -#: ../midori/midori-browser.c:4807 +#: ../midori/midori-browser.c:4716 msgid "See about:version for version info." -msgstr "انظر حول:لمعلومات نسخة الإصدار." +msgstr "انظر حول : لمعلومات نسخة الإصدار." -#: ../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 "" -"هذه المكتبة هي برمجيات حرة ، ويمكنك إعادة توزيعها و/أو تعديلها تحت شروط رخصة " -"جنو العمومية الصغرى كما نشرت من قبل مؤسسة البرمجيات الحرة ؛ إما الإصدار 2.1 " -"من الرخصة ، أو (باختيارك) أي إصدار لاحق." +#: ../midori/midori-browser.c:4718 +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:4830 +#: ../midori/midori-browser.c:4737 msgid "translator-credits" -msgstr "Karim Oulad Chalha كريم اولاد الشلحة Mohamed Al Hargan محمد الحرقان" +msgstr "" +"Arabic Xfce Translation Team (فريق تعريب إكسفس)\n" +" Karim Oulad Chalha (كريم اولاد الشلحة) \n" +" Mohamed Al Hargan(محمد الحرقان) " -#: ../midori/midori-browser.c:5216 +#: ../midori/midori-browser.c:5081 msgid "_File" msgstr "_ملف" -#: ../midori/midori-browser.c:5219 +#: ../midori/midori-browser.c:5083 ../midori/sokoke.c:1523 +msgid "New _Window" +msgstr "_نافذة جديدة" + +#: ../midori/midori-browser.c:5084 msgid "Open a new window" msgstr "فتح نافذة جديدة" -#: ../midori/midori-browser.c:5222 +#: ../midori/midori-browser.c:5087 msgid "Open a new tab" msgstr "فتح تبويب جديد" -#: ../midori/midori-browser.c:5224 +#: ../midori/midori-browser.c:5089 msgid "New P_rivate Browsing Window" msgstr "نافذة تصفح جديدة خاصة" -#: ../midori/midori-browser.c:5228 +#: ../midori/midori-browser.c:5090 +msgid "Don't save any private data while browsing" +msgstr "لا تقم بحفظ أي بيانات خاصة أثناء التصفح" + +#: ../midori/midori-browser.c:5094 msgid "Open a file" msgstr "فتح ملف" -#: ../midori/midori-browser.c:5230 -msgid "_Save Page As…" -msgstr "_حفظ الصفحة باسم…" +#: ../midori/midori-browser.c:5096 +msgid "_Save Page As..." +msgstr "حفظ الصفحة باسم..." -#: ../midori/midori-browser.c:5231 +#: ../midori/midori-browser.c:5097 msgid "Save to a file" msgstr "حفظ إلى ملف" -#: ../midori/midori-browser.c:5233 +#: ../midori/midori-browser.c:5099 msgid "Add to Speed _dial" msgstr "أضف إلى _الحوار السريع" -#: ../midori/midori-browser.c:5237 +#: ../midori/midori-browser.c:5100 +msgid "Add shortcut to speed dial" +msgstr "إضافة اختصار لسرعة الاتصال الهاتفي" + +#: ../midori/midori-browser.c:5103 msgid "Add Shortcut to the _desktop" msgstr "إضافة إلى اختصار سطح المكتب" -#: ../midori/midori-browser.c:5239 +#: ../midori/midori-browser.c:5104 +msgid "Add shortcut to the desktop" +msgstr "إضافة اختصار إلى سطح المكتب" + +#: ../midori/midori-browser.c:5106 msgid "Create _Launcher" msgstr "إنشاء مطلق" -#: ../midori/midori-browser.c:5243 +#: ../midori/midori-browser.c:5107 +msgid "Create a launcher" +msgstr "إنشاء مطلق" + +#: ../midori/midori-browser.c:5110 msgid "Subscribe to News _feed" msgstr "الاشتراك في مصدر أخبار" -#: ../midori/midori-browser.c:5249 +#: ../midori/midori-browser.c:5111 +msgid "Subscribe to this news feed" +msgstr "اشترك في هذا المصدر الإخباري" + +#: ../midori/midori-browser.c:5116 msgid "_Close Tab" -msgstr "_غلق التبويب" +msgstr "غل_ق التبويب" -#: ../midori/midori-browser.c:5250 +#: ../midori/midori-browser.c:5117 msgid "Close the current tab" msgstr "إغلاق علامة التبويب الحالية" -#: ../midori/midori-browser.c:5252 +#: ../midori/midori-browser.c:5119 msgid "C_lose Window" -msgstr "غلق التافذة" +msgstr "_غلق التافذة" -#: ../midori/midori-browser.c:5256 +#: ../midori/midori-browser.c:5120 +msgid "Close this window" +msgstr "غلق هذه التافذة" + +#: ../midori/midori-browser.c:5123 msgid "Print the current page" msgstr "اطبع الصفحة الحالية" -#: ../midori/midori-browser.c:5258 +#: ../midori/midori-browser.c:5125 msgid "Close a_ll Windows" -msgstr "إغلاق جميع النوافذ" +msgstr "إغلاق جميع النوافذ" -#: ../midori/midori-browser.c:5261 +#: ../midori/midori-browser.c:5126 +msgid "Close all open windows" +msgstr "إغلاق جميع النوافذ المفتوحة" + +#: ../midori/midori-browser.c:5128 msgid "_Edit" msgstr "_تحرير" -#: ../midori/midori-browser.c:5284 -msgid "_Find…" -msgstr "_العثور على…" +#: ../midori/midori-browser.c:5131 +msgid "Undo the last modification" +msgstr "تراجع عن الإجراء الأخير" + +#: ../midori/midori-browser.c:5134 +msgid "Redo the last modification" +msgstr "أعِد آخر عملية متراجع عنها" + +#: ../midori/midori-browser.c:5137 +msgid "Cut the selected text" +msgstr "قص النص المحدد" + +#: ../midori/midori-browser.c:5140 +msgid "Copy the selected text" +msgstr "أنسخ النص المحدد" + +#: ../midori/midori-browser.c:5143 +msgid "Paste text from the clipboard" +msgstr "ألصق النص من الحافظة" -#: ../midori/midori-browser.c:5285 +#: ../midori/midori-browser.c:5146 +msgid "Delete the selected text" +msgstr "حذف النص المحدد" + +#: ../midori/midori-browser.c:5149 +msgid "Select all text" +msgstr "حدد كل النص" + +#: ../midori/midori-browser.c:5151 +msgid "_Find..." +msgstr "العثور على..." + +#: ../midori/midori-browser.c:5152 msgid "Find a word or phrase in the page" msgstr "العثور على كلمة أو عبارة في الصفحة" -#: ../midori/midori-browser.c:5287 +#: ../midori/midori-browser.c:5154 msgid "Find _Next" -msgstr "العثور على التالي" +msgstr "_عثور على التالي" -#: ../midori/midori-browser.c:5290 +#: ../midori/midori-browser.c:5155 +msgid "Find the next occurrence of a word or phrase" +msgstr "العثور على التكرار التالي للكلمة أو جملة" + +#: ../midori/midori-browser.c:5157 msgid "Find _Previous" msgstr "عث_ور على السابق" -#: ../midori/midori-browser.c:5294 +#: ../midori/midori-browser.c:5158 +msgid "Find the previous occurrence of a word or phrase" +msgstr "العثور على التكرار السابقة من كلمة أو عبارة" + +#: ../midori/midori-browser.c:5162 msgid "Configure the application preferences" msgstr "تكوين تفضيلات التطبيق" -#: ../midori/midori-browser.c:5296 +#: ../midori/midori-browser.c:5164 msgid "_View" msgstr "_عرض" -#: ../midori/midori-browser.c:5297 +#: ../midori/midori-browser.c:5165 msgid "_Toolbars" -msgstr "_شريط الأدوات" +msgstr "شريط ال_أدوات" -#: ../midori/midori-browser.c:5302 +#: ../midori/midori-browser.c:5170 ../midori/midori-browser.c:5171 msgid "Reload page without caching" msgstr "تحديث الصفحة دون التخزين المؤقت" -#: ../midori/midori-browser.c:5312 +#: ../midori/midori-browser.c:5180 msgid "Increase the zoom level" msgstr "زيادة مستوى التكبير" -#: ../midori/midori-browser.c:5315 +#: ../midori/midori-browser.c:5183 msgid "Decrease the zoom level" msgstr "انخفاض مستوى التكبير" -#: ../midori/midori-browser.c:5319 +#: ../midori/midori-browser.c:5186 +msgid "Reset the zoom level" +msgstr "إستعادة مستوى التكبير" + +#: ../midori/midori-browser.c:5187 msgid "_Encoding" -msgstr "_تشفير" +msgstr "ت_شفير" -#: ../midori/midori-browser.c:5321 +#: ../midori/midori-browser.c:5189 msgid "View So_urce" msgstr "عرض المصدر" -#: ../midori/midori-browser.c:5324 +#: ../midori/midori-browser.c:5190 +msgid "View the source code of the page" +msgstr "اعرض النص المصدري لهذه الصفحة" + +#: ../midori/midori-browser.c:5192 msgid "Ca_ret Browsing" msgstr "إنشاء تصفح" -#: ../midori/midori-browser.c:5328 +#: ../midori/midori-browser.c:5193 +msgid "Toggle text cursor navigation" +msgstr "مسمار النص عند الاتنقل بالمؤشر" + +#: ../midori/midori-browser.c:5196 msgid "Toggle fullscreen view" msgstr "تبديل لعرض ملء الشاشة" -#: ../midori/midori-browser.c:5330 +#: ../midori/midori-browser.c:5198 msgid "Scroll _Left" msgstr "انتقل لليسار" -#: ../midori/midori-browser.c:5333 +#: ../midori/midori-browser.c:5199 +msgid "Scroll to the left" +msgstr "انتقل إلى اليسار" + +#: ../midori/midori-browser.c:5201 msgid "Scroll _Down" msgstr "انتقل إلى للاسفل" -#: ../midori/midori-browser.c:5336 +#: ../midori/midori-browser.c:5202 +msgid "Scroll down" +msgstr "انتقل إلى للاسفل" + +#: ../midori/midori-browser.c:5204 msgid "Scroll _Up" msgstr "انتقل إلى للأعلى" -#: ../midori/midori-browser.c:5339 +#: ../midori/midori-browser.c:5205 +msgid "Scroll up" +msgstr "انتقل إلى للأعلى" + +#: ../midori/midori-browser.c:5207 msgid "Scroll _Right" msgstr "انتقل إلى اليمين" -#: ../midori/midori-browser.c:5342 +#: ../midori/midori-browser.c:5208 +msgid "Scroll to the right" +msgstr "انتقل إلى اليمين" + +#: ../midori/midori-browser.c:5210 msgid "_Go" msgstr "_إذهب" -#: ../midori/midori-browser.c:5345 +#: ../midori/midori-browser.c:5213 msgid "Go back to the previous page" msgstr "العودة إلى الصفحة السابقة" -#: ../midori/midori-browser.c:5348 +#: ../midori/midori-browser.c:5216 msgid "Go forward to the next page" msgstr "المضي قدما إلى الصفحة التالية" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5352 +#: ../midori/midori-browser.c:5220 msgid "Go to the previous sub-page" msgstr "انتقل إلى الصفحة الفرعية السابقة" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5356 +#: ../midori/midori-browser.c:5224 msgid "Go to the next sub-page" msgstr "انتقل إلى صفحة فرعية اللاحقة" -#: ../midori/midori-browser.c:5359 +#: ../midori/midori-browser.c:5227 msgid "Go to your homepage" msgstr "ذهاب إلى الصفحة الرئيسية" -#: ../midori/midori-browser.c:5361 +#: ../midori/midori-browser.c:5229 msgid "Empty Trash" msgstr "سلة المهملات فارغة" -#: ../midori/midori-browser.c:5364 +#: ../midori/midori-browser.c:5230 +msgid "Delete the contents of the trash" +msgstr "حذف محتويات سلة المهملات" + +#: ../midori/midori-browser.c:5232 msgid "Undo _Close Tab" msgstr "تراجع عن Ø¥_غلاق التبويب" -#: ../midori/midori-browser.c:5371 +#: ../midori/midori-browser.c:5233 +msgid "Open the last closed tab" +msgstr "فتح علامة التبويب المغلقة حديثاً" + +#: ../midori/midori-browser.c:5239 msgid "Add a new _folder" -msgstr "أضف مجلد جديد" +msgstr "أضف مجلد ج_ديد" -#: ../midori/midori-browser.c:5377 +#: ../midori/midori-browser.c:5240 +msgid "Add a new bookmark folder" +msgstr "أضف مجلد علامات جديد" + +#: ../midori/midori-browser.c:5245 msgid "_Export bookmarks" -msgstr "_صدّر العلامات" +msgstr "صدّ_ر العلامات" -#: ../midori/midori-browser.c:5380 ../midori/midori-searchaction.c:497 +#: ../midori/midori-browser.c:5248 ../midori/midori-searchaction.c:497 msgid "_Manage Search Engines" -msgstr "_إدارة محركات البحث" +msgstr "إدار_Ø© الأدوات البحث" -#: ../midori/midori-browser.c:5383 +#: ../midori/midori-browser.c:5249 +msgid "Add, edit and remove search engines..." +msgstr "أضف, حرر و إحذف أدوات البحث..." + +#: ../midori/midori-browser.c:5252 msgid "_Clear Private Data" -msgstr "_حذف البيانات الخاصة" +msgstr "حذف البيانات الخاصة " + +#: ../midori/midori-browser.c:5253 +msgid "Clear private data..." +msgstr "حذف البيانات الخاصة ..." -#: ../midori/midori-browser.c:5386 +#: ../midori/midori-browser.c:5256 msgid "_Inspect Page" -msgstr "_معاينة الصفحة" +msgstr "معاينة الصفحة" + +#: ../midori/midori-browser.c:5257 +msgid "Inspect page details and access developer tools..." +msgstr "معاينة تفاصيل الصفحة أدوات وصول المطورين ..." -#: ../midori/midori-browser.c:5390 +#: ../midori/midori-browser.c:5261 msgid "_Previous Tab" -msgstr "_التبويب السابق" +msgstr "التبويب الساب_ق" -#: ../midori/midori-browser.c:5393 +#: ../midori/midori-browser.c:5262 +msgid "Switch to the previous tab" +msgstr "التحول إلى التبويب السابق" + +#: ../midori/midori-browser.c:5264 msgid "_Next Tab" -msgstr "_التبويب التالي" +msgstr "التبويب _التالي" + +#: ../midori/midori-browser.c:5265 +msgid "Switch to the next tab" +msgstr "التحول إلى التبويب التالي" -#: ../midori/midori-browser.c:5395 +#: ../midori/midori-browser.c:5266 msgid "Move Tab _Backward" msgstr "نقل علامة التبويب" -#: ../midori/midori-browser.c:5397 +#: ../midori/midori-browser.c:5267 +msgid "Move tab behind the previous tab" +msgstr "حرك علامة التبويب السابقة للوراء" + +#: ../midori/midori-browser.c:5268 msgid "_Move Tab Forward" -msgstr "_حرك التبويب إلى الأمام" +msgstr "حرك التبويب إلى الأمام" -#: ../midori/midori-browser.c:5400 +#: ../midori/midori-browser.c:5269 +msgid "Move tab in front of the next tab" +msgstr "الانتقال للتبويب أمام علامة التبويب التالية" + +#: ../midori/midori-browser.c:5271 msgid "Focus _Current Tab" msgstr "فصل التبويب ال_حالي" -#: ../midori/midori-browser.c:5403 +#: ../midori/midori-browser.c:5272 +msgid "Focus the current tab" +msgstr "فصل التبويب الحالي" + +#: ../midori/midori-browser.c:5274 msgid "Focus _Next view" msgstr "عرض التركيز التالي" -#: ../midori/midori-browser.c:5406 +#: ../midori/midori-browser.c:5275 +msgid "Cycle focus between views" +msgstr "حلقة التركيز بين طرق العرض" + +#: ../midori/midori-browser.c:5277 msgid "Only show the Icon of the _Current Tab" msgstr "أظهر فقط Ø£_يقونة التبويب الحالي" -#: ../midori/midori-browser.c:5409 +#: ../midori/midori-browser.c:5278 +msgid "Only show the icon of the current tab" +msgstr "أظهر فقط أيقونة التبويب الحالي" + +#: ../midori/midori-browser.c:5280 msgid "_Duplicate Current Tab" -msgstr "_مضاعفة التبويب الحالي" +msgstr "مضاعفة التبويب الحالي" -#: ../midori/midori-browser.c:5412 +#: ../midori/midori-browser.c:5281 +msgid "Duplicate the current tab" +msgstr "تكرار التبويب الحالية" + +#: ../midori/midori-browser.c:5283 msgid "Close Ot_her Tabs" msgstr "أغلق تبويبات أخر_ى" -#: ../midori/midori-browser.c:5415 +#: ../midori/midori-browser.c:5284 +msgid "Close all tabs except the current tab" +msgstr "أغلق كل التبويبات بإستثناء التبويب الحالي" + +#: ../midori/midori-browser.c:5286 msgid "Open last _session" msgstr "فتح آخر جلسة" -#: ../midori/midori-browser.c:5418 +#: ../midori/midori-browser.c:5287 +msgid "Open the tabs saved in the last session" +msgstr "فتح العلامات المحفوظة في الدورة الماضية" + +#: ../midori/midori-browser.c:5289 msgid "_Help" msgstr "_مساعدة" -#: ../midori/midori-browser.c:5420 +#: ../midori/midori-browser.c:5291 msgid "_Frequent Questions" -msgstr "_أسئلة شائعة" +msgstr "أسئلة شائعة" -#: ../midori/midori-browser.c:5423 -msgid "_Report a Problem…" -msgstr "_بلغ عن عله…" +#: ../midori/midori-browser.c:5292 +msgid "Show the Frequently Asked Questions" +msgstr "تظهر أسئلة شائعة وأجوبتها" + +#: ../midori/midori-browser.c:5294 +msgid "_Report a Problem..." +msgstr "بلغ عن عله ..." -#: ../midori/midori-browser.c:5435 +#: ../midori/midori-browser.c:5295 +msgid "Open Midori's bug tracker" +msgstr "تعقب العلل وفتح ميدوري" + +#: ../midori/midori-browser.c:5298 +msgid "Show information about the program" +msgstr "مزيد من المعلومات حول البرنامج" + +#: ../midori/midori-browser.c:5306 msgid "_Menubar" msgstr "_شريط القائمة" -#: ../midori/midori-browser.c:5439 +#: ../midori/midori-browser.c:5307 +msgid "Show menubar" +msgstr "أظهر شريك القائمة" + +#: ../midori/midori-browser.c:5310 msgid "_Navigationbar" -msgstr "_شريط التصفح" +msgstr "شري_Ø· التصفح" -#: ../midori/midori-browser.c:5443 +#: ../midori/midori-browser.c:5311 +msgid "Show navigationbar" +msgstr "أظهر شريط التصفح" + +#: ../midori/midori-browser.c:5314 msgid "Side_panel" msgstr "لوحة ال_جانبية" -#: ../midori/midori-browser.c:5444 -msgid "Sidepanel" -msgstr "لوحة جانبية" +#: ../midori/midori-browser.c:5315 +msgid "Show sidepanel" +msgstr "أظهر لوحة الجانبية" -#: ../midori/midori-browser.c:5447 +#: ../midori/midori-browser.c:5318 msgid "_Bookmarkbar" -msgstr "_شريط العلامات" +msgstr "شري_Ø· الغلامات" + +#: ../midori/midori-browser.c:5319 +msgid "Show bookmarkbar" +msgstr "أظهر شريط العلامات" -#: ../midori/midori-browser.c:5451 +#: ../midori/midori-browser.c:5322 msgid "_Statusbar" -msgstr "_شريط الحالة" +msgstr "شريط الحالة" -#: ../midori/midori-browser.c:5460 ../midori/midori-websettings.c:312 -msgid "_Automatic" -msgstr "_تلقائي" +#: ../midori/midori-browser.c:5323 +msgid "Show statusbar" +msgstr "عرض شريط الحالة" -#: ../midori/midori-browser.c:5463 ../midori/midori-websettings.c:236 -msgid "Chinese Traditional (BIG5)" -msgstr "صيني تقليدي (Big5)" +#: ../midori/midori-browser.c:5331 +msgid "_Automatic" +msgstr "Ø¢_لي" -#: ../midori/midori-browser.c:5466 ../midori/midori-websettings.c:237 -msgid "Chinese Simplified (GB18030)" -msgstr "صيني مبسّط (GB18030)" +#: ../midori/midori-browser.c:5334 ../midori/midori-websettings.c:216 +msgid "Chinese (BIG5)" +msgstr "صيني (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5470 +#: ../midori/midori-browser.c:5338 msgid "Japanese (SHIFT__JIS)" msgstr "ياباني (_Shift-JIS)" -#: ../midori/midori-browser.c:5473 ../midori/midori-websettings.c:239 +#: ../midori/midori-browser.c:5341 ../midori/midori-websettings.c:218 msgid "Korean (EUC-KR)" msgstr "كوري (_EUC-KR)" -#: ../midori/midori-browser.c:5476 ../midori/midori-websettings.c:240 +#: ../midori/midori-browser.c:5344 ../midori/midori-websettings.c:219 msgid "Russian (KOI8-R)" msgstr "روسي (_KOI8-R)" -#: ../midori/midori-browser.c:5479 ../midori/midori-websettings.c:241 +#: ../midori/midori-browser.c:5347 ../midori/midori-websettings.c:220 msgid "Unicode (UTF-8)" msgstr "يونيكود (UTF-_8)" -#: ../midori/midori-browser.c:5482 ../midori/midori-websettings.c:242 +#: ../midori/midori-browser.c:5350 ../midori/midori-websettings.c:221 msgid "Western (ISO-8859-1)" msgstr "غربي (_ISO-8859-1)" -#: ../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:5353 ../midori/midori-websettings.c:222 +#: ../midori/midori-websettings.c:296 ../katze/katze-utils.c:732 +msgid "Custom..." +msgstr "مخصص..." -#: ../midori/midori-browser.c:5991 +#: ../midori/midori-browser.c:5883 msgid "_Separator" msgstr "_فاصل" -#: ../midori/midori-browser.c:5998 -msgid "_Location…" -msgstr "_موقع…" +#: ../midori/midori-browser.c:5890 +msgid "_Location..." +msgstr "مو_قع..." -#: ../midori/midori-browser.c:6000 +#: ../midori/midori-browser.c:5892 msgid "Open a particular location" msgstr "فتح موقع معين" -#: ../midori/midori-browser.c:6022 -msgid "_Web Search…" -msgstr "_بحث في الوِب…" +#: ../midori/midori-browser.c:5914 +msgid "_Web Search..." +msgstr "بحث في ال_وِب" -#: ../midori/midori-browser.c:6024 +#: ../midori/midori-browser.c:5916 msgid "Run a web search" msgstr "شغل البحث في الوب" -#: ../midori/midori-browser.c:6051 +#: ../midori/midori-browser.c:5937 msgid "Reopen a previously closed tab or window" msgstr "إعادة فتح التبويب مغلقة سابقا ، أو نافذة" -#: ../midori/midori-browser.c:6068 +#: ../midori/midori-browser.c:5950 ../midori/sokoke.c:1512 +msgid "_Bookmarks" +msgstr "_علامات" + +#: ../midori/midori-browser.c:5952 msgid "Show the saved bookmarks" msgstr "عرض العلامات المحفوظة" -#: ../midori/midori-browser.c:6085 +#: ../midori/midori-browser.c:5966 msgid "_Tools" -msgstr "_أدوات" +msgstr "أد_وات" -#: ../midori/midori-browser.c:6101 +#: ../midori/midori-browser.c:5981 msgid "_Window" -msgstr "_النافذة" +msgstr "الناف_ذة" -#: ../midori/midori-browser.c:6103 +#: ../midori/midori-browser.c:5983 msgid "Show a list of all open tabs" msgstr "أظهر قائمة كل التبويبات المفتوحة" -#: ../midori/midori-browser.c:6117 +#: ../midori/midori-browser.c:5997 msgid "_Menu" -msgstr "_قائمة" +msgstr "قا_ئمة" -#: ../midori/midori-browser.c:6119 +#: ../midori/midori-browser.c:5999 msgid "Menu" msgstr "قائمة" -#: ../midori/midori-browser.c:6933 +#: ../midori/midori-browser.c:6549 #, c-format msgid "Unexpected setting '%s'" msgstr "إعداد غير متوقع '%s'" -#: ../midori/midori-extension.c:329 +#: ../midori/midori-extension.c:305 #, c-format msgid "The configuration of the extension '%s' couldn't be loaded: %s\n" msgstr "إعدادات الامتداد '%s' لا يمكن تحميلها: %s\n" -#: ../midori/midori-extension.c:747 ../midori/midori-extension.c:844 -#: ../midori/midori-extension.c:941 ../midori/midori-extension.c:1053 -#: ../extensions/addons.c:1695 +#: ../midori/midori-extension.c:703 ../midori/midori-extension.c:800 +#: ../midori/midori-extension.c:897 ../midori/midori-extension.c:1009 +#: ../extensions/addons.c:1642 #, c-format msgid "The configuration of the extension '%s' couldn't be saved: %s\n" msgstr "إعدادات الامتداد '%s' لا يمكن حفظها: %s\n" -#: ../midori/midori-locationaction.c:394 -#, c-format -msgid "Search with %s" -msgstr "البحث بـ %s" - -#: ../midori/midori-locationaction.c:412 -msgid "Search with…" -msgstr "بحث باستخدام…" - -#: ../midori/midori-locationaction.c:537 +#: ../midori/midori-locationaction.c:400 #, c-format msgid "Failed to select from history\n" msgstr "فشل التحديد من التاريخ\n" -#: ../midori/midori-locationaction.c:624 +#: ../midori/midori-locationaction.c:484 #, c-format msgid "Search for %s" msgstr "بحث عن %s" +#: ../midori/midori-locationaction.c:510 +#, c-format +msgid "Search with %s" +msgstr "البحث بـ %s" + #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1398 +#: ../midori/midori-locationaction.c:1258 msgid "Paste and p_roceed" msgstr "لصق ثم تابع" -#: ../midori/midori-locationaction.c:1739 +#: ../midori/midori-locationaction.c:1653 msgid "Not verified" msgstr "غير متحقق منه" -#: ../midori/midori-locationaction.c:1759 +#: ../midori/midori-locationaction.c:1668 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 "محاذاة اللوحة الجانبية إلى اليمين" +msgstr " محاذاة اللوحة الجانبية إلى اليمين" #: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410 msgid "Close panel" @@ -1087,933 +1190,902 @@ msgstr "أغلق الشريط" #: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566 msgid "Align sidepanel to the left" -msgstr "محاذاة اللوحة الجانبية إلى اليسار" +msgstr " محاذاة اللوحة الجانبية إلى اليسار" -#: ../midori/midori-websettings.c:218 +#: ../midori/midori-websettings.c:198 msgid "Show Speed Dial" msgstr "عرض الطلب السريع" -#: ../midori/midori-websettings.c:219 +#: ../midori/midori-websettings.c:199 msgid "Show Homepage" msgstr "أظهر الصفحة الرئيسية" -#: ../midori/midori-websettings.c:238 +#: ../midori/midori-websettings.c:217 msgid "Japanese (SHIFT_JIS)" msgstr "ياباني (_Shift-JIS)" -#: ../midori/midori-websettings.c:258 +#: ../midori/midori-websettings.c:237 msgid "New tab" msgstr "تبويب جديد" -#: ../midori/midori-websettings.c:259 +#: ../midori/midori-websettings.c:238 msgid "New window" msgstr "نافذة جديدة" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:239 msgid "Current tab" msgstr "التبويب الحالي" -#: ../midori/midori-websettings.c:275 +#: ../midori/midori-websettings.c:254 msgid "Default" msgstr "المبدئي" -#: ../midori/midori-websettings.c:276 +#: ../midori/midori-websettings.c:255 msgid "Icons" -msgstr "أيقونات" +msgstr "أيقونات " -#: ../midori/midori-websettings.c:277 +#: ../midori/midori-websettings.c:256 msgid "Small icons" msgstr "أيقونات الصغيرة" -#: ../midori/midori-websettings.c:278 +#: ../midori/midori-websettings.c:257 msgid "Text" msgstr "نص" -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-websettings.c:258 msgid "Icons and text" msgstr "أيقونات ونص" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:259 msgid "Text beside icons" msgstr "نص بجانب الأيقونات" -#: ../midori/midori-websettings.c:295 +#: ../midori/midori-websettings.c:274 msgid "Automatic (GNOME or environment)" msgstr "تلقائي (جنوم أو environment)" -#: ../midori/midori-websettings.c:296 +#: ../midori/midori-websettings.c:275 msgid "HTTP proxy server" msgstr "خادم بروكسي HTTP" -#: ../midori/midori-websettings.c:297 +#: ../midori/midori-websettings.c:276 msgid "No proxy server" msgstr "بدون خادم بروكسي" -#: ../midori/midori-websettings.c:314 +#: ../midori/midori-websettings.c:292 msgid "Safari" -msgstr "سافاري" +msgstr "Safari" -#: ../midori/midori-websettings.c:315 +#: ../midori/midori-websettings.c:293 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:316 +#: ../midori/midori-websettings.c:294 msgid "Firefox" msgstr "فيَرفُكس" -#: ../midori/midori-websettings.c:317 +#: ../midori/midori-websettings.c:295 msgid "Internet Explorer" -msgstr "إنترنت إكسبلورر" +msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:401 +#: ../midori/midori-websettings.c:348 msgid "Remember last window size" msgstr "نتذكر حجم الإطار الماضي" -#: ../midori/midori-websettings.c:402 +#: ../midori/midori-websettings.c:349 msgid "Whether to save the last window size" msgstr "إذا كنت تريد حفظ حجم الإطار الأخير" -#: ../midori/midori-websettings.c:410 +#: ../midori/midori-websettings.c:357 msgid "Last window width" msgstr "عرض آخر نافذة" -#: ../midori/midori-websettings.c:411 +#: ../midori/midori-websettings.c:358 msgid "The last saved window width" -msgstr "عرض آخر نافذة محفوظة" +msgstr "عرض آخر نافذة المحفوظة" -#: ../midori/midori-websettings.c:419 +#: ../midori/midori-websettings.c:366 msgid "Last window height" msgstr "آخر ارتفاع للنافذة" -#: ../midori/midori-websettings.c:420 +#: ../midori/midori-websettings.c:367 msgid "The last saved window height" msgstr "آخر ارتفاع محفوظ للنافذة" -#: ../midori/midori-websettings.c:445 +#: ../midori/midori-websettings.c:392 msgid "Last panel position" msgstr "آخر موقع للوحة" -#: ../midori/midori-websettings.c:446 +#: ../midori/midori-websettings.c:393 msgid "The last saved panel position" msgstr "آخر موقع محفوظ للوحة" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:455 +#: ../midori/midori-websettings.c:402 msgid "Last panel page" msgstr "آخر صفحة للوحة" -#: ../midori/midori-websettings.c:456 +#: ../midori/midori-websettings.c:403 msgid "The last saved panel page" msgstr "آخر صفحة لوحة محفوظة" -#: ../midori/midori-websettings.c:464 +#: ../midori/midori-websettings.c:411 msgid "Last Web search" msgstr "آخر بحث إنترنت" -#: ../midori/midori-websettings.c:465 +#: ../midori/midori-websettings.c:412 msgid "The last saved Web search" msgstr "آخر بحث ويب محفوظ" -#: ../midori/midori-websettings.c:474 +#: ../midori/midori-websettings.c:421 msgid "Show Menubar" msgstr "عرض شريط القوائم" -#: ../midori/midori-websettings.c:475 +#: ../midori/midori-websettings.c:422 msgid "Whether to show the menubar" msgstr "إظهار شريط القوائم في كل ألأحوال" -#: ../midori/midori-websettings.c:483 +#: ../midori/midori-websettings.c:430 msgid "Show Navigationbar" msgstr "اظهر شريط التصفح" -#: ../midori/midori-websettings.c:484 +#: ../midori/midori-websettings.c:431 msgid "Whether to show the navigationbar" msgstr "إظهار شريط التصفح في كل ألأحوال" -#: ../midori/midori-websettings.c:492 +#: ../midori/midori-websettings.c:439 msgid "Show Bookmarkbar" msgstr "إظهار العلامات" -#: ../midori/midori-websettings.c:493 +#: ../midori/midori-websettings.c:440 msgid "Whether to show the bookmarkbar" msgstr "إظهار العلامات في كل ألأحوال" -#: ../midori/midori-websettings.c:501 +#: ../midori/midori-websettings.c:448 msgid "Show Panel" msgstr "تظهر لوحة" -#: ../midori/midori-websettings.c:502 +#: ../midori/midori-websettings.c:449 msgid "Whether to show the panel" msgstr "إظهار لوحة في كل ألأحوال" -#: ../midori/midori-websettings.c:510 +#: ../midori/midori-websettings.c:457 msgid "Show Statusbar" msgstr "عرض شريط الحالة" -#: ../midori/midori-websettings.c:511 +#: ../midori/midori-websettings.c:458 msgid "Whether to show the statusbar" msgstr "إظهار شريط الحالة في كل ألأحوال" -#: ../midori/midori-websettings.c:520 +#: ../midori/midori-websettings.c:467 msgid "Toolbar Style:" -msgstr "نمط شريط الأدوات:" +msgstr "نمط شريط الأدوات :" -#: ../midori/midori-websettings.c:521 +#: ../midori/midori-websettings.c:468 msgid "The style of the toolbar" msgstr "نمط شريط الأدوات" -#: ../midori/midori-websettings.c:530 +#: ../midori/midori-websettings.c:477 msgid "Toolbar Items" msgstr "عناصر شريط أدوات" -#: ../midori/midori-websettings.c:531 +#: ../midori/midori-websettings.c:478 msgid "The items to show on the toolbar" msgstr "العناصر التي تظهر على شريط الأدوات" -#: ../midori/midori-websettings.c:539 +#: ../midori/midori-websettings.c:486 msgid "Compact Sidepanel" msgstr "ضغط اللوحة الجانبية" -#: ../midori/midori-websettings.c:540 +#: ../midori/midori-websettings.c:487 msgid "Whether to make the sidepanel compact" msgstr "ضغط اللوحة الجانبية في كل ألأحوال" -#: ../midori/midori-websettings.c:555 +#: ../midori/midori-websettings.c:502 msgid "Align sidepanel on the right" -msgstr "محاذاة اللوحة الجانبية على اليمين" +msgstr " محاذاة اللوحة الجانبية على اليمين" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:503 msgid "Whether to align the sidepanel on the right" -msgstr "محاذاة اللوحة الجانبية على اليمين في كل ألأحوال" +msgstr " محاذاة اللوحة الجانبية على اليمين في كل ألأحوال" -#: ../midori/midori-websettings.c:571 +#: ../midori/midori-websettings.c:518 msgid "Open panels in separate windows" -msgstr "فتح اللوحات في إطارات منفصلة" +msgstr " فتح اللوحات في إطارات منفصلة" -#: ../midori/midori-websettings.c:572 +#: ../midori/midori-websettings.c:519 msgid "Whether to always open panels in separate windows" -msgstr "فتح اللوحات في إطارات منفصلة دائماً" +msgstr " فتح اللوحات في إطارات منفصلة دائماً" -#: ../midori/midori-websettings.c:581 +#: ../midori/midori-websettings.c:528 msgid "When Midori starts:" -msgstr "عندما يبدأ ميدوري:" +msgstr "عندما يبدأ ميدوري :" -#: ../midori/midori-websettings.c:582 +#: ../midori/midori-websettings.c:529 msgid "What to do when Midori starts" msgstr "ماذا تفعل عندما يبدأ ميدوري" -#: ../midori/midori-websettings.c:591 +#: ../midori/midori-websettings.c:538 msgid "Homepage:" msgstr "الصفحة الرئيسية:" -#: ../midori/midori-websettings.c:592 +#: ../midori/midori-websettings.c:539 msgid "The homepage" msgstr "الصفحة الرئيسية" -#: ../midori/midori-websettings.c:607 +#: ../midori/midori-websettings.c:554 msgid "Show crash dialog" msgstr "عرض حوار التحطم" -#: ../midori/midori-websettings.c:608 +#: ../midori/midori-websettings.c:555 msgid "Show a dialog after Midori crashed" msgstr "عرض الحوار بعد تحطم ميدوري" -#: ../midori/midori-websettings.c:616 +#: ../midori/midori-websettings.c:563 msgid "Save downloaded files to:" -msgstr "حفظ الملفات التي تم تحميلها في:" +msgstr "حفظ الملفات التي تم تحميلها في :" -#: ../midori/midori-websettings.c:617 +#: ../midori/midori-websettings.c:564 msgid "The folder downloaded files are saved to" msgstr "يتم حفظ ملفات التحميل في مجلد" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:572 msgid "Text Editor" msgstr "محرر المصوص" -#: ../midori/midori-websettings.c:626 +#: ../midori/midori-websettings.c:573 msgid "An external text editor" msgstr "محرر نص خارجي" -#: ../midori/midori-websettings.c:641 +#: ../midori/midori-websettings.c:588 msgid "News Aggregator" msgstr "مجمع الأخبار" -#: ../midori/midori-websettings.c:642 +#: ../midori/midori-websettings.c:589 msgid "An external news aggregator" msgstr "مجمع الأخبار الخارجية" -#: ../midori/midori-websettings.c:650 +#: ../midori/midori-websettings.c:597 msgid "Location entry Search" msgstr "دخول مكان البحث" -#: ../midori/midori-websettings.c:651 +#: ../midori/midori-websettings.c:598 msgid "The search to perform inside the location entry" msgstr "أداء البحث داخل الموقع" -#: ../midori/midori-websettings.c:659 +#: ../midori/midori-websettings.c:606 msgid "Preferred Encoding" msgstr "الترميز المفضل" -#: ../midori/midori-websettings.c:660 +#: ../midori/midori-websettings.c:607 msgid "The preferred character encoding" msgstr "ترميز الحرف المفضل" -#: ../midori/midori-websettings.c:670 +#: ../midori/midori-websettings.c:617 msgid "Always Show Tabbar" msgstr "أظهر دائما شريط التبويب" -#: ../midori/midori-websettings.c:671 +#: ../midori/midori-websettings.c:618 msgid "Always show the tabbar" msgstr "أظهر دائما شريط التبويب" -#: ../midori/midori-websettings.c:684 +#: ../midori/midori-websettings.c:626 msgid "Close Buttons on Tabs" msgstr "أزرار الإغلاق على الألسنة" -#: ../midori/midori-websettings.c:685 +#: ../midori/midori-websettings.c:627 msgid "Whether tabs have close buttons" msgstr "حتى إذا كانت العلامات على أزرار قريبة" -#: ../midori/midori-websettings.c:710 +#: ../midori/midori-websettings.c:652 msgid "Open new pages in:" msgstr "فتح صفحات جديدة في:" -#: ../midori/midori-websettings.c:711 +#: ../midori/midori-websettings.c:653 msgid "Where to open new pages" msgstr "أين يتم فتح صفحات جديدة" -#: ../midori/midori-websettings.c:720 +#: ../midori/midori-websettings.c:662 msgid "Middle click opens Selection" msgstr "نقر الزر الأوسط يفتح التحديد" -#: ../midori/midori-websettings.c:721 +#: ../midori/midori-websettings.c:663 msgid "Load an address from the selection via middle click" msgstr "تحميل عنوان محدد بالنقر على الزر الاوسط" -#: ../midori/midori-websettings.c:729 +#: ../midori/midori-websettings.c:671 msgid "Open tabs in the background" msgstr "فتح علامات التبويب في الخلفية" -#: ../midori/midori-websettings.c:730 +#: ../midori/midori-websettings.c:672 msgid "Whether to open new tabs in the background" msgstr "فتح علامات تبويب جديدة في الخلفية في كل الأحوال" -#: ../midori/midori-websettings.c:738 +#: ../midori/midori-websettings.c:680 msgid "Open Tabs next to Current" msgstr "فتح علامات بجانب الحالية" -#: ../midori/midori-websettings.c:739 +#: ../midori/midori-websettings.c:681 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "فتح علامات تبويب جديدة بجوار علامة التبويب الحالية أو بعد الأخيرة" -#: ../midori/midori-websettings.c:747 +#: ../midori/midori-websettings.c:689 msgid "Open popups in tabs" msgstr "فتح النوافذ المنبثقة في علامات تبويب" -#: ../midori/midori-websettings.c:748 +#: ../midori/midori-websettings.c:690 msgid "Whether to open popup windows in tabs" msgstr "فتح النوافذ المنبثقة في علامات تبويب في كل الأحوال" -#: ../midori/midori-websettings.c:758 ../extensions/statusbar-features.c:134 +#: ../midori/midori-websettings.c:700 ../extensions/statusbar-features.c:132 msgid "Load images automatically" msgstr "تحميل الصور تلقائيا" -#: ../midori/midori-websettings.c:759 +#: ../midori/midori-websettings.c:701 msgid "Load and display images automatically" msgstr "تحميل وعرض الصور تلقائيا" -#: ../midori/midori-websettings.c:766 ../extensions/statusbar-features.c:143 +#: ../midori/midori-websettings.c:708 ../extensions/statusbar-features.c:141 msgid "Enable scripts" -msgstr "تمكين النصوص البرمجية" +msgstr "تمكين البرامج النصية" -#: ../midori/midori-websettings.c:767 +#: ../midori/midori-websettings.c:709 msgid "Enable embedded scripting languages" msgstr "تمكين لغات البرمجة المضمنة" -#: ../midori/midori-websettings.c:774 ../extensions/statusbar-features.c:154 +#: ../midori/midori-websettings.c:716 ../extensions/statusbar-features.c:150 msgid "Enable Netscape plugins" msgstr "تمكين إضافات نتسكيب" -#: ../midori/midori-websettings.c:775 +#: ../midori/midori-websettings.c:717 msgid "Enable embedded Netscape plugin objects" msgstr "تمكين لغات البرمجة المضمنة في إضافات نتسكيب" -#: ../midori/midori-websettings.c:790 +#: ../midori/midori-websettings.c:737 msgid "Enable Spell Checking" msgstr "تمكين التدقيق الإملائي" -#: ../midori/midori-websettings.c:791 +#: ../midori/midori-websettings.c:738 msgid "Enable spell checking while typing" msgstr "تمكين التدقيق الإملائي أثناء الكتابة" -#: ../midori/midori-websettings.c:797 +#: ../midori/midori-websettings.c:744 msgid "Enable HTML5 database support" msgstr "تمكين قاعدة بيانات دعم HTML5 في كل الأحوال" -#: ../midori/midori-websettings.c:798 +#: ../midori/midori-websettings.c:745 msgid "Whether to enable HTML5 database support" msgstr "تمكين قاعدة بيانات دعم HTML5 في كل الأحوال" -#: ../midori/midori-websettings.c:804 +#: ../midori/midori-websettings.c:751 msgid "Enable HTML5 local storage support" msgstr "تمكين دعم HTML5 التخزين المحلية" -#: ../midori/midori-websettings.c:805 +#: ../midori/midori-websettings.c:752 msgid "Whether to enable HTML5 local storage support" msgstr "لتفعيل دعم تخزين المحلي HTML5" -#: ../midori/midori-websettings.c:811 +#: ../midori/midori-websettings.c:758 msgid "Enable offline web application cache" msgstr "تمكين التخزين المؤقت لتطبيق ويب" -#: ../midori/midori-websettings.c:812 +#: ../midori/midori-websettings.c:759 msgid "Whether to enable offline web application cache" msgstr "لتمكين تخزين المؤقت لتطبيقات الوب" -#: ../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 "تمكين قاعدة بيانات دعم HTML5 في كل الأحوال" - -#: ../midori/midori-websettings.c:838 -msgid "Allow websites to use OpenGL rendering" -msgstr "السماح للمواقع باستخدام OpenGL للتقديم" - -#: ../midori/midori-websettings.c:864 +#: ../midori/midori-websettings.c:783 msgid "Zoom Text and Images" msgstr "تكبير النص والصور" -#: ../midori/midori-websettings.c:865 +#: ../midori/midori-websettings.c:784 msgid "Whether to zoom text and images" msgstr "تكبير النص والصور في كل الاحوال" -#: ../midori/midori-websettings.c:880 +#: ../midori/midori-websettings.c:799 msgid "Find inline while typing" msgstr "العثور على السطر أثناء الكتابة" -#: ../midori/midori-websettings.c:881 +#: ../midori/midori-websettings.c:800 msgid "Whether to automatically find inline while typing" msgstr "العثور على السطر أثناء الكتابة في كل الاحوال" -#: ../midori/midori-websettings.c:896 +#: ../midori/midori-websettings.c:815 msgid "Kinetic scrolling" msgstr "حركية التمرير" -#: ../midori/midori-websettings.c:897 +#: ../midori/midori-websettings.c:816 msgid "Whether scrolling should kinetically move according to speed" msgstr "على كل ألأحوال حركة التمرير تناسب سرعة التنقل" -#: ../midori/midori-websettings.c:905 +#: ../midori/midori-websettings.c:824 msgid "Delete old Cookies after:" -msgstr "حذف الكوكيز القديمة بعد:" +msgstr "حذف الكوكيز القديمة بعد :" -#: ../midori/midori-websettings.c:906 +#: ../midori/midori-websettings.c:825 msgid "The maximum number of days to save cookies for" 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 +#: ../midori/midori-websettings.c:834 msgid "Delete pages from history after:" -msgstr "حذف الصفحات القديمة بعد:" +msgstr "حذف الصفحات القديمة بعد :" -#: ../midori/midori-websettings.c:938 +#: ../midori/midori-websettings.c:835 msgid "The maximum number of days to save the history for" msgstr "الحد الأقصى لعدد الأيام لحفظ التاريخ ل" -#: ../midori/midori-websettings.c:953 +#: ../midori/midori-websettings.c:850 msgid "Proxy server" msgstr "خادم بروكسي" -#: ../midori/midori-websettings.c:954 +#: ../midori/midori-websettings.c:851 msgid "The type of proxy server to use" msgstr "نوع الخادم الوكيل المستخدم" -#: ../midori/midori-websettings.c:963 +#: ../midori/midori-websettings.c:860 msgid "HTTP Proxy Server" msgstr "خادم وكيل HTTP" -#: ../midori/midori-websettings.c:964 +#: ../midori/midori-websettings.c:861 msgid "The proxy server used for HTTP connections" msgstr "خادم proxy المستعمل لإتصالات 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 +#: ../midori/midori-websettings.c:878 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:1015 +#: ../midori/midori-websettings.c:895 msgid "Identify as" msgstr "تعرف كـ" -#: ../midori/midori-websettings.c:1016 +#: ../midori/midori-websettings.c:896 msgid "What to identify as to web pages" msgstr "كماذا تريد تعريف نفسك لصفحات الوب" -#: ../midori/midori-websettings.c:1032 +#: ../midori/midori-websettings.c:912 msgid "Identification string" msgstr "تعريف الجملة" -#: ../midori/midori-websettings.c:1033 +#: ../midori/midori-websettings.c:913 msgid "The application identification string" msgstr "تطبيق تعريف الجمل" -#: ../midori/midori-websettings.c:1049 +#: ../midori/midori-websettings.c:929 msgid "Preferred languages" msgstr "اللغات المفضلة" -#: ../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 "" -"نقطة للفصل بين قائمة من اللغات المفضلة لجعل صفحات الوب متعددة اللغات, كمثال " -"\"ar\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" +#: ../midori/midori-websettings.c:930 +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:1065 +#: ../midori/midori-websettings.c:945 msgid "Clear private data" msgstr "مسح البيانات الخاصة" -#: ../midori/midori-websettings.c:1066 +#: ../midori/midori-websettings.c:946 msgid "The private data selected for deletion" msgstr "البيانات الخاصة المحددة للحذف" -#: ../midori/midori-websettings.c:1081 +#: ../midori/midori-websettings.c:961 msgid "Clear data" msgstr "مسح البيانات" -#: ../midori/midori-websettings.c:1082 +#: ../midori/midori-websettings.c:962 msgid "The data selected for deletion" msgstr "بيانات محددة للحذف" #. i18n: Reworded: Shorten details propagated when going to another page -#: ../midori/midori-websettings.c:1131 +#: ../midori/midori-websettings.c:995 msgid "Strip referrer details sent to websites" msgstr "شريط المرجعية أرسل التفاصيل إلى مواقع ويب" #. i18n: Referer here is not a typo but a technical term -#: ../midori/midori-websettings.c:1133 +#: ../midori/midori-websettings.c:997 msgid "Whether the \"Referer\" header should be shortened to the hostname" -msgstr "ما إذا كان ينبغي تقصير مسار \"إنعاش\" إلى اسم المضيف" - -#: ../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 "استبدل خطوط المواقع بخطوط تفضيلات المستخدم" +msgstr "" -#: ../midori/midori-view.c:1375 +#: ../midori/midori-view.c:1351 #, c-format msgid "%s wants to save an HTML5 database." msgstr "%s تريد حفظ قاعدة بيانات HTML5." -#: ../midori/midori-view.c:1379 ../midori/midori-view.c:1413 +#: ../midori/midori-view.c:1355 ../midori/midori-view.c:1384 msgid "_Deny" -msgstr "_رفض" +msgstr "رفض" -#: ../midori/midori-view.c:1379 ../midori/midori-view.c:1413 +#: ../midori/midori-view.c:1355 ../midori/midori-view.c:1384 msgid "_Allow" -msgstr "_سماح" +msgstr "سماح" -#: ../midori/midori-view.c:1408 +#: ../midori/midori-view.c:1380 #, c-format msgid "%s wants to know your location." msgstr "%s يريد أن يعرف مكانك." -#: ../midori/midori-view.c:1502 +#: ../midori/midori-view.c:1478 #, c-format msgid "Error - %s" msgstr "خطأ - %s" -#: ../midori/midori-view.c:1503 +#: ../midori/midori-view.c:1479 #, c-format msgid "The page '%s' couldn't be loaded." -msgstr "هذه الصفحة '%s' لا يمكن تحميلها." +msgstr "هذه الصفحة '%s' لا يمكن تحميلها" -#: ../midori/midori-view.c:1505 +#: ../midori/midori-view.c:1481 msgid "Try again" msgstr "حاول مجددا" -#: ../midori/midori-view.c:1703 ../midori/midori-view.c:2625 +#: ../midori/midori-view.c:1640 ../midori/midori-view.c:2475 #, c-format msgid "Send a message to %s" msgstr "ارسال رسالة إلى %s" -#: ../midori/midori-view.c:2455 ../midori/midori-view.c:2781 +#: ../midori/midori-view.c:2314 ../midori/midori-view.c:2628 msgid "Inspect _Element" msgstr "تفقد عنصر" -#: ../midori/midori-view.c:2507 +#: ../midori/midori-view.c:2364 msgid "Open Link in New _Tab" msgstr "فتح وصلة جديدة في لسان جديد" -#: ../midori/midori-view.c:2511 +#: ../midori/midori-view.c:2368 msgid "Open Link in _Foreground Tab" msgstr "فتح الرابط في لسان للأمام" -#: ../midori/midori-view.c:2512 +#: ../midori/midori-view.c:2369 msgid "Open Link in _Background Tab" msgstr "فتح الرابط في لسان في الخلف" -#: ../midori/midori-view.c:2515 +#: ../midori/midori-view.c:2372 msgid "Open Link in New _Window" msgstr "فتح الرابط في نافذة جديدة" -#: ../midori/midori-view.c:2518 +#: ../midori/midori-view.c:2375 msgid "Open Link as Web A_pplication" msgstr "فتح الرابط كتطبيق" -#: ../midori/midori-view.c:2523 +#: ../midori/midori-view.c:2378 msgid "Copy Link de_stination" msgstr "انسخ وجهة الرابط" -#: ../midori/midori-view.c:2539 +#: ../midori/midori-view.c:2390 msgid "Open _Image in New Tab" msgstr "فتح الصورة في لسان جديد" -#: ../midori/midori-view.c:2542 +#: ../midori/midori-view.c:2393 msgid "Copy Image _Address" msgstr "نسخ عنوان الصورة" -#: ../midori/midori-view.c:2545 +#: ../midori/midori-view.c:2396 msgid "Save I_mage" msgstr "حفظ الصورة" -#: ../midori/midori-view.c:2548 -msgid "Open in Image _Viewer" -msgstr "افتح في عارض الصور" - -#: ../midori/midori-view.c:2555 +#: ../midori/midori-view.c:2403 msgid "Copy Video _Address" msgstr "نسخ عنوان الفيديو" -#: ../midori/midori-view.c:2558 +#: ../midori/midori-view.c:2406 msgid "Save _Video" msgstr "حفظ الفيديو" -#: ../midori/midori-view.c:2558 +#: ../midori/midori-view.c:2406 msgid "Download _Video" msgstr "تحميل الفيديو" -#: ../midori/midori-view.c:2584 +#: ../midori/midori-view.c:2432 msgid "Search _with" msgstr "بحث باستخدام" -#: ../midori/midori-view.c:2616 +#: ../midori/midori-view.c:2466 msgid "_Search the Web" -msgstr "_بحث في الانترنت" +msgstr "بحث في الانترنت" -#: ../midori/midori-view.c:2633 +#: ../midori/midori-view.c:2483 msgid "Open Address in New _Tab" msgstr "فتح العنوان في لسان جديد" -#: ../midori/midori-view.c:2686 -msgid "Open _Frame in New Tab" -msgstr "فتح في لسان جديد" - -#: ../midori/midori-view.c:2943 +#: ../midori/midori-view.c:2767 msgid "Open or download file" msgstr "فتح أو تحميل الملف" -#: ../midori/midori-view.c:2964 -#, c-format -msgid "File Name: %s" -msgstr "اسم الملف: %s" - -#: ../midori/midori-view.c:2969 +#: ../midori/midori-view.c:2786 #, c-format msgid "File Type: '%s'" msgstr "نوع الملف: '%s'" -#: ../midori/midori-view.c:2971 +#: ../midori/midori-view.c:2788 #, c-format msgid "File Type: %s ('%s')" msgstr "نوع الملف: %s ('%s')" -#: ../midori/midori-view.c:3000 -#, c-format -msgid "Size: %s" -msgstr "الحجم: %s" +#: ../midori/midori-view.c:2799 +msgid "MD5-Checksum:" +msgstr "MD5-Checksum:" + +#: ../midori/midori-view.c:2806 +msgid "SHA1-Checksum:" +msgstr "SHA1-Checksum:" -#: ../midori/midori-view.c:3012 +#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" +#: ../midori/midori-view.c:2816 #, c-format msgid "Open %s" msgstr "فتح %s" -#: ../midori/midori-view.c:3635 +#: ../midori/midori-view.c:3397 #, c-format msgid "Inspect page - %s" msgstr "فحص الصفحة - %s" -#: ../midori/midori-view.c:3982 +#: ../midori/midori-view.c:3688 msgid "Speed Dial" msgstr "حوار السريع" -#: ../midori/midori-view.c:3983 ../midori/midori-view.c:4079 +#: ../midori/midori-view.c:3689 msgid "Click to add a shortcut" msgstr "انقر لإضافة اختصار" -#: ../midori/midori-view.c:3984 +#: ../midori/midori-view.c:3690 msgid "Enter shortcut address" msgstr "أدخل عنوان الاختصار" -#: ../midori/midori-view.c:3985 +#: ../midori/midori-view.c:3691 msgid "Enter shortcut title" msgstr "أدخل وسم للاختصار" -#: ../midori/midori-view.c:3986 +#: ../midori/midori-view.c:3692 msgid "Are you sure you want to delete this shortcut?" msgstr "هل أنت متأكد أنك تريد حذف هذا الاختصار؟" -#: ../midori/midori-view.c:4148 -#, c-format -msgid "No documentation installed" -msgstr "لا توجد وثائق مثبتة" - -#: ../midori/midori-view.c:4224 -msgid "Midori doesn't store any personal data:" -msgstr "لا يخزن ميدوري أي بيانات شخصية:" +#: ../midori/midori-view.c:3693 +msgid "Set number of columns and rows" +msgstr "تعيين عدد الأعمدة والصفوف" -#: ../midori/midori-view.c:4225 -msgid "No history or web cookies are being saved." -msgstr "لم يتم حفظ التاريخ أو كعكات الويب." +#: ../midori/midori-view.c:3694 +msgid "Enter number of columns and rows:" +msgstr "أدخل عدد الأعمدة والصفوف :" -#: ../midori/midori-view.c:4226 -msgid "Extensions are disabled." -msgstr "تعطيل الملحقات." +#: ../midori/midori-view.c:3695 +msgid "Invalid input for the size of the speed dial" +msgstr "المدخلات غير صالحة للطلب السريع" -#: ../midori/midori-view.c:4227 -msgid "HTML5 storage, local database and application caches are disabled." -msgstr "يتم تعطيل تخزين HTML5، قاعدة البيانات المحلية ومخابئ التطبيق." +#: ../midori/midori-view.c:3696 +msgid "Thumb size:" +msgstr "حجم المصغرات:" -#: ../midori/midori-view.c:4228 -msgid "Midori prevents websites from tracking the user:" -msgstr "ميدوري يمنع المواقع من تعقب المستخدم:" +#: ../midori/midori-view.c:3697 +msgid "Small" +msgstr "صغير" -#: ../midori/midori-view.c:4229 -msgid "Referrer URLs are stripped down to the hostname." -msgstr "تجريد إحالات URLs إلى اسم المضيف." +#: ../midori/midori-view.c:3698 +msgid "Medium" +msgstr "متوسط" -#: ../midori/midori-view.c:4230 -msgid "DNS prefetching is disabled." -msgstr "تعطيل الجلب المسبق DNS." +#: ../midori/midori-view.c:3699 +msgid "Big" +msgstr "كبير" -#: ../midori/midori-view.c:4231 -msgid "The language and timezone are not revealed to websites." -msgstr "اللغة والمنطقة الزمنية لا يكشف عنها لمواقع ويب." - -#: ../midori/midori-view.c:4232 -msgid "Flash and other Netscape plugins cannot be listed by websites." -msgstr "فلاش وغيرها من الإضافات Netscape لا يمكن سردهابمواقع ويب." +#: ../midori/midori-view.c:3890 +#, c-format +msgid "No documentation installed" +msgstr "لا توجد وثائق مثبتة" -#: ../midori/midori-view.c:4302 +#: ../midori/midori-view.c:3960 msgid "Version numbers in brackets show the version used at runtime." msgstr "أرقام إصدار في أقواس تظهر النسخة المستخدمة في التشغيل." -#: ../midori/midori-view.c:4352 +#: ../midori/midori-view.c:4009 msgid "Page loading delayed" msgstr "تأخير تحميل الصفحة" -#: ../midori/midori-view.c:4353 +#: ../midori/midori-view.c:4010 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "تأخر التحميل إما بسبب انهيار أو تفضيلات بدء التشغيل." -#: ../midori/midori-view.c:4354 +#: ../midori/midori-view.c:4011 msgid "Load Page" msgstr "تحميل الصفحة" -#: ../midori/midori-view.c:4520 +#: ../midori/midori-view.c:4154 msgid "Blank page" msgstr "صفحة فارغة" -#: ../midori/midori-view.c:4782 +#: ../midori/midori-view.c:4394 msgid "_Duplicate Tab" -msgstr "_ضاعف اللسان" +msgstr "ضاعف اللسان" -#: ../midori/midori-view.c:4787 +#: ../midori/midori-view.c:4399 msgid "Show Tab _Label" msgstr "عرض عنوان اللسان" -#: ../midori/midori-view.c:4787 +#: ../midori/midori-view.c:4399 msgid "Show Tab _Icon Only" msgstr "عرض أيقونة اللسان فقط" -#: ../midori/midori-view.c:4793 +#: ../midori/midori-view.c:4405 msgid "Close ot_her Tabs" msgstr "غلق ألألسنه الأخري" -#. i18n: word stem of "previous page" type links, case is not important -#: ../midori/midori-view.c:5606 -msgid "previous" -msgstr "السّابق" - -#. i18n: word stem of "next page" type links, case is not important -#: ../midori/midori-view.c:5625 -msgid "next" -msgstr "التّالي" - -#: ../midori/midori-view.c:5638 +#: ../midori/midori-view.c:5022 msgid "Print background images" msgstr "طباعة صورة الخلفية" -#: ../midori/midori-view.c:5639 +#: ../midori/midori-view.c:5023 msgid "Whether background images should be printed" msgstr "ما إذا كان ينبغي طباعة صور الخلفية" -#: ../midori/midori-view.c:5671 +#: ../midori/midori-view.c:5055 msgid "Features" msgstr "الميزّات" -#: ../midori/midori-preferences.c:297 +#: ../midori/midori-preferences.c:301 msgid "Startup" msgstr "بدء التشغيل" -#: ../midori/midori-preferences.c:310 +#: ../midori/midori-preferences.c:314 msgid "Use _current page" msgstr "استخدام الصفحة الحالية" -#: ../midori/midori-preferences.c:314 +#: ../midori/midori-preferences.c:318 msgid "Use current page as homepage" msgstr "استخدام الصفحة الحالية كصفحة بداية" #. Page "Appearance" -#: ../midori/midori-preferences.c:323 +#: ../midori/midori-preferences.c:327 msgid "Fonts" msgstr "الخطوط" -#: ../midori/midori-preferences.c:326 +#: ../midori/midori-preferences.c:330 msgid "Proportional Font Family" msgstr "مجموعة خطوط متناسبة" -#: ../midori/midori-preferences.c:330 +#: ../midori/midori-preferences.c:334 msgid "The default font family used to display text" msgstr "استخدم مجموعة الخط الافتراضي لعرض النص" -#: ../midori/midori-preferences.c:333 +#: ../midori/midori-preferences.c:337 msgid "The default font size used to display text" msgstr "حجم الخط الافتراضي المستخدم لعرض النص" -#: ../midori/midori-preferences.c:335 +#: ../midori/midori-preferences.c:339 msgid "Fixed-width Font Family" msgstr "عرض مجموعة خط ثابتة" -#: ../midori/midori-preferences.c:339 +#: ../midori/midori-preferences.c:343 msgid "The font family used to display fixed-width text" msgstr "مجموعة الخطوط المستخدمة لعرض النص ثابت العرض" -#: ../midori/midori-preferences.c:342 +#: ../midori/midori-preferences.c:346 msgid "The font size used to display fixed-width text" msgstr "حجم الخط المستخدم لعرض النص ثابت العرض" -#: ../midori/midori-preferences.c:344 +#: ../midori/midori-preferences.c:348 msgid "Minimum Font Size" msgstr "حجم الخط الأدنى" -#: ../midori/midori-preferences.c:348 +#: ../midori/midori-preferences.c:352 msgid "The minimum font size used to display text" msgstr "حجم الخط الأدنى المستخدم لعرض النص" #. Page "Behavior" -#: ../midori/midori-preferences.c:359 +#: ../midori/midori-preferences.c:361 msgid "Behavior" msgstr "السلوك" -#: ../midori/midori-preferences.c:385 +#: ../midori/midori-preferences.c:387 msgid "Allow scripts to open popups" -msgstr "السماح للنصول البرمجية بفتح النوافذ المنبثقة" +msgstr "السماح البرامج النصية لفتح النوافذ المنبثقة" -#: ../midori/midori-preferences.c:386 +#: ../midori/midori-preferences.c:388 msgid "Whether scripts are allowed to open popup windows automatically" -msgstr "حتى لو كان مسموحا للنصوص البرمجية لفتح النوافذ المنبثقة تلقائيا" +msgstr "حتى لو كان مسموحا للبرامج النصية لفتح النوافذ المنبثقة تلقائيا" #. Page "Interface" -#: ../midori/midori-preferences.c:416 +#: ../midori/midori-preferences.c:409 msgid "Browsing" -msgstr "تصفح" +msgstr "تصفح " #. Page "Network" -#: ../midori/midori-preferences.c:456 +#: ../midori/midori-preferences.c:447 msgid "Network" msgstr "شبكة" -#: ../midori/midori-preferences.c:463 +#: ../midori/midori-preferences.c:454 msgid "Hostname" msgstr "اسم الجهاز" -#: ../midori/midori-preferences.c:487 +#: ../midori/midori-preferences.c:470 msgid "MB" msgstr "MB" -#: ../midori/midori-searchaction.c:902 +#: ../midori/midori-searchaction.c:908 msgid "Add search engine" msgstr "أضف أداة البحث" -#: ../midori/midori-searchaction.c:902 +#: ../midori/midori-searchaction.c:908 msgid "Edit search engine" msgstr "حرر أداة البحث" -#: ../midori/midori-searchaction.c:931 +#: ../midori/midori-searchaction.c:937 msgid "_Name:" msgstr "_الإسم:" -#: ../midori/midori-searchaction.c:947 +#: ../midori/midori-searchaction.c:953 msgid "_Description:" msgstr "_وصف:" -#: ../midori/midori-searchaction.c:981 +#: ../midori/midori-searchaction.c:986 msgid "_Icon:" msgstr "_ايقونة:" -#: ../midori/midori-searchaction.c:995 +#: ../midori/midori-searchaction.c:1000 msgid "_Token:" msgstr "_علامة:" -#: ../midori/midori-searchaction.c:1295 +#: ../midori/midori-searchaction.c:1300 msgid "Manage Search Engines" msgstr "إدارة أدوات البحث" -#: ../midori/midori-searchaction.c:1395 +#: ../midori/midori-searchaction.c:1400 msgid "Use as _default" msgstr "إستعمل _كإفتراضي" -#: ../midori/sokoke.c:354 +#: ../midori/sokoke.c:452 msgid "Open with" msgstr "إفتح بـ" -#: ../midori/sokoke.c:362 +#: ../midori/sokoke.c:460 #, c-format msgid "Choose an application or command to open \"%s\":" msgstr "إختر تطبيقا أو أمرا لفتح \"%s\":" -#: ../midori/sokoke.c:403 ../midori/sokoke.c:413 ../midori/sokoke.c:441 -#: ../midori/sokoke.c:470 ../midori/sokoke.c:484 +#: ../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/sokoke.c:1595 +#: ../midori/sokoke.c:1511 +msgid "_Bookmark" +msgstr "_علامة" + +#: ../midori/sokoke.c:1513 +msgid "Add Boo_kmark" +msgstr "أضِف _علامة" + +#: ../midori/sokoke.c:1514 +msgid "_Console" +msgstr "_طرفية" + +#: ../midori/sokoke.c:1515 +msgid "_Extensions" +msgstr "إمتدا_دات" + +#: ../midori/sokoke.c:1517 +msgid "_Homepage" +msgstr "الصف_حة الرئيسية" + +#: ../midori/sokoke.c:1518 +msgid "_Userscripts" +msgstr "البرامج النصية للم_ستعمل" + +#: ../midori/sokoke.c:1519 +msgid "New _Tab" +msgstr "تب_ويب جديد" + +#: ../midori/sokoke.c:1520 +msgid "_Transfers" +msgstr "الن_قل" + +#: ../midori/sokoke.c:1521 +msgid "Netscape p_lugins" +msgstr "Netscape _ملحقات" + +#: ../midori/sokoke.c:1524 +msgid "New _Folder" +msgstr "مج_لد جديد" + +#: ../midori/sokoke.c:2210 #, c-format msgid "%d hour" msgid_plural "%d hours" @@ -2021,10 +2093,8 @@ msgstr[0] "%d ساعة" msgstr[1] "%d ساعة" msgstr[2] "%d ساعات" msgstr[3] "%d ساعات" -msgstr[4] "%d ساعات" -msgstr[5] "%d ساعات" -#: ../midori/sokoke.c:1596 +#: ../midori/sokoke.c:2211 #, c-format msgid "%d minute" msgid_plural "%d minutes" @@ -2032,10 +2102,8 @@ msgstr[0] "%d دقيقة" msgstr[1] "%d دقيقة" msgstr[2] "%d دقيقتان" msgstr[3] "%d دقائق" -msgstr[4] "%d دقائق" -msgstr[5] "%d دقائق" -#: ../midori/sokoke.c:1597 +#: ../midori/sokoke.c:2212 #, c-format msgid "%d second" msgid_plural "%d seconds" @@ -2043,322 +2111,303 @@ 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:1605 ../panels/midori-transfers.c:268 +#: ../midori/sokoke.c:2220 ../panels/midori-transfers.c:268 #, c-format msgid "%s of %s" msgstr "%s لـ %s" #. i18n: Unknown number of bytes, used for transfer rate like ?B/s -#: ../midori/sokoke.c:1614 +#: ../midori/sokoke.c:2229 msgid "?B" msgstr "?B" #. i18n: Download tooltip (transfer rate): (130KB/s) -#: ../midori/sokoke.c:1617 +#: ../midori/sokoke.c:2232 #, c-format msgid " (%s/s)" msgstr " (%s/s)" #. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning -#: ../midori/sokoke.c:1634 +#: ../midori/sokoke.c:2249 #, c-format msgid " - %s remaining" msgstr " - %s متبقي" #. i18n: A panel at the bottom, to search text in pages -#: ../toolbars/midori-findbar.c:291 +#: ../toolbars/midori-findbar.c:230 msgid "_Inline Find:" msgstr "_بحث مضمن:" -#: ../toolbars/midori-findbar.c:317 +#: ../toolbars/midori-findbar.c:264 msgid "Previous" msgstr "السّابق" -#: ../toolbars/midori-findbar.c:323 +#: ../toolbars/midori-findbar.c:270 msgid "Next" msgstr "التّالي" -#: ../toolbars/midori-findbar.c:327 +#: ../toolbars/midori-findbar.c:274 msgid "Match Case" msgstr "حالة تطابق" -#: ../toolbars/midori-findbar.c:336 +#: ../toolbars/midori-findbar.c:283 msgid "Highlight Matches" msgstr "ميّز المتشابهات" -#: ../toolbars/midori-findbar.c:347 +#: ../toolbars/midori-findbar.c:294 msgid "Close Findbar" msgstr "إغلاق شريط المكتشف" -#: ../toolbars/midori-transferbar.c:122 +#: ../toolbars/midori-transferbar.c:129 #, c-format msgid "The file '%s' has been downloaded." msgstr "الملف '%s' تم تحميله." -#: ../toolbars/midori-transferbar.c:125 +#: ../toolbars/midori-transferbar.c:132 msgid "Transfer completed" msgstr "إنتهاء النقل" -#: ../toolbars/midori-transferbar.c:193 +#: ../toolbars/midori-transferbar.c:214 msgid "The downloaded file is erroneous." -msgstr "الملف المحمل خاطئ." +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:215 +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 +#: ../toolbars/midori-transferbar.c:323 ../panels/midori-transfers.c:142 msgid "Clear All" msgstr "محو الكل" -#: ../toolbars/midori-transferbar.c:371 ../toolbars/midori-transferbar.c:373 +#: ../toolbars/midori-transferbar.c:360 ../toolbars/midori-transferbar.c:362 msgid "Some files are being downloaded" msgstr "يتم تحميل بعض الملفات" -#: ../toolbars/midori-transferbar.c:377 +#: ../toolbars/midori-transferbar.c:366 msgid "_Quit Midori" msgstr "_خروج من ميدوري" -#: ../toolbars/midori-transferbar.c:379 +#: ../toolbars/midori-transferbar.c:368 msgid "The transfers will be cancelled if Midori quits." msgstr "سيتم إلغاء النقل اذا تم إنها ميدوري." -#: ../panels/midori-bookmarks.c:114 +#: ../panels/midori-bookmarks.c:116 msgid "Bookmarks" msgstr "العلامات" -#: ../panels/midori-bookmarks.c:257 +#: ../panels/midori-bookmarks.c:294 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "فشل إضافة العلامة: %s\n" -#: ../panels/midori-bookmarks.c:435 +#: ../panels/midori-bookmarks.c:474 msgid "Edit the selected bookmark" msgstr "حرر العلامة المحددة" -#: ../panels/midori-bookmarks.c:443 +#: ../panels/midori-bookmarks.c:482 msgid "Delete the selected bookmark" msgstr "حذف العلامة المحددة" -#: ../panels/midori-bookmarks.c:458 +#: ../panels/midori-bookmarks.c:497 msgid "Add a new folder" msgstr "أضف مجلد جديد" -#: ../panels/midori-bookmarks.c:594 ../panels/midori-history.c:635 +#: ../panels/midori-bookmarks.c:631 ../panels/midori-history.c:583 msgid "Separator" msgstr "فاصل" -#: ../panels/midori-history.c:111 +#: ../panels/midori-history.c:114 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:146 +msgid "A week ago" +msgstr "قبل أسبوع" -#: ../panels/midori-history.c:162 ../panels/midori-history.c:186 +#: ../panels/midori-history.c:148 #, 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:165 ../panels/midori-history.c:184 -msgid "A week ago" -msgstr "قبل أسبوع" +msgstr[0] "منذ %d ستة" +msgstr[1] "منذ سنة %d" +msgstr[2] "منذ %d سنوات" +msgstr[3] "منذ %d ستوات" -#: ../panels/midori-history.c:232 -#, c-format -msgid "Failed to remove history item: %s\n" -msgstr "فشل حذف عنصر السجل: %s\n" +#: ../panels/midori-history.c:151 +msgid "Today" +msgstr "اليوم" + +#: ../panels/midori-history.c:153 +msgid "Yesterday" +msgstr "البارحة" -#: ../panels/midori-history.c:360 +#: ../panels/midori-history.c:321 msgid "Are you sure you want to remove all history items?" -msgstr "هل تريد حذف كل عناصر التاريخ؟" +msgstr "هل تريد حذف كل عناصر التاريخ " -#: ../panels/midori-history.c:407 +#: ../panels/midori-history.c:367 msgid "Bookmark the selected history item" msgstr "علم التاريخ المحدد" -#: ../panels/midori-history.c:416 +#: ../panels/midori-history.c:376 msgid "Delete the selected history item" -msgstr "حذف كل عناصر التاريخ" +msgstr "حذف كل عناصر التاريخ " -#: ../panels/midori-history.c:424 +#: ../panels/midori-history.c:384 msgid "Clear the entire history" msgstr "مسح تاريخ الدخول" -#: ../panels/midori-transfers.c:86 +#: ../panels/midori-transfers.c:87 msgid "Transfers" msgstr "النقل" -#: ../panels/midori-transfers.c:469 +#: ../panels/midori-transfers.c:468 msgid "Open Destination _Folder" msgstr "افتح الدليل الوجهة" -#: ../panels/midori-transfers.c:472 +#: ../panels/midori-transfers.c:471 msgid "Copy Link Loc_ation" msgstr "انسخ موقع الرابط" -#: ../katze/katze-http-auth.c:210 +#: ../katze/katze-http-auth.c:213 msgid "Authentication Required" msgstr "مطلوب المصادقة" -#: ../katze/katze-http-auth.c:226 +#: ../katze/katze-http-auth.c:229 msgid "" "A username and a password are required\n" "to open this location:" -msgstr "" -"مطلوب اسم مستخدم وكلمة \n" -"مرور لفتح هذا الموقع:" +msgstr "ادخل اسم المستخدم وكلمة مرور \\ لفتح هذا الموقع :" -#: ../katze/katze-http-auth.c:240 +#: ../katze/katze-http-auth.c:243 msgid "Username" msgstr "إسم المستخدم" -#: ../katze/katze-http-auth.c:253 +#: ../katze/katze-http-auth.c:256 msgid "Password" -msgstr "كلمة المرور" +msgstr "كلمة السر:" -#: ../katze/katze-http-auth.c:267 +#: ../katze/katze-http-auth.c:270 msgid "_Remember password" -msgstr "_تذكّر كلمة السرّ" +msgstr "تذكّر كلمة السرّ" -#: ../katze/katze-throbber.c:949 +#: ../katze/katze-throbber.c:879 #, c-format msgid "Named icon '%s' couldn't be loaded" msgstr "الأيقونة المحددة '%s' لا يمكن تحميلها" -#: ../katze/katze-throbber.c:962 +#: ../katze/katze-throbber.c:892 #, c-format msgid "Stock icon '%s' couldn't be loaded" -msgstr "الرمز المخزن '%s' لا يمكن تحميله" +msgstr "الرمز المخزن '%s' لا يمكن أن يتم تحميله" -#: ../katze/katze-throbber.c:1042 +#: ../katze/katze-throbber.c:964 msgid "Animation frames are broken" msgstr "تعطل إطارات الصور المتحركة" -#: ../katze/katze-utils.c:445 ../katze/katze-utils.c:879 +#: ../katze/katze-utils.c:536 ../katze/katze-utils.c:971 #, c-format msgid "Property '%s' is invalid for %s" msgstr "خصائص '%s' غير صالحة لـ %s" -#: ../katze/katze-utils.c:491 ../katze/katze-utils.c:520 +#: ../katze/katze-utils.c:582 ../katze/katze-utils.c:611 #: ../extensions/addons.c:308 msgid "Choose file" msgstr "إختر ملف" -#: ../katze/katze-utils.c:506 +#: ../katze/katze-utils.c:597 msgid "Choose folder" msgstr "إختر مجلد" -#: ../katze/katze-utils.c:610 +#: ../katze/katze-utils.c:701 msgid "None" msgstr "لا شيء" -#: ../katze/katze-utils.c:725 +#: ../katze/katze-utils.c:819 msgid "1 hour" msgstr "1 ساعة" -#: ../katze/katze-utils.c:726 +#: ../katze/katze-utils.c:820 msgid "1 day" msgstr "1 يوم" -#: ../katze/katze-utils.c:727 +#: ../katze/katze-utils.c:821 msgid "1 week" msgstr "1 أسبوع" -#: ../katze/katze-utils.c:728 +#: ../katze/katze-utils.c:822 msgid "1 month" msgstr "1 شهر" -#: ../katze/katze-utils.c:729 +#: ../katze/katze-utils.c:823 msgid "1 year" msgstr "1 سنة" -#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235 +#: ../katze/katze-preferences.c:95 ../extensions/history-list.vala:228 #, c-format msgid "Preferences for %s" msgstr "تفضيلات ل %s" -#: ../extensions/adblock.c:473 +#: ../extensions/adblock.c:422 msgid "Configure Advertisement filters" msgstr "تكوين فلتر الإعلانات" -#: ../extensions/adblock.c:504 +#: ../extensions/adblock.c:454 #, 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:882 +#: ../extensions/adblock.c:817 msgid "Edit rule" msgstr "تحرير قاعد" -#: ../extensions/adblock.c:896 +#: ../extensions/adblock.c:830 msgid "_Rule:" msgstr "_قاعدة:" -#: ../extensions/adblock.c:950 +#: ../extensions/adblock.c:884 msgid "Bl_ock image" msgstr "منع الصور" -#: ../extensions/adblock.c:955 +#: ../extensions/adblock.c:889 msgid "Bl_ock link" msgstr "منع الروابط" -#: ../extensions/adblock.c:1670 +#: ../extensions/adblock.c:1457 msgid "Advertisement blocker" msgstr "منع الإعلانات" -#: ../extensions/adblock.c:1671 +#: ../extensions/adblock.c:1458 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 +#: ../extensions/addons.c:218 msgid "This page appears to contain a user script. Do you wish to install it?" -msgstr "يبدو أن هذه الصفحة تحتوي على نصوص برمجية للمستخدم. هل ترغب في تثبيته؟" +msgstr "يبدو أن هذه الصفحة تحتوي على برنامج نصي للمستخدم. هل ترغب في تثبيته؟" -#: ../extensions/addons.c:222 +#: ../extensions/addons.c:219 msgid "_Install user script" -msgstr "_تثبيت النصوص البرمجية" +msgstr "تثبيتبرنامج المستخدم النصي" #. i18n: An infobar shows up when viewing a style on userstyles.org -#: ../extensions/addons.c:227 +#: ../extensions/addons.c:224 msgid "This page appears to contain a user style. Do you wish to install it?" msgstr "هذه الصفحة تحتوي على نمط المستخدم. هل ترغب في تثبيته؟" -#: ../extensions/addons.c:228 +#: ../extensions/addons.c:225 msgid "_Install user style" -msgstr "_تثبيت نمط المستخدم" +msgstr "تثبيت نمط المستخدم" -#: ../extensions/addons.c:236 +#: ../extensions/addons.c:233 msgid "Don't install" msgstr "لا تقم بتثبيت" #: ../extensions/addons.c:319 ../extensions/addons.c:681 msgid "Userscripts" -msgstr "النصوص البرمجية للمستعمل" +msgstr "البرامج النصية للمستعمل" #: ../extensions/addons.c:324 ../extensions/addons.c:683 msgid "Userstyles" @@ -2372,11 +2421,11 @@ msgstr "خطأ" #: ../extensions/addons.c:421 #, c-format msgid "Do you want to delete '%s'?" -msgstr "هل تريد حذف '%s'؟" +msgstr "هل تريد حذف '%s'?" #: ../extensions/addons.c:427 msgid "Delete user script" -msgstr "حذف النصوص البرمجية المستخدمة" +msgstr "حذف نص المستخدم" #: ../extensions/addons.c:428 msgid "Delete user style" @@ -2385,7 +2434,7 @@ msgstr "حذف نمط المستخدم" #: ../extensions/addons.c:431 #, c-format msgid "The file %s will be permanently deleted." -msgstr "الملف %s سيحذف بشكل نهائي." +msgstr "الملف %s سيحذف بشكل نهائي" #: ../extensions/addons.c:570 ../extensions/addons.c:647 msgid "Open in Text Editor" @@ -2403,18 +2452,18 @@ msgstr "إضافة ملحق جديد" msgid "Remove selected addon" msgstr "إزالة الملحقات المختارة" -#: ../extensions/addons.c:1696 ../extensions/addons.c:1914 +#: ../extensions/addons.c:1643 ../extensions/addons.c:1805 msgid "User addons" msgstr "إضافات المستخدم" -#: ../extensions/addons.c:1826 +#: ../extensions/addons.c:1764 #, c-format msgid "Can't monitor folder '%s': %s" msgstr "لا تستطيع مراقبة المجلد '%s': %s" -#: ../extensions/addons.c:1915 +#: ../extensions/addons.c:1806 msgid "Support for userscripts and userstyles" -msgstr "دعم النصوص البرمجية وأنماط المستخدم" +msgstr "دعم البرامج النصية وأنماط المستخدم" #: ../extensions/colorful-tabs.c:201 msgid "Colorful Tabs" @@ -2424,48 +2473,44 @@ msgstr "الألسنة الملونة" msgid "Tint each tab distinctly" msgstr "لون كل علامة تبويب" -#: ../extensions/cookie-manager/cookie-manager-page.c:73 +#: ../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:103 +#: ../extensions/cookie-manager/cookie-manager-page.c:112 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: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:120 +#: ../extensions/cookie-manager/cookie-manager-page.c:129 msgid "Expand All" msgstr "توسيع الكل" -#: ../extensions/cookie-manager/cookie-manager-page.c:127 +#: ../extensions/cookie-manager/cookie-manager-page.c:136 msgid "Collapse All" msgstr "طوي الكل" -#: ../extensions/cookie-manager/cookie-manager-page.c:572 +#: ../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:574 +#: ../extensions/cookie-manager/cookie-manager-page.c:580 msgid "Question" msgstr "سؤال" -#: ../extensions/cookie-manager/cookie-manager-page.c:583 +#: ../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:671 +#: ../extensions/cookie-manager/cookie-manager-page.c:677 msgid "At the end of the session" msgstr "في نهاية الدورة" -#: ../extensions/cookie-manager/cookie-manager-page.c:674 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 #, c-format msgid "" "Host: %s\n" @@ -2482,15 +2527,15 @@ msgstr "" "الأمان: %s\n" "الإنتهاء: %s" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:686 msgid "Yes" msgstr "نعم" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:686 msgid "No" msgstr "لا" -#: ../extensions/cookie-manager/cookie-manager-page.c:694 +#: ../extensions/cookie-manager/cookie-manager-page.c:700 #, c-format msgid "" "Domain: %s\n" @@ -2499,41 +2544,39 @@ msgstr "" "نطاق: %s\n" "كوكيز: %d" -#: ../extensions/cookie-manager/cookie-manager-page.c:1024 +#: ../extensions/cookie-manager/cookie-manager-page.c:1030 msgid "Name" msgstr "إسم" -#: ../extensions/cookie-manager/cookie-manager-page.c:1077 +#: ../extensions/cookie-manager/cookie-manager-page.c:1083 msgid "_Expand All" -msgstr "_توسيع الكل" +msgstr "ت_وسيع الكل" -#: ../extensions/cookie-manager/cookie-manager-page.c:1085 +#: ../extensions/cookie-manager/cookie-manager-page.c:1091 msgid "_Collapse All" msgstr "_طوي الكل" -#: ../extensions/cookie-manager/cookie-manager-page.c:1139 +#: ../extensions/cookie-manager/cookie-manager-page.c:1144 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/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:36 msgid "List, view and delete cookies" msgstr "القائمة ، عرض وحذف الكوكيز" -#: ../extensions/copy-tabs.c:38 +#: ../extensions/copy-tabs.c:39 msgid "Copy Tab _Addresses" msgstr "نسخ عناواين التبويب" -#: ../extensions/copy-tabs.c:95 +#: ../extensions/copy-tabs.c:96 msgid "Copy Addresses of Tabs" -msgstr "نسخة من عناوين علامات الجدولة" +msgstr " نسخة من عناوين علامات الجدولة" -#: ../extensions/copy-tabs.c:96 +#: ../extensions/copy-tabs.c:97 msgid "Copy the addresses of all tabs to the clipboard" msgstr "نسخ عناوين كافة علامات التبويب إلى الحافظة" @@ -2546,27 +2589,27 @@ 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 +#: ../extensions/feed-panel/feed-panel.c:392 #, c-format msgctxt "Feed" msgid "Last updated: %s." msgstr "آخر التحديثات: %s." -#: ../extensions/feed-panel/feed-panel.c:653 +#: ../extensions/feed-panel/feed-panel.c:658 msgid "Feeds" msgstr "تغذيات" -#: ../extensions/feed-panel/feed-panel.c:706 +#: ../extensions/feed-panel/feed-panel.c:711 msgid "Add new feed" msgstr "أضف تغذية جديدة" -#: ../extensions/feed-panel/feed-panel.c:713 +#: ../extensions/feed-panel/feed-panel.c:718 msgid "Delete feed" msgstr "حذف التغذية" -#: ../extensions/feed-panel/feed-panel.c:795 +#: ../extensions/feed-panel/feed-panel.c:800 msgid "_Feeds" -msgstr "_تغذية" +msgstr "ت_غذية" #: ../extensions/feed-panel/feed-parse.c:195 #, c-format @@ -2576,7 +2619,7 @@ msgstr "فشل العثور على عنصر الجذر في بيانات تغذ #: ../extensions/feed-panel/feed-parse.c:235 #, c-format msgid "Unsupported feed format." -msgstr "صيغة الخدمة غير معتمدة." +msgstr "صيغة الخدمة غير معتمدة" #: ../extensions/feed-panel/feed-parse.c:265 #, c-format @@ -2589,7 +2632,7 @@ msgstr "فشل العثور على \"channel\" عنصر في بيانات RSS XM #: ../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." @@ -2617,127 +2660,87 @@ msgstr "لوحة التغذية" msgid "Read Atom/ RSS feeds" msgstr "قراءة التغذيات Atom/ RSS" -#: ../extensions/formhistory/formhistory.c:39 +#: ../extensions/formhistory.c:146 #, 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 +#: ../extensions/formhistory.c:403 ../extensions/formhistory.c:407 #, 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 +#: ../extensions/formhistory.c:450 msgid "Stores history of entered form data" msgstr "تخزين تاريخ بيانات الدخول" -#: ../extensions/formhistory/formhistory-gdom-frontend.c:225 -#: ../extensions/formhistory/formhistory-js-frontend.c:106 +#: ../extensions/formhistory.c:454 #, c-format -msgid "Failed to select suggestions\n" -msgstr "فشل في تحديد الاقتراحات\n" +msgid "Not available: %s" +msgstr "غبر متوفر: %s" -#: ../extensions/history-list.vala:197 +#: ../extensions/formhistory.c:455 +msgid "Resource files not installed" +msgstr "ملفات المصدر غبر مثبتة" + +#: ../extensions/formhistory.c:461 +msgid "Form history filler" +msgstr "ترشيح صيغة التاريخ" + +#: ../extensions/history-list.vala:190 msgid "There are no unvisited tabs" msgstr "لا توجد تبويبات لم تسبق زيارتها" -#: ../extensions/history-list.vala:235 +#: ../extensions/history-list.vala:228 #, c-format msgid "History-List" msgstr "قائمة التاريخ" -#: ../extensions/history-list.vala:275 +#: ../extensions/history-list.vala:267 msgid "Tab closing behavior" msgstr "سلوك إغلاق التبويب" -#: ../extensions/history-list.vala:283 +#: ../extensions/history-list.vala:275 msgid "Do nothing" msgstr "لا تفعل شيئا" -#: ../extensions/history-list.vala:289 -msgid "Switch to last viewed tab" -msgstr "التبديل إلى آخر تبويب مشاهدة" +#: ../extensions/history-list.vala:281 +msgid "Switch to last view tab" +msgstr "التحول إلى التبويب الأخير" -#: ../extensions/history-list.vala:295 +#: ../extensions/history-list.vala:287 msgid "Switch to newest tab" msgstr "التحول إلى احدث تبويب" -#: ../extensions/history-list.vala:423 +#: ../extensions/history-list.vala:411 msgid "Next new Tab (History List)" msgstr "علامة التبويب الجديدة القادمة (قائمة التاريخ)" -#: ../extensions/history-list.vala:424 +#: ../extensions/history-list.vala:412 msgid "Next new tab from history" msgstr "التبويب الجديد من التاريخ" -#: ../extensions/history-list.vala:433 +#: ../extensions/history-list.vala:421 msgid "Previous new Tab (History List)" msgstr "تبويب جديدة متقدمة (قائمة التاريخ)" -#: ../extensions/history-list.vala:434 +#: ../extensions/history-list.vala:422 msgid "Previous new tab from history" msgstr "علامة تبويب جديدة من التاريخ السابق" -#: ../extensions/history-list.vala:443 +#: ../extensions/history-list.vala:431 msgid "Display tab in background (History List)" msgstr "عرض التبويب في الخلفية (قائمة التاريخ)" -#: ../extensions/history-list.vala:444 +#: ../extensions/history-list.vala:432 msgid "Display the current selected tab in background" msgstr "عرض علامة التبويب الحالية المحددة في الخلفية" -#: ../extensions/history-list.vala:569 +#: ../extensions/history-list.vala:557 msgid "History List" msgstr "السجل" -#: ../extensions/history-list.vala:570 +#: ../extensions/history-list.vala:558 msgid "Move to the last used tab when switching or closing tabs" msgstr "الانتقال إلى علامة التبويب الأخيرة عند إغلاق علامات التبويب" @@ -2749,7 +2752,7 @@ msgstr "إيماءات الفأرة" msgid "Control Midori by moving the mouse" msgstr "تحكم بميدوري عن طريق تحريك الفأرة" -#: ../extensions/shortcuts.c:109 +#: ../extensions/shortcuts.c:110 msgid "Reload page or stop loading" msgstr "تحديث الصفحة أو إيقاف تحميل" @@ -2757,15 +2760,15 @@ msgstr "تحديث الصفحة أو إيقاف تحميل" msgid "Customize Keyboard shortcuts" msgstr "تخصيص اختصارات لوحة المفاتيح" -#: ../extensions/shortcuts.c:283 -msgid "Customize Sh_ortcuts…" -msgstr "تخصيص الاختصارات…" +#: ../extensions/shortcuts.c:282 +msgid "Customize Sh_ortcuts..." +msgstr "تخصيص الاختصارات..." -#: ../extensions/shortcuts.c:320 +#: ../extensions/shortcuts.c:319 msgid "Shortcuts" msgstr "إختصارات" -#: ../extensions/shortcuts.c:321 +#: ../extensions/shortcuts.c:320 msgid "View and edit keyboard shortcuts" msgstr "عرض وتحرير إختصار لوحة المفاتيح" @@ -2777,281 +2780,82 @@ msgstr "شريط حالة الساعة" msgid "Display date and time in the statusbar" msgstr "عرض التاريخ والوقت في شريط الحالة" -#: ../extensions/statusbar-features.c:131 +#: ../extensions/statusbar-features.c:129 msgid "Images" msgstr "صور" -#: ../extensions/statusbar-features.c:140 +#: ../extensions/statusbar-features.c:138 msgid "Scripts" -msgstr "نصوص برمجية" +msgstr "برامج نصية" -#: ../extensions/statusbar-features.c:151 +#: ../extensions/statusbar-features.c:147 msgid "Netscape plugins" msgstr "Netscape ملحقات" -#: ../extensions/statusbar-features.c:199 +#: ../extensions/statusbar-features.c:193 msgid "Statusbar Features" msgstr "سمات شريط الحالة" -#: ../extensions/statusbar-features.c:200 +#: ../extensions/statusbar-features.c:194 msgid "Easily toggle features on web pages on and off" msgstr "تبديل ملامح بسهولة على صفحات الويب تشغيل وإيقاف" -#: ../extensions/tab-panel.c:593 ../extensions/tab-panel.c:680 +#: ../extensions/tab-panel.c:597 ../extensions/tab-panel.c:684 msgid "Tab Panel" msgstr "لوحة التبويب" -#: ../extensions/tab-panel.c:663 +#: ../extensions/tab-panel.c:667 msgid "T_ab Panel" -msgstr "لوحة التبويب" +msgstr "_لوحة التبويب" -#: ../extensions/tab-panel.c:681 +#: ../extensions/tab-panel.c:685 msgid "Show tabs in a vertical panel" msgstr "عرض علامات التبويب في لوحة عمودية" -#: ../extensions/tabs-minimized.c:76 +#: ../extensions/tabs-minimized.c:77 msgid "Only Icons on Tabs by default" msgstr "فقط الرموز على علامات افتراضيا" -#: ../extensions/tabs-minimized.c:77 +#: ../extensions/tabs-minimized.c:78 msgid "New tabs have no label by default" msgstr "علامات التبويب الجديدة ليس لها تسمية افتراضيا" -#: ../extensions/toolbar-editor.c:393 +#: ../extensions/toolbar-editor.c:391 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:407 +msgid "Select items to be displayed on the toolbar. Items can be reodered by drag and drop." +msgstr "تحديد عناصر ليتم عرضها على شريط الأدوات. يمكن ترتيب العناصر عن طريق السحب والإفلات." -#: ../extensions/toolbar-editor.c:425 +#: ../extensions/toolbar-editor.c:423 msgid "Available Items" msgstr "العناصر المتوفرة" -#: ../extensions/toolbar-editor.c:446 +#: ../extensions/toolbar-editor.c:444 msgid "Displayed Items" msgstr "العناصر المعروضة" -#: ../extensions/toolbar-editor.c:581 -msgid "Customize _Toolbar…" -msgstr "ت_خصيص شريط الادوات…" +#: ../extensions/toolbar-editor.c:579 +msgid "Customize _Toolbar..." +msgstr "ت_خصيص شريط الادوات" -#: ../extensions/toolbar-editor.c:597 -msgid "_Customize…" -msgstr "_تخصيص…" +#: ../extensions/toolbar-editor.c:595 +msgid "_Customize..." +msgstr "تخصيص..." -#: ../extensions/toolbar-editor.c:627 +#: ../extensions/toolbar-editor.c:625 msgid "Toolbar Editor" msgstr "محرر شريط الادوات" -#: ../extensions/toolbar-editor.c:628 +#: ../extensions/toolbar-editor.c:626 msgid "Easily edit the toolbar layout" msgstr "تحرير شريط الادوات بسهولة" -#: ../extensions/web-cache.c:463 +#: ../extensions/web-cache.c:479 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 "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 "إستعادة Ø£_خر جلسة" @@ -3091,6 +2895,9 @@ msgstr "إخفاء ملف HTTP التواصل في القرص" #~ msgid "External applications" #~ msgstr "تكبيقات خارجية" +#~ msgid "_Form History" +#~ msgstr "صيغة الت_اريخ" + #~ msgid "Next Tab (History List)" #~ msgstr "التبويب التالي (السجل)" diff --git a/po/ast.po b/po/ast.po index 44b05631..69ff3b2c 100644 --- a/po/ast.po +++ b/po/ast.po @@ -594,15 +594,15 @@ msgid "_Manage Search Engines" msgstr "_Alministrar motores de gueta" #: ../midori/midori-browser.c:4282 -msgid "Add, edit and remove search engines…" -msgstr "Amestar, editar y quitar motores de gueta…" +msgid "Add, edit and remove search engines..." +msgstr "Amestar, editar y quitar motores de gueta..." #: ../midori/midori-browser.c:4285 msgid "_Clear Private Data" msgstr "_Desaniciar datos privaos" #: ../midori/midori-browser.c:4286 -msgid "Clear private data…" +msgid "Clear private data..." msgstr "Desaniciar datos privaos" #: ../midori/midori-browser.c:4290 @@ -741,24 +741,24 @@ msgstr "Occidental (ISO-8859-1)" #: ../midori/midori-browser.c:4368 #: ../midori/midori-websettings.c:219 #: ../midori/midori-websettings.c:291 -msgid "Custom…" -msgstr "Personalizáu…" +msgid "Custom..." +msgstr "Personalizáu..." #: ../midori/midori-browser.c:4806 msgid "_Separator" msgstr "_Separtador" #: ../midori/midori-browser.c:4813 -msgid "_Location…" -msgstr "_Allugamientu…" +msgid "_Location..." +msgstr "_Allugamientu..." #: ../midori/midori-browser.c:4815 msgid "Open a particular location" msgstr "Abrir una direición en particular" #: ../midori/midori-browser.c:4839 -msgid "_Web Search…" -msgstr "_Guetar n'internet…" +msgid "_Web Search..." +msgstr "_Guetar n'internet..." #: ../midori/midori-browser.c:4841 msgid "Run a web search" @@ -1960,8 +1960,8 @@ msgid "Configure Advertisement filters" msgstr "Configurar los filtros de publicidá" #: ../extensions/adblock.c:304 -msgid "Configure _Advertisement filters…" -msgstr "Configurar filtros de p_ublicidá…" +msgid "Configure _Advertisement filters..." +msgstr "Configurar filtros de p_ublicidá..." #: ../extensions/adblock.c:562 msgid "Advertisement blocker" @@ -2176,8 +2176,8 @@ msgid "Customize Keyboard shortcuts" msgstr "Personalizar los atayos del tecláu" #: ../extensions/shortcuts.c:264 -msgid "Customize Sh_ortcuts…" -msgstr "Personalizar los ac_cesos direutos…" +msgid "Customize Sh_ortcuts..." +msgstr "Personalizar los ac_cesos direutos..." #: ../extensions/shortcuts.c:303 msgid "Shortcuts" @@ -2221,7 +2221,7 @@ msgid "Customize Toolbar" msgstr "Personalizar la barra de xeres" #: ../extensions/toolbar-editor.c:407 -msgid "Select items to be displayed on the toolbar. Items can be reordered by drag and drop." +msgid "Select items to be displayed on the toolbar. Items can be reodered 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 @@ -2233,8 +2233,8 @@ msgid "Displayed Items" msgstr "Elementos usaos" #: ../extensions/toolbar-editor.c:579 -msgid "Customize _Toolbar…" -msgstr "Personalizar la barra de _xeres…" +msgid "Customize _Toolbar..." +msgstr "Personalizar la barra de _xeres..." #: ../extensions/toolbar-editor.c:611 msgid "Toolbar Editor" @@ -2256,7 +2256,7 @@ msgstr "Editar cenciellamente el diseñu de la barra de herramienta" #~ msgstr "Al entamar Midori cargar:" #~ msgid "Download Folder" #~ msgstr "Carpeta de descargues" -#~ msgid "Configure _Toolbar…" +#~ msgid "Configure _Toolbar..." #~ msgstr "Configurar la _Barra de xeres" #~ msgid "_Quick Find" #~ msgstr "Gueta _rápida" diff --git a/po/be.po b/po/be.po deleted file mode 100644 index 6af162ca..00000000 --- a/po/be.po +++ /dev/null @@ -1,3274 +0,0 @@ -# Belarussian traslation for Midori -# Copyright (C) 2012 Midori team -# This file is distributed under the same license as the Midori package. -# Andrej Zakharevich , 2012. -# Mikalai Udodau , 2012. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: midori 0.4.6\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-18 14:42+0000\n" -"PO-Revision-Date: 2012-08-18 19:24+0300\n" -"Last-Translator: Mikalai Udodau \n" -"Language-Team: Belarusian \n" -"Language: be\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" - -#: ../data/midori.desktop.in.h:1 -msgid "Browse the Web" -msgstr "Аглядаць Сеціва" - -#: ../data/midori.desktop.in.h:2 -msgid "Internet;WWW;Explorer" -msgstr "Internet;WWW;Explorer" - -#: ../data/midori.desktop.in.h:3 ../midori/main.c:2025 ../midori/main.c:2049 -#: ../midori/main.c:2063 ../midori/midori-websettings.c:315 -msgid "Midori" -msgstr "Midori" - -#: ../data/midori.desktop.in.h:4 -msgid "Midori Web Browser" -msgstr "Веб-браўзер Midori" - -#: ../data/midori.desktop.in.h:5 -msgid "New Private Browsing Window" -msgstr "Акно прыватнага аглядання" - -#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1479 -msgid "New Tab" -msgstr "Новая картка" - -#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1476 -msgid "New Window" -msgstr "Новае вакно" - -#: ../data/midori.desktop.in.h:8 -msgid "Web Browser" -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 "Адкрыць новае вакно прыватнага аглядання" - -#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4505 -msgid "Private Browsing" -msgstr "Прыватнае агляданне" - -#: ../midori/main.c:91 ../midori/main.c:97 -#, c-format -msgid "The configuration couldn't be loaded: %s\n" -msgstr "Немагчыма прачытаць канфігурацыю: %s\n" - -#: ../midori/main.c:145 -#, c-format -msgid "Value '%s' is invalid for %s" -msgstr "Значэнне '%s' недапушчальнае ў %s" - -#: ../midori/main.c:150 ../midori/main.c:254 -#, c-format -msgid "Invalid configuration value '%s'" -msgstr "Недапушчальнае значэнне канфігурацыі '%s'" - -#: ../midori/main.c:375 -#, c-format -msgid "The search engines couldn't be loaded. %s\n" -msgstr "Немагчыма адчытаць пошукавыя рухавікі. %s\n" - -#: ../midori/main.c:429 -#, c-format -msgid "Failed to clear history: %s\n" -msgstr "Не ўдалося ачысціць гісторыю: %s\n" - -#: ../midori/main.c:451 ../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:523 -#, c-format -msgid "Failed to remove old history items: %s\n" -msgstr "Памылка сцірання старых элементаў гісторыі: %s\n" - -#: ../midori/main.c:545 -#, c-format -msgid "The configuration couldn't be saved. %s" -msgstr "Немагчыма запісаць канфігурацыю. %s" - -#: ../midori/main.c:571 -#, c-format -msgid "The search engines couldn't be saved. %s" -msgstr "Немагчыма запісаць пошукавыя рухавікі. %s" - -#. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:608 -#, c-format -msgid "The trash couldn't be saved. %s" -msgstr "Немагчыма запісаць гэту сметніцу. %s" - -#: ../midori/main.c:681 ../panels/midori-extensions.c:90 -msgid "Extensions" -msgstr "Прыстаўкі" - -#: ../midori/main.c:695 -msgid "Privacy" -msgstr "Прыватнасць" - -#: ../midori/main.c:707 -msgid "" -"Cookies store login data, saved games, or user profiles for advertisement " -"purposes." -msgstr "" -"Кукісы захоўваюць звесткі пра ўваходы, запісы гульняў, ці профіль " -"карыстальніка, у рэкламных мэтах." - -#: ../midori/main.c:763 -#, c-format -msgid "The session couldn't be saved. %s" -msgstr "Немагчыма запісаць гэты сеанс. %s" - -#: ../midori/main.c:1001 -msgid "" -"No root certificate file is available. SSL certificates cannot be verified." -msgstr "" -"Не знойдзены файл каранёвага сертыфіката. SSL-сертыфікаты нельга спраўдзіць." - -#: ../midori/main.c:1093 -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:1112 -msgid "Modify _preferences" -msgstr "_Правіць настаўленні" - -#: ../midori/main.c:1116 -msgid "Disable all _extensions" -msgstr "Выключыць _усе прыстаўкі" - -#: ../midori/main.c:1129 -msgid "Discard old tabs" -msgstr "Адкінуць старыя карткі" - -#: ../midori/main.c:1130 ../midori/midori-websettings.c:223 -msgid "Show last tabs without loading" -msgstr "Паказаць апошнія карткі без адкрыцця" - -#: ../midori/main.c:1131 ../midori/midori-websettings.c:222 -msgid "Show last open tabs" -msgstr "Паказаць апошнія адкрытыя карткі" - -#: ../midori/main.c:1379 ../midori/main.c:2433 -#, c-format -msgid "The session couldn't be loaded: %s\n" -msgstr "Немагчыма прачытаць сеанс: %s\n" - -#: ../midori/main.c:1517 -#, c-format -msgid "Snapshot saved to: %s\n" -msgstr "Здымак запісаны ў: %s\n" - -#: ../midori/main.c:1933 -msgid "Run ADDRESS as a web application" -msgstr "Выканаць АДРАС як вэб-прыкладанне" - -#: ../midori/main.c:1933 -msgid "ADDRESS" -msgstr "АДРАС" - -#: ../midori/main.c:1936 -msgid "Use FOLDER as configuration folder" -msgstr "Ужыць КАТАЛОГ як каталог канфігурацыі" - -#: ../midori/main.c:1936 -msgid "FOLDER" -msgstr "КАТАЛОГ" - -#: ../midori/main.c:1939 -msgid "Private browsing, no changes are saved" -msgstr "Прыватнае агляданне, ніякія змены не запісваюцца" - -#: ../midori/main.c:1941 -msgid "Show a diagnostic dialog" -msgstr "Паказаць дыягнастычны дыялог" - -#: ../midori/main.c:1943 -msgid "Run the specified filename as javascript" -msgstr "Выканаць азначаны файл як скрыпт javascript" - -#: ../midori/main.c:1945 -msgid "Take a snapshot of the specified URI" -msgstr "Зрабіць здымак зададзенага адраса URI" - -#: ../midori/main.c:1947 -msgid "Execute the specified command" -msgstr "Выканаць азначаны загад" - -#: ../midori/main.c:1949 -msgid "List available commands to execute with -e/ --execute" -msgstr "Спіс даступных для выканання загадаў з -e/ --execute" - -#: ../midori/main.c:1951 -msgid "Display program version" -msgstr "Паказаць версію праграмы" - -#: ../midori/main.c:1953 -msgid "Addresses" -msgstr "Адрасы" - -#: ../midori/main.c:1955 -msgid "Block URIs according to regular expression PATTERN" -msgstr "Блакаваць URI спасылкі згодна з рэгулярным выразам ПРЫКЛАД" - -#: ../midori/main.c:1955 -msgid "PATTERN" -msgstr "ПРЫКЛАД" - -#. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1959 -msgid "Reset Midori after SECONDS seconds of inactivity" -msgstr "Скінуць Midori пасля СЕКУНД секундаў неактыўнасці" - -#: ../midori/main.c:1959 -msgid "SECONDS" -msgstr "СЕКУНД" - -#: ../midori/main.c:1962 -msgid "Redirects console warnings to the specified FILENAME" -msgstr "Перанакіраваць папярэджанні з кансолі ў зададзены ФАЙЛ" - -#: ../midori/main.c:1962 -msgid "FILENAME" -msgstr "ФАЙЛ" - -#: ../midori/main.c:2064 -msgid "Please report comments, suggestions and bugs to:" -msgstr "" -"Калі ласка, дасылайце каментарыі, прапановы і паведамленні пра памылкі на:" - -#: ../midori/main.c:2066 -msgid "Check for new versions at:" -msgstr "Спраўдзіць новую версію:" - -#. i18n: Logins and passwords in websites and web forms -#: ../midori/main.c:2161 -msgid "Saved logins and _passwords" -msgstr "Запісаныя ўліковыя _запісы і паролі" - -#: ../midori/main.c:2163 -msgid "Cookies and Website data" -msgstr "Кукісы і звесткі вэб-сайтаў" - -#. TODO: Preserve page icons of search engines and merge privacy items -#: ../midori/main.c:2167 ../midori/midori-websettings.c:1020 -#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471 -msgid "Web Cache" -msgstr "Вэб-кэш" - -#: ../midori/main.c:2170 -msgid "Website icons" -msgstr "Значкі вэб-сайтаў" - -#: ../midori/main.c:2274 -msgid "An unknown error occured" -msgstr "Здарылася невядомая памылка" - -#: ../midori/main.c:2381 -msgid "An instance of Midori is already running but not responding.\n" -msgstr "Экзэмпляр Midori ўжо запушчаны, але не адказвае.\n" - -#: ../midori/main.c:2415 -#, c-format -msgid "Bookmarks couldn't be loaded: %s\n" -msgstr "Немагчыма прачытаць закладкі: %s\n" - -#: ../midori/main.c:2448 -#, c-format -msgid "The trash couldn't be loaded: %s\n" -msgstr "Немагчыма прачытаць сметніцу: %s\n" - -#: ../midori/main.c:2461 -#, c-format -msgid "The history couldn't be loaded: %s\n" -msgstr "Немагчыма прачытаць гісторыю: %s\n" - -#: ../midori/main.c:2476 -msgid "The following errors occured:" -msgstr "Здарылася наступная памылка:" - -#: ../midori/main.c:2492 -msgid "_Ignore" -msgstr "_Ігнараваць" - -#: ../midori/midori-app.c:1155 ../midori/midori-browser.c:545 -#, c-format -msgid "Unexpected action '%s'." -msgstr "Нечаканае дзеянне '%s'." - -#: ../midori/midori-app.c:1459 ../midori/midori-browser.c:6435 -msgid "_Bookmarks" -msgstr "_Закладкі" - -#: ../midori/midori-app.c:1460 -msgid "Add Boo_kmark" -msgstr "Зак_ладку на гэту старонку" - -#: ../midori/midori-app.c:1461 -msgid "_Extensions" -msgstr "_Прыстаўкі" - -#. i18n: Browsing history, visited web pages, closed tabs -#: ../midori/midori-app.c:1462 ../midori/midori-browser.c:4891 -msgid "_History" -msgstr "_Гісторыя" - -#: ../midori/midori-app.c:1463 -msgid "_Userscripts" -msgstr "_Карыстальніцкія скрыпты" - -#: ../midori/midori-app.c:1464 -msgid "User_styles" -msgstr "Карыстальніцкія стылі" - -#: ../midori/midori-app.c:1465 -msgid "New _Tab" -msgstr "Новая _картка" - -#: ../midori/midori-app.c:1466 -msgid "_Transfers" -msgstr "П_ерасыланні" - -#: ../midori/midori-app.c:1467 -msgid "Netscape p_lugins" -msgstr "П_лагіны Netscape" - -#: ../midori/midori-app.c:1468 -msgid "_Closed Tabs" -msgstr "_Закрытыя карткі" - -#: ../midori/midori-app.c:1469 ../midori/midori-browser.c:5574 -msgid "New _Window" -msgstr "Новае _вакно" - -#: ../midori/midori-app.c:1470 -msgid "New _Folder" -msgstr "Новы к_аталог" - -#: ../midori/midori-app.c:1499 -msgid "[Addresses]" -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:364 ../midori/midori-browser.c:5662 -#: ../midori/midori-browser.c:5671 -msgid "Reload the current page" -msgstr "Перачытаць бягучую старонку" - -#: ../midori/midori-browser.c:373 ../midori/midori-browser.c:5668 -msgid "Stop loading the current page" -msgstr "Спыніць чытанне бягучай старонкі" - -#: ../midori/midori-browser.c:530 -#, c-format -msgid "Failed to update title: %s\n" -msgstr "Памылка абнаўлення загалоўка: %s\n" - -#: ../midori/midori-browser.c:625 -#, c-format -msgid "%s (Private Browsing)" -msgstr "%s (Прыватнае агляданне)" - -#: ../midori/midori-browser.c:735 ../midori/midori-browser.c:777 -#: ../panels/midori-bookmarks.c:114 -msgid "Bookmarks" -msgstr "Закладкі" - -#: ../midori/midori-browser.c:837 -msgid "New folder" -msgstr "Новы каталог" - -#: ../midori/midori-browser.c:837 -msgid "Edit folder" -msgstr "Рэдагаваць каталог" - -#: ../midori/midori-browser.c:839 -msgid "New bookmark" -msgstr "Новая закладка" - -#: ../midori/midori-browser.c:839 -msgid "Edit bookmark" -msgstr "Рэдагаваць закладкі" - -#: ../midori/midori-browser.c:873 -msgid "Type a name for this bookmark and choose where to keep it." -msgstr "Увядзіце назву для гэтай закладкі і выберыце, дзе яе захоўваць." - -#: ../midori/midori-browser.c:934 -msgid "Add to _Speed Dial" -msgstr "Дадаць у хуткі в_ыбар" - -#: ../midori/midori-browser.c:940 -msgid "Show in the tool_bar" -msgstr "Паказваць на с_тужцы прылад" - -#: ../midori/midori-browser.c:948 -msgid "Run as _web application" -msgstr "Выкана_ць як вэб-прыкладанне" - -#: ../midori/midori-browser.c:1019 -#, c-format -msgid "The file \"%s\" can't be saved in this folder." -msgstr "Файл \"%s\" нельга запісаць у гэтым каталогу." - -#: ../midori/midori-browser.c:1021 -#, c-format -msgid "You don't have permission to write in this location." -msgstr "Вы не маеце дазволу на запіс у гэтым месцы." - -#: ../midori/midori-browser.c:1028 -#, c-format -msgid "There is not enough free space to download \"%s\"." -msgstr "Не хапае вольнага месца, каб сцягнуць \"%s\"." - -#: ../midori/midori-browser.c:1031 -#, c-format -msgid "The file needs %s but only %s are left." -msgstr "Для файла трэба %s, але толькі %s засталося." - -#: ../midori/midori-browser.c:1167 ../midori/midori-browser.c:4695 -msgid "Save file as" -msgstr "Запісаць файл як" - -#: ../midori/midori-browser.c:1173 -msgid "Save associated _resources" -msgstr "Запісаць звязаныя рэсурсы" - -#: ../midori/midori-browser.c:1476 -msgid "A new window has been opened" -msgstr "Адкрыта новае вакно" - -#: ../midori/midori-browser.c:1479 -msgid "A new tab has been opened" -msgstr "Адкрыта новая картка" - -#: ../midori/midori-browser.c:1496 -msgid "Error opening the image!" -msgstr "Памылка адкрыцця выявы!" - -#: ../midori/midori-browser.c:1497 -msgid "Can not open selected image in a default viewer." -msgstr "Немагчыма адкрыць вылучаную выяву ў прадвызначаным праглядніку." - -#: ../midori/midori-browser.c:1503 -msgid "Error downloading the image!" -msgstr "Памылка сцягвання выявы!" - -#: ../midori/midori-browser.c:1504 -msgid "Can not download selected image." -msgstr "Немагчыма сцягнуць вылучаную выяву." - -#: ../midori/midori-browser.c:1625 -msgid "Save file" -msgstr "Запісаць файл" - -#: ../midori/midori-browser.c:2528 -msgid "Open file" -msgstr "Адкрыць файл" - -#: ../midori/midori-browser.c:2660 -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/midori-browser.c:2666 ../extensions/feed-panel/main.c:365 -msgid "New feed" -msgstr "Новы канал" - -#: ../midori/midori-browser.c:2709 ../midori/midori-browser.c:5734 -#: ../panels/midori-bookmarks.c:527 -msgid "Add a new bookmark" -msgstr "Дадаць закладку" - -#: ../midori/midori-browser.c:3253 ../midori/midori-searchaction.c:487 -msgid "Empty" -msgstr "Пуста" - -#: ../midori/midori-browser.c:3699 ../midori/midori-browser.c:3700 -msgid "Toggle text cursor navigation" -msgstr "Пераключыць навігацыю тэкставым курсорам" - -#: ../midori/midori-browser.c:3702 -msgid "" -"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in " -"all websites." -msgstr "" -"Націсканне F7 пераключае рэжым навігацыі тэкставым курсорам. Калі ён " -"актыўны, тэкставы курсор адлюстроўваецца на ўсіх вэб-старонках." - -#: ../midori/midori-browser.c:3705 -msgid "_Enable Caret Browsing" -msgstr "Навігацыя тэкставым к_урсорам" - -#: ../midori/midori-browser.c:4095 ../midori/midori-browser.c:6128 -#, c-format -msgid "Failed to insert new history item: %s\n" -msgstr "Памылка дадання новага элемента гісторыі: %s\n" - -#: ../midori/midori-browser.c:4421 ../panels/midori-bookmarks.c:850 -#: ../panels/midori-history.c:806 -msgid "Open all in _Tabs" -msgstr "Адкрыць усё ў картках" - -#: ../midori/midori-browser.c:4428 ../panels/midori-bookmarks.c:856 -#: ../panels/midori-history.c:812 ../extensions/feed-panel/feed-panel.c:528 -msgid "Open in New _Tab" -msgstr "Адкрыць у новай _картцы" - -#: ../midori/midori-browser.c:4431 ../midori/midori-view.c:2944 -#: ../midori/midori-view.c:5082 ../panels/midori-bookmarks.c:858 -#: ../panels/midori-history.c:814 ../extensions/feed-panel/feed-panel.c:530 -msgid "Open in New _Window" -msgstr "Адкры_ць у новым акне" - -#: ../midori/midori-browser.c:4520 -msgid "Arora" -msgstr "Arora" - -#: ../midori/midori-browser.c:4521 -msgid "Kazehakase" -msgstr "Казахеказэ" - -#: ../midori/midori-browser.c:4522 -msgid "Opera" -msgstr "Opera" - -#: ../midori/midori-browser.c:4523 -msgid "Konqueror" -msgstr "Konqueror" - -#: ../midori/midori-browser.c:4524 -msgid "Epiphany" -msgstr "Epiphany" - -#: ../midori/midori-browser.c:4525 -#, c-format -msgid "Firefox (%s)" -msgstr "Firefox (%s)" - -#: ../midori/midori-browser.c:4526 -msgid "Midori 0.2.6" -msgstr "Midori 0.2.6" - -#: ../midori/midori-browser.c:4547 -msgid "Import bookmarks…" -msgstr "Імпарт закладак…" - -#: ../midori/midori-browser.c:4550 ../midori/midori-browser.c:5739 -msgid "_Import bookmarks" -msgstr "_Імпартаваць закладкі" - -#: ../midori/midori-browser.c:4561 -msgid "_Application:" -msgstr "_Праграма:" - -#: ../midori/midori-browser.c:4626 -msgid "Import from XBEL or HTML file" -msgstr "Імпарт з XBEL ці HTML файла" - -#: ../midori/midori-browser.c:4654 -msgid "Import from a file" -msgstr "Імпартаваць з файла" - -#: ../midori/midori-browser.c:4666 -msgid "Failed to import bookmarks" -msgstr "Памылка імпартавання закладак" - -#: ../midori/midori-browser.c:4700 -msgid "XBEL Bookmarks" -msgstr "XBEL-закладкі" - -#: ../midori/midori-browser.c:4705 -msgid "Netscape Bookmarks" -msgstr "Закладкі Netscape" - -#: ../midori/midori-browser.c:4719 -msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)" -msgstr "Midori можа экспартаваць толькі ў XBEL (*.xbel) або Netscape (*.html)" - -#: ../midori/midori-browser.c:4734 -msgid "Failed to export bookmarks" -msgstr "Памылка экспартавання закладак" - -#. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4856 -msgid "Clear Private Data" -msgstr "Сцерці асабовыя звесткі" - -#: ../midori/midori-browser.c:4860 -msgid "_Clear private data" -msgstr "Сц_ерці" - -#: ../midori/midori-browser.c:4875 -msgid "Clear the following data:" -msgstr "Сцерці наступныя звесткі:" - -#: ../midori/midori-browser.c:4885 -msgid "Last open _tabs" -msgstr "Апошнія адкрытыя карткі" - -#: ../midori/midori-browser.c:4911 -msgid "Clear private data when _quitting Midori" -msgstr "С_ціраць асабовыя звесткі пры выхадзе з Midori" - -#: ../midori/midori-browser.c:5126 -msgid "A lightweight web browser." -msgstr "Лёгкі вэб-браўзер." - -#: ../midori/midori-browser.c:5127 -msgid "See about:version for version info." -msgstr "Гл. about:version за звесткамі пра версію." - -#: ../midori/midori-browser.c:5129 -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 (GNU " -"GPL), выдадзенай Фондам Свабодных Праграм (FSF); як версіі 2.1, так і (на " -"ваш выбар) якой-колечы пазнейшай версіі." - -#: ../midori/midori-browser.c:5159 -msgid "translator-credits" -msgstr "Мікалай Удодаў " - -#: ../midori/midori-browser.c:5572 -msgid "_File" -msgstr "Ф_айл" - -#: ../midori/midori-browser.c:5575 -msgid "Open a new window" -msgstr "Адкрыць новае вакно" - -#: ../midori/midori-browser.c:5578 -msgid "Open a new tab" -msgstr "Дадаць картку" - -#: ../midori/midori-browser.c:5580 -msgid "New P_rivate Browsing Window" -msgstr "Новае ва_кно, прыватнае агляданне" - -#: ../midori/midori-browser.c:5584 -msgid "Open a file" -msgstr "Адкрыць файл" - -#: ../midori/midori-browser.c:5586 -msgid "_Save Page As…" -msgstr "Запісаць старонку як…" - -#: ../midori/midori-browser.c:5587 -msgid "Save to a file" -msgstr "Запісаць у файл" - -#: ../midori/midori-browser.c:5589 -msgid "Add to Speed _dial" -msgstr "Дадаць у _хуткі выбар" - -#: ../midori/midori-browser.c:5593 -msgid "Add Shortcut to the _desktop" -msgstr "Дадаць цэтлік на дэсктоп" - -#: ../midori/midori-browser.c:5595 -msgid "Create _Launcher" -msgstr "Зрабіць цэт_лік" - -#: ../midori/midori-browser.c:5599 -msgid "Subscribe to News _feed" -msgstr "Падпісацца на к_анал навін" - -#: ../midori/midori-browser.c:5605 -msgid "_Close Tab" -msgstr "Закрыць _картку" - -#: ../midori/midori-browser.c:5606 -msgid "Close the current tab" -msgstr "Закрыць бягучую картку" - -#: ../midori/midori-browser.c:5608 -msgid "C_lose Window" -msgstr "_Закрыць акно" - -#: ../midori/midori-browser.c:5612 -msgid "_Share" -msgstr "Падзяліцца" - -#: ../midori/midori-browser.c:5617 -msgid "Print the current page" -msgstr "Друкаваць бягучую старонку" - -#: ../midori/midori-browser.c:5620 -msgid "Close a_ll Windows" -msgstr "Закры_ць усе вокны" - -#: ../midori/midori-browser.c:5623 -msgid "_Edit" -msgstr "_Праца" - -#: ../midori/midori-browser.c:5646 -msgid "_Find…" -msgstr "Зн_айсці…" - -#: ../midori/midori-browser.c:5647 -msgid "Find a word or phrase in the page" -msgstr "Шукаць слова ці выраз на старонцы" - -#: ../midori/midori-browser.c:5649 -msgid "Find _Next" -msgstr "Знайсці нас_тупнае" - -#: ../midori/midori-browser.c:5652 -msgid "Find _Previous" -msgstr "_Знайсці папярэдняе" - -#: ../midori/midori-browser.c:5656 -msgid "Configure the application preferences" -msgstr "Наставіць праграмныя пераважанні" - -#: ../midori/midori-browser.c:5658 -msgid "_View" -msgstr "_Выгляд" - -#: ../midori/midori-browser.c:5659 -msgid "_Toolbars" -msgstr "_Стужкі прылад" - -#: ../midori/midori-browser.c:5664 -msgid "Reload page without caching" -msgstr "Перачытаць старонку без кэшавання" - -#: ../midori/midori-browser.c:5674 -msgid "Increase the zoom level" -msgstr "Павысіць узровень павелічэння" - -#: ../midori/midori-browser.c:5677 -msgid "Decrease the zoom level" -msgstr "Знізіць узровень павелічэння" - -#: ../midori/midori-browser.c:5681 -msgid "_Encoding" -msgstr "_Знаказбор" - -#: ../midori/midori-browser.c:5683 -msgid "View So_urce" -msgstr "_Паказаць выточны тэкст" - -#: ../midori/midori-browser.c:5686 -msgid "Ca_ret Browsing" -msgstr "Навігацыя тэкставым курсорам" - -#: ../midori/midori-browser.c:5690 -msgid "Toggle fullscreen view" -msgstr "Пераключыць від на поўны экран" - -#: ../midori/midori-browser.c:5692 -msgid "Scroll _Left" -msgstr "Пракруціць у_лева" - -#: ../midori/midori-browser.c:5695 -msgid "Scroll _Down" -msgstr "Пракруціць у_ніз" - -#: ../midori/midori-browser.c:5698 -msgid "Scroll _Up" -msgstr "Пракруціць у_верх" - -#: ../midori/midori-browser.c:5701 -msgid "Scroll _Right" -msgstr "Пра_круціць управа" - -#: ../midori/midori-browser.c:5704 -msgid "_Readable" -msgstr "Чытэльны" - -#: ../midori/midori-browser.c:5707 -msgid "_Go" -msgstr "_Пераход" - -#: ../midori/midori-browser.c:5710 -msgid "Go back to the previous page" -msgstr "Перайсці да папярэдняй старонкі" - -#: ../midori/midori-browser.c:5713 -msgid "Go forward to the next page" -msgstr "Перайсці да наступнай старонкі" - -#. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5717 -msgid "Go to the previous sub-page" -msgstr "Ісці да папярэдняй падстаронкі" - -#. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5721 -msgid "Go to the next sub-page" -msgstr "Ісці да наступнай падстаронкі" - -#: ../midori/midori-browser.c:5723 -msgid "_Homepage" -msgstr "_Хатняя старонка" - -#: ../midori/midori-browser.c:5724 -msgid "Go to your homepage" -msgstr "Перайсці да хатняй старонкі" - -#: ../midori/midori-browser.c:5726 -msgid "Empty Trash" -msgstr "Ачысціць сметніцу" - -#: ../midori/midori-browser.c:5729 -msgid "Undo _Close Tab" -msgstr "Адкаціць закрыццё кар_ткі" - -#: ../midori/midori-browser.c:5736 -msgid "Add a new _folder" -msgstr "Стварыць к_аталог" - -#: ../midori/midori-browser.c:5742 -msgid "_Export bookmarks" -msgstr "_Экспартаваць закладкі" - -#: ../midori/midori-browser.c:5745 ../midori/midori-searchaction.c:496 -msgid "_Manage Search Engines" -msgstr "_Распараджацца пошукам" - -#: ../midori/midori-browser.c:5748 -msgid "_Clear Private Data" -msgstr "_Сцерці асабовыя звесткі" - -#: ../midori/midori-browser.c:5751 -msgid "_Inspect Page" -msgstr "Выточны тэкст старонкі" - -#: ../midori/midori-browser.c:5755 -msgid "_Previous Tab" -msgstr "_Папярэдняя картка" - -#: ../midori/midori-browser.c:5758 -msgid "_Next Tab" -msgstr "_Наступная картка" - -#: ../midori/midori-browser.c:5760 -msgid "Move Tab _Backward" -msgstr "Перамясціць картку назад" - -#: ../midori/midori-browser.c:5762 -msgid "_Move Tab Forward" -msgstr "Пасунуць картку наперад" - -#: ../midori/midori-browser.c:5765 -msgid "Focus _Current Tab" -msgstr "Бягучая _картка" - -#: ../midori/midori-browser.c:5768 -msgid "Focus _Next view" -msgstr "_Наступны від" - -#: ../midori/midori-browser.c:5771 -msgid "Only show the Icon of the _Current Tab" -msgstr "Паказваць толькі значок _бягучай карткі" - -#: ../midori/midori-browser.c:5774 -msgid "_Duplicate Current Tab" -msgstr "Прадубля_ваць бягучую картку" - -#: ../midori/midori-browser.c:5777 -msgid "Close Ot_her Tabs" -msgstr "Закрыць усе іншыя ка_рткі" - -#: ../midori/midori-browser.c:5780 -msgid "Open last _session" -msgstr "Адкр_ыць апошні сеанс" - -#: ../midori/midori-browser.c:5783 -msgid "_Help" -msgstr "_Даведка" - -#: ../midori/midori-browser.c:5785 -msgid "_Frequent Questions" -msgstr "_Частыя пытанні" - -#: ../midori/midori-browser.c:5788 -msgid "_Report a Problem…" -msgstr "Паведаміць пра памыл_ку…" - -#: ../midori/midori-browser.c:5793 ../midori/midori-browser.c:6454 -msgid "_Tools" -msgstr "_Прылады" - -#: ../midori/midori-browser.c:5800 -msgid "_Menubar" -msgstr "_Стужка меню" - -#: ../midori/midori-browser.c:5804 -msgid "_Navigationbar" -msgstr "_Стужка навігацыі" - -#: ../midori/midori-browser.c:5808 -msgid "Side_panel" -msgstr "Бакавая панэль" - -#: ../midori/midori-browser.c:5809 -msgid "Sidepanel" -msgstr "Бакавая панэль" - -#: ../midori/midori-browser.c:5812 -msgid "_Bookmarkbar" -msgstr "_Стужка закладак" - -#: ../midori/midori-browser.c:5816 -msgid "_Statusbar" -msgstr "_Стужка статусу" - -#: ../midori/midori-browser.c:5825 ../midori/midori-websettings.c:314 -msgid "_Automatic" -msgstr "_Аўтаматычна" - -#: ../midori/midori-browser.c:5828 ../midori/midori-websettings.c:238 -msgid "Chinese Traditional (BIG5)" -msgstr "Кітайскі традыцыйны (BIG5)" - -#: ../midori/midori-browser.c:5831 ../midori/midori-websettings.c:239 -msgid "Chinese Simplified (GB18030)" -msgstr "Кітайскі спрошчаны (GB18030)" - -#. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5835 -msgid "Japanese (SHIFT__JIS)" -msgstr "Японскі (SHIFT__JIS)" - -#: ../midori/midori-browser.c:5838 ../midori/midori-websettings.c:241 -msgid "Korean (EUC-KR)" -msgstr "Карэйскі (EUC-KR)" - -#: ../midori/midori-browser.c:5841 ../midori/midori-websettings.c:242 -msgid "Russian (KOI8-R)" -msgstr "Рускі (KOI8-R)" - -#: ../midori/midori-browser.c:5844 ../midori/midori-websettings.c:243 -msgid "Unicode (UTF-8)" -msgstr "Унікод (UTF-8)" - -#: ../midori/midori-browser.c:5847 ../midori/midori-websettings.c:244 -msgid "Western (ISO-8859-1)" -msgstr "Заходні (ISO-8859-1)" - -#: ../midori/midori-browser.c:5850 -msgid "Custom…" -msgstr "Адмысловы…" - -#: ../midori/midori-browser.c:6360 -msgid "_Separator" -msgstr "_Раздзельнік" - -#: ../midori/midori-browser.c:6367 -msgid "_Location…" -msgstr "А_драс…" - -#: ../midori/midori-browser.c:6369 -msgid "Open a particular location" -msgstr "Адкрыць пэўнае месцазнаходжанне" - -#: ../midori/midori-browser.c:6391 -msgid "_Web Search…" -msgstr "Пошук у Се_ціве…" - -#: ../midori/midori-browser.c:6393 -msgid "Run a web search" -msgstr "Запусціць сеціўны пошук" - -#: ../midori/midori-browser.c:6420 -msgid "Reopen a previously closed tab or window" -msgstr "Адкрыць раней закрытыя карткі ці вокны" - -#: ../midori/midori-browser.c:6437 -msgid "Show the saved bookmarks" -msgstr "Паказаць запісаныя закладкі" - -#: ../midori/midori-browser.c:6470 -msgid "_Window" -msgstr "_Вокны" - -#: ../midori/midori-browser.c:6472 -msgid "Show a list of all open tabs" -msgstr "Паказаць спіс усіх адкрытых картак" - -#: ../midori/midori-browser.c:6486 -msgid "_Menu" -msgstr "_Меню" - -#: ../midori/midori-browser.c:6488 -msgid "Menu" -msgstr "Меню" - -#: ../midori/midori-browser.c:7313 -#, c-format -msgid "Unexpected setting '%s'" -msgstr "Нечаканае настаўленне '%s'" - -#: ../midori/midori-extension.c:329 -#, c-format -msgid "The configuration of the extension '%s' couldn't be loaded: %s\n" -msgstr "Немагчыма прачытаць канфігурацыю прыстаўкі '%s': %s\n" - -#: ../midori/midori-extension.c:747 ../midori/midori-extension.c:844 -#: ../midori/midori-extension.c:941 ../midori/midori-extension.c:1053 -#: ../extensions/addons.c:1688 -#, c-format -msgid "The configuration of the extension '%s' couldn't be saved: %s\n" -msgstr "Для прыстаўкі '%s' немагчыма запісаць настаўленні: %s\n" - -#: ../midori/midori-locationaction.c:398 -#, c-format -msgid "Search with %s" -msgstr "Шукаць на %s" - -#: ../midori/midori-locationaction.c:418 -msgid "Search with…" -msgstr "Шукаць на…" - -#: ../midori/midori-locationaction.c:545 -#, c-format -msgid "Failed to select from history\n" -msgstr "Не ўдалося выбраць з гісторыі\n" - -#: ../midori/midori-locationaction.c:632 -#, c-format -msgid "Search for %s" -msgstr "Шукаць %s" - -#: ../midori/midori-locationaction.c:1227 -msgid "Export certificate" -msgstr "Экспартаваць сертыфікаты" - -#: ../midori/midori-locationaction.c:1259 -msgid "The signing certificate authority is not known." -msgstr "Сертыфікат падпісаны невядомай установай." - -#: ../midori/midori-locationaction.c:1261 -msgid "" -"The certificate does not match the expected identity of the site that it was " -"retrieved from." -msgstr "" -"Сертыфікат не супадае з меркаванай ідэнтыфікацыяй пляцоўкі, з якой ён " -"атрыманы." - -#: ../midori/midori-locationaction.c:1263 -msgid "The certificate's activation time is still in the future." -msgstr "Час актывацыі сертыфіката ўсё яшчэ ў будучыні." - -#: ../midori/midori-locationaction.c:1265 -msgid "The certificate has expired" -msgstr "Сертыфікат пратэрмінаваны" - -#: ../midori/midori-locationaction.c:1267 -msgid "" -"The certificate has been revoked according to the GTlsConnection's " -"certificate revocation list." -msgstr "" -"Сертыфікат быў перагледжаны, згодна з спісам перагледжаных сертыфікатаў " -"GTlsConnection." - -#: ../midori/midori-locationaction.c:1269 -msgid "The certificate's algorithm is considered insecure." -msgstr "Алгарытм сертыфіката меркаваны небяспечным." - -#: ../midori/midori-locationaction.c:1271 -msgid "Some other error occurred validating the certificate." -msgstr "Нейкія памылкі здарыліся падчас спраўджвання сертыфіката." - -#: ../midori/midori-locationaction.c:1318 -msgid "_Export certificate" -msgstr "_Экспартаваць сертыфікаты" - -#: ../midori/midori-locationaction.c:1333 -msgid "Self-signed" -msgstr "Самападпісаны" - -#: ../midori/midori-locationaction.c:1367 -msgid "Security details" -msgstr "Падрабязнасці прыватнасці" - -#. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1650 -msgid "Paste and p_roceed" -msgstr "Уставіць і перайсці" - -#: ../midori/midori-locationaction.c:1974 -msgid "Not verified" -msgstr "Не пацверджана" - -#: ../midori/midori-locationaction.c:1982 -msgid "Verified and encrypted connection" -msgstr "Пацверджанае і зашыфраванае злучэнне" - -#: ../midori/midori-locationaction.c:1989 -msgid "Open, unencrypted connection" -msgstr "Адкрытае, нешыфраванае злучэнне" - -#: ../midori/midori-panel.c:317 ../midori/midori-panel.c:319 -#: ../midori/midori-panel.c:483 ../midori/midori-panel.c:486 -msgid "Align sidepanel to the right" -msgstr "Трымаць бакавую панэль справа" - -#: ../midori/midori-panel.c:329 ../midori/midori-panel.c:330 -msgid "Close panel" -msgstr "Закрыць панэль" - -#: ../midori/midori-panel.c:484 ../midori/midori-panel.c:487 -msgid "Align sidepanel to the left" -msgstr "Трымаць бакавую панэль злева" - -#: ../midori/midori-websettings.c:220 -msgid "Show Speed Dial" -msgstr "Паказаць панэль хуткага запуску" - -#: ../midori/midori-websettings.c:221 -msgid "Show Homepage" -msgstr "Паказаць хатнюю старонку" - -#: ../midori/midori-websettings.c:240 -msgid "Japanese (SHIFT_JIS)" -msgstr "Японскі (SHIFT_JIS)" - -#: ../midori/midori-websettings.c:245 ../midori/midori-websettings.c:321 -#: ../katze/katze-utils.c:633 -msgid "Custom..." -msgstr "Адмысловы..." - -#: ../midori/midori-websettings.c:260 -msgid "New tab" -msgstr "Новая картка" - -#: ../midori/midori-websettings.c:261 -msgid "New window" -msgstr "Новае вакно" - -#: ../midori/midori-websettings.c:262 -msgid "Current tab" -msgstr "Бягучая картка" - -#: ../midori/midori-websettings.c:277 -msgid "Default" -msgstr "Прадвызначаны" - -#: ../midori/midori-websettings.c:278 -msgid "Icons" -msgstr "Значкі" - -#: ../midori/midori-websettings.c:279 -msgid "Small icons" -msgstr "Малыя значкі" - -#: ../midori/midori-websettings.c:280 -msgid "Text" -msgstr "Тэкст" - -#: ../midori/midori-websettings.c:281 -msgid "Icons and text" -msgstr "Значкі і тэкст" - -#: ../midori/midori-websettings.c:282 -msgid "Text beside icons" -msgstr "Тэкст побач са значкамі" - -#: ../midori/midori-websettings.c:297 -msgid "Automatic (GNOME or environment)" -msgstr "Аўтаматычна (GNOME ці асяроддзе)" - -#: ../midori/midori-websettings.c:298 -msgid "HTTP proxy server" -msgstr "Проксі-сервер HTTP" - -#: ../midori/midori-websettings.c:299 -msgid "No proxy server" -msgstr "Без проксі-сервера" - -#: ../midori/midori-websettings.c:316 -msgid "Chrome" -msgstr "Chrome" - -#: ../midori/midori-websettings.c:317 -msgid "Safari" -msgstr "Safari" - -#: ../midori/midori-websettings.c:318 -msgid "iPhone" -msgstr "iPhone" - -#: ../midori/midori-websettings.c:319 -msgid "Firefox" -msgstr "Firefox" - -#: ../midori/midori-websettings.c:320 -msgid "Internet Explorer" -msgstr "Internet Explorer" - -#: ../midori/midori-websettings.c:404 -msgid "Remember last window size" -msgstr "Памятаць апошні памер акна" - -#: ../midori/midori-websettings.c:405 -msgid "Whether to save the last window size" -msgstr "Ці запісваць памеры апошняга вакна" - -#: ../midori/midori-websettings.c:413 -msgid "Last window width" -msgstr "Апошняя шырыня вакна" - -#: ../midori/midori-websettings.c:414 -msgid "The last saved window width" -msgstr "Шырыня апошняга запісанага вакна" - -#: ../midori/midori-websettings.c:422 -msgid "Last window height" -msgstr "Апошняя вышыня вакна" - -#: ../midori/midori-websettings.c:423 -msgid "The last saved window height" -msgstr "Вышыня апошняга запісанага вакна" - -#: ../midori/midori-websettings.c:448 -msgid "Last panel position" -msgstr "Апошняя пазіцыя панэлі" - -#: ../midori/midori-websettings.c:449 -msgid "The last saved panel position" -msgstr "Апошняя запісаная пазіцыя панэлі" - -#. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:458 -msgid "Last panel page" -msgstr "Апошняя старонка панэлі" - -#: ../midori/midori-websettings.c:459 -msgid "The last saved panel page" -msgstr "Апошняя запісаная старонка панэлі" - -#: ../midori/midori-websettings.c:467 -msgid "Last Web search" -msgstr "Апошні сеціўны пошук" - -#: ../midori/midori-websettings.c:468 -msgid "The last saved Web search" -msgstr "Апошні запісаны сеціўны пошук" - -#: ../midori/midori-websettings.c:492 -msgid "Show Menubar" -msgstr "Паказваць стужку меню" - -#: ../midori/midori-websettings.c:493 -msgid "Whether to show the menubar" -msgstr "Ці паказваць стужку меню" - -#: ../midori/midori-websettings.c:501 -msgid "Show Navigationbar" -msgstr "Паказваць стужку навігацыі" - -#: ../midori/midori-websettings.c:502 -msgid "Whether to show the navigationbar" -msgstr "Ці паказваць стужку навігацыі" - -#: ../midori/midori-websettings.c:510 -msgid "Show Bookmarkbar" -msgstr "Паказаць закладкі" - -#: ../midori/midori-websettings.c:511 -msgid "Whether to show the bookmarkbar" -msgstr "Ці паказваць стужку закладак" - -#: ../midori/midori-websettings.c:519 -msgid "Show Panel" -msgstr "Паказаць панэль" - -#: ../midori/midori-websettings.c:520 -msgid "Whether to show the panel" -msgstr "Ці паказваць панэль" - -#: ../midori/midori-websettings.c:528 -msgid "Show Statusbar" -msgstr "Паказваць радок статусу" - -#: ../midori/midori-websettings.c:529 -msgid "Whether to show the statusbar" -msgstr "Ці паказваць стужку статусу" - -#: ../midori/midori-websettings.c:538 -msgid "Toolbar Style:" -msgstr "Стыль стужкі прылад:" - -#: ../midori/midori-websettings.c:539 -msgid "The style of the toolbar" -msgstr "Стыль стужкі прылад" - -#: ../midori/midori-websettings.c:548 -msgid "Toolbar Items" -msgstr "Элементы стужкі прылад" - -#: ../midori/midori-websettings.c:549 -msgid "The items to show on the toolbar" -msgstr "Элементы, якія паказваць на стужцы прылад" - -#: ../midori/midori-websettings.c:557 -msgid "Compact Sidepanel" -msgstr "Кампактная бакавая панэль" - -#: ../midori/midori-websettings.c:558 -msgid "Whether to make the sidepanel compact" -msgstr "Ці рабіць бакавую панэль кампактнай" - -#: ../midori/midori-websettings.c:573 -msgid "Align sidepanel on the right" -msgstr "Трымаць бакавую панэль справа" - -#: ../midori/midori-websettings.c:574 -msgid "Whether to align the sidepanel on the right" -msgstr "Ці выраўніваць бакавую панэль па праваму боку" - -#: ../midori/midori-websettings.c:589 -msgid "Open panels in separate windows" -msgstr "Адкрываць панэлі ў асобных вокнах" - -#: ../midori/midori-websettings.c:590 -msgid "Whether to always open panels in separate windows" -msgstr "Ці адкрываць заўжды панэлі ў асобных вокнах" - -#: ../midori/midori-websettings.c:599 -msgid "When Midori starts:" -msgstr "Па запуску Midori:" - -#: ../midori/midori-websettings.c:600 -msgid "What to do when Midori starts" -msgstr "Што рабіць падчас запуску Midori" - -#: ../midori/midori-websettings.c:609 -msgid "Homepage:" -msgstr "Хатняя старонка:" - -#: ../midori/midori-websettings.c:610 -msgid "The homepage" -msgstr "Хатняя старонка" - -#: ../midori/midori-websettings.c:625 -msgid "Show crash dialog" -msgstr "Паказваць гэты дыялог пасля падзення" - -#: ../midori/midori-websettings.c:626 -msgid "Show a dialog after Midori crashed" -msgstr "Паказваць гэты дыялог пасля аварыйнага завяршэння Midori" - -#: ../midori/midori-websettings.c:634 -msgid "Save downloaded files to:" -msgstr "Запісваць сцягнутыя файлы ў:" - -#: ../midori/midori-websettings.c:635 -msgid "The folder downloaded files are saved to" -msgstr "Каталог, у які запісваюцца сцягнутыя файлы" - -#: ../midori/midori-websettings.c:643 -msgid "Text Editor" -msgstr "Тэкставы рэдактар" - -#: ../midori/midori-websettings.c:644 -msgid "An external text editor" -msgstr "Вонкавы тэкставы рэдактар" - -#: ../midori/midori-websettings.c:659 -msgid "News Aggregator" -msgstr "Агрэгатар навін" - -#: ../midori/midori-websettings.c:660 -msgid "An external news aggregator" -msgstr "Вонкавы агрэгатар навін" - -#: ../midori/midori-websettings.c:668 -msgid "Location entry Search" -msgstr "Пошук уваходжання лакацыі" - -#: ../midori/midori-websettings.c:669 -msgid "The search to perform inside the location entry" -msgstr "Выконваць пошук у полі адраса" - -#: ../midori/midori-websettings.c:677 -msgid "Preferred Encoding" -msgstr "Пераважны знаказбор" - -#: ../midori/midori-websettings.c:678 -msgid "The preferred character encoding" -msgstr "Пераважнае кадаванне сімвалаў" - -#: ../midori/midori-websettings.c:688 -msgid "Always Show Tabbar" -msgstr "Заўсёды паказваць карткі" - -#: ../midori/midori-websettings.c:689 -msgid "Always show the tabbar" -msgstr "Заўсёды паказваць карткі" - -#: ../midori/midori-websettings.c:702 -msgid "Close Buttons on Tabs" -msgstr "Кнопкі закрыцця на картках" - -#: ../midori/midori-websettings.c:703 -msgid "Whether tabs have close buttons" -msgstr "Ці паказваць кнопкі закрыцця на картках" - -#: ../midori/midori-websettings.c:728 -msgid "Open new pages in:" -msgstr "Адкрываць новыя старонкі ў:" - -#: ../midori/midori-websettings.c:729 -msgid "Where to open new pages" -msgstr "Дзе адкрываць новыя старонкі" - -#: ../midori/midori-websettings.c:738 -msgid "Middle click opens Selection" -msgstr "Сярэдняя кнопка адкрывае вылучэнне" - -#: ../midori/midori-websettings.c:739 -msgid "Load an address from the selection via middle click" -msgstr "Чытанне адрасу з вылучэння праз націсканне сярэдняй кнопкі мышы" - -#: ../midori/midori-websettings.c:747 -msgid "Open tabs in the background" -msgstr "Адкрываць карткі ў фоне" - -#: ../midori/midori-websettings.c:748 -msgid "Whether to open new tabs in the background" -msgstr "Ці адкрываць новыя карткі ў фоне" - -#: ../midori/midori-websettings.c:756 -msgid "Open Tabs next to Current" -msgstr "Адкрываць карткі следам за бягучай" - -#: ../midori/midori-websettings.c:757 -msgid "Whether to open new tabs next to the current tab or after the last one" -msgstr "Ці адкрываць новыя карткі побач з бягучай карткай або пасля апошняй" - -#: ../midori/midori-websettings.c:765 -msgid "Open popups in tabs" -msgstr "Адкрываць усплыўныя вокны як карткі" - -#: ../midori/midori-websettings.c:766 -msgid "Whether to open popup windows in tabs" -msgstr "Ці адкрываць усплыўныя вокны ў картках" - -#: ../midori/midori-websettings.c:776 ../extensions/statusbar-features.c:155 -msgid "Load images automatically" -msgstr "Аўтаматычна паказваць выявы" - -#: ../midori/midori-websettings.c:777 -msgid "Load and display images automatically" -msgstr "Адчытваць і паказваць выявы аўтаматычна" - -#: ../midori/midori-websettings.c:784 ../extensions/statusbar-features.c:165 -msgid "Enable scripts" -msgstr "Дазволіць скрыпты" - -#: ../midori/midori-websettings.c:785 -msgid "Enable embedded scripting languages" -msgstr "Уключыць убудаваныя скрыптавыя мовы" - -#: ../midori/midori-websettings.c:792 ../extensions/statusbar-features.c:177 -msgid "Enable Netscape plugins" -msgstr "Уключыць плагіны Netscape" - -#: ../midori/midori-websettings.c:793 -msgid "Enable embedded Netscape plugin objects" -msgstr "Уключыць убудаваныя аб'екты плагінаў Netscape" - -#: ../midori/midori-websettings.c:808 -msgid "Enable Spell Checking" -msgstr "Уключыць праверку правапісу" - -#: ../midori/midori-websettings.c:809 -msgid "Enable spell checking while typing" -msgstr "Уключыць праверку правапісу падчас упісвання" - -#: ../midori/midori-websettings.c:815 -msgid "Enable HTML5 database support" -msgstr "Падтрымка баз звестак HTML5" - -#: ../midori/midori-websettings.c:816 -msgid "Whether to enable HTML5 database support" -msgstr "Ці дазваляць падтрымку баз звестак HTML5" - -#: ../midori/midori-websettings.c:822 -msgid "Enable HTML5 local storage support" -msgstr "Падтрымка лакальных сховішчаў HTML5" - -#: ../midori/midori-websettings.c:823 -msgid "Whether to enable HTML5 local storage support" -msgstr "Ці дазволіць лакальную падтрымку HTML5-назапашвальнікаў" - -#: ../midori/midori-websettings.c:829 -msgid "Enable offline web application cache" -msgstr "Пазасеткавы кэш вэб-прыкладанняў" - -#: ../midori/midori-websettings.c:830 -msgid "Whether to enable offline web application cache" -msgstr "Ці дазволіць пазасеткавы кэш вэб-прыкладанняў" - -#: ../midori/midori-websettings.c:851 -msgid "Flash window on background tabs" -msgstr "Мігценне па адкрыцці карткі ў фоне" - -#: ../midori/midori-websettings.c:852 -msgid "Flash the browser window if a new tab was opened in the background" -msgstr "" -"Загаловак акна браўзера будзе мігцець, калі адкрыта новая фонавая картка" - -#: ../midori/midori-websettings.c:860 -msgid "Enable WebGL support" -msgstr "Уключыць падтрымку WebGL" - -#: ../midori/midori-websettings.c:861 -msgid "Allow websites to use OpenGL rendering" -msgstr "Дазволіць вэб-пляцоўкам выкарыстоўваць OpenGL" - -#: ../midori/midori-websettings.c:887 -msgid "Zoom Text and Images" -msgstr "Павялічваць тэкст і выявы" - -#: ../midori/midori-websettings.c:888 -msgid "Whether to zoom text and images" -msgstr "Павялічваць, ці не, тэкст і выявы" - -#: ../midori/midori-websettings.c:903 -msgid "Find inline while typing" -msgstr "Інкрэментальны пошук падчас упісвання" - -#: ../midori/midori-websettings.c:904 -msgid "Whether to automatically find inline while typing" -msgstr "Ці рабіць аўтаматычны пошук падчас упісвання" - -#: ../midori/midori-websettings.c:919 -msgid "Kinetic scrolling" -msgstr "Кінетычны скролінг" - -#: ../midori/midori-websettings.c:920 -msgid "Whether scrolling should kinetically move according to speed" -msgstr "Ці мусіць пракрутка рухацца з паскарэннем у залежнасці ад хуткасці" - -#: ../midori/midori-websettings.c:928 -msgid "Delete old Cookies after:" -msgstr "Сціраць старыя кукісы праз:" - -#: ../midori/midori-websettings.c:929 -msgid "The maximum number of days to save cookies for" -msgstr "Максімальная працягласць захоўвання кукісаў у днях" - -#: ../midori/midori-websettings.c:945 -msgid "Only accept Cookies from sites you visit" -msgstr "Прымаць кукісы толькі з наведаных пляцовак" - -#: ../midori/midori-websettings.c:946 -msgid "Block cookies sent by third-party websites" -msgstr "Блакаваць кукісы, дасланыя пляцоўкамі трэцяга боку" - -#: ../midori/midori-websettings.c:960 -msgid "Delete pages from history after:" -msgstr "Сціраць старонкі з гісторыі праз:" - -#: ../midori/midori-websettings.c:961 -msgid "The maximum number of days to save the history for" -msgstr "Максімальная колькасць дзён, цягам якіх захоўваць гісторыю" - -#: ../midori/midori-websettings.c:976 -msgid "Proxy server" -msgstr "Проксі-сервер" - -#: ../midori/midori-websettings.c:977 -msgid "The type of proxy server to use" -msgstr "Тып проксі-сервера" - -#: ../midori/midori-websettings.c:986 -msgid "HTTP Proxy Server" -msgstr "Проксі-сервер HTTP" - -#: ../midori/midori-websettings.c:987 -msgid "The proxy server used for HTTP connections" -msgstr "Проксі-сервер, ужываны для HTTP-злучэнняў" - -#: ../midori/midori-websettings.c:1002 -msgid "Port" -msgstr "Порт" - -#: ../midori/midori-websettings.c:1003 -msgid "The proxy server port used for HTTP connections" -msgstr "Порт проксі-сервера, ужываны для HTTP-злучэнняў" - -#: ../midori/midori-websettings.c:1021 -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 -msgid "Identify as" -msgstr "Ідэнтыфікавацца як" - -#: ../midori/midori-websettings.c:1039 -msgid "What to identify as to web pages" -msgstr "Як прадстаўляцца вэб-пляцоўкам" - -#: ../midori/midori-websettings.c:1055 -msgid "Identification string" -msgstr "Радок ідэнтыфікацыі" - -#: ../midori/midori-websettings.c:1056 -msgid "The application identification string" -msgstr "Радок ідэнтыфікацыі праграмы" - -#: ../midori/midori-websettings.c:1072 -msgid "Preferred languages" -msgstr "Пераважныя мовы" - -#: ../midori/midori-websettings.c:1073 -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 "" -"Раздзелены коскамі спіс пераважных моў для адлюстравання шматмоўных старонак " -"сеціва, напрыклад \"be\", \"pl,ru\" ці \"en-us;q=1.0, fr-fr;q=0.667\"" - -#: ../midori/midori-websettings.c:1088 -msgid "Clear private data" -msgstr "Сцерці асабовыя звесткі" - -#: ../midori/midori-websettings.c:1089 -msgid "The private data selected for deletion" -msgstr "Асабовыя звесткі пазначаны да сцірання" - -#: ../midori/midori-websettings.c:1104 -msgid "Clear data" -msgstr "Сцерці звесткі" - -#: ../midori/midori-websettings.c:1105 -msgid "The data selected for deletion" -msgstr "Звесткі, вылучаныя для сцірання" - -#. i18n: Reworded: Shorten details propagated when going to another page -#: ../midori/midori-websettings.c:1154 -msgid "Strip referrer details sent to websites" -msgstr "Выразаць дэталі рэферэра" - -#. i18n: Referer here is not a typo but a technical term -#: ../midori/midori-websettings.c:1156 -msgid "Whether the \"Referer\" header should be shortened to the hostname" -msgstr "Скарачаць, ці не, загаловак \"Referer\" да назвы хоста" - -#: ../midori/midori-websettings.c:1170 -msgid "Always use my font choices" -msgstr "Заўжды ўжываць выбраныя шрыфты" - -#: ../midori/midori-websettings.c:1171 -msgid "Override fonts picked by websites with user preferences" -msgstr "" -"Перасягаць шрыфты, пададзеныя вэб-пляцоўкай, пераважнымі карыстальніцкімі" - -#: ../midori/midori-view.c:1002 ../midori/midori-view.c:1140 -msgid "Trust this website" -msgstr "Давяраць гэтай пляцоўцы" - -#: ../midori/midori-view.c:1138 -msgid "Security unknown" -msgstr "Прыватнасць невядомая" - -#: ../midori/midori-view.c:1436 -#, c-format -msgid "%s wants to save an HTML5 database." -msgstr "%s хоча запісаць HTML5 базу звестак." - -#: ../midori/midori-view.c:1440 ../midori/midori-view.c:1474 -msgid "_Deny" -msgstr "_Забараніць" - -#: ../midori/midori-view.c:1440 ../midori/midori-view.c:1474 -msgid "_Allow" -msgstr "_Дазволіць" - -#: ../midori/midori-view.c:1469 -#, c-format -msgid "%s wants to know your location." -msgstr "%s хоча ведаць ваша месцазнаходжанне." - -#: ../midori/midori-view.c:1565 -#, c-format -msgid "Error - %s" -msgstr "Памылка - %s" - -#: ../midori/midori-view.c:1566 -#, c-format -msgid "The page '%s' couldn't be loaded." -msgstr "Немагчыма прачытаць старонку '%s'." - -#: ../midori/midori-view.c:1568 -msgid "Try again" -msgstr "Паспрабаваць ізноў" - -#: ../midori/midori-view.c:1766 ../midori/midori-view.c:2879 -#, c-format -msgid "Send a message to %s" -msgstr "Даслаць паведамленне да %s" - -#: ../midori/midori-view.c:2665 -msgid "Add _search engine..." -msgstr "Дадаць пошукав_ы рухавік..." - -#: ../midori/midori-view.c:2709 ../midori/midori-view.c:3035 -msgid "Inspect _Element" -msgstr "Інспектаваць эл_емент" - -#: ../midori/midori-view.c:2761 -msgid "Open Link in New _Tab" -msgstr "Адкрыць у новай _картцы" - -#: ../midori/midori-view.c:2765 -msgid "Open Link in _Foreground Tab" -msgstr "Адкрыць у _бягучай картцы" - -#: ../midori/midori-view.c:2766 -msgid "Open Link in _Background Tab" -msgstr "Адкрыць у фонавай кар_тцы" - -#: ../midori/midori-view.c:2769 -msgid "Open Link in New _Window" -msgstr "Адкры_ць у новым акне" - -#: ../midori/midori-view.c:2772 -msgid "Open Link as Web A_pplication" -msgstr "Адкрыць як в_эб-прыкладанне" - -#: ../midori/midori-view.c:2777 -msgid "Copy Link de_stination" -msgstr "Капіраваць адрас спас_ылкі" - -#: ../midori/midori-view.c:2793 -msgid "Open _Image in New Tab" -msgstr "Адкрыць _выяву ў новай картцы" - -#: ../midori/midori-view.c:2796 -msgid "Copy Image _Address" -msgstr "Капіраваць адрас _выявы" - -#: ../midori/midori-view.c:2799 -msgid "Save I_mage" -msgstr "Запісац_ь выяву" - -#: ../midori/midori-view.c:2802 -msgid "Open in Image _Viewer" -msgstr "Адкрыць у праглядніку _выяў" - -#: ../midori/midori-view.c:2809 -msgid "Copy Video _Address" -msgstr "Капіраваць _адрас відэа" - -#: ../midori/midori-view.c:2812 -msgid "Save _Video" -msgstr "Запісаць в_ідэа" - -#: ../midori/midori-view.c:2812 -msgid "Download _Video" -msgstr "Сцягнуць _відэа" - -#: ../midori/midori-view.c:2838 -msgid "Search _with" -msgstr "Шукаць _на" - -#: ../midori/midori-view.c:2870 -msgid "_Search the Web" -msgstr "Шука_ць у Сеціве" - -#: ../midori/midori-view.c:2887 -msgid "Open Address in New _Tab" -msgstr "Адкрыць адрас у новай _картцы" - -#: ../midori/midori-view.c:2940 -msgid "Open _Frame in New Tab" -msgstr "_Адкрыць фрэйм у новай картцы" - -#: ../midori/midori-view.c:3201 -#, c-format -msgid "Open or download file from %s" -msgstr "Адкрыць ці сцягнуць файл з %s" - -#: ../midori/midori-view.c:3225 -#, c-format -msgid "File Name: %s" -msgstr "Назва файла: %s" - -#: ../midori/midori-view.c:3230 -#, c-format -msgid "File Type: '%s'" -msgstr "Тып файла: '%s'" - -#: ../midori/midori-view.c:3232 -#, c-format -msgid "File Type: %s ('%s')" -msgstr "Тып файла: %s ('%s')" - -#: ../midori/midori-view.c:3267 -#, c-format -msgid "Size: %s" -msgstr "Памер: %s" - -#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:3278 -#, c-format -msgid "Open %s" -msgstr "Адкрыць %s" - -#: ../midori/midori-view.c:3897 -#, c-format -msgid "Inspect page - %s" -msgstr "Інспектаванне старонкі - %s" - -#: ../midori/midori-view.c:4252 -msgid "Speed Dial" -msgstr "Хуткі выбар" - -#: ../midori/midori-view.c:4253 ../midori/midori-view.c:4359 -msgid "Click to add a shortcut" -msgstr "Націсніце, каб дадаць цэтлік" - -#: ../midori/midori-view.c:4254 -msgid "Enter shortcut address" -msgstr "Увядзіце адрас цэтліка" - -#: ../midori/midori-view.c:4255 -msgid "Enter shortcut title" -msgstr "Увядзіце назву цэтліка" - -#: ../midori/midori-view.c:4256 -msgid "Are you sure you want to delete this shortcut?" -msgstr "Вы ўпэўнены, што хочаце сцерці гэты цэтлік?" - -#: ../midori/midori-view.c:4429 -#, c-format -msgid "No documentation installed" -msgstr "Дакументацыя не ўстаноўлена" - -#: ../midori/midori-view.c:4506 -msgid "Midori doesn't store any personal data:" -msgstr "Midori не запісвае ніякіх асабовых звестак:" - -#: ../midori/midori-view.c:4507 -msgid "No history or web cookies are being saved." -msgstr "Не запісваюцца кукісы і гісторыя." - -#: ../midori/midori-view.c:4508 -msgid "Extensions are disabled." -msgstr "Прыстаўкі адключаны." - -#: ../midori/midori-view.c:4509 -msgid "HTML5 storage, local database and application caches are disabled." -msgstr "HTML5-сховішчы, лакальныя базы звестак і праграмныя кэшы адключаны." - -#: ../midori/midori-view.c:4510 -msgid "Midori prevents websites from tracking the user:" -msgstr "Midori забараняе вэб-пляцоўкам асочваць карыстальніка:" - -#: ../midori/midori-view.c:4511 -msgid "Referrer URLs are stripped down to the hostname." -msgstr "URL-спасылкі рэферэра скарачаюцца да назвы хоста." - -#: ../midori/midori-view.c:4512 -msgid "DNS prefetching is disabled." -msgstr "Папярэдняе атрыманне звестак DNS адключана." - -#: ../midori/midori-view.c:4513 -msgid "The language and timezone are not revealed to websites." -msgstr "Вэб-пляцоўкі не могуць высветліць мову і часавы пояс." - -#: ../midori/midori-view.c:4514 -msgid "Flash and other Netscape plugins cannot be listed by websites." -msgstr "Вэб-пляцоўкі не могуць атрымаць спіс флэш і іншых плагінаў Netscape" - -#: ../midori/midori-view.c:4603 -msgid "Version numbers in brackets show the version used at runtime." -msgstr "Нумары версій у дужках паказваюць версіі, ужытыя пры запуску." - -#: ../midori/midori-view.c:4653 -msgid "Page loading delayed" -msgstr "Чытанне старонкі адкладзена" - -#: ../midori/midori-view.c:4654 -msgid "Loading delayed either due to a recent crash or startup preferences." -msgstr "" -"Чытанне адкладзена з-за нядаўняга падзення ці з-за настаўленняў запуску" - -#: ../midori/midori-view.c:4655 -msgid "Load Page" -msgstr "Чытаць старонку" - -#: ../midori/midori-view.c:4822 -msgid "Blank page" -msgstr "Пустая старонка" - -#: ../midori/midori-view.c:5086 -msgid "_Duplicate Tab" -msgstr "Прадубля_ваць картку" - -#: ../midori/midori-view.c:5091 -msgid "Show Tab _Label" -msgstr "Паказваць по_дпісы картак" - -#: ../midori/midori-view.c:5091 -msgid "Show Tab _Icon Only" -msgstr "Паказваць толькі _значок карткі" - -#: ../midori/midori-view.c:5098 -msgid "Close Ot_her Tab" -msgid_plural "Close Ot_her Tabs" -msgstr[0] "Закрыць іншую ка_ртку" -msgstr[1] "Закрыць іншыя ка_рткі" -msgstr[2] "Закрыць іншыя ка_рткі" - -#. i18n: word stem of "previous page" type links, case is not important -#: ../midori/midori-view.c:5934 -msgid "previous" -msgstr "папярэдняя" - -#. i18n: word stem of "next page" type links, case is not important -#: ../midori/midori-view.c:5953 -msgid "next" -msgstr "наступная" - -#: ../midori/midori-view.c:5966 -msgid "Print background images" -msgstr "Друкаваць фонавыя выявы" - -#: ../midori/midori-view.c:5967 -msgid "Whether background images should be printed" -msgstr "Друкаваць, ці не, фонавыя выявы старонак" - -#: ../midori/midori-view.c:5999 -msgid "Features" -msgstr "Магчымасці" - -#: ../midori/midori-preferences.c:298 -msgid "Startup" -msgstr "Запуск" - -#: ../midori/midori-preferences.c:311 -msgid "Use _current page" -msgstr "Ужыць бягучую _старонку" - -#: ../midori/midori-preferences.c:315 -msgid "Use current page as homepage" -msgstr "Ужыць бягучую старонку як хатнюю" - -#. Page "Appearance" -#: ../midori/midori-preferences.c:324 -msgid "Fonts" -msgstr "Шрыфты" - -#: ../midori/midori-preferences.c:327 -msgid "Proportional Font Family" -msgstr "Прапарцыянальны шрыфт" - -#: ../midori/midori-preferences.c:331 -msgid "The default font family used to display text" -msgstr "Прадвызначаны шрыфт для адлюстравання тэксту" - -#: ../midori/midori-preferences.c:334 -msgid "The default font size used to display text" -msgstr "Прадвызначаны памер шрыфту для адлюстравання тэксту" - -#: ../midori/midori-preferences.c:336 -msgid "Fixed-width Font Family" -msgstr "Монашырынны шрыфт" - -#: ../midori/midori-preferences.c:340 -msgid "The font family used to display fixed-width text" -msgstr "Прадвызначаны шрыфт для адлюстравання тэксту фіксаванай шырыні" - -#: ../midori/midori-preferences.c:343 -msgid "The font size used to display fixed-width text" -msgstr "Прадвызначаны памер шрыфту для адлюстравання тэксту фіксаванай шырыні" - -#: ../midori/midori-preferences.c:345 -msgid "Minimum Font Size" -msgstr "Мінімальны памер шрыфту" - -#: ../midori/midori-preferences.c:349 -msgid "The minimum font size used to display text" -msgstr "Мінімальны памер шрыфту для адлюстравання тэксту" - -#. Page "Behavior" -#: ../midori/midori-preferences.c:360 -msgid "Behavior" -msgstr "Паводзіны" - -#: ../midori/midori-preferences.c:386 -msgid "Allow scripts to open popups" -msgstr "Дазволіць скрыптам адкрываць вокны" - -#: ../midori/midori-preferences.c:387 -msgid "Whether scripts are allowed to open popup windows automatically" -msgstr "Дазваляць, ці не, скрыптам адкрываць усплыўныя вокны аўтаматычна" - -#. Page "Interface" -#: ../midori/midori-preferences.c:418 -msgid "Browsing" -msgstr "Навігацыя" - -#. Page "Network" -#: ../midori/midori-preferences.c:458 -msgid "Network" -msgstr "Сетка" - -#: ../midori/midori-preferences.c:465 -msgid "Hostname" -msgstr "Назва хоста" - -#: ../midori/midori-preferences.c:489 -msgid "MB" -msgstr "МБ" - -#: ../midori/midori-searchaction.c:957 -msgid "Add search engine" -msgstr "Дадаць пошукавы рухавік" - -#: ../midori/midori-searchaction.c:957 -msgid "Edit search engine" -msgstr "Рэдагаваць пошукавыя рухавікі" - -#: ../midori/midori-searchaction.c:985 -msgid "_Name:" -msgstr "_Назва:" - -#: ../midori/midori-searchaction.c:1000 -msgid "_Description:" -msgstr "_Апісанне:" - -#: ../midori/midori-searchaction.c:1013 ../extensions/feed-panel/main.c:377 -msgid "_Address:" -msgstr "_Адрас:" - -#: ../midori/midori-searchaction.c:1032 -msgid "_Token:" -msgstr "_Токен:" - -#: ../midori/midori-searchaction.c:1330 -msgid "Manage Search Engines" -msgstr "Кіраванне пошукавымі рухавікамі" - -#: ../midori/midori-searchaction.c:1432 -msgid "Use as _default" -msgstr "Ужыць як база_вы" - -#: ../midori/sokoke.c:346 -msgid "Open with" -msgstr "Адкрыць з" - -#: ../midori/sokoke.c:354 -#, c-format -msgid "Choose an application or command to open \"%s\":" -msgstr "Выберыце праграму ці загад для адкрыцця \"%s\":" - -#: ../midori/sokoke.c:468 ../midori/sokoke.c:482 -msgid "Could not run external program." -msgstr "Немагчыма запусціць вонкавую праграму." - -#: ../midori/sokoke.c:1529 -#, c-format -msgid "%d hour" -msgid_plural "%d hours" -msgstr[0] "%d гадзіна" -msgstr[1] "%d гадзіны" -msgstr[2] "%d гадзін" - -#: ../midori/sokoke.c:1530 -#, c-format -msgid "%d minute" -msgid_plural "%d minutes" -msgstr[0] "%d хвіліна" -msgstr[1] "%d хвіліны" -msgstr[2] "%d хвілін" - -#: ../midori/sokoke.c:1531 -#, c-format -msgid "%d second" -msgid_plural "%d seconds" -msgstr[0] "%'d секунда" -msgstr[1] "%'d секунды" -msgstr[2] "%'d секунд" - -#. i18n: Download tooltip (size): 4KB of 43MB -#: ../midori/sokoke.c:1539 ../panels/midori-transfers.c:268 -#, c-format -msgid "%s of %s" -msgstr "%s з %s" - -#. i18n: Unknown number of bytes, used for transfer rate like ?B/s -#: ../midori/sokoke.c:1548 -msgid "?B" -msgstr "?Б" - -#. i18n: Download tooltip (transfer rate): (130KB/s) -#: ../midori/sokoke.c:1551 -#, c-format -msgid " (%s/s)" -msgstr " (%s/s)" - -#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning -#: ../midori/sokoke.c:1568 -#, c-format -msgid " - %s remaining" -msgstr " - %s засталося" - -#. i18n: A panel at the bottom, to search text in pages -#: ../toolbars/midori-findbar.c:265 -msgid "_Inline Find:" -msgstr "_Шукаць:" - -#: ../toolbars/midori-findbar.c:287 -msgid "Previous" -msgstr "Папярэдняе" - -#: ../toolbars/midori-findbar.c:293 -msgid "Next" -msgstr "Наступнае" - -#: ../toolbars/midori-findbar.c:297 -msgid "Match Case" -msgstr "З улікам рэгістру" - -#: ../toolbars/midori-findbar.c:306 -msgid "Highlight Matches" -msgstr "Вылучыць супадзенні" - -#: ../toolbars/midori-findbar.c:317 -msgid "Close Findbar" -msgstr "Закрыць форму пошуку" - -#: ../toolbars/midori-transferbar.c:124 -#, c-format -msgid "The file '%s' has been downloaded." -msgstr "Перасыланне файла '%s' скончана." - -#: ../toolbars/midori-transferbar.c:129 -msgid "Transfer completed" -msgstr "Перасыланне скончана" - -#: ../toolbars/midori-transferbar.c:201 -msgid "The downloaded file is erroneous." -msgstr "Атрыманы файл - памылковы." - -#: ../toolbars/midori-transferbar.c:202 -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:345 ../panels/midori-transfers.c:142 -msgid "Clear All" -msgstr "Ачысціць усё" - -#: ../toolbars/midori-transferbar.c:382 ../toolbars/midori-transferbar.c:384 -msgid "Some files are being downloaded" -msgstr "Некаторыя файлы яшчэ цягнуцца" - -#: ../toolbars/midori-transferbar.c:388 -msgid "_Quit Midori" -msgstr "Вы_йсці з Midori" - -#: ../toolbars/midori-transferbar.c:390 -msgid "The transfers will be cancelled if Midori quits." -msgstr "Перасыланні будуць скасаваныя, калі выйсці з Midori." - -#: ../panels/midori-bookmarks.c:308 -#, c-format -msgid "Failed to add bookmark item: %s\n" -msgstr "Не ўдалося дадаць закладку: %s\n" - -#: ../panels/midori-bookmarks.c:475 -#, c-format -msgid "Failed to update bookmark : %s\n" -msgstr "Не ўдалося абнавіць закладку: %s\n" - -#: ../panels/midori-bookmarks.c:535 -msgid "Edit the selected bookmark" -msgstr "Рэдагаваць вылучаную закладку" - -#: ../panels/midori-bookmarks.c:543 -msgid "Delete the selected bookmark" -msgstr "Сцерці вылучаную закладку" - -#: ../panels/midori-bookmarks.c:558 -msgid "Add a new folder" -msgstr "Дадаць каталог" - -#: ../panels/midori-bookmarks.c:697 ../panels/midori-history.c:638 -msgid "Separator" -msgstr "Раздзяляльнік" - -#. Create the filter entry -#: ../panels/midori-bookmarks.c:1027 -msgid "Search Bookmarks" -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] "%d дзень таму" -msgstr[1] "%d дні таму" -msgstr[2] "%d дзён таму" - -#: ../panels/midori-history.c:165 ../panels/midori-history.c:184 -msgid "A week ago" -msgstr "Тыдзень таму" - -#: ../panels/midori-history.c:232 -#, c-format -msgid "Failed to remove history item: %s\n" -msgstr "Памылка сцірання элемента гісторыі: %s\n" - -#: ../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 "Сцерці ўсю гісторыю" - -#. Create the filter entry -#: ../panels/midori-history.c:997 -msgid "Search History" -msgstr "Шукаць у гісторыі" - -#: ../panels/midori-transfers.c:87 -msgid "Transfers" -msgstr "Перасыланні" - -#: ../panels/midori-transfers.c:470 -msgid "Open Destination _Folder" -msgstr "Адкрыць к_аталог прызначэння" - -#: ../panels/midori-transfers.c:473 -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:949 -#, c-format -msgid "Named icon '%s' couldn't be loaded" -msgstr "Названы значок '%s' нельга прачытаць" - -#: ../katze/katze-throbber.c:962 -#, c-format -msgid "Stock icon '%s' couldn't be loaded" -msgstr "Немагчыма прачытаць значок '%s' сховішча" - -#: ../katze/katze-throbber.c:1042 -msgid "Animation frames are broken" -msgstr "Фрэймы анімацыі пашкоджаны" - -#: ../katze/katze-utils.c:443 ../katze/katze-utils.c:867 -#, c-format -msgid "Property '%s' is invalid for %s" -msgstr "Уласцівасць '%s' недапушчальная для %s" - -#: ../katze/katze-utils.c:489 ../katze/katze-utils.c:518 -#: ../extensions/addons.c:308 -msgid "Choose file" -msgstr "Выберыце файл" - -#: ../katze/katze-utils.c:504 -msgid "Choose folder" -msgstr "Выберыце каталог" - -#: ../katze/katze-utils.c:602 -msgid "None" -msgstr "Няма" - -#: ../katze/katze-utils.c:717 -msgid "1 hour" -msgstr "1 гадзіну" - -#: ../katze/katze-utils.c:718 -msgid "1 day" -msgstr "1 дзень" - -#: ../katze/katze-utils.c:719 -msgid "1 week" -msgstr "1 тыдзень" - -#: ../katze/katze-utils.c:720 -msgid "1 month" -msgstr "1 месяц" - -#: ../katze/katze-utils.c:721 -msgid "1 year" -msgstr "1 год" - -#: ../katze/katze-preferences.c:98 ../extensions/history-list.vala:235 -#, c-format -msgid "Preferences for %s" -msgstr "Настаўленні %s" - -#: ../extensions/adblock.c:470 -msgid "Configure Advertisement filters" -msgstr "Наставіць фільтры рэкламы" - -#: ../extensions/adblock.c:503 -#, 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:917 -msgid "Edit rule" -msgstr "Рэдагаваць правіла" - -#: ../extensions/adblock.c:931 -msgid "_Rule:" -msgstr "_Правіла:" - -#: ../extensions/adblock.c:985 -msgid "Bl_ock image" -msgstr "Блакаванне выя_ў" - -#: ../extensions/adblock.c:990 -msgid "Bl_ock link" -msgstr "Блакаван_не спасылак" - -#: ../extensions/adblock.c:1689 -msgid "Advertisement blocker" -msgstr "Блакавальнік рэкламы" - -#: ../extensions/adblock.c:1690 -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:677 -msgid "Userscripts" -msgstr "Карыстальніцкія скрыпты" - -#: ../extensions/addons.c:324 ../extensions/addons.c:679 -msgid "Userstyles" -msgstr "Карыстальніцкія стылі" - -#: ../extensions/addons.c:370 ../extensions/addons.c:449 -#: ../extensions/feed-panel/main.c:129 -msgid "Error" -msgstr "Памылка" - -#: ../extensions/addons.c:411 -#, c-format -msgid "Do you want to delete '%s'?" -msgstr "Вы хочаце сцерці '%s'?" - -#: ../extensions/addons.c:417 -msgid "Delete user script" -msgstr "Сцерці карыстальніцкі скрыпт" - -#: ../extensions/addons.c:418 -msgid "Delete user style" -msgstr "Сцерці карыстальніцкі стыль" - -#: ../extensions/addons.c:421 -#, c-format -msgid "The file %s will be permanently deleted." -msgstr "Файл %s будзе сцёрты без магчымасці ўзнаўлення." - -#: ../extensions/addons.c:566 ../extensions/addons.c:643 -msgid "Open in Text Editor" -msgstr "Адкрыць у тэкставым рэдактары" - -#: ../extensions/addons.c:568 ../extensions/addons.c:652 -msgid "Open Target Folder" -msgstr "Адкрыць мэтавы каталог" - -#: ../extensions/addons.c:634 -msgid "Add new addon" -msgstr "Дадаць прыстаўку" - -#: ../extensions/addons.c:660 -msgid "Remove selected addon" -msgstr "Сцерці вылучаную прыстаўку" - -#: ../extensions/addons.c:1689 ../extensions/addons.c:1907 -msgid "User addons" -msgstr "Карыстальніцкія прыстаўкі" - -#: ../extensions/addons.c:1819 -#, c-format -msgid "Can't monitor folder '%s': %s" -msgstr "Нельга назіраць за каталогам '%s': %s" - -#: ../extensions/addons.c:1908 -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:1017 -msgid "Name" -msgstr "Назва" - -#: ../extensions/cookie-manager/cookie-manager-page.c:1069 -msgid "_Expand All" -msgstr "Расцягн_уць усё" - -#: ../extensions/cookie-manager/cookie-manager-page.c:1077 -msgid "_Collapse All" -msgstr "Згарну_ць усё" - -#: ../extensions/cookie-manager/cookie-manager-page.c:1129 -msgid "Search Cookies by Name or Domain" -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 "Не ўдалося знайсці \"channel\"-элемент у звестках XML." - -#: ../extensions/feed-panel/feed-atom.c:315 -msgid "Failed to find required Atom \"feed\" elements in XML data." -msgstr "Не ўдалося знайсці неабходны элемент Атам \"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\"-элемент у звестках 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-каналы (feeds)" - -#: ../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.c:302 -msgid "Control Midori by moving the mouse" -msgstr "Кіраванне Midori рухамі мышы" - -#: ../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:152 -msgid "Images" -msgstr "Выявы" - -#: ../extensions/statusbar-features.c:162 -msgid "Scripts" -msgstr "Скрыпты" - -#: ../extensions/statusbar-features.c:174 -msgid "Netscape plugins" -msgstr "Плагіны Netscape" - -#: ../extensions/statusbar-features.c:259 -msgid "Statusbar Features" -msgstr "Магчымасці стужкі статусу" - -#: ../extensions/statusbar-features.c:260 -msgid "Easily toggle features on web pages on and off" -msgstr "Зручнае ўключэнне-выключэнне магчымасцей вэб-старонак" - -#: ../extensions/tab-panel.c:589 ../extensions/tab-panel.c:676 -msgid "Tab Panel" -msgstr "Панэль картак" - -#: ../extensions/tab-panel.c:659 -msgid "T_ab Panel" -msgstr "Панэль к_артак" - -#: ../extensions/tab-panel.c:677 -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:395 -msgid "Customize Toolbar" -msgstr "Наставіць стужку прылад" - -#: ../extensions/toolbar-editor.c:411 -msgid "" -"Select items to be displayed on the toolbar. Items can be reordered by drag " -"and drop." -msgstr "" -"Выберыце элементы, якія трэба паказваць на стужцы прылад. Элементы можна " -"парадкаваць перацягваннем." - -#: ../extensions/toolbar-editor.c:427 -msgid "Available Items" -msgstr "Даступныя элементы" - -#: ../extensions/toolbar-editor.c:448 -msgid "Displayed Items" -msgstr "Паказаныя элементы" - -#: ../extensions/toolbar-editor.c:588 -msgid "_Customize Toolbar…" -msgstr "На_ставіць стужку прылад…" - -#: ../extensions/toolbar-editor.c:617 -msgid "Toolbar Editor" -msgstr "Рэдактар стужкі прылад" - -#: ../extensions/toolbar-editor.c:618 -msgid "Easily edit the toolbar layout" -msgstr "Зручнае рэдагаванне выкладу стужкі прылад" - -#: ../extensions/web-cache.c:463 -msgid "Cache HTTP communication on disk" -msgstr "Запісваць HTTP-перасыланні ў дыскавы кэш" - -#~ msgid "Close ot_her Tabs" -#~ msgstr "Зак_рыць іншыя карткі" - -#~ msgid "Filter:" -#~ msgstr "Фільтр:" - -#~ msgid "" -#~ "Enter a filter string to show only cookies whose name or domain field " -#~ "match the entered filter" -#~ msgstr "" -#~ "Увядзіце радок фільтра, каб паказваць толькі тыя кукісы, дзе назва ці " -#~ "дамен адпавядаюць фільтру" - -#~ msgid "'Flash' Cookies" -#~ msgstr "«Flash» Кукісы" - -#~ msgid "Accept cookies" -#~ msgstr "Прымаць кукі" - -#~ msgid "Add a new bookmark folder" -#~ msgstr "Дадаць каталог закладак" - -#~ msgid "Add shortcut to speed dial" -#~ msgstr "Дадаць цэтлік хуткага запуску" - -#~ msgid "Add shortcut to the desktop" -#~ msgstr "Дадаць цэтлік на працоўную прастору" - -#~ msgid "Add, edit and remove search engines..." -#~ msgstr "Даданне, змяненне і выдаленне пошукавых рухавікоў..." - -#~ msgid "All cookies" -#~ msgstr "Усе кукісы" - -#~ msgid "An external download manager" -#~ msgstr "Вонкавы распараднік перасыланняў" - -#~ msgid "Appearance" -#~ msgstr "Выгляд" - -#~ msgid "Big" -#~ msgstr "Вялікі" - -#~ msgid "Clear private data..." -#~ msgstr "Сціранне асабовых звестак..." - -#~ msgid "Close all open windows" -#~ msgstr "Закрыць усе адкрытыя вокны" - -#~ msgid "Close all tabs except the current tab" -#~ msgstr "Закрыць усе карткі, акрамя бягучай" - -#~ msgid "Close this window" -#~ msgstr "Закрыць гэта вакно" - -#~ msgid "Configure _Advertisement filters..." -#~ msgstr "Настаўленне _фільтра рэкламы..." - -#~ msgid "Cookies" -#~ msgstr "Кукісы/Cookies" - -#~ msgid "Copy the selected text" -#~ msgstr "Капіраваць вылучаны тэкст" - -#~ msgid "Create a launcher" -#~ msgstr "Стварыць пускальнік" - -#~ msgid "Customize _Toolbar..." -#~ msgstr "_Настаўленне стужкі прылад..." - -#~ msgid "Cut the selected text" -#~ msgstr "Выразаць вылучаны тэкст" - -#~ msgid "Cycle focus between views" -#~ msgstr "Цыклічнае пераключэнне відаў" - -#~ msgid "Delete old cookies after 1 hour" -#~ msgstr "Сціраць старыя кукісы праз 1 гадзіну" - -#~ msgid "Delete old cookies after 1 month" -#~ msgstr "Сціраць старыя кукісы пасля 1 месяца" - -#~ msgid "Delete old cookies after 1 week" -#~ msgstr "Сціраць старыя кукісы пасля 1 тыдня" - -#~ msgid "Delete old cookies after 1 year" -#~ msgstr "Сціраць старыя кукісы пасля 1 года" - -#~ msgid "Delete the contents of the trash" -#~ msgstr "Сцерці змест сметніцы" - -#~ msgid "Delete the selected text" -#~ msgstr "Сцерці вылучаны тэкст" - -#~ msgid "Document cannot be displayed" -#~ msgstr "Дакумент не можа быць паказаны" - -#~ msgid "Don't save any private data while browsing" -#~ msgstr "Не запісваць ніякіх асабовых звестак падчас аглядання" - -#~ msgid "Download Manager" -#~ msgstr "Менеджар перасыланняў" - -#~ msgid "Duplicate the current tab" -#~ msgstr "Прадубліраваць бягучую картку" - -#~ msgid "Enforce 96 dots per inch" -#~ msgstr "Прымусова выставіць 96 кропак на цалю" - -#~ msgid "Enforce a video dot density of 96 DPI" -#~ msgstr "Прымусова выставіць шчыльнасць відэа 96 DPI" - -#~ msgid "Enter number of columns and rows:" -#~ msgstr "Увесці колькасць слупкоў і радкоў:" - -#~ msgid "Find the next occurrence of a word or phrase" -#~ msgstr "Знайсці наступнае ўваходжанне слова ці выразу" - -#~ msgid "Find the previous occurrence of a word or phrase" -#~ msgstr "Знайсці папярэдняе ўваходжанне слова ці выразу" - -#~ msgid "Focus the current tab" -#~ msgstr "Бягучая картка" - -#~ msgid "HTML5 _Databases" -#~ msgstr "База з_вестак HTML5" - -#~ msgid "Import bookmarks..." -#~ msgstr "Імпартаванне закладак..." - -#~ msgid "Inspect page details and access developer tools..." -#~ msgstr "Інспектаванне дэталяў старонкі, прылады распрацоўніка..." - -#~ msgid "Invalid input for the size of the speed dial" -#~ msgstr "Недапушчальны ўвод для памераў хуткага выбару" - -#~ msgid "Lightweight web browser" -#~ msgstr "Лёгкі вэб-браўзер" - -#~ msgid "MD5-Checksum:" -#~ msgstr "Кантрольная сума MD5:" - -#~ msgid "Maximum cookie age" -#~ msgstr "Максімальны узрост кукісаў" - -#~ msgid "Maximum history age" -#~ msgstr "Максімальная даўжыня гісторыі" - -#~ msgid "Medium" -#~ msgstr "Сярэдні" - -#~ msgid "Move tab behind the previous tab" -#~ msgstr "Перамясціць картку за папярэднюю" - -#~ msgid "Move tab in front of the next tab" -#~ msgstr "Перамясціць картку перад наступнай" - -#~ msgid "No filename specified" -#~ msgstr "Не уведзена назва файла" - -#~ msgid "Not available: %s" -#~ msgstr "Недаступна: %s" - -#~ msgid "Not found - %s" -#~ msgstr "Не знойдзена - %s" - -#~ msgid "Offline Application Cache" -#~ msgstr "Пазасеткавы кэш прыкладанняў" - -#~ msgid "Only show the icon of the current tab" -#~ msgstr "Паказваць толькі значок на бягучай картцы" - -#~ msgid "Open Midori's bug tracker" -#~ msgstr "Адкрыць баг-трэкер Midori" - -#~ msgid "Open external pages in:" -#~ msgstr "Адкрываць вонкавыя старонкі ў:" - -#~ msgid "Open the last closed tab" -#~ msgstr "Адкрыць апошнюю закрытую картку" - -#~ msgid "Open the tabs saved in the last session" -#~ msgstr "Адкрываць карткі, запісаныя ў апошнім сеансе" - -#~ msgid "Paste text from the clipboard" -#~ msgstr "Уставіць тэкст з буфера абмену" - -#~ msgid "Redo the last modification" -#~ msgstr "Узнавіць апошняе змяненне" - -#~ msgid "Remember last downloaded files" -#~ msgstr "Памятаваць апошнія сцягнутыя файлы" - -#~ msgid "Reset the last _session" -#~ msgstr "Скінуць апошні се_анс" - -#~ msgid "Reset the zoom level" -#~ msgstr "Скінуць узровень павелічэння" - -#~ msgid "Resource files not installed" -#~ msgstr "Файлы рэсурсаў не ўстаноўлены" - -#~ msgid "SHA1-Checksum:" -#~ msgstr "Кантрольная сума SHA1:" - -#~ msgid "Scroll down" -#~ msgstr "Пракруціць уніз" - -#~ msgid "Scroll to the left" -#~ msgstr "Пракруціць улева" - -#~ msgid "Scroll to the right" -#~ msgstr "Пракруціць управа" - -#~ msgid "Scroll up" -#~ msgstr "Пракруціць уверх" - -#~ msgid "Search engines in location completion" -#~ msgstr "Пошукавыя рухавікі ў дапаўненні адрасоў" - -#~ msgid "Select all text" -#~ msgstr "Вылучыць увесь тэкст" - -#~ msgid "Session cookies" -#~ msgstr "Кукі сеанса" - -#~ msgid "Set number of columns and rows" -#~ msgstr "Задаць колькасць слупкоў і радкоў" - -#~ msgid "Show Transferbar" -#~ msgstr "Паказваць стужку перасыланняў" - -#~ msgid "Show bookmarkbar" -#~ msgstr "Паказваць панэль закладак" - -#~ msgid "Show information about the program" -#~ msgstr "Паказваць звесткі пра праграму" - -#~ msgid "Show menubar" -#~ msgstr "Паказаць радок меню" - -#~ msgid "Show navigationbar" -#~ msgstr "Паказаць панэль навігацыі" - -#~ msgid "Show operating controls of the panel" -#~ msgstr "Паказваць аперацыйныя кантрольнікі панэлі" - -#~ msgid "Show sidepanel" -#~ msgstr "Паказаць бакавую панэль" - -#~ msgid "Show speed dial in new tabs" -#~ msgstr "Паказваць хуткі выбар у новай картцы" - -#~ msgid "Show speed dial in newly opened tabs" -#~ msgstr "Паказваць хуткі выбар у наноў адкрытых картках" - -#~ msgid "Show statusbar" -#~ msgstr "Паказваць стужку статусу" - -#~ msgid "Show the Frequently Asked Questions" -#~ msgstr "Паказаць Частыя Пытанні" - -#~ msgid "Small" -#~ msgstr "Малы" - -#~ msgid "Subscribe to this news feed" -#~ msgstr "Падпісацца на гэты канал навін" - -#~ msgid "Switch tabs with Ctrl+Tab sorted by last usage" -#~ msgstr "Пераключаць карткі па Strg+Tab парадкуючы па апошнім ужыванні" - -#~ msgid "Switch to the previous tab" -#~ msgstr "Перайсці да папярэдняй карткі" - -#~ msgid "The bookmarks couldn't be saved. %s" -#~ msgstr "Немагчыма захаваць закладкі. %s" - -#~ msgid "Thumb size:" -#~ msgstr "Памер значкоў:" - -#~ msgid "Toplevel folder" -#~ msgstr "Верхні ўзровень" - -#~ msgid "View the source code of the page" -#~ msgstr "Глядзець выточны тэкст старонкі" - -#~ msgid "Whether the last downloaded files are saved" -#~ msgstr "Ці запісваць апошнія сцягнутыя файлы" - -#~ msgid "Whether to show search engines in the location completion" -#~ msgstr "Ці паказваць пошукавыя рухавікі ў дапаўненні адрасоў" - -#~ msgid "Whether to show the operating controls of the panel" -#~ msgstr "Ці паказваць аперацыйныя кантрольнікі на панэлі" - -#~ msgid "Whether to show the transferbar" -#~ msgstr "Ці паказваць стужку перасыланняў" - -#~ msgid "_Bookmark" -#~ msgstr "_Закладка" - -#~ msgid "_Console" -#~ msgstr "_Сonsole" - -#~ msgid "_Customize..." -#~ msgstr "_Наставіць…" - -#~ msgid "_Folder:" -#~ msgstr "К_аталог:" - -#~ msgid "_Icon:" -#~ msgstr "_Значок:" - -#~ msgid "_Title:" -#~ msgstr "_Загаловак:" - -#~ msgid "days" -#~ msgstr "дні" diff --git a/po/ca.po b/po/ca.po index 0e30b8d0..0aab097e 100644 --- a/po/ca.po +++ b/po/ca.po @@ -2,17 +2,16 @@ # 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. -# Pol Ruzafa , 2011. -# Carles Muñoz Gorriz , 2009-2010, 2012. +# Carles Muñoz Gorriz , 2009-2010. # Harald Servat , 2009. -# +# msgid "" msgstr "" "Project-Id-Version: midori\n" "Report-Msgid-Bugs-To: \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" +"POT-Creation-Date: 2011-08-11 10:19+0000\n" +"PO-Revision-Date: 2011-08-11 18:14+0100\n" +"Last-Translator: Pol Ruzafa \n" "Language-Team: Catalan\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -23,362 +22,314 @@ msgstr "" "X-Poedit-SourceCharset: utf-8\n" #: ../data/midori.desktop.in.h:1 -msgid "Browse the Web" -msgstr "Navega la web" +msgid "Lightweight web browser" +msgstr "Navegador web lleuger" #: ../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 +#: ../midori/main.c:1431 +#: ../midori/main.c:2005 +#: ../midori/main.c:2029 +#: ../midori/main.c:2045 +#: ../midori/midori-websettings.c:291 msgid "Midori" msgstr "Midori" -#: ../data/midori.desktop.in.h:4 +#: ../data/midori.desktop.in.h:3 msgid "Web Browser" msgstr "Navegador web" -#: ../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 +#: ../midori/main.c:106 +#: ../midori/main.c:112 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "No s'ha pogut carregar la configuració: %s\n" -#: ../midori/main.c:150 +#: ../midori/main.c:160 #, 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:259 +#: ../midori/main.c:165 +#: ../midori/main.c:258 #, c-format msgid "Invalid configuration value '%s'" msgstr "Valor de configuració «%s» no és vàlid" -#: ../midori/main.c:380 +#: ../midori/main.c:363 #, 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 +#: ../midori/main.c:417 #, 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 +#: ../midori/main.c:437 +#: ../midori/main.c:558 +#: ../extensions/formhistory.c:388 #, 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:524 +#: ../midori/main.c:501 #, 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:564 ../panels/midori-history.c:232 +#: ../midori/main.c:541 +#: ../panels/midori-history.c:193 #, 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:611 +#: ../midori/main.c:588 #, 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:633 +#: ../midori/main.c:622 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "No s'ha pogut desar la configuració: %s" -#: ../midori/main.c:668 +#: ../midori/main.c:657 #, 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:705 +#: ../midori/main.c:683 +#: ../midori/main.c:703 #, c-format msgid "The trash couldn't be saved. %s" msgstr "No s'han pogut desar les escombraries. %s" -#: ../midori/main.c:746 ../panels/midori-extensions.c:91 +#: ../midori/main.c:737 +#: ../panels/midori-extensions.c:93 msgid "Extensions" msgstr "Extensions" -#: ../midori/main.c:760 +#: ../midori/main.c:751 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:759 +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 +#: ../midori/main.c:823 #, c-format msgid "The session couldn't be saved. %s" msgstr "No s'ha pogut desar la sessió. %s" -#: ../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:1017 +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: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 "" -"Sembla que Midori ha fallat el darrer cop que s'ha executat. Si això ha " -"ocorregut repetidament, proveu una de les següents opcions per a resoldre el " -"problema." +#: ../midori/main.c:1079 +msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." +msgstr "Sembla que Midori ha fallat el darrer cop que s'ha executat. Si això ha ocorregut repetidament, proveu una de les següents opcions per a resoldre el problema." -#: ../midori/main.c:1134 +#: ../midori/main.c:1098 msgid "Modify _preferences" msgstr "Modificació de les _preferències" -#: ../midori/main.c:1138 +#: ../midori/main.c:1102 msgid "Disable all _extensions" msgstr "Inhabilita totes les _extensions" -#: ../midori/main.c:1151 +#: ../midori/main.c:1115 msgid "Discard old tabs" msgstr "Descarta pestanyes velles" -#: ../midori/main.c:1152 ../midori/midori-websettings.c:221 +#: ../midori/main.c:1116 +#: ../midori/midori-websettings.c:201 msgid "Show last tabs without loading" msgstr "Mostra les darreres pestanyes sense carregar-les" -#: ../midori/main.c:1153 ../midori/midori-websettings.c:220 +#: ../midori/main.c:1117 +#: ../midori/midori-websettings.c:200 msgid "Show last open tabs" msgstr "Mostra les pestanyes obertes recentment" -#: ../midori/main.c:1400 ../midori/main.c:2464 +#: ../midori/main.c:1310 +#: ../midori/main.c:2366 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "No s'ha pogut carregar la sessió: %s\n" -#: ../midori/main.c:1538 +#: ../midori/main.c:1431 +msgid "No filename specified" +msgstr "No s'ha especificat un nom de fitxer" + +#: ../midori/main.c:1450 +msgid "An unknown error occured." +msgstr "Ha ocorregut un error desconegut." + +#: ../midori/main.c:1479 #, c-format msgid "Snapshot saved to: %s\n" msgstr "S'ha desat una captura a: %s\n" -#: ../midori/main.c:1951 +#: ../midori/main.c:1889 msgid "Run ADDRESS as a web application" msgstr "Executa ADREÇA com una aplicació web" -#: ../midori/main.c:1951 +#: ../midori/main.c:1889 msgid "ADDRESS" msgstr "ADREÇA" -#: ../midori/main.c:1954 +#: ../midori/main.c:1892 msgid "Use FOLDER as configuration folder" msgstr "Empra CARPETA com a carpeta de configuració" -#: ../midori/main.c:1954 +#: ../midori/main.c:1892 msgid "FOLDER" msgstr "CARPETA" -#: ../midori/main.c:1957 +#: ../midori/main.c:1895 msgid "Private browsing, no changes are saved" msgstr "Navegació privada, els canvis no es desaran" -#: ../midori/main.c:1959 +#: ../midori/main.c:1897 msgid "Show a diagnostic dialog" msgstr "Mostra el diàleg de diagnosis" -#: ../midori/main.c:1961 +#: ../midori/main.c:1899 msgid "Run the specified filename as javascript" msgstr "Executa el fitxer especificat com a javascript" -#: ../midori/main.c:1963 +#: ../midori/main.c:1901 msgid "Take a snapshot of the specified URI" msgstr "Fes una captura de la ubicació especificada" -#: ../midori/main.c:1965 +#: ../midori/main.c:1903 msgid "Execute the specified command" msgstr "Executar la comanda especificada" -#: ../midori/main.c:1967 +#: ../midori/main.c:1905 msgid "List available commands to execute with -e/ --execute" msgstr "Llista de comandes disponibles per a executar amb -e/--execute" -#: ../midori/main.c:1969 +#: ../midori/main.c:1907 msgid "Display program version" msgstr "Mostra la versió del programa" -#: ../midori/main.c:1971 +#: ../midori/main.c:1909 msgid "Addresses" msgstr "Adreces" -#: ../midori/main.c:1973 +#: ../midori/main.c:1911 msgid "Block URIs according to regular expression PATTERN" msgstr "Bloquejar URIs segons l'expressió regular PATRÓ" -#: ../midori/main.c:1973 +#: ../midori/main.c:1911 msgid "PATTERN" msgstr "PATRÓ" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1977 +#: ../midori/main.c:1915 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "Reiniciar Midori després de SEGONS d'activitat" -#: ../midori/main.c:1977 +#: ../midori/main.c:1915 msgid "SECONDS" msgstr "SEGONS" -#: ../midori/main.c:1980 +#: ../midori/main.c:1918 msgid "Redirects console warnings to the specified FILENAME" msgstr "Redirigeix les alertes de consola a l'ARXIU especificat" -#: ../midori/main.c:1980 +#: ../midori/main.c:1918 msgid "FILENAME" msgstr "ARXIU" -#: ../midori/main.c:2045 +#: ../midori/main.c:2002 msgid "[Addresses]" msgstr "[adreces]" -#: ../midori/main.c:2087 +#: ../midori/main.c:2016 +msgid "The specified configuration folder is invalid." +msgstr "La carpeta de configuració especificada és invalida." + +#: ../midori/main.c:2046 msgid "Please report comments, suggestions and bugs to:" msgstr "Envieu comentaris, suggeriments i informes d'error a:" -#: ../midori/main.c:2089 +#: ../midori/main.c:2048 msgid "Check for new versions at:" msgstr "Comprova si hi ha noves versions a:" +#: ../midori/main.c:2115 +msgid "Website icons" +msgstr "Icones de llocs webs" + #. i18n: Logins and passwords in websites and web forms -#: ../midori/main.c:2173 +#: ../midori/main.c:2118 msgid "Saved logins and _passwords" -msgstr "Noms d'usuari i contra_senyes guardats" +msgstr "Noms d'usuari i contrasenyes guardats" + +#: ../midori/main.c:2120 +msgid "Cookies" +msgstr "Galetes" -#: ../midori/main.c:2175 -msgid "Cookies and Website data" -msgstr "Galetes i informació de llocs web" +#: ../midori/main.c:2123 +msgid "'Flash' Cookies" +msgstr "Galetes «Flash»" -#. 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 +#: ../midori/main.c:2126 +msgid "HTML5 _Databases" +msgstr "_Bases de dades HTML5" + +#: ../midori/main.c:2129 +#: ../midori/midori-websettings.c:877 +#: ../extensions/web-cache.c:478 +#: ../extensions/web-cache.c:487 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:2133 +#, fuzzy +msgid "Offline Application Cache" +msgstr "Habilita la memòria cau d'aplicació de fora de línia" -#: ../midori/main.c:2395 +#: ../midori/main.c:2297 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:2431 +#: ../midori/main.c:2333 #, 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:2479 +#: ../midori/main.c:2381 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "No s'han pogut carregar les escombraries: %s\n" -#: ../midori/main.c:2492 +#: ../midori/main.c:2394 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "No s'ha pogut carregar l'historial: %s\n" -#: ../midori/main.c:2508 +#: ../midori/main.c:2410 msgid "The following errors occured:" msgstr "S'han produït els següents errors:" -#: ../midori/main.c:2524 +#: ../midori/main.c:2426 msgid "_Ignore" msgstr "_Ignora" -#: ../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:547 ../midori/midori-array.c:586 -#: ../midori/midori-array.c:609 ../midori/midori-array.c:619 +#: ../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." @@ -386,1671 +337,1857 @@ msgstr "Document format erròniament." msgid "Unrecognized bookmark format." msgstr "No es reconeix el format de l'adreça d'interès." -#: ../midori/midori-array.c:915 +#: ../midori/midori-array.c:916 msgid "Writing failed." msgstr "Ha fallat l'escriptura" -#: ../midori/midori-browser.c:350 ../midori/midori-browser.c:5298 -#: ../midori/midori-browser.c:5307 +#: ../midori/midori-browser.c:329 +#: ../midori/midori-browser.c:5168 +#: ../midori/midori-browser.c:5177 msgid "Reload the current page" msgstr "Actualitza la pàgina actual" -#: ../midori/midori-browser.c:359 ../midori/midori-browser.c:5304 +#: ../midori/midori-browser.c:340 +#: ../midori/midori-browser.c:5174 msgid "Stop loading the current page" msgstr "Atura la càrrega d'aquesta pàgina" -#: ../midori/midori-browser.c:476 +#: ../midori/midori-browser.c:467 #, c-format msgid "Failed to update title: %s\n" msgstr "No s'ha pogut actualitzar el títol: %s\n" -#: ../midori/midori-browser.c:489 +#: ../midori/midori-browser.c:480 #, c-format msgid "Unexpected action '%s'." msgstr "Acció inesperada «%s»." -#: ../midori/midori-browser.c:569 -#, c-format +#: ../midori/midori-browser.c:581 +#, fuzzy, 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" +msgstr "Navegació p_rivada" -#: ../midori/midori-browser.c:774 +#: ../midori/midori-browser.c:721 msgid "New folder" msgstr "Nova carpeta" -#: ../midori/midori-browser.c:774 +#: ../midori/midori-browser.c:721 msgid "Edit folder" msgstr "Edita la carpeta" -#: ../midori/midori-browser.c:776 +#: ../midori/midori-browser.c:723 msgid "New bookmark" msgstr "Nova adreça d'interès" -#: ../midori/midori-browser.c:776 +#: ../midori/midori-browser.c:723 msgid "Edit bookmark" msgstr "Edita l'adreça d'interès" -#: ../midori/midori-browser.c:818 +#: ../midori/midori-browser.c:754 msgid "_Title:" msgstr "_Títol:" -#: ../midori/midori-browser.c:838 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:774 +#: ../midori/midori-searchaction.c:967 #: ../extensions/feed-panel/main.c:377 msgid "_Address:" msgstr "_Adreça:" -#: ../midori/midori-browser.c:861 ../midori/midori-browser.c:4326 +#: ../midori/midori-browser.c:807 +#: ../midori/midori-browser.c:4233 msgid "_Folder:" msgstr "_Carpeta:" -#: ../midori/midori-browser.c:877 +#: ../midori/midori-browser.c:817 +#: ../midori/midori-browser.c:905 +#: ../midori/midori-browser.c:4238 +#: ../midori/midori-browser.c:4266 +msgid "Toplevel folder" +msgstr "Carpeta de nivell superior" + +#: ../midori/midori-browser.c:848 msgid "Add to _Speed Dial" -msgstr "Afegeix al _velocímetre" +msgstr "Afegeix al _marcador ràpid" -#: ../midori/midori-browser.c:890 +#: ../midori/midori-browser.c:861 msgid "Show in the tool_bar" msgstr "Mostra a la _barra d'eines" -#: ../midori/midori-browser.c:905 +#: ../midori/midori-browser.c:876 msgid "Run as _web application" msgstr "Executa com una aplicació _web" -#: ../midori/midori-browser.c:976 +#: ../midori/midori-browser.c:949 #, 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 +#: ../midori/midori-browser.c:951 #, 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 +#: ../midori/midori-browser.c:958 #, 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:988 +#: ../midori/midori-browser.c:961 #, 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:1026 ../midori/midori-browser.c:4395 +#: ../midori/midori-browser.c:1003 +#: ../midori/midori-browser.c:4317 msgid "Save file as" msgstr "Anomena i desa" -#: ../midori/midori-browser.c:1320 +#: ../midori/midori-browser.c:1301 +#, fuzzy msgid "New Window" -msgstr "Nova finestra" +msgstr "Nova _finestra" -#: ../midori/midori-browser.c:1320 +#: ../midori/midori-browser.c:1301 msgid "A new window has been opened" msgstr "Una nova finestra s'ha obert" -#: ../midori/midori-browser.c:1323 +#: ../midori/midori-browser.c:1304 +#, fuzzy msgid "New Tab" -msgstr "Nova pestanya" +msgstr "Nova _pestanya" -#: ../midori/midori-browser.c:1323 +#: ../midori/midori-browser.c:1304 +#, fuzzy 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." +msgstr "Informa quan una transferència hagi finalitzat" -#: ../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 +#: ../midori/midori-browser.c:1341 msgid "Save file" msgstr "Desa el fitxer" -#: ../midori/midori-browser.c:2367 +#: ../midori/midori-browser.c:2222 msgid "Open file" msgstr "Obre un fitxer" -#: ../midori/midori-browser.c:2499 +#: ../midori/midori-browser.c:2339 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 a usar l'URI que hi ha a dalt, obriu un agregador de notícies. " -"Normalment hi ha un botó de \"Nova suscripció\", \"Noves notícies\" o " -"similar.\n" -"Alternativament, aneu a Preferències/Aplicacions a Midori i seleccioneu " -"agregador de notícies. El proper cop que cliqueu a la icona de les notícies, " -"s'agregarà automàticament." - -#: ../midori/midori-browser.c:2505 ../extensions/feed-panel/main.c:365 +"Per a usar l'URI que hi ha a dalt, obriu un agregador de notícies. Normalment hi ha un botó de \"Nova suscripció\", \"Noves notícies\" o similar.\n" +"Alternativament, aneu a Preferències/Aplicacions a Midori i seleccioneu agregador de notícies. El proper cop que cliqueu a la icona de les notícies, s'agregarà automàticament." + +#: ../midori/midori-browser.c:2345 +#: ../extensions/feed-panel/main.c:365 msgid "New feed" msgstr "Nou canal" -#: ../midori/midori-browser.c:2548 ../midori/midori-browser.c:5367 -#: ../panels/midori-bookmarks.c:427 +#: ../midori/midori-browser.c:2388 +#: ../midori/midori-browser.c:5237 +#: ../panels/midori-bookmarks.c:466 msgid "Add a new bookmark" msgstr "Afegeix una adreça d'interès" -#: ../midori/midori-browser.c:3047 ../midori/midori-searchaction.c:488 +#: ../midori/midori-browser.c:2947 +#: ../midori/midori-searchaction.c:488 msgid "Empty" msgstr "Buit" -#: ../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 +#: ../midori/midori-browser.c:3735 +#: ../midori/midori-browser.c:5647 #, 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:4114 ../panels/midori-bookmarks.c:743 -#: ../panels/midori-history.c:801 +#: ../midori/midori-browser.c:4065 +#: ../panels/midori-bookmarks.c:782 +#: ../panels/midori-history.c:751 msgid "Open all in _Tabs" msgstr "Obre-ho tot en _pestanyes" -#: ../midori/midori-browser.c:4121 ../panels/midori-bookmarks.c:749 -#: ../panels/midori-history.c:807 ../extensions/feed-panel/feed-panel.c:528 +#: ../midori/midori-browser.c:4072 +#: ../panels/midori-bookmarks.c:788 +#: ../panels/midori-history.c:757 +#: ../extensions/feed-panel/feed-panel.c:533 msgid "Open in New _Tab" msgstr "Obre l'enllaç en una _pestanya nova" -#: ../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 +#: ../midori/midori-browser.c:4075 +#: ../midori/midori-view.c:2534 +#: ../midori/midori-view.c:4390 +#: ../panels/midori-bookmarks.c:790 +#: ../panels/midori-history.c:759 +#: ../extensions/feed-panel/feed-panel.c:535 msgid "Open in New _Window" msgstr "Obre en una _finestra nova" # Nom d'un navegador web. -#: ../midori/midori-browser.c:4213 +#: ../midori/midori-browser.c:4155 msgid "Arora" msgstr "Arora" # Nom d'un navegador web japonès -#: ../midori/midori-browser.c:4214 +#: ../midori/midori-browser.c:4156 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4215 +#: ../midori/midori-browser.c:4157 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4216 +#: ../midori/midori-browser.c:4158 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4217 +#: ../midori/midori-browser.c:4159 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4218 -#, c-format -msgid "Firefox (%s)" -msgstr "Firefox (%s)" - -#: ../midori/midori-browser.c:4239 -msgid "Import bookmarks…" +#: ../midori/midori-browser.c:4184 +msgid "Import bookmarks..." msgstr "Importa les adreces d'interès…" -#: ../midori/midori-browser.c:4242 ../midori/midori-browser.c:5372 +#: ../midori/midori-browser.c:4187 +#: ../midori/midori-browser.c:5242 msgid "_Import bookmarks" msgstr "_Importa les adreces d'interès" -#: ../midori/midori-browser.c:4253 +#: ../midori/midori-browser.c:4198 msgid "_Application:" msgstr "_Aplicació:" -#: ../midori/midori-browser.c:4318 +#: ../midori/midori-browser.c:4225 +#, fuzzy msgid "Import from XBEL or HTML file" -msgstr "Importa d'unn fitxer XBEL o HTML" +msgstr "Importar d'un fitxer" -#: ../midori/midori-browser.c:4353 +#: ../midori/midori-browser.c:4274 msgid "Import from a file" msgstr "Importar d'un fitxer" -#: ../midori/midori-browser.c:4365 +#: ../midori/midori-browser.c:4286 msgid "Failed to import bookmarks" msgstr "No s'han pogut importar les adreces d'interès" -#: ../midori/midori-browser.c:4400 +#: ../midori/midori-browser.c:4322 +#, fuzzy msgid "XBEL Bookmarks" -msgstr "Adreces d'interès XBEL" +msgstr "Adreces d'interès" -#: ../midori/midori-browser.c:4405 +#: ../midori/midori-browser.c:4327 +#, fuzzy msgid "Netscape Bookmarks" -msgstr "Adreces d'interés Netscape" +msgstr "Nova adreça d'interès" -#: ../midori/midori-browser.c:4419 +#: ../midori/midori-browser.c:4341 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 +#: ../midori/midori-browser.c:4357 msgid "Failed to export bookmarks" msgstr "No s'han pogut exportar les adreces d'interès" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4556 +#: ../midori/midori-browser.c:4483 msgid "Clear Private Data" msgstr "Neteja les dades privades" -#: ../midori/midori-browser.c:4560 +#: ../midori/midori-browser.c:4487 msgid "_Clear private data" msgstr "_Neteja les dades privades" -#: ../midori/midori-browser.c:4573 +#: ../midori/midori-browser.c:4500 msgid "Clear the following data:" msgstr "Neteja les següents dades" -#: ../midori/midori-browser.c:4583 +#: ../midori/midori-browser.c:4510 +#, fuzzy msgid "Last open _tabs" -msgstr "Mostra les darreres _pestanyes obertes" +msgstr "Mostra les pestanyes obertes recentment" -#: ../midori/midori-browser.c:4609 +#. i18n: Browsing history, visited web pages +#: ../midori/midori-browser.c:4516 +#: ../midori/sokoke.c:1516 +msgid "_History" +msgstr "_Historial" + +#: ../midori/midori-browser.c:4521 +#: ../midori/sokoke.c:1522 +msgid "_Closed Tabs" +msgstr "Pestanyes _tancades" + +#: ../midori/midori-browser.c:4541 msgid "Clear private data when _quitting Midori" msgstr "Neteja les dades provades al _sortir de Midori" -#: ../midori/midori-browser.c:4804 +#: ../midori/midori-browser.c:4715 msgid "A lightweight web browser." msgstr "Un navegador de pàgines web lleuger." -#: ../midori/midori-browser.c:4805 +#: ../midori/midori-browser.c:4716 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 " -"Free Software Foundation; either version 2.1 of the License, or (at your " -"option) any later version." -msgstr "" -"Aquesta llibreria és software lliure; podeu redistribuir-la i/o modificar-la " -"segons els termes de la GNU Lesser General Public License tal com està " -"publicat per la Free Software Foundation; ja sigui a la versió 2.1, o " -"(segons la vostra tria) versió posterior." +#: ../midori/midori-browser.c:4718 +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 "Aquesta llibreria és software lliure; podeu redistribuir-la i/o modificar-la segons els termes de la GNU Lesser General Public License tal com està publicat per la Free Software Foundation; ja sigui a la versió 2.1, o (segons la vostra tria) versió posterior." -#: ../midori/midori-browser.c:4828 +#: ../midori/midori-browser.c:4737 msgid "translator-credits" msgstr "" "Carles Muñoz Gorriz , 2009-2010.\n" "Harald Servat , 2009." -#: ../midori/midori-browser.c:5214 +#: ../midori/midori-browser.c:5081 msgid "_File" msgstr "_Fitxer" -#: ../midori/midori-browser.c:5217 +#: ../midori/midori-browser.c:5083 +#: ../midori/sokoke.c:1523 +msgid "New _Window" +msgstr "Nova _finestra" + +#: ../midori/midori-browser.c:5084 msgid "Open a new window" msgstr "Obre una finestra nova" -#: ../midori/midori-browser.c:5220 +#: ../midori/midori-browser.c:5087 msgid "Open a new tab" msgstr "Obre una pestanya nova" -#: ../midori/midori-browser.c:5222 +#: ../midori/midori-browser.c:5089 +#, fuzzy msgid "New P_rivate Browsing Window" -msgstr "Nova finestra de navegació p_rivada" +msgstr "Navegació p_rivada" -#: ../midori/midori-browser.c:5226 +#: ../midori/midori-browser.c:5090 +msgid "Don't save any private data while browsing" +msgstr "No desar qualsevol mena de dada privada mentre es navega" + +#: ../midori/midori-browser.c:5094 msgid "Open a file" msgstr "Obre un fitxer" -#: ../midori/midori-browser.c:5228 -msgid "_Save Page As…" -msgstr "_Desa pàgina com…" +#: ../midori/midori-browser.c:5096 +msgid "_Save Page As..." +msgstr "_Desa pàgina com..." -#: ../midori/midori-browser.c:5229 +#: ../midori/midori-browser.c:5097 msgid "Save to a file" msgstr "Desa en un fitxer" -#: ../midori/midori-browser.c:5231 +#: ../midori/midori-browser.c:5099 msgid "Add to Speed _dial" -msgstr "Afegeix al _velocímetre" +msgstr "Afegeix al _marcador ràpid" + +#: ../midori/midori-browser.c:5100 +msgid "Add shortcut to speed dial" +msgstr "Afegeix drecera al marcador ràpid" -#: ../midori/midori-browser.c:5235 +#: ../midori/midori-browser.c:5103 msgid "Add Shortcut to the _desktop" msgstr "Afegeix drecera a l'_escriptori" -#: ../midori/midori-browser.c:5237 +#: ../midori/midori-browser.c:5104 +msgid "Add shortcut to the desktop" +msgstr "Afegeix drecera a l'escriptori" + +#: ../midori/midori-browser.c:5106 msgid "Create _Launcher" msgstr "Crea _Llançador" -#: ../midori/midori-browser.c:5241 +#: ../midori/midori-browser.c:5107 +msgid "Create a launcher" +msgstr "Crea un llançador" + +#: ../midori/midori-browser.c:5110 msgid "Subscribe to News _feed" msgstr "Subscriure's a un _canal de notícies" -#: ../midori/midori-browser.c:5247 +#: ../midori/midori-browser.c:5111 +msgid "Subscribe to this news feed" +msgstr "Subscriure's a aquest canal de notícies" + +#: ../midori/midori-browser.c:5116 msgid "_Close Tab" msgstr "Tan_ca la pestanya" -#: ../midori/midori-browser.c:5248 +#: ../midori/midori-browser.c:5117 msgid "Close the current tab" msgstr "Tanca la pestanya actual" -#: ../midori/midori-browser.c:5250 +#: ../midori/midori-browser.c:5119 msgid "C_lose Window" msgstr "_Tanca la finestra" -#: ../midori/midori-browser.c:5254 +#: ../midori/midori-browser.c:5120 +msgid "Close this window" +msgstr "Tanca aquesta finestra" + +#: ../midori/midori-browser.c:5123 msgid "Print the current page" msgstr "Imprimeix la pàgina actual" -#: ../midori/midori-browser.c:5256 +#: ../midori/midori-browser.c:5125 +#, fuzzy msgid "Close a_ll Windows" -msgstr "Tanc_a totes la finestra" +msgstr "_Tanca la finestra" -#: ../midori/midori-browser.c:5259 +#: ../midori/midori-browser.c:5126 +#, fuzzy +msgid "Close all open windows" +msgstr "Tanca aquesta finestra" + +#: ../midori/midori-browser.c:5128 msgid "_Edit" msgstr "_Edita" -#: ../midori/midori-browser.c:5282 -msgid "_Find…" -msgstr "_Cerca…" +#: ../midori/midori-browser.c:5131 +msgid "Undo the last modification" +msgstr "Desfés la darrera modificació" -#: ../midori/midori-browser.c:5283 +#: ../midori/midori-browser.c:5134 +msgid "Redo the last modification" +msgstr "Refés la darrera modifcació" + +#: ../midori/midori-browser.c:5137 +msgid "Cut the selected text" +msgstr "Talla el text seleccionat" + +#: ../midori/midori-browser.c:5140 +msgid "Copy the selected text" +msgstr "Copia el text seleccionat al porta-retalls" + +#: ../midori/midori-browser.c:5143 +msgid "Paste text from the clipboard" +msgstr "Enganxa el text al porta-retalls" + +#: ../midori/midori-browser.c:5146 +msgid "Delete the selected text" +msgstr "Suprimeix el text seleccionat" + +#: ../midori/midori-browser.c:5149 +msgid "Select all text" +msgstr "Selecciona tot el text" + +#: ../midori/midori-browser.c:5151 +#, fuzzy +msgid "_Find..." +msgstr "_Ubicació…" + +#: ../midori/midori-browser.c:5152 msgid "Find a word or phrase in the page" msgstr "Cerca una paraula o frase a la pàgina" -#: ../midori/midori-browser.c:5285 +#: ../midori/midori-browser.c:5154 msgid "Find _Next" msgstr "Cerca el _següent" -#: ../midori/midori-browser.c:5288 +#: ../midori/midori-browser.c:5155 +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:5157 msgid "Find _Previous" msgstr "Cerca l'_anterior" -#: ../midori/midori-browser.c:5292 +#: ../midori/midori-browser.c:5158 +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:5162 msgid "Configure the application preferences" msgstr "Canvia les preferències de l'aplicació" -#: ../midori/midori-browser.c:5294 +#: ../midori/midori-browser.c:5164 msgid "_View" msgstr "_Visualitza" -#: ../midori/midori-browser.c:5295 +#: ../midori/midori-browser.c:5165 msgid "_Toolbars" msgstr "Barres d'e_ines" -#: ../midori/midori-browser.c:5300 +#: ../midori/midori-browser.c:5170 +#: ../midori/midori-browser.c:5171 msgid "Reload page without caching" msgstr "Carrega la pàgina sense emmagatzematge en memòria cau" -#: ../midori/midori-browser.c:5310 +#: ../midori/midori-browser.c:5180 msgid "Increase the zoom level" msgstr "Augmenta el nivell d'ampliació" -#: ../midori/midori-browser.c:5313 +#: ../midori/midori-browser.c:5183 msgid "Decrease the zoom level" msgstr "Disminueix el nivell d'ampliació" -#: ../midori/midori-browser.c:5317 +#: ../midori/midori-browser.c:5186 +msgid "Reset the zoom level" +msgstr "Reiniciar el nivell d'ampliació" + +#: ../midori/midori-browser.c:5187 msgid "_Encoding" msgstr "_Codificació" -#: ../midori/midori-browser.c:5319 +#: ../midori/midori-browser.c:5189 msgid "View So_urce" msgstr "Veure codi _font" -#: ../midori/midori-browser.c:5322 +#: ../midori/midori-browser.c:5190 +msgid "View the source code of the page" +msgstr "Veure el codi font de la pàgina" + +#: ../midori/midori-browser.c:5192 +#, fuzzy msgid "Ca_ret Browsing" msgstr "Navegació p_rivada" -#: ../midori/midori-browser.c:5326 +#: ../midori/midori-browser.c:5193 +msgid "Toggle text cursor navigation" +msgstr "Canvia el cursor de la navegació de text" + +#: ../midori/midori-browser.c:5196 msgid "Toggle fullscreen view" msgstr "Commuta la vista a pantalla completa" -#: ../midori/midori-browser.c:5328 +#: ../midori/midori-browser.c:5198 msgid "Scroll _Left" msgstr "Desplaçament _esquerra" -#: ../midori/midori-browser.c:5331 +#: ../midori/midori-browser.c:5199 +msgid "Scroll to the left" +msgstr "Desplaçar cap a l'esquerra" + +#: ../midori/midori-browser.c:5201 msgid "Scroll _Down" msgstr "Desplaçament a_vall" -#: ../midori/midori-browser.c:5334 +#: ../midori/midori-browser.c:5202 +msgid "Scroll down" +msgstr "Desplaçar cap avall" + +#: ../midori/midori-browser.c:5204 msgid "Scroll _Up" msgstr "Desplaçament _amunt" -#: ../midori/midori-browser.c:5337 +#: ../midori/midori-browser.c:5205 +msgid "Scroll up" +msgstr "Desplaçar cap amunt" + +#: ../midori/midori-browser.c:5207 msgid "Scroll _Right" msgstr "Desplaçament _dreta" -#: ../midori/midori-browser.c:5340 +#: ../midori/midori-browser.c:5208 +msgid "Scroll to the right" +msgstr "Desplaçament cap a la dreta" + +#: ../midori/midori-browser.c:5210 msgid "_Go" msgstr "Vé_s" -#: ../midori/midori-browser.c:5343 +#: ../midori/midori-browser.c:5213 msgid "Go back to the previous page" msgstr "Torna a la pàgina anterior" -#: ../midori/midori-browser.c:5346 +#: ../midori/midori-browser.c:5216 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:5350 +#: ../midori/midori-browser.c:5220 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:5354 +#: ../midori/midori-browser.c:5224 msgid "Go to the next sub-page" msgstr "Avança al apartat següent de la pàgina" -#: ../midori/midori-browser.c:5357 +#: ../midori/midori-browser.c:5227 msgid "Go to your homepage" msgstr "Va a la vostre pàgina d'inici" -#: ../midori/midori-browser.c:5359 +#: ../midori/midori-browser.c:5229 msgid "Empty Trash" msgstr "Buida la paperera" -#: ../midori/midori-browser.c:5362 +#: ../midori/midori-browser.c:5230 +msgid "Delete the contents of the trash" +msgstr "Esborra tot el contingut de la paperera" + +#: ../midori/midori-browser.c:5232 msgid "Undo _Close Tab" msgstr "Desfés _tanca pestanya" -#: ../midori/midori-browser.c:5369 +#: ../midori/midori-browser.c:5233 +msgid "Open the last closed tab" +msgstr "Obre la darrera pestanya tancada" + +#: ../midori/midori-browser.c:5239 msgid "Add a new _folder" msgstr "Afegeix una _carpeta" -#: ../midori/midori-browser.c:5375 +#: ../midori/midori-browser.c:5240 +msgid "Add a new bookmark folder" +msgstr "Afegeix una carpeta d'adreces d'interès" + +#: ../midori/midori-browser.c:5245 msgid "_Export bookmarks" msgstr "_Exporta les adreces d'interès" -#: ../midori/midori-browser.c:5378 ../midori/midori-searchaction.c:497 +#: ../midori/midori-browser.c:5248 +#: ../midori/midori-searchaction.c:497 msgid "_Manage Search Engines" msgstr "_Gestiona els ginys de cerca" -#: ../midori/midori-browser.c:5381 +#: ../midori/midori-browser.c:5249 +msgid "Add, edit and remove search engines..." +msgstr "Afegeix, edita o treu ginys de cerca…" + +#: ../midori/midori-browser.c:5252 msgid "_Clear Private Data" msgstr "_Neteja les dades privades" -#: ../midori/midori-browser.c:5384 +#: ../midori/midori-browser.c:5253 +msgid "Clear private data..." +msgstr "Neteja les dades privades…" + +#: ../midori/midori-browser.c:5256 msgid "_Inspect Page" msgstr "_Inspecciona la pàgina" -#: ../midori/midori-browser.c:5388 +#: ../midori/midori-browser.c:5257 +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:5261 msgid "_Previous Tab" msgstr "_Anterior pestanya" -#: ../midori/midori-browser.c:5391 +#: ../midori/midori-browser.c:5262 +msgid "Switch to the previous tab" +msgstr "Canvia a la pestanya anterior" + +#: ../midori/midori-browser.c:5264 msgid "_Next Tab" msgstr "_Següent pestanya" -#: ../midori/midori-browser.c:5393 +#: ../midori/midori-browser.c:5265 +msgid "Switch to the next tab" +msgstr "Canvia a la pestanya següent" + +#: ../midori/midori-browser.c:5266 msgid "Move Tab _Backward" msgstr "Mou la Pestanya _Enrera" -#: ../midori/midori-browser.c:5395 +#: ../midori/midori-browser.c:5267 +#, fuzzy +msgid "Move tab behind the previous tab" +msgstr "Canvia a la pestanya anterior" + +#: ../midori/midori-browser.c:5268 msgid "_Move Tab Forward" msgstr "_Mou la Pestanya Endavant" -#: ../midori/midori-browser.c:5398 +#: ../midori/midori-browser.c:5269 +#, fuzzy +msgid "Move tab in front of the next tab" +msgstr "Canvia a la pestanya següent" + +#: ../midori/midori-browser.c:5271 msgid "Focus _Current Tab" msgstr "Enfoca la pestanya _actual" -#: ../midori/midori-browser.c:5401 +#: ../midori/midori-browser.c:5272 +msgid "Focus the current tab" +msgstr "Enfoca la pestanya actual" + +#: ../midori/midori-browser.c:5274 msgid "Focus _Next view" msgstr "Enfoca la _Següent vista" -#: ../midori/midori-browser.c:5404 +#: ../midori/midori-browser.c:5275 +msgid "Cycle focus between views" +msgstr "Canvia l'enfocament entre les vistes" + +#: ../midori/midori-browser.c:5277 msgid "Only show the Icon of the _Current Tab" msgstr "Mostra la icona només a la pestanya _actual" -#: ../midori/midori-browser.c:5407 +#: ../midori/midori-browser.c:5278 +msgid "Only show the icon of the current tab" +msgstr "Mostra només la icona de la pestanya actual" + +#: ../midori/midori-browser.c:5280 msgid "_Duplicate Current Tab" msgstr "_Duplica la pestanya actual" -#: ../midori/midori-browser.c:5410 +#: ../midori/midori-browser.c:5281 +msgid "Duplicate the current tab" +msgstr "Duplica la pestanya actual" + +#: ../midori/midori-browser.c:5283 msgid "Close Ot_her Tabs" msgstr "Tanca la _resta de pestanyes" -#: ../midori/midori-browser.c:5413 +#: ../midori/midori-browser.c:5284 +msgid "Close all tabs except the current tab" +msgstr "Tanca totes les pestanyes menys l'actual" + +#: ../midori/midori-browser.c:5286 msgid "Open last _session" msgstr "Obre la darrera _sessió" -#: ../midori/midori-browser.c:5416 +#: ../midori/midori-browser.c:5287 +msgid "Open the tabs saved in the last session" +msgstr "Obre les pestanyes emmagatzemades a la darrera sessió" + +#: ../midori/midori-browser.c:5289 msgid "_Help" msgstr "A_juda" -#: ../midori/midori-browser.c:5418 +#: ../midori/midori-browser.c:5291 msgid "_Frequent Questions" msgstr "_Preguntes freqüents" -#: ../midori/midori-browser.c:5421 -msgid "_Report a Problem…" -msgstr "Informa d'un _error…" +#: ../midori/midori-browser.c:5292 +msgid "Show the Frequently Asked Questions" +msgstr "Mostra les preguntes més freqüents" + +#: ../midori/midori-browser.c:5294 +#, fuzzy +msgid "_Report a Problem..." +msgstr "Informa d'un _error" + +#: ../midori/midori-browser.c:5295 +msgid "Open Midori's bug tracker" +msgstr "Obre el sistema de seguiment d'errors de Midori" + +#: ../midori/midori-browser.c:5298 +msgid "Show information about the program" +msgstr "Mostra la informació sobre aquest programa" -#: ../midori/midori-browser.c:5433 +#: ../midori/midori-browser.c:5306 msgid "_Menubar" msgstr "Barra de _menú" -#: ../midori/midori-browser.c:5437 +#: ../midori/midori-browser.c:5307 +msgid "Show menubar" +msgstr "Mostra la barra de menú" + +#: ../midori/midori-browser.c:5310 msgid "_Navigationbar" msgstr "Barra de _navegació" -#: ../midori/midori-browser.c:5441 +#: ../midori/midori-browser.c:5311 +msgid "Show navigationbar" +msgstr "Mostra barra de navegació" + +#: ../midori/midori-browser.c:5314 msgid "Side_panel" msgstr "_Quadre lateral" -#: ../midori/midori-browser.c:5442 -msgid "Sidepanel" -msgstr "Quadre lateral" +#: ../midori/midori-browser.c:5315 +msgid "Show sidepanel" +msgstr "Mostra el quadre lateral" -#: ../midori/midori-browser.c:5445 +#: ../midori/midori-browser.c:5318 msgid "_Bookmarkbar" msgstr "Barra d'_adreces d'interès" -#: ../midori/midori-browser.c:5449 +#: ../midori/midori-browser.c:5319 +msgid "Show bookmarkbar" +msgstr "Mostra la barra d'adreces d'interès" + +#: ../midori/midori-browser.c:5322 msgid "_Statusbar" msgstr "Barra d'_estat" -#: ../midori/midori-browser.c:5458 ../midori/midori-websettings.c:311 +#: ../midori/midori-browser.c:5323 +msgid "Show statusbar" +msgstr "Mostra la barra d'estat" + +#: ../midori/midori-browser.c:5331 msgid "_Automatic" msgstr "_Automàtic" -#: ../midori/midori-browser.c:5461 ../midori/midori-websettings.c:236 +#: ../midori/midori-browser.c:5334 +#: ../midori/midori-websettings.c:216 msgid "Chinese (BIG5)" msgstr "Chinese Traditional (Big5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5465 +#: ../midori/midori-browser.c:5338 msgid "Japanese (SHIFT__JIS)" msgstr "Japonès (Shift_JIS)" -#: ../midori/midori-browser.c:5468 ../midori/midori-websettings.c:238 +#: ../midori/midori-browser.c:5341 +#: ../midori/midori-websettings.c:218 msgid "Korean (EUC-KR)" msgstr "Koreà (EUC-KR)" -#: ../midori/midori-browser.c:5471 ../midori/midori-websettings.c:239 +#: ../midori/midori-browser.c:5344 +#: ../midori/midori-websettings.c:219 msgid "Russian (KOI8-R)" msgstr "Rus (KOI8-R)" -#: ../midori/midori-browser.c:5474 ../midori/midori-websettings.c:240 +#: ../midori/midori-browser.c:5347 +#: ../midori/midori-websettings.c:220 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5477 ../midori/midori-websettings.c:241 +#: ../midori/midori-browser.c:5350 +#: ../midori/midori-websettings.c:221 msgid "Western (ISO-8859-1)" msgstr "Occidental (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…" +#: ../midori/midori-browser.c:5353 +#: ../midori/midori-websettings.c:222 +#: ../midori/midori-websettings.c:296 +#: ../katze/katze-utils.c:732 +msgid "Custom..." msgstr "Personalitzat…" -#: ../midori/midori-browser.c:5985 +#: ../midori/midori-browser.c:5883 msgid "_Separator" msgstr "_Separador" -#: ../midori/midori-browser.c:5992 -msgid "_Location…" +#: ../midori/midori-browser.c:5890 +msgid "_Location..." msgstr "_Ubicació…" -#: ../midori/midori-browser.c:5994 +#: ../midori/midori-browser.c:5892 msgid "Open a particular location" msgstr "Obre una ubicació" -#: ../midori/midori-browser.c:6016 -msgid "_Web Search…" +#: ../midori/midori-browser.c:5914 +msgid "_Web Search..." msgstr "Cerca _web…" -#: ../midori/midori-browser.c:6018 +#: ../midori/midori-browser.c:5916 msgid "Run a web search" msgstr "Executa una cerca web" -#: ../midori/midori-browser.c:6045 +#: ../midori/midori-browser.c:5937 msgid "Reopen a previously closed tab or window" msgstr "Reobre una pestanya o finestra prèviament tancada" -#: ../midori/midori-browser.c:6062 +#: ../midori/midori-browser.c:5950 +#: ../midori/sokoke.c:1512 +msgid "_Bookmarks" +msgstr "_Adreces d'interès" + +#: ../midori/midori-browser.c:5952 msgid "Show the saved bookmarks" msgstr "Mostra les adreces d'interès desades" -#: ../midori/midori-browser.c:6079 +#: ../midori/midori-browser.c:5966 msgid "_Tools" msgstr "E_ines" -#: ../midori/midori-browser.c:6095 +#: ../midori/midori-browser.c:5981 msgid "_Window" msgstr "Fines_tra" -#: ../midori/midori-browser.c:6097 +#: ../midori/midori-browser.c:5983 msgid "Show a list of all open tabs" msgstr "Mostra una llista de totes les pestanyes obertes" -#: ../midori/midori-browser.c:6111 +#: ../midori/midori-browser.c:5997 msgid "_Menu" msgstr "_Menú" -#: ../midori/midori-browser.c:6113 +#: ../midori/midori-browser.c:5999 msgid "Menu" msgstr "Menú" -#: ../midori/midori-browser.c:6927 +#: ../midori/midori-browser.c:6549 #, c-format msgid "Unexpected setting '%s'" msgstr "Opció inesperada «%s»" -#: ../midori/midori-extension.c:329 +#: ../midori/midori-extension.c:305 #, c-format 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-extension.c:747 ../midori/midori-extension.c:844 -#: ../midori/midori-extension.c:941 ../midori/midori-extension.c:1053 -#: ../extensions/addons.c:1695 +#: ../midori/midori-extension.c:703 +#: ../midori/midori-extension.c:800 +#: ../midori/midori-extension.c:897 +#: ../midori/midori-extension.c:1009 +#: ../extensions/addons.c:1642 #, 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" -#: ../midori/midori-locationaction.c:394 -#, c-format -msgid "Search with %s" -msgstr "Cerca amb %s" - -#: ../midori/midori-locationaction.c:412 -msgid "Search with…" -msgstr "Cerca amb…" - -#: ../midori/midori-locationaction.c:537 +#: ../midori/midori-locationaction.c:400 #, c-format msgid "Failed to select from history\n" msgstr "No s'ha pogut seleccionar de l'historial\n" -#: ../midori/midori-locationaction.c:624 +#: ../midori/midori-locationaction.c:484 #, c-format msgid "Search for %s" msgstr "Cercar %s" +#: ../midori/midori-locationaction.c:510 +#, c-format +msgid "Search with %s" +msgstr "Cerca amb %s" + #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1398 +#: ../midori/midori-locationaction.c:1258 msgid "Paste and p_roceed" msgstr "Enganxa i _procedeix" -#: ../midori/midori-locationaction.c:1739 +#: ../midori/midori-locationaction.c:1653 msgid "Not verified" msgstr "No verificat" -#: ../midori/midori-locationaction.c:1759 +#: ../midori/midori-locationaction.c:1668 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:397 ../midori/midori-panel.c:399 -#: ../midori/midori-panel.c:562 ../midori/midori-panel.c:565 +#: ../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:409 ../midori/midori-panel.c:410 +#: ../midori/midori-panel.c:409 +#: ../midori/midori-panel.c:410 msgid "Close panel" msgstr "Tanca el quadre" -#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566 +#: ../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-websettings.c:218 +#: ../midori/midori-websettings.c:198 +#, fuzzy msgid "Show Speed Dial" -msgstr "Mostra el velocímetre" +msgstr "Marcador ràpid" -#: ../midori/midori-websettings.c:219 +#: ../midori/midori-websettings.c:199 msgid "Show Homepage" msgstr "Mostra la pàgina d'inici" -#: ../midori/midori-websettings.c:237 +#: ../midori/midori-websettings.c:217 msgid "Japanese (SHIFT_JIS)" msgstr "Japonès (Shift_JIS)" -#: ../midori/midori-websettings.c:257 +#: ../midori/midori-websettings.c:237 msgid "New tab" msgstr "Nova pestanya" -#: ../midori/midori-websettings.c:258 +#: ../midori/midori-websettings.c:238 msgid "New window" msgstr "Nova finestra" -#: ../midori/midori-websettings.c:259 +#: ../midori/midori-websettings.c:239 msgid "Current tab" msgstr "Pestanya actual" -#: ../midori/midori-websettings.c:274 +#: ../midori/midori-websettings.c:254 msgid "Default" msgstr "Per defecte" -#: ../midori/midori-websettings.c:275 +#: ../midori/midori-websettings.c:255 msgid "Icons" msgstr "Icones" -#: ../midori/midori-websettings.c:276 +#: ../midori/midori-websettings.c:256 msgid "Small icons" msgstr "Icones petites" -#: ../midori/midori-websettings.c:277 +#: ../midori/midori-websettings.c:257 msgid "Text" msgstr "Text" -#: ../midori/midori-websettings.c:278 +#: ../midori/midori-websettings.c:258 msgid "Icons and text" msgstr "Icones i text" -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-websettings.c:259 msgid "Text beside icons" msgstr "Text sota les icones" -#: ../midori/midori-websettings.c:294 +#: ../midori/midori-websettings.c:274 msgid "Automatic (GNOME or environment)" msgstr "Automàtic (GNOME o entorn)" -#: ../midori/midori-websettings.c:295 +#: ../midori/midori-websettings.c:275 msgid "HTTP proxy server" msgstr "Servidor intermediari de HTTP" -#: ../midori/midori-websettings.c:296 +#: ../midori/midori-websettings.c:276 msgid "No proxy server" msgstr "Sense servidor intermediari" -#: ../midori/midori-websettings.c:313 +#: ../midori/midori-websettings.c:292 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:314 +#: ../midori/midori-websettings.c:293 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:315 +#: ../midori/midori-websettings.c:294 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:316 +#: ../midori/midori-websettings.c:295 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:400 +#: ../midori/midori-websettings.c:348 msgid "Remember last window size" msgstr "Recorda la mida de la darrera finestra" -#: ../midori/midori-websettings.c:401 +#: ../midori/midori-websettings.c:349 msgid "Whether to save the last window size" msgstr "Si voleu desar la mida de la finestra" -#: ../midori/midori-websettings.c:409 +#: ../midori/midori-websettings.c:357 msgid "Last window width" msgstr "Amplada de la darrera finestra" -#: ../midori/midori-websettings.c:410 +#: ../midori/midori-websettings.c:358 msgid "The last saved window width" msgstr "L'amplada emmagatzemada de la darrera finestra" -#: ../midori/midori-websettings.c:418 +#: ../midori/midori-websettings.c:366 msgid "Last window height" msgstr "Alçada de la darrera finestra" -#: ../midori/midori-websettings.c:419 +#: ../midori/midori-websettings.c:367 msgid "The last saved window height" msgstr "L'alçada emmagatzemada de la darrera finestra" -#: ../midori/midori-websettings.c:444 +#: ../midori/midori-websettings.c:392 msgid "Last panel position" msgstr "Posició del darrer panell" -#: ../midori/midori-websettings.c:445 +#: ../midori/midori-websettings.c:393 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:454 +#: ../midori/midori-websettings.c:402 msgid "Last panel page" msgstr "Darrera pàgina del panell" -#: ../midori/midori-websettings.c:455 +#: ../midori/midori-websettings.c:403 msgid "The last saved panel page" msgstr "La darrera pàgina del panell emmagatzemada" -#: ../midori/midori-websettings.c:463 +#: ../midori/midori-websettings.c:411 msgid "Last Web search" msgstr "Darrera cerca a la Web" -#: ../midori/midori-websettings.c:464 +#: ../midori/midori-websettings.c:412 msgid "The last saved Web search" msgstr "La darrera cerca a la Web emmagatzemada" -#: ../midori/midori-websettings.c:473 +#: ../midori/midori-websettings.c:421 msgid "Show Menubar" msgstr "Mostra la barra de menú" -#: ../midori/midori-websettings.c:474 +#: ../midori/midori-websettings.c:422 msgid "Whether to show the menubar" msgstr "Si es mostrarà la barra de menú" -#: ../midori/midori-websettings.c:482 +#: ../midori/midori-websettings.c:430 msgid "Show Navigationbar" msgstr "Mostra la barra de navegació" -#: ../midori/midori-websettings.c:483 +#: ../midori/midori-websettings.c:431 msgid "Whether to show the navigationbar" msgstr "Si es mostrarà la barra de navegació" -#: ../midori/midori-websettings.c:491 +#: ../midori/midori-websettings.c:439 msgid "Show Bookmarkbar" msgstr "Mostra la barra d'adreces d'interès" -#: ../midori/midori-websettings.c:492 +#: ../midori/midori-websettings.c:440 msgid "Whether to show the bookmarkbar" msgstr "Si es mostra la barra d'adreces d'interès" -#: ../midori/midori-websettings.c:500 +#: ../midori/midori-websettings.c:448 msgid "Show Panel" msgstr "Mostra el quadre" -#: ../midori/midori-websettings.c:501 +#: ../midori/midori-websettings.c:449 msgid "Whether to show the panel" msgstr "Si s'ha de mostrar el panell" -#: ../midori/midori-websettings.c:509 +#: ../midori/midori-websettings.c:457 msgid "Show Statusbar" msgstr "Mostra la barra d'estat" -#: ../midori/midori-websettings.c:510 +#: ../midori/midori-websettings.c:458 msgid "Whether to show the statusbar" msgstr "Si es mostrarà la barra d'estat" -#: ../midori/midori-websettings.c:519 +#: ../midori/midori-websettings.c:467 msgid "Toolbar Style:" msgstr "Estil de la barra d'eines:" -#: ../midori/midori-websettings.c:520 +#: ../midori/midori-websettings.c:468 msgid "The style of the toolbar" msgstr "L'estil de la barra d'eines" -#: ../midori/midori-websettings.c:529 +#: ../midori/midori-websettings.c:477 msgid "Toolbar Items" msgstr "Elements de la barra d'eines" -#: ../midori/midori-websettings.c:530 +#: ../midori/midori-websettings.c:478 msgid "The items to show on the toolbar" msgstr "Els elements que es mostraran a la barra d'eines" -#: ../midori/midori-websettings.c:538 +#: ../midori/midori-websettings.c:486 msgid "Compact Sidepanel" msgstr "Panell lateral compacte" -#: ../midori/midori-websettings.c:539 +#: ../midori/midori-websettings.c:487 msgid "Whether to make the sidepanel compact" msgstr "Si s'ha de compactar el panell lateral" -#: ../midori/midori-websettings.c:554 +#: ../midori/midori-websettings.c:502 msgid "Align sidepanel on the right" msgstr "La barra d'estat està a la dreta" -#: ../midori/midori-websettings.c:555 +#: ../midori/midori-websettings.c:503 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:570 +#: ../midori/midori-websettings.c:518 msgid "Open panels in separate windows" msgstr "Obre els quadres en finestres separades" -#: ../midori/midori-websettings.c:571 +#: ../midori/midori-websettings.c:519 msgid "Whether to always open panels in separate windows" msgstr "Si s'ha d'obrir els quadres en finestres separades" -#: ../midori/midori-websettings.c:580 +#: ../midori/midori-websettings.c:528 msgid "When Midori starts:" msgstr "Quan Midori s'inicia:" -#: ../midori/midori-websettings.c:581 +#: ../midori/midori-websettings.c:529 msgid "What to do when Midori starts" msgstr "Què fer quan Midori s'iniciï" -#: ../midori/midori-websettings.c:590 +#: ../midori/midori-websettings.c:538 msgid "Homepage:" msgstr "Pàgina d'inici:" -#: ../midori/midori-websettings.c:591 +#: ../midori/midori-websettings.c:539 msgid "The homepage" msgstr "La pàgina d'inici" -#: ../midori/midori-websettings.c:606 +#: ../midori/midori-websettings.c:554 msgid "Show crash dialog" msgstr "Mostra el diàleg de fallades" -#: ../midori/midori-websettings.c:607 +#: ../midori/midori-websettings.c:555 msgid "Show a dialog after Midori crashed" msgstr "Mostra un diàleg quan Midori falli" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:563 msgid "Save downloaded files to:" msgstr "Desar els fitxers descarregats a:" -#: ../midori/midori-websettings.c:616 +#: ../midori/midori-websettings.c:564 msgid "The folder downloaded files are saved to" msgstr "El directori on s'emmagatzemaran els fitxers descarregats" -#: ../midori/midori-websettings.c:624 +#: ../midori/midori-websettings.c:572 msgid "Text Editor" msgstr "Editor de text" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:573 msgid "An external text editor" msgstr "Un editor de text extern" -#: ../midori/midori-websettings.c:640 +#: ../midori/midori-websettings.c:588 msgid "News Aggregator" msgstr "Acumulador de notícies" -#: ../midori/midori-websettings.c:641 +#: ../midori/midori-websettings.c:589 msgid "An external news aggregator" msgstr "Un acumulador de notícies extern" -#: ../midori/midori-websettings.c:649 +#: ../midori/midori-websettings.c:597 msgid "Location entry Search" msgstr "Ubicació que s'ha de cercar" -#: ../midori/midori-websettings.c:650 +#: ../midori/midori-websettings.c:598 msgid "The search to perform inside the location entry" msgstr "La cerca a executar dins l'entrada de la localització" -#: ../midori/midori-websettings.c:658 +#: ../midori/midori-websettings.c:606 msgid "Preferred Encoding" msgstr "La codificació preferida" -#: ../midori/midori-websettings.c:659 +#: ../midori/midori-websettings.c:607 msgid "The preferred character encoding" msgstr "Codificació de caràcters preferida" -#: ../midori/midori-websettings.c:669 +#: ../midori/midori-websettings.c:617 msgid "Always Show Tabbar" msgstr "Mostra sempre la barra d'eines" -#: ../midori/midori-websettings.c:670 +#: ../midori/midori-websettings.c:618 msgid "Always show the tabbar" msgstr "Mostra sempre la barra des pestanyes " -#: ../midori/midori-websettings.c:683 +#: ../midori/midori-websettings.c:626 msgid "Close Buttons on Tabs" msgstr "Mostra el botó de tancar a les pestanyes" -#: ../midori/midori-websettings.c:684 +#: ../midori/midori-websettings.c:627 msgid "Whether tabs have close buttons" msgstr "Si les pestanyes tenen botó de tancar" -#: ../midori/midori-websettings.c:709 +#: ../midori/midori-websettings.c:652 msgid "Open new pages in:" msgstr "Obre les noves pàgines a:" -#: ../midori/midori-websettings.c:710 +#: ../midori/midori-websettings.c:653 msgid "Where to open new pages" msgstr "On s'han d'obrir les pàgines noves" -#: ../midori/midori-websettings.c:719 +#: ../midori/midori-websettings.c:662 msgid "Middle click opens Selection" msgstr "Fer clic al botó central del ratolí obre la selecció" -#: ../midori/midori-websettings.c:720 +#: ../midori/midori-websettings.c:663 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í" +msgstr "Carregar una adreça des de la selecció mitjançant el botó central del ratolí" -#: ../midori/midori-websettings.c:728 +#: ../midori/midori-websettings.c:671 msgid "Open tabs in the background" -msgstr "Obre pestanyes sense fer-les actives" +msgstr "Obre pestanyes al fons" -#: ../midori/midori-websettings.c:729 +#: ../midori/midori-websettings.c:672 msgid "Whether to open new tabs in the background" -msgstr "Si s'ha d'obrir pestanyes actives o inactives" +msgstr "Si s'ha d'obrir pestanyes al fons" -#: ../midori/midori-websettings.c:737 +#: ../midori/midori-websettings.c:680 msgid "Open Tabs next to Current" msgstr "Obre les pestanyes al costat de l'actual" -#: ../midori/midori-websettings.c:738 +#: ../midori/midori-websettings.c:681 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" +msgstr "Si obrir les noves pestanyes al costat de la pestanya actual o de l'última" -#: ../midori/midori-websettings.c:746 +#: ../midori/midori-websettings.c:689 msgid "Open popups in tabs" msgstr "Obre els missatges emergents en pestanyes" -#: ../midori/midori-websettings.c:747 +#: ../midori/midori-websettings.c:690 msgid "Whether to open popup windows in tabs" msgstr "Si s'han d'obrir els missatges emergents dins pestanyes" -#: ../midori/midori-websettings.c:757 ../extensions/statusbar-features.c:134 +#: ../midori/midori-websettings.c:700 +#: ../extensions/statusbar-features.c:132 msgid "Load images automatically" msgstr "Carrega les imatges automàticament" -#: ../midori/midori-websettings.c:758 +#: ../midori/midori-websettings.c:701 msgid "Load and display images automatically" msgstr "Carrega i mostra les imatges automàticament" -#: ../midori/midori-websettings.c:765 ../extensions/statusbar-features.c:143 +#: ../midori/midori-websettings.c:708 +#: ../extensions/statusbar-features.c:141 msgid "Enable scripts" msgstr "Habilita els scripts" -#: ../midori/midori-websettings.c:766 +#: ../midori/midori-websettings.c:709 msgid "Enable embedded scripting languages" msgstr "Habilita els llenguatges d'script incrustats" -#: ../midori/midori-websettings.c:773 ../extensions/statusbar-features.c:154 +#: ../midori/midori-websettings.c:716 +#: ../extensions/statusbar-features.c:150 msgid "Enable Netscape plugins" msgstr "Habilita els connectors de netscape" -#: ../midori/midori-websettings.c:774 +#: ../midori/midori-websettings.c:717 msgid "Enable embedded Netscape plugin objects" msgstr "Activar els objectes de connexió integrats de Netscape" -#: ../midori/midori-websettings.c:789 +#: ../midori/midori-websettings.c:737 msgid "Enable Spell Checking" msgstr "Habilita el corrector ortogràfic" -#: ../midori/midori-websettings.c:790 +#: ../midori/midori-websettings.c:738 msgid "Enable spell checking while typing" msgstr "Activa la comprovació ortogràfica mentre s'escriu" -#: ../midori/midori-websettings.c:796 +#: ../midori/midori-websettings.c:744 msgid "Enable HTML5 database support" msgstr "Habilita la compatibilitat amb bases de dades HTML5" -#: ../midori/midori-websettings.c:797 +#: ../midori/midori-websettings.c:745 msgid "Whether to enable HTML5 database support" msgstr "Si s'habilitat la compatibilitat amb bases de dades HTML5" -#: ../midori/midori-websettings.c:803 +#: ../midori/midori-websettings.c:751 msgid "Enable HTML5 local storage support" msgstr "Habilita l'emmagatzematge local HTML5" -#: ../midori/midori-websettings.c:804 +#: ../midori/midori-websettings.c:752 msgid "Whether to enable HTML5 local storage support" msgstr "Si s'habilita l'emmagatzematge local HTML5" -#: ../midori/midori-websettings.c:810 +#: ../midori/midori-websettings.c:758 msgid "Enable offline web application cache" msgstr "Habilita la memòria cau d'aplicació de fora de línia" -#: ../midori/midori-websettings.c:811 +#: ../midori/midori-websettings.c:759 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: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 +#: ../midori/midori-websettings.c:783 msgid "Zoom Text and Images" msgstr "Ampliar text i imatges" -#: ../midori/midori-websettings.c:864 +#: ../midori/midori-websettings.c:784 msgid "Whether to zoom text and images" msgstr "Si s'han d'ampliar text i imatges" -#: ../midori/midori-websettings.c:879 +#: ../midori/midori-websettings.c:799 msgid "Find inline while typing" msgstr "Buscar en línia mentre s'escriu" -#: ../midori/midori-websettings.c:880 +#: ../midori/midori-websettings.c:800 msgid "Whether to automatically find inline while typing" msgstr "Si es buscarà automàticament a mesura que s'escriu" -#: ../midori/midori-websettings.c:895 +#: ../midori/midori-websettings.c:815 msgid "Kinetic scrolling" msgstr "Desplaçament cinètic" -#: ../midori/midori-websettings.c:896 +#: ../midori/midori-websettings.c:816 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" +msgstr "Si el desplaçament hauria de moure's de forma cinètica segons la velocitat" -#: ../midori/midori-websettings.c:904 +#: ../midori/midori-websettings.c:824 +#, fuzzy msgid "Delete old Cookies after:" -msgstr "Esborrar les galetes antigues després de:" +msgstr "Esborrar les galetes antigues després d'un dia" -#: ../midori/midori-websettings.c:905 +#: ../midori/midori-websettings.c:825 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: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 +#: ../midori/midori-websettings.c:834 +#, fuzzy msgid "Delete pages from history after:" -msgstr "Esborra les pàgines de l'historia després de:" +msgstr "Pestanya següent de l'historial" -#: ../midori/midori-websettings.c:937 +#: ../midori/midori-websettings.c:835 msgid "The maximum number of days to save the history for" msgstr "Caducitat de l'historial" -#: ../midori/midori-websettings.c:952 +#: ../midori/midori-websettings.c:850 msgid "Proxy server" msgstr "Servidor intermediari" -#: ../midori/midori-websettings.c:953 +#: ../midori/midori-websettings.c:851 msgid "The type of proxy server to use" msgstr "Tipus de servidor intermediari a fer servir" -#: ../midori/midori-websettings.c:962 +#: ../midori/midori-websettings.c:860 msgid "HTTP Proxy Server" msgstr "Servidor intermediari de HTTP" -#: ../midori/midori-websettings.c:963 +#: ../midori/midori-websettings.c:861 msgid "The proxy server used for HTTP connections" -msgstr "El servidor intermediari usat per a les connexions HTTP" - -#: ../midori/midori-websettings.c:978 -msgid "Port" -msgstr "Port" +msgstr "El servidor proxy usat per a les connexions HTTP" -#: ../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 +#: ../midori/midori-websettings.c:878 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:1014 +#: ../midori/midori-websettings.c:895 msgid "Identify as" msgstr "Identifica'l com a" -#: ../midori/midori-websettings.c:1015 +#: ../midori/midori-websettings.c:896 msgid "What to identify as to web pages" msgstr "Què identificar com a pàgines web" -#: ../midori/midori-websettings.c:1031 +#: ../midori/midori-websettings.c:912 msgid "Identification string" msgstr "Cadena de caràcters d'identificació" -#: ../midori/midori-websettings.c:1032 +#: ../midori/midori-websettings.c:913 msgid "The application identification string" msgstr "La cadena d'identificació d'aplicacions" -#: ../midori/midori-websettings.c:1048 +#: ../midori/midori-websettings.c:929 msgid "Preferred languages" msgstr "Idiomes preferits" -#: ../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 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:930 +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 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:1064 +#: ../midori/midori-websettings.c:945 msgid "Clear private data" msgstr "Esborrar dades privades" -#: ../midori/midori-websettings.c:1065 +#: ../midori/midori-websettings.c:946 msgid "The private data selected for deletion" msgstr "La selecció de dades privades per a esborrar" -#: ../midori/midori-websettings.c:1080 +#: ../midori/midori-websettings.c:961 msgid "Clear data" msgstr "Neteja les dades" -#: ../midori/midori-websettings.c:1081 +#: ../midori/midori-websettings.c:962 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 +#: ../midori/midori-websettings.c:995 msgid "Strip referrer details sent to websites" -msgstr "Treu la informació de referència enviada als llocs webs" +msgstr "" #. i18n: Referer here is not a typo but a technical term -#: ../midori/midori-websettings.c:1132 +#: ../midori/midori-websettings.c:997 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" +msgstr "Si la capçalera \"Referer\" hauria d'haver estat escurçada al nom del host" -#: ../midori/midori-view.c:1360 +#: ../midori/midori-view.c:1351 #, 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 +#: ../midori/midori-view.c:1355 +#: ../midori/midori-view.c:1384 msgid "_Deny" msgstr "_Denegar" -#: ../midori/midori-view.c:1364 ../midori/midori-view.c:1396 +#: ../midori/midori-view.c:1355 +#: ../midori/midori-view.c:1384 msgid "_Allow" msgstr "_Permetre" -#: ../midori/midori-view.c:1392 +#: ../midori/midori-view.c:1380 #, c-format msgid "%s wants to know your location." msgstr "%s vol saber la vostra ubicació." -#: ../midori/midori-view.c:1485 +#: ../midori/midori-view.c:1478 #, c-format msgid "Error - %s" msgstr "Error - %s" -#: ../midori/midori-view.c:1486 +#: ../midori/midori-view.c:1479 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "No s'ha pogut carregar la pàgina «%s»." -#: ../midori/midori-view.c:1488 +#: ../midori/midori-view.c:1481 msgid "Try again" msgstr "Torneu-ho a provar" -#: ../midori/midori-view.c:1685 ../midori/midori-view.c:2598 +#: ../midori/midori-view.c:1640 +#: ../midori/midori-view.c:2475 #, c-format msgid "Send a message to %s" msgstr "Enviar un missatge a %s" -#: ../midori/midori-view.c:2428 ../midori/midori-view.c:2747 +#: ../midori/midori-view.c:2314 +#: ../midori/midori-view.c:2628 msgid "Inspect _Element" msgstr "Inspecciona l'_element" -#: ../midori/midori-view.c:2480 +#: ../midori/midori-view.c:2364 msgid "Open Link in New _Tab" msgstr "Obre l'enllaç en una nova _pestanya" -#: ../midori/midori-view.c:2484 +#: ../midori/midori-view.c:2368 msgid "Open Link in _Foreground Tab" msgstr "Obre l'enllaç en una nova pestanya en primer _pla" -#: ../midori/midori-view.c:2485 +#: ../midori/midori-view.c:2369 msgid "Open Link in _Background Tab" msgstr "Obre l'enllaç en una nova pestanya _no activa" -#: ../midori/midori-view.c:2488 +#: ../midori/midori-view.c:2372 msgid "Open Link in New _Window" msgstr "Obre l'enllaç a una nova _finestra" -#: ../midori/midori-view.c:2491 +#: ../midori/midori-view.c:2375 msgid "Open Link as Web A_pplication" msgstr "Obre l'enllaç com si fos una _aplicació web" -#: ../midori/midori-view.c:2496 +#: ../midori/midori-view.c:2378 msgid "Copy Link de_stination" msgstr "_Copia la destinació de l'enllaç" -#: ../midori/midori-view.c:2512 +#: ../midori/midori-view.c:2390 msgid "Open _Image in New Tab" msgstr "Obre la _imatge en una nova pestanya" -#: ../midori/midori-view.c:2515 +#: ../midori/midori-view.c:2393 msgid "Copy Image _Address" msgstr "Copia l'_adreça de la imatge" -#: ../midori/midori-view.c:2518 +#: ../midori/midori-view.c:2396 msgid "Save I_mage" msgstr "Desa la i_matge" -#: ../midori/midori-view.c:2521 -msgid "Open in Image _Viewer" -msgstr "Obre en el visualitzador d'_imatges" - -#: ../midori/midori-view.c:2528 +#: ../midori/midori-view.c:2403 msgid "Copy Video _Address" msgstr "Copia l'_adreça del vídeo" -#: ../midori/midori-view.c:2531 +#: ../midori/midori-view.c:2406 msgid "Save _Video" msgstr "Desa el _vídeo" -#: ../midori/midori-view.c:2531 +#: ../midori/midori-view.c:2406 msgid "Download _Video" msgstr "Descarrega el _vídeo" -#: ../midori/midori-view.c:2557 +#: ../midori/midori-view.c:2432 msgid "Search _with" msgstr "Cerca _amb" -#: ../midori/midori-view.c:2589 +#: ../midori/midori-view.c:2466 msgid "_Search the Web" msgstr "_Cerca la Web" -#: ../midori/midori-view.c:2606 +#: ../midori/midori-view.c:2483 msgid "Open Address in New _Tab" msgstr "Obre l'adreça en una nova _pestanya" -#: ../midori/midori-view.c:2909 +#: ../midori/midori-view.c:2767 msgid "Open or download file" msgstr "Obre o descarrega el fitxer" -#: ../midori/midori-view.c:2929 +#: ../midori/midori-view.c:2786 #, c-format msgid "File Type: '%s'" msgstr "Tipus de fitxer: «%s»" -#: ../midori/midori-view.c:2931 +#: ../midori/midori-view.c:2788 #, c-format msgid "File Type: %s ('%s')" msgstr "Tipus de fitxer: %s («%s»)" -#: ../midori/midori-view.c:2935 -#, c-format -msgid "File Name: %s" -msgstr "Nom de fitxer: %s" +#: ../midori/midori-view.c:2799 +msgid "MD5-Checksum:" +msgstr "MD5-Checksum:" + +#: ../midori/midori-view.c:2806 +msgid "SHA1-Checksum:" +msgstr "SHA1-Checksum:" -#: ../midori/midori-view.c:2955 +#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" +#: ../midori/midori-view.c:2816 #, c-format msgid "Open %s" msgstr "Obre %s" -#: ../midori/midori-view.c:3576 +#: ../midori/midori-view.c:3397 #, c-format msgid "Inspect page - %s" msgstr "Inspecciona la pàgina «%s»" -#: ../midori/midori-view.c:3923 +#: ../midori/midori-view.c:3688 msgid "Speed Dial" -msgstr "Velocímetre" +msgstr "Marcador ràpid" -#: ../midori/midori-view.c:3924 ../midori/midori-view.c:4020 +#: ../midori/midori-view.c:3689 msgid "Click to add a shortcut" msgstr "Feu clic per a afegir una drecera" -#: ../midori/midori-view.c:3925 +#: ../midori/midori-view.c:3690 msgid "Enter shortcut address" msgstr "Introduïu l'adreça de la drecera" -#: ../midori/midori-view.c:3926 +#: ../midori/midori-view.c:3691 msgid "Enter shortcut title" msgstr "Introduïu un títol per a la drecera" -#: ../midori/midori-view.c:3927 +#: ../midori/midori-view.c:3692 msgid "Are you sure you want to delete this shortcut?" msgstr "Esteu segur d'esborrar aquesta drecera?" -#: ../midori/midori-view.c:4089 -#, c-format -msgid "No documentation installed" -msgstr "No s'ha instaŀlat la documentació" +#: ../midori/midori-view.c:3693 +msgid "Set number of columns and rows" +msgstr "Estableix 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:3694 +msgid "Enter number of columns and rows:" +msgstr "Introduïu el nombre de columnes i files:" -#: ../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:3695 +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:4167 -msgid "Extensions are disabled." -msgstr "Les extensions estan deshabilitades." +#: ../midori/midori-view.c:3696 +msgid "Thumb size:" +msgstr "Tamany de la miniatura:" -#: ../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:3697 +msgid "Small" +msgstr "Petit" -#: ../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:3698 +msgid "Medium" +msgstr "Mitjà" -#: ../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:3699 +msgid "Big" +msgstr "Gran" -#: ../midori/midori-view.c:4171 -msgid "DNS prefetching is disabled." -msgstr "Càrrega prèvia de DNS deshabilitada." - -#: ../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: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:3890 +#, c-format +msgid "No documentation installed" +msgstr "No s'ha instaŀlat la documentació" -#: ../midori/midori-view.c:4222 +#: ../midori/midori-view.c:3960 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ó." +msgstr "Els nombres de versió mostrats entre parèntesis mostren la versió utilitzada al temps d'execució." -#: ../midori/midori-view.c:4278 +#: ../midori/midori-view.c:4009 msgid "Page loading delayed" msgstr "S'ha retardat la càrrega de la pàgina" -#: ../midori/midori-view.c:4279 +#: ../midori/midori-view.c:4010 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." +msgstr "S'ha retardat la càrrega degut a una fallada recent o a les preferències d'inici." -#: ../midori/midori-view.c:4280 +#: ../midori/midori-view.c:4011 msgid "Load Page" msgstr "Carregar pàgina" -#: ../midori/midori-view.c:4446 +#: ../midori/midori-view.c:4154 msgid "Blank page" msgstr "Pàgina en blanc" -#: ../midori/midori-view.c:4708 +#: ../midori/midori-view.c:4394 msgid "_Duplicate Tab" msgstr "_Duplica la pestanya" -#: ../midori/midori-view.c:4713 +#: ../midori/midori-view.c:4399 msgid "Show Tab _Label" msgstr "Mostra la _etiqueta a la pestanya" -#: ../midori/midori-view.c:4713 +#: ../midori/midori-view.c:4399 msgid "Show Tab _Icon Only" msgstr "Mostra només _icones a les pestanyes" -#: ../midori/midori-view.c:4719 +#: ../midori/midori-view.c:4405 msgid "Close ot_her Tabs" msgstr "Tanca la _resta de pestanyes" -#. 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 +#: ../midori/midori-view.c:5022 msgid "Print background images" msgstr "Imprimeix les imatges de fons" -#: ../midori/midori-view.c:5565 +#: ../midori/midori-view.c:5023 msgid "Whether background images should be printed" msgstr "Si s'han d'imprimir les imatges de fons" -#: ../midori/midori-view.c:5597 +#: ../midori/midori-view.c:5055 msgid "Features" msgstr "Característiques" -#: ../midori/midori-preferences.c:297 +#: ../midori/midori-preferences.c:301 msgid "Startup" msgstr "Inicialització" -#: ../midori/midori-preferences.c:310 +#: ../midori/midori-preferences.c:314 +#, fuzzy msgid "Use _current page" -msgstr "Empra la pàgina _actual" +msgstr "Imprimeix la pàgina actual" -#: ../midori/midori-preferences.c:314 +#: ../midori/midori-preferences.c:318 msgid "Use current page as homepage" msgstr "Empra la pàgina actual com a pàgina d'inici" #. Page "Appearance" -#: ../midori/midori-preferences.c:323 +#: ../midori/midori-preferences.c:327 msgid "Fonts" msgstr "Tipus de lletra" -#: ../midori/midori-preferences.c:326 +#: ../midori/midori-preferences.c:330 +#, fuzzy msgid "Proportional Font Family" -msgstr "Família de tipus de lletra proporcional" +msgstr "Família de tipus de lletra per defecte" -#: ../midori/midori-preferences.c:330 +#: ../midori/midori-preferences.c:334 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:333 +#: ../midori/midori-preferences.c:337 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:335 +#: ../midori/midori-preferences.c:339 msgid "Fixed-width Font Family" msgstr "Família de tipus de lletra d'amplada fixa" -#: ../midori/midori-preferences.c:339 +#: ../midori/midori-preferences.c:343 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:342 +#: ../midori/midori-preferences.c:346 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:344 +#: ../midori/midori-preferences.c:348 msgid "Minimum Font Size" msgstr "Mida mínima del tipus de lletra" -#: ../midori/midori-preferences.c:348 +#: ../midori/midori-preferences.c:352 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:359 +#: ../midori/midori-preferences.c:361 msgid "Behavior" msgstr "Comportament" -#: ../midori/midori-preferences.c:385 +#: ../midori/midori-preferences.c:387 msgid "Allow scripts to open popups" msgstr "Permetre als scripts obrir finestres emergents" -#: ../midori/midori-preferences.c:386 +#: ../midori/midori-preferences.c:388 msgid "Whether scripts are allowed to open popup windows automatically" msgstr "Si els scripts poden obrir finestres emergents de forma automàtica" #. Page "Interface" -#: ../midori/midori-preferences.c:416 +#: ../midori/midori-preferences.c:409 msgid "Browsing" msgstr "Navegant" #. Page "Network" -#: ../midori/midori-preferences.c:456 +#: ../midori/midori-preferences.c:447 msgid "Network" msgstr "Xarxa" -#: ../midori/midori-preferences.c:463 +#: ../midori/midori-preferences.c:454 msgid "Hostname" msgstr "Nom del host" -#: ../midori/midori-preferences.c:487 +#: ../midori/midori-preferences.c:470 msgid "MB" msgstr "MB" -#: ../midori/midori-searchaction.c:902 +#: ../midori/midori-searchaction.c:908 msgid "Add search engine" msgstr "Afegeix giny de cerca" -#: ../midori/midori-searchaction.c:902 +#: ../midori/midori-searchaction.c:908 msgid "Edit search engine" msgstr "Edita giny de cerca" -#: ../midori/midori-searchaction.c:931 +#: ../midori/midori-searchaction.c:937 msgid "_Name:" msgstr "_Nom:" -#: ../midori/midori-searchaction.c:947 +#: ../midori/midori-searchaction.c:953 msgid "_Description:" msgstr "_Descripció:" -#: ../midori/midori-searchaction.c:981 +#: ../midori/midori-searchaction.c:986 msgid "_Icon:" msgstr "_Icona:" -#: ../midori/midori-searchaction.c:995 +#: ../midori/midori-searchaction.c:1000 msgid "_Token:" msgstr "_Testimoni:" -#: ../midori/midori-searchaction.c:1295 +#: ../midori/midori-searchaction.c:1300 msgid "Manage Search Engines" msgstr "Gestiona els ginys de cerca" -#: ../midori/midori-searchaction.c:1395 +#: ../midori/midori-searchaction.c:1400 msgid "Use as _default" msgstr "Empra'l per _defecte" -#: ../midori/sokoke.c:354 +#: ../midori/sokoke.c:452 msgid "Open with" msgstr "Obrir amb" -#: ../midori/sokoke.c:362 +#: ../midori/sokoke.c:460 #, c-format msgid "Choose an application or command to open \"%s\":" msgstr "Seleccioneu una aplicació o ordre per obrir «%s»:" -#: ../midori/sokoke.c:403 ../midori/sokoke.c:413 ../midori/sokoke.c:441 -#: ../midori/sokoke.c:470 ../midori/sokoke.c:484 +#: ../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 "No s'ha pogut executar el programa extern." -#: ../midori/sokoke.c:1595 +#: ../midori/sokoke.c:1511 +msgid "_Bookmark" +msgstr "_Adreça d'interès" + +#: ../midori/sokoke.c:1513 +msgid "Add Boo_kmark" +msgstr "Afegeix adreça d'_interès" + +#: ../midori/sokoke.c:1514 +msgid "_Console" +msgstr "_Consola" + +#: ../midori/sokoke.c:1515 +msgid "_Extensions" +msgstr "_Extensions" + +#: ../midori/sokoke.c:1517 +msgid "_Homepage" +msgstr "_Pàgina d'inici" + +#: ../midori/sokoke.c:1518 +msgid "_Userscripts" +msgstr "Scripts d'_usuari" + +#: ../midori/sokoke.c:1519 +msgid "New _Tab" +msgstr "Nova _pestanya" + +#: ../midori/sokoke.c:1520 +msgid "_Transfers" +msgstr "_Transferències" + +#: ../midori/sokoke.c:1521 +msgid "Netscape p_lugins" +msgstr "_Connectors de Netscape" + +#: ../midori/sokoke.c:1524 +msgid "New _Folder" +msgstr "Nova _carpeta" + +#: ../midori/sokoke.c:2210 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d hora" msgstr[1] "%d hores" -#: ../midori/sokoke.c:1596 +#: ../midori/sokoke.c:2211 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minut" msgstr[1] "%d minuts" -#: ../midori/sokoke.c:1597 +#: ../midori/sokoke.c:2212 #, c-format msgid "%d second" msgid_plural "%d seconds" @@ -2058,171 +2195,171 @@ msgstr[0] "%d segon" msgstr[1] "%d segons" #. i18n: Download tooltip (size): 4KB of 43MB -#: ../midori/sokoke.c:1605 ../panels/midori-transfers.c:268 +#: ../midori/sokoke.c:2220 +#: ../panels/midori-transfers.c:268 #, c-format msgid "%s of %s" msgstr "%s de %s" #. i18n: Unknown number of bytes, used for transfer rate like ?B/s -#: ../midori/sokoke.c:1614 +#: ../midori/sokoke.c:2229 msgid "?B" msgstr "?B" #. i18n: Download tooltip (transfer rate): (130KB/s) -#: ../midori/sokoke.c:1617 +#: ../midori/sokoke.c:2232 #, c-format msgid " (%s/s)" msgstr "(%s/s)" #. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning -#: ../midori/sokoke.c:1634 +#: ../midori/sokoke.c:2249 #, c-format msgid " - %s remaining" msgstr "-%s restants" #. i18n: A panel at the bottom, to search text in pages -#: ../toolbars/midori-findbar.c:291 +#: ../toolbars/midori-findbar.c:230 msgid "_Inline Find:" msgstr "Cerca en _línia:" -#: ../toolbars/midori-findbar.c:317 +#: ../toolbars/midori-findbar.c:264 msgid "Previous" msgstr "Anterior" -#: ../toolbars/midori-findbar.c:323 +#: ../toolbars/midori-findbar.c:270 msgid "Next" msgstr "Següent" -#: ../toolbars/midori-findbar.c:327 +#: ../toolbars/midori-findbar.c:274 msgid "Match Case" msgstr "Coincidència de majúscules i minúscules" -#: ../toolbars/midori-findbar.c:336 +#: ../toolbars/midori-findbar.c:283 msgid "Highlight Matches" msgstr "Ressalta les coincidències" -#: ../toolbars/midori-findbar.c:347 +#: ../toolbars/midori-findbar.c:294 msgid "Close Findbar" msgstr "Tanca la barra de cerques" -#: ../toolbars/midori-transferbar.c:122 +#: ../toolbars/midori-transferbar.c:129 #, c-format msgid "The file '%s' has been downloaded." msgstr "S'ha descarregat el fitxer «%s»." -#: ../toolbars/midori-transferbar.c:125 +#: ../toolbars/midori-transferbar.c:132 msgid "Transfer completed" msgstr "Transferència finalitzada" -#: ../toolbars/midori-transferbar.c:193 +#: ../toolbars/midori-transferbar.c:214 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:215 +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 +#: ../toolbars/midori-transferbar.c:323 +#: ../panels/midori-transfers.c:142 msgid "Clear All" msgstr "Netejar-ho tot" -#: ../toolbars/midori-transferbar.c:371 ../toolbars/midori-transferbar.c:373 +#: ../toolbars/midori-transferbar.c:360 +#: ../toolbars/midori-transferbar.c:362 msgid "Some files are being downloaded" msgstr "S'estan descarregant fitxers" -#: ../toolbars/midori-transferbar.c:377 +#: ../toolbars/midori-transferbar.c:366 msgid "_Quit Midori" msgstr "_Sortir de Midori" -#: ../toolbars/midori-transferbar.c:379 +#: ../toolbars/midori-transferbar.c:368 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:114 +#: ../panels/midori-bookmarks.c:116 msgid "Bookmarks" msgstr "Adreces d'interès" -#: ../panels/midori-bookmarks.c:257 +#: ../panels/midori-bookmarks.c:294 #, 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:435 +#: ../panels/midori-bookmarks.c:474 msgid "Edit the selected bookmark" msgstr "Edita l'adreça d'interès seleccionada" -#: ../panels/midori-bookmarks.c:443 +#: ../panels/midori-bookmarks.c:482 msgid "Delete the selected bookmark" msgstr "Suprimeix l'adreça d'interès seleccionada" -#: ../panels/midori-bookmarks.c:458 +#: ../panels/midori-bookmarks.c:497 msgid "Add a new folder" msgstr "Afegeix una carpeta nova" -#: ../panels/midori-bookmarks.c:592 ../panels/midori-history.c:633 +#: ../panels/midori-bookmarks.c:631 +#: ../panels/midori-history.c:583 msgid "Separator" msgstr "Separador" -#: ../panels/midori-history.c:111 +#: ../panels/midori-history.c:114 msgid "History" msgstr "Historial" -#: ../panels/midori-history.c:158 ../panels/midori-history.c:189 -msgid "Today" -msgstr "Avuí" - -#: ../panels/midori-history.c:160 ../panels/midori-history.c:191 -msgid "Yesterday" -msgstr "Ahir" +#: ../panels/midori-history.c:146 +msgid "A week ago" +msgstr "Setmana passada" -#: ../panels/midori-history.c:162 ../panels/midori-history.c:186 +#: ../panels/midori-history.c:148 #, 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:165 ../panels/midori-history.c:184 -msgid "A week ago" -msgstr "Setmana passada" +#: ../panels/midori-history.c:151 +msgid "Today" +msgstr "Avuí" + +#: ../panels/midori-history.c:153 +msgid "Yesterday" +msgstr "Ahir" -#: ../panels/midori-history.c:360 +#: ../panels/midori-history.c:321 msgid "Are you sure you want to remove all history items?" msgstr "Voleu esborrar tots els elements de l’historial?" -#: ../panels/midori-history.c:407 +#: ../panels/midori-history.c:367 msgid "Bookmark the selected history item" msgstr "Afegeix l'element seleccionat de l'historial a les adreces d'interès" -#: ../panels/midori-history.c:416 +#: ../panels/midori-history.c:376 msgid "Delete the selected history item" msgstr "Esborra l'element de l'historial seleccionat" -#: ../panels/midori-history.c:424 +#: ../panels/midori-history.c:384 msgid "Clear the entire history" msgstr "Buida l'historial" -#: ../panels/midori-transfers.c:86 +#: ../panels/midori-transfers.c:87 msgid "Transfers" msgstr "Transferències" -#: ../panels/midori-transfers.c:469 +#: ../panels/midori-transfers.c:468 msgid "Open Destination _Folder" msgstr "_Obre la carpeta destí" -#: ../panels/midori-transfers.c:472 +#: ../panels/midori-transfers.c:471 msgid "Copy Link Loc_ation" msgstr "Copia la _localització de l'enllaç" -#: ../katze/katze-http-auth.c:210 +#: ../katze/katze-http-auth.c:213 msgid "Authentication Required" msgstr "Es requereix autenticació" -#: ../katze/katze-http-auth.c:226 +#: ../katze/katze-http-auth.c:229 msgid "" "A username and a password are required\n" "to open this location:" @@ -2230,143 +2367,147 @@ msgstr "" "És necessari un nom d'usuari i una contrasenya\n" "per a obrir aquesta ubicació:" -#: ../katze/katze-http-auth.c:240 +#: ../katze/katze-http-auth.c:243 msgid "Username" msgstr "Nom d'usuari" -#: ../katze/katze-http-auth.c:253 +#: ../katze/katze-http-auth.c:256 msgid "Password" msgstr "Contrasenya" -#: ../katze/katze-http-auth.c:267 +#: ../katze/katze-http-auth.c:270 msgid "_Remember password" msgstr "_Recorda la contrasenya" -#: ../katze/katze-throbber.c:949 +#: ../katze/katze-throbber.c:879 #, 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:962 +#: ../katze/katze-throbber.c:892 #, c-format msgid "Stock icon '%s' couldn't be loaded" msgstr "La icona «%s» no s'ha pogut carregar" -#: ../katze/katze-throbber.c:1042 +#: ../katze/katze-throbber.c:964 msgid "Animation frames are broken" msgstr "Els marcs d'animació no funcionen correctament" -#: ../katze/katze-utils.c:445 ../katze/katze-utils.c:879 +#: ../katze/katze-utils.c:536 +#: ../katze/katze-utils.c:971 #, c-format msgid "Property '%s' is invalid for %s" msgstr "La propietat «%s» no és vàlida per a %s" -#: ../katze/katze-utils.c:491 ../katze/katze-utils.c:520 +#: ../katze/katze-utils.c:582 +#: ../katze/katze-utils.c:611 #: ../extensions/addons.c:308 msgid "Choose file" msgstr "Seleccioneu fitxer" -#: ../katze/katze-utils.c:506 +#: ../katze/katze-utils.c:597 msgid "Choose folder" msgstr "Seleccioneu carpeta" -#: ../katze/katze-utils.c:610 +#: ../katze/katze-utils.c:701 msgid "None" msgstr "Cap" -#: ../katze/katze-utils.c:725 +#: ../katze/katze-utils.c:819 msgid "1 hour" msgstr "1 hora" -#: ../katze/katze-utils.c:726 +#: ../katze/katze-utils.c:820 +#, fuzzy msgid "1 day" -msgstr "1 dia" +msgstr "dies" -#: ../katze/katze-utils.c:727 +#: ../katze/katze-utils.c:821 +#, fuzzy msgid "1 week" -msgstr "1 setmana" +msgstr "Setmana passada" -#: ../katze/katze-utils.c:728 +#: ../katze/katze-utils.c:822 msgid "1 month" msgstr "1 mes" -#: ../katze/katze-utils.c:729 +#: ../katze/katze-utils.c:823 msgid "1 year" msgstr "1 any" -#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235 +#: ../katze/katze-preferences.c:95 +#: ../extensions/history-list.vala:228 #, c-format msgid "Preferences for %s" msgstr "Preferències per a %s" -#: ../extensions/adblock.c:473 +#: ../extensions/adblock.c:422 msgid "Configure Advertisement filters" msgstr "Configura els filtres de publicitat" -#: ../extensions/adblock.c:504 +#: ../extensions/adblock.c:454 #, c-format -msgid "" -"Type the address of a preconfigured filter list in the text entry and click " -"\"Add\" to add it to the list. You can find more lists at %s." -msgstr "" -"Escriu l'adreça d'una llista de filtres preconfigurada a l'entrada de text i " -"premeu \"Afegir\" per a afegir-ho a la llista. Podeu trobar més llistes a %s." +msgid "Type the address of a preconfigured filter list in the text entry and click \"Add\" to add it to the list. You can find more lists at %s." +msgstr "Escriu l'adreça d'una llista de filtres preconfigurada a l'entrada de text i premeu \"Afegir\" per a afegir-ho a la llista. Podeu trobar més llistes a %s." -#: ../extensions/adblock.c:882 +#: ../extensions/adblock.c:817 msgid "Edit rule" msgstr "Edita la regla" -#: ../extensions/adblock.c:896 +#: ../extensions/adblock.c:830 msgid "_Rule:" msgstr "_Regla:" -#: ../extensions/adblock.c:950 +#: ../extensions/adblock.c:884 msgid "Bl_ock image" msgstr "Bl_oca imatge" -#: ../extensions/adblock.c:955 +#: ../extensions/adblock.c:889 msgid "Bl_ock link" msgstr "Bl_oca enllaç" -#: ../extensions/adblock.c:1670 +#: ../extensions/adblock.c:1457 msgid "Advertisement blocker" msgstr "Bloqueig de publicitat" -#: ../extensions/adblock.c:1671 +#: ../extensions/adblock.c:1458 msgid "Block advertisements according to a filter list" msgstr "Bloca els anuncis publicitaris segons una llista de filtres" #. i18n: An infobar shows up when viewing a script on userscripts.org -#: ../extensions/addons.c:221 +#: ../extensions/addons.c:218 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 +#: ../extensions/addons.c:219 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 +#: ../extensions/addons.c:224 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 +#: ../extensions/addons.c:225 msgid "_Install user style" msgstr "_Instaŀla l'estil d'usuari" -#: ../extensions/addons.c:236 +#: ../extensions/addons.c:233 msgid "Don't install" msgstr "No instaŀlis" -#: ../extensions/addons.c:319 ../extensions/addons.c:681 +#: ../extensions/addons.c:319 +#: ../extensions/addons.c:681 msgid "Userscripts" msgstr "Scripts d'usuari" -#: ../extensions/addons.c:324 ../extensions/addons.c:683 +#: ../extensions/addons.c:324 +#: ../extensions/addons.c:683 msgid "Userstyles" msgstr "Estils d'usuari" -#: ../extensions/addons.c:380 ../extensions/addons.c:459 +#: ../extensions/addons.c:380 +#: ../extensions/addons.c:459 #: ../extensions/feed-panel/main.c:129 msgid "Error" msgstr "Error" @@ -2389,11 +2530,13 @@ msgstr "Suprimeix l'estil d'usuari" msgid "The file %s will be permanently deleted." msgstr "El fitxer «%s» s'esborrarà de forma permanent." -#: ../extensions/addons.c:570 ../extensions/addons.c:647 +#: ../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 +#: ../extensions/addons.c:572 +#: ../extensions/addons.c:656 msgid "Open Target Folder" msgstr "Obre la carpeta destí" @@ -2405,16 +2548,17 @@ msgstr "Afegeix un nou afegitó" msgid "Remove selected addon" msgstr "Suprimeix l'afegitó seleccionat" -#: ../extensions/addons.c:1696 ../extensions/addons.c:1914 +#: ../extensions/addons.c:1643 +#: ../extensions/addons.c:1805 msgid "User addons" msgstr "Afegitons de l'usuari" -#: ../extensions/addons.c:1826 +#: ../extensions/addons.c:1764 #, c-format msgid "Can't monitor folder '%s': %s" msgstr "No es pot seguir la pista de la carpeta «%s»: %s" -#: ../extensions/addons.c:1915 +#: ../extensions/addons.c:1806 msgid "Support for userscripts and userstyles" msgstr "Adment l'ús d'scripts i estils d'usuari" @@ -2426,48 +2570,44 @@ msgstr "Pestanyes de colors" msgid "Tint each tab distinctly" msgstr "Aplica un color diferent a cadascuna de les pestanyes" -#: ../extensions/cookie-manager/cookie-manager-page.c:73 +#: ../extensions/cookie-manager/cookie-manager-page.c:82 #: ../extensions/cookie-manager/main.c:35 msgid "Cookie Manager" msgstr "Gestor de galetes" -#: ../extensions/cookie-manager/cookie-manager-page.c:103 +#: ../extensions/cookie-manager/cookie-manager-page.c:112 msgid "Delete All" msgstr "Suprimeix-ho tot" -#: ../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 "" -"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:114 +msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter." +msgstr "Esborra totes les galetes mostrades. Si hi ha un filtre establert, només aquelles galetes que coincideixin amb el filtre s'esborraran." -#: ../extensions/cookie-manager/cookie-manager-page.c:120 +#: ../extensions/cookie-manager/cookie-manager-page.c:129 msgid "Expand All" msgstr "Expansiona-ho tot" -#: ../extensions/cookie-manager/cookie-manager-page.c:127 +#: ../extensions/cookie-manager/cookie-manager-page.c:136 msgid "Collapse All" msgstr "Colapsa-ho tot" -#: ../extensions/cookie-manager/cookie-manager-page.c:572 +#: ../extensions/cookie-manager/cookie-manager-page.c:578 msgid "Do you really want to delete all cookies?" msgstr "Voleu eliminar totes les galetes?" -#: ../extensions/cookie-manager/cookie-manager-page.c:574 +#: ../extensions/cookie-manager/cookie-manager-page.c:580 msgid "Question" msgstr "Qüestió" -#: ../extensions/cookie-manager/cookie-manager-page.c:583 +#: ../extensions/cookie-manager/cookie-manager-page.c:589 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:671 +#: ../extensions/cookie-manager/cookie-manager-page.c:677 msgid "At the end of the session" msgstr "Al finalitzar la sessió" -#: ../extensions/cookie-manager/cookie-manager-page.c:674 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 #, c-format msgid "" "Host: %s\n" @@ -2484,15 +2624,15 @@ msgstr "" "Segura: %s\n" "Expiració: %s" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:686 msgid "Yes" msgstr "Sí" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:686 msgid "No" msgstr "No" -#: ../extensions/cookie-manager/cookie-manager-page.c:694 +#: ../extensions/cookie-manager/cookie-manager-page.c:700 #, c-format msgid "" "Domain: %s\n" @@ -2501,43 +2641,39 @@ msgstr "" "Domini: %s\n" "Galeta: %d" -#: ../extensions/cookie-manager/cookie-manager-page.c:1024 +#: ../extensions/cookie-manager/cookie-manager-page.c:1030 msgid "Name" msgstr "Nom" -#: ../extensions/cookie-manager/cookie-manager-page.c:1077 +#: ../extensions/cookie-manager/cookie-manager-page.c:1083 msgid "_Expand All" msgstr "_Expandeix-ho tot" -#: ../extensions/cookie-manager/cookie-manager-page.c:1085 +#: ../extensions/cookie-manager/cookie-manager-page.c:1091 msgid "_Collapse All" msgstr "_Plega-ho tot" -#: ../extensions/cookie-manager/cookie-manager-page.c:1139 +#: ../extensions/cookie-manager/cookie-manager-page.c:1144 msgid "Filter:" msgstr "Filtre:" -#: ../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 "" -"Introduïu un filtre per a mostrar aquelles galetes amb nom o domini que " -"coincideixi amb el filtre" +#: ../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 "Introduïu un filtre per a mostrar aquelles galetes amb nom o domini que coincideixi amb el filtre" #: ../extensions/cookie-manager/main.c:36 msgid "List, view and delete cookies" msgstr "Llista, mostra i borra galetes" -#: ../extensions/copy-tabs.c:38 +#: ../extensions/copy-tabs.c:39 msgid "Copy Tab _Addresses" msgstr "Copia _adreces de les pestanyes" -#: ../extensions/copy-tabs.c:95 +#: ../extensions/copy-tabs.c:96 msgid "Copy Addresses of Tabs" msgstr "Copia les adreces de les pestanyes" -#: ../extensions/copy-tabs.c:96 +#: ../extensions/copy-tabs.c:97 msgid "Copy the addresses of all tabs to the clipboard" msgstr "Copia les adreces de totes les pestanyes al porta-retalls" @@ -2550,25 +2686,25 @@ msgid "Failed to find required Atom \"feed\" elements in XML data." 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:387 +#: ../extensions/feed-panel/feed-panel.c:392 #, c-format msgctxt "Feed" msgid "Last updated: %s." msgstr "Darrera actualització: %s." -#: ../extensions/feed-panel/feed-panel.c:653 +#: ../extensions/feed-panel/feed-panel.c:658 msgid "Feeds" msgstr "Canals" -#: ../extensions/feed-panel/feed-panel.c:706 +#: ../extensions/feed-panel/feed-panel.c:711 msgid "Add new feed" msgstr "Afegeix un nou canal" -#: ../extensions/feed-panel/feed-panel.c:713 +#: ../extensions/feed-panel/feed-panel.c:718 msgid "Delete feed" msgstr "Suprimeix el canal" -#: ../extensions/feed-panel/feed-panel.c:795 +#: ../extensions/feed-panel/feed-panel.c:800 msgid "_Feeds" msgstr "_Canals" @@ -2621,128 +2757,92 @@ msgstr "Quadre de canals" msgid "Read Atom/ RSS feeds" msgstr "Llegeix canals Atom/RSS" -#: ../extensions/formhistory/formhistory.c:39 +#: ../extensions/formhistory.c:146 #, c-format msgid "Failed to add form value: %s\n" msgstr "No s'ha pogut afegir un valor al formulari: %s\n" -#: ../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 +#: ../extensions/formhistory.c:403 +#: ../extensions/formhistory.c:407 #, 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/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 +#: ../extensions/formhistory.c:450 msgid "Stores history of entered form data" msgstr "Emmagatzema l'historial de les dades introduïdes als formularis" -#: ../extensions/formhistory/formhistory-gdom-frontend.c:225 -#: ../extensions/formhistory/formhistory-js-frontend.c:106 +#: ../extensions/formhistory.c:454 #, c-format -msgid "Failed to select suggestions\n" -msgstr "No s'ha pogut seleccionar suggeriments\n" +msgid "Not available: %s" +msgstr "No disponible: %s" + +#: ../extensions/formhistory.c:455 +msgid "Resource files not installed" +msgstr "Els fitxers de recursos no estan instaŀlats" -#: ../extensions/history-list.vala:197 +#: ../extensions/formhistory.c:461 +msgid "Form history filler" +msgstr "Omple el formulari de l'historial" + +#: ../extensions/history-list.vala:190 msgid "There are no unvisited tabs" msgstr "No hi ha pestanyes sense visitar" -#: ../extensions/history-list.vala:235 -#, c-format +#: ../extensions/history-list.vala:228 +#, fuzzy, c-format msgid "History-List" -msgstr "Llista d'historial" +msgstr "Llista de l'historial" -#: ../extensions/history-list.vala:275 +#: ../extensions/history-list.vala:267 msgid "Tab closing behavior" msgstr "Comportament del tancament de pestanyes" -#: ../extensions/history-list.vala:283 +#: ../extensions/history-list.vala:275 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:281 +#, fuzzy +msgid "Switch to last view tab" +msgstr "Canvia a la pestanya següent" -#: ../extensions/history-list.vala:295 +#: ../extensions/history-list.vala:287 +#, fuzzy msgid "Switch to newest tab" -msgstr "Canvia a la pestanya més nova" +msgstr "Canvia a la pestanya següent" -#: ../extensions/history-list.vala:423 +#: ../extensions/history-list.vala:411 msgid "Next new Tab (History List)" msgstr "Nova pestanya següent (Llista de l'historial)" -#: ../extensions/history-list.vala:424 +#: ../extensions/history-list.vala:412 msgid "Next new tab from history" msgstr "Nova pestanya següent de l'historial" -#: ../extensions/history-list.vala:433 +#: ../extensions/history-list.vala:421 msgid "Previous new Tab (History List)" msgstr "Nova pestanya anterior (Llista de l'historial)" -#: ../extensions/history-list.vala:434 +#: ../extensions/history-list.vala:422 msgid "Previous new tab from history" msgstr "Nova pestanya anterior de l'historial" -#: ../extensions/history-list.vala:443 +#: ../extensions/history-list.vala:431 msgid "Display tab in background (History List)" -msgstr "Mostra la pestanya inactiva (Llistat d'historial)" +msgstr "Mostra la pestanya al fons (Llistat d'historial)" -#: ../extensions/history-list.vala:444 +#: ../extensions/history-list.vala:432 msgid "Display the current selected tab in background" -msgstr "Mostra la pestanya seleccionada actualment inactiva" +msgstr "Mostra la pestanya seleccionada actualment al fons" -#: ../extensions/history-list.vala:569 +#: ../extensions/history-list.vala:557 msgid "History List" msgstr "Llista de l'historial" -#: ../extensions/history-list.vala:570 +#: ../extensions/history-list.vala:558 msgid "Move to the last used tab when switching or closing tabs" -msgstr "" -"Mou a la ultima pestanya utilitzada quan es canvien o tanquen pestanyes" +msgstr "Mou a la ultima pestanya utilitzada quan es canvien o tanquen pestanyes" #: ../extensions/mouse-gestures.c:301 msgid "Mouse Gestures" @@ -2752,7 +2852,7 @@ msgstr "Gesticulacions de ratolí" msgid "Control Midori by moving the mouse" msgstr "Controla Midori usant el ratolí" -#: ../extensions/shortcuts.c:109 +#: ../extensions/shortcuts.c:110 msgid "Reload page or stop loading" msgstr "Carrega la pàgina de nou o atura la càrrega" @@ -2760,15 +2860,15 @@ msgstr "Carrega la pàgina de nou o atura la càrrega" msgid "Customize Keyboard shortcuts" msgstr "Configura les dreceres de teclat" -#: ../extensions/shortcuts.c:283 -msgid "Customize Sh_ortcuts…" +#: ../extensions/shortcuts.c:282 +msgid "Customize Sh_ortcuts..." msgstr "Configura les _dreceres…" -#: ../extensions/shortcuts.c:320 +#: ../extensions/shortcuts.c:319 msgid "Shortcuts" msgstr "Dreceres" -#: ../extensions/shortcuts.c:321 +#: ../extensions/shortcuts.c:320 msgid "View and edit keyboard shortcuts" msgstr "Mostra i edita les dreceres del teclat" @@ -2780,280 +2880,84 @@ msgstr "Rellotge a la barra d'estat" msgid "Display date and time in the statusbar" msgstr "Mostrar la data i l'hora a la barra d'estat" -#: ../extensions/statusbar-features.c:131 +#: ../extensions/statusbar-features.c:129 msgid "Images" msgstr "Imatges" -#: ../extensions/statusbar-features.c:140 +#: ../extensions/statusbar-features.c:138 msgid "Scripts" msgstr "Scripts" -#: ../extensions/statusbar-features.c:151 +#: ../extensions/statusbar-features.c:147 msgid "Netscape plugins" msgstr "Connectors de Netscape" -#: ../extensions/statusbar-features.c:199 +#: ../extensions/statusbar-features.c:193 msgid "Statusbar Features" msgstr "Característiques de la la barra d'estat" -#: ../extensions/statusbar-features.c:200 +#: ../extensions/statusbar-features.c:194 msgid "Easily toggle features on web pages on and off" msgstr "Activa o desactiva fàcilment funcionalitats en planes web" -#: ../extensions/tab-panel.c:593 ../extensions/tab-panel.c:680 +#: ../extensions/tab-panel.c:597 +#: ../extensions/tab-panel.c:684 msgid "Tab Panel" msgstr "Quadre de pestanyes" -#: ../extensions/tab-panel.c:663 +#: ../extensions/tab-panel.c:667 msgid "T_ab Panel" msgstr "Quadre de _pestanyes" -#: ../extensions/tab-panel.c:681 +#: ../extensions/tab-panel.c:685 msgid "Show tabs in a vertical panel" msgstr "Mostra les pestanyes en un quadre vertical" -#: ../extensions/tabs-minimized.c:76 +#: ../extensions/tabs-minimized.c:77 msgid "Only Icons on Tabs by default" msgstr "Per defecte només icones a les pestanyes" -#: ../extensions/tabs-minimized.c:77 +#: ../extensions/tabs-minimized.c:78 msgid "New tabs have no label by default" msgstr "Les noves pestanyes no tenen etiqueta per defecte" -#: ../extensions/toolbar-editor.c:393 +#: ../extensions/toolbar-editor.c:391 msgid "Customize Toolbar" msgstr "_Personalitza la barra d'eines" -#: ../extensions/toolbar-editor.c:409 -msgid "" -"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:407 +msgid "Select items to be displayed on the toolbar. Items can be reodered by drag and drop." +msgstr "Selecciona els elements mostrats a la barra d'eines. Els elements poden ser ordenats arrossegant-los." -#: ../extensions/toolbar-editor.c:425 +#: ../extensions/toolbar-editor.c:423 msgid "Available Items" msgstr "Elements disponibles" -#: ../extensions/toolbar-editor.c:446 +#: ../extensions/toolbar-editor.c:444 msgid "Displayed Items" msgstr "Elements mostrats" -#: ../extensions/toolbar-editor.c:581 -msgid "Customize _Toolbar…" +#: ../extensions/toolbar-editor.c:579 +msgid "Customize _Toolbar..." msgstr "Personalitza la barra d'e_ines…" -#: ../extensions/toolbar-editor.c:597 -msgid "_Customize…" -msgstr "_Configura…" +#: ../extensions/toolbar-editor.c:595 +#, fuzzy +msgid "_Customize..." +msgstr "Personalitzat…" -#: ../extensions/toolbar-editor.c:627 +#: ../extensions/toolbar-editor.c:625 msgid "Toolbar Editor" msgstr "Editor de la barra d'eines" -#: ../extensions/toolbar-editor.c:628 +#: ../extensions/toolbar-editor.c:626 msgid "Easily edit the toolbar layout" msgstr "Edita fàcilment la distribució de la barra d'eines" -#: ../extensions/web-cache.c:463 +#: ../extensions/web-cache.c:479 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ó" @@ -3221,12 +3125,15 @@ msgstr "Empra el disc com a memòria cau de comunicacions HTTP" #~ msgid "Delete old cookies after 1 year" #~ msgstr "Esborrar les galetes antigues després d'un any" -#~ msgid "Configure _Advertisement filters…" +#~ 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 "_Form History" +#~ msgstr "Historial de _formularis" + #~ msgid "Next Tab (History List)" #~ msgstr "Pestanya següent (Llista de l'historial)" @@ -3318,6 +3225,9 @@ msgstr "Empra el disc com a memòria cau de comunicacions HTTP" #~ 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" @@ -3390,6 +3300,9 @@ msgstr "Empra el disc com a memòria cau de comunicacions HTTP" #~ 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" diff --git a/po/cs.po b/po/cs.po index 8387ae48..4734dd6d 100644 --- a/po/cs.po +++ b/po/cs.po @@ -2,54 +2,37 @@ # 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: 2012-09-17 06:15+0000\n" -"PO-Revision-Date: 2012-02-24 01:20+0100\n" -"Last-Translator: Michal Várady \n" +"POT-Creation-Date: 2011-11-29 05:39+0000\n" +"PO-Revision-Date: 2010-05-04 08:08+0200\n" +"Last-Translator: David Å tancl \n" "Language-Team: Czech < >\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" +"Content-Transfer-Encoding: UTF-8\n" "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 "Browse the Web" -msgstr "Prohlížet internet" - -#: ../data/midori.desktop.in.h:2 msgid "Internet;WWW;Explorer" msgstr "Internet;WWW;Explorer" -#: ../data/midori.desktop.in.h:3 ../midori/main.c:1922 ../midori/main.c:1946 -#: ../midori/main.c:1960 ../midori/midori-websettings.c:200 +#: ../data/midori.desktop.in.h:2 +msgid "Lightweight web browser" +msgstr "Odlehčený prohlížeč" + +#: ../data/midori.desktop.in.h:3 ../midori/main.c:2005 ../midori/main.c:2025 +#: ../midori/main.c:2036 ../midori/midori-websettings.c:303 msgid "Midori" msgstr "Midori" #: ../data/midori.desktop.in.h:4 -msgid "Midori Web Browser" -msgstr "Internetový prohlížeč Midori" - -#: ../data/midori.desktop.in.h:5 -msgid "New Private Browsing Window" -msgstr "Nové okno soukromého prohlížení" - -#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1326 -msgid "New Tab" -msgstr "Nová karta" - -#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1323 -msgid "New Window" -msgstr "Nové okno" - -#: ../data/midori.desktop.in.h:8 msgid "Web Browser" msgstr "Internetový prohlížeč" @@ -61,373 +44,345 @@ msgstr "Midori - soukromé prohlížení" 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:4355 +#: ../data/midori-private.desktop.in.h:3 msgid "Private Browsing" msgstr "Soukromé prohlížení" -#: ../midori/main.c:91 ../midori/main.c:97 +#: ../midori/main.c:96 ../midori/main.c:102 #, c-format msgid "The configuration couldn't be loaded: %s\n" -msgstr "Konfiguraci nelze načíst: %s\n" +msgstr "Konfigurace nemůže být načtena: %s\n" -#: ../midori/main.c:145 +#: ../midori/main.c:150 #, c-format msgid "Value '%s' is invalid for %s" -msgstr "Hodnota '%s' je pro %s neplatná" +msgstr "Hodnota '%s' je pro %s Å¡patná" -#: ../midori/main.c:150 ../midori/main.c:254 +#: ../midori/main.c:155 ../midori/main.c:261 #, c-format msgid "Invalid configuration value '%s'" -msgstr "Neplatná hodnota '%s' konfigurace" +msgstr "Nesprávná hodnota '%s' v konfiguraci" -#: ../midori/main.c:365 +#: ../midori/main.c:366 #, c-format msgid "The search engines couldn't be loaded. %s\n" -msgstr "Vyhledávací nástroje nelze načíst.%s\n" +msgstr "Vyhledávací nástroje nemohou být načteny.%s\n" -#: ../midori/main.c:419 +#: ../midori/main.c:420 #, c-format msgid "Failed to clear history: %s\n" msgstr "Nepodařilo se smazat historii: %s\n" -#: ../midori/main.c:441 ../extensions/formhistory/formhistory.c:531 +#: ../midori/main.c:440 ../midori/main.c:561 ../extensions/formhistory.c:417 #, 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:513 +#: ../midori/main.c:504 #, 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:535 +#: ../midori/main.c:544 ../panels/midori-history.c:189 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "Nepodařilo se odstranit položku historie: %s\n" + +#: ../midori/main.c:591 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "Záložky nemohou být uloženy. %s" + +#: ../midori/main.c:624 #, c-format msgid "The configuration couldn't be saved. %s" -msgstr "Konfiguraci nelze uložit. %s" +msgstr "Konfigurace nemůže být uložena. %s" -#: ../midori/main.c:561 +#: ../midori/main.c:659 #, c-format msgid "The search engines couldn't be saved. %s" -msgstr "Vyhledávací nástroj nelze uložit. %s" +msgstr "Vyhledávací nástroj nemůže být uložen. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:598 +#: ../midori/main.c:685 ../midori/main.c:705 #, c-format msgid "The trash couldn't be saved. %s" -msgstr "Seznam zavřených karet nelze uložit. %s" +msgstr "Seznam zavřených karet nemůže být uložen. %s" -#: ../midori/main.c:671 ../panels/midori-extensions.c:90 +#: ../midori/main.c:739 ../panels/midori-extensions.c:91 msgid "Extensions" msgstr "Rozšíření" -#: ../midori/main.c:685 +#: ../midori/main.c:753 msgid "Privacy" msgstr "Soukromí" -#: ../midori/main.c:687 -msgid "Delete old Cookies after:" -msgstr "Smazat stará cookies po:" - -#: ../midori/main.c:689 ../midori/main.c:692 -msgid "The maximum number of days to save cookies for" -msgstr "Maximální počet dní, po které jsou cookies platná." - -#: ../midori/main.c:696 -msgid "Only accept Cookies from sites you visit" -msgstr "Přijímat cookies pouze z navÅ¡tívených stránek" - -#: ../midori/main.c:697 -msgid "Block cookies sent by third-party websites" -msgstr "Blokovat cookies z jiných stránek" - -#: ../midori/main.c:702 +#: ../midori/main.c:765 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." +"pro reklamu." -#: ../midori/main.c:709 -msgid "Enable offline web application cache" -msgstr "Povolit mezipaměť pro offline aplikace" - -#: ../midori/main.c:712 -msgid "Enable HTML5 local storage support" -msgstr "Povolit místní úložiÅ¡tě pro HTML5" - -#. i18n: Reworded: Shorten details propagated when going to another page -#: ../midori/main.c:716 -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/main.c:718 -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/main.c:721 -msgid "Delete pages from history after:" -msgstr "Smazat stránky z historie po:" - -#: ../midori/main.c:723 ../midori/main.c:726 -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/main.c:767 +#: ../midori/main.c:821 #, c-format msgid "The session couldn't be saved. %s" -msgstr "Relaci nelze uložit. %s" +msgstr "Sezení nemůže být uloženo. %s" -#: ../midori/main.c:989 +#: ../midori/main.c:1031 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." +"Nejsou k dispozici žádné kořenové certifikáty. SSL certifikáty nemohou být " +"ověřovány." -#: ../midori/main.c:1084 +#: ../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 "" -"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." +"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:1103 +#: ../midori/main.c:1118 msgid "Modify _preferences" msgstr "Změnit _nastavení" -#: ../midori/main.c:1107 +#: ../midori/main.c:1122 msgid "Disable all _extensions" msgstr "Zakázat vÅ¡echna _rozšíření" -#: ../midori/main.c:1116 -msgid "Show a dialog after Midori crashed" -msgstr "Zobrazit dialog po pádu aplikace Midori" - -#: ../midori/main.c:1121 +#: ../midori/main.c:1135 msgid "Discard old tabs" -msgstr "Zahodit staré karty" +msgstr "Bez otevření karet" -#: ../midori/main.c:1122 ../midori/midori-websettings.c:108 +#: ../midori/main.c:1136 ../midori/midori-websettings.c:212 msgid "Show last tabs without loading" msgstr "zobrazit naposledy otevřené karty bez načtení" -#: ../midori/main.c:1123 ../midori/midori-websettings.c:107 +#: ../midori/main.c:1137 ../midori/midori-websettings.c:211 msgid "Show last open tabs" msgstr "zobrazit naposledy otevřené karty" -#: ../midori/main.c:1370 ../midori/main.c:2382 +#: ../midori/main.c:1345 ../midori/main.c:2408 #, c-format msgid "The session couldn't be loaded: %s\n" -msgstr "Relaci nelze načíst: %s\n" +msgstr "Sezení nemůže být načteno: %s\n" -#: ../midori/main.c:1508 +#: ../midori/main.c:1484 #, 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:1837 +#: ../midori/main.c:1908 msgid "Run ADDRESS as a web application" -msgstr "Spustit řetězec ADRESA jako webovou aplikaci" +msgstr "Spustit ADRESA jako webovou aplikaci" -#: ../midori/main.c:1837 +#: ../midori/main.c:1908 msgid "ADDRESS" msgstr "ADRESA" -#: ../midori/main.c:1840 +#: ../midori/main.c:1911 msgid "Use FOLDER as configuration folder" -msgstr "Použít řetězec SLOŽKA jako složku konfigurace" +msgstr "Použít SLOŽKA jako místo pro uložení konfigurace" -#: ../midori/main.c:1840 +#: ../midori/main.c:1911 msgid "FOLDER" msgstr "SLOŽKA" -#: ../midori/main.c:1843 +#: ../midori/main.c:1914 msgid "Private browsing, no changes are saved" -msgstr "Soukromé prohlížení, bez uložení změn" - -#: ../midori/main.c:1846 -msgid "Portable mode, all runtime files are stored in one place" -msgstr "Přenosný mód, vÅ¡echny soubory jsou na jednom místě" - -#: ../midori/main.c:1849 -msgid "Plain GTK+ window with WebKit, akin to GtkLauncher" -msgstr "Obyčejné okno s jádrem WebKit, obdoba GtkLauncher" +msgstr "Soukromé prohlížení, nic se neukládá" -#: ../midori/main.c:1851 +#: ../midori/main.c:1916 msgid "Show a diagnostic dialog" -msgstr "Zobrazit diagnostické dialogové okno" +msgstr "Zobrazit dialog po pádu" -#: ../midori/main.c:1853 +#: ../midori/main.c:1918 msgid "Run the specified filename as javascript" -msgstr "Spustit zadaný soubor jako javascript" +msgstr "Spustit jako javascript" -#: ../midori/main.c:1855 +#: ../midori/main.c:1920 msgid "Take a snapshot of the specified URI" -msgstr "Získat snímek zadané adresy URI" +msgstr "Získat snímek požadovaného URI" -#: ../midori/main.c:1857 +#: ../midori/main.c:1922 msgid "Execute the specified command" -msgstr "Spustit zadaný příkaz" +msgstr "Spustit vybraný příkaz" -#: ../midori/main.c:1859 +#: ../midori/main.c:1924 msgid "List available commands to execute with -e/ --execute" -msgstr "Seznam dostupných příkazů spustitelných s parametrem -e / --execute" +msgstr "Seznam možných programů použitelných s parametrem -e / --execute" -#: ../midori/main.c:1861 +#: ../midori/main.c:1926 msgid "Display program version" msgstr "Zobrazit verzi programu" -#: ../midori/main.c:1863 +#: ../midori/main.c:1928 msgid "Addresses" msgstr "Adresy" -#: ../midori/main.c:1865 +#: ../midori/main.c:1930 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:1865 +#: ../midori/main.c:1930 msgid "PATTERN" msgstr "REGVÝRAZ" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1869 +#: ../midori/main.c:1934 msgid "Reset Midori after SECONDS seconds of inactivity" -msgstr "Restartovat aplikaci Midori po SEKUNDY sekund neaktivity" +msgstr "Restartovat Midori po VTEŘINY vteřin neaktivity" -#: ../midori/main.c:1869 +#: ../midori/main.c:1934 msgid "SECONDS" -msgstr "SEKUNDY" +msgstr "VTEŘINY" -#: ../midori/main.c:1872 +#: ../midori/main.c:1937 msgid "Redirects console warnings to the specified FILENAME" msgstr "Přesměruje varování z konzoly do souboru SOUBOR" -#: ../midori/main.c:1872 +#: ../midori/main.c:1937 msgid "FILENAME" msgstr "SOUBOR" -#: ../midori/main.c:1961 +#: ../midori/main.c:2002 +msgid "[Addresses]" +msgstr "[Adresy]" + +#: ../midori/main.c:2012 +msgid "The specified configuration folder is invalid." +msgstr "Vybraný konfigurační adresář je neplatný." + +#: ../midori/main.c:2037 msgid "Please report comments, suggestions and bugs to:" -msgstr "Komentáře, požadavky a hlášení o chybách posílejte na:" +msgstr "Komentáře, požadavky a chyby posílejte na:" -#: ../midori/main.c:1963 +#: ../midori/main.c:2039 msgid "Check for new versions at:" -msgstr "Zjistěte dostupnost nové verze na:" +msgstr "Zkontrolujte, zda není nová verze na " + +#: ../midori/main.c:2122 +msgid "Website icons" +msgstr "Ikony stránek" #. i18n: Logins and passwords in websites and web forms -#: ../midori/main.c:2102 +#: ../midori/main.c:2125 msgid "Saved logins and _passwords" msgstr "Uložené _přihlaÅ¡ovací údaje" -#: ../midori/main.c:2104 -msgid "Cookies and Website data" -msgstr "Cookies a data stránek" +#: ../midori/main.c:2127 +msgid "Cookies" +msgstr "cookies" + +#: ../midori/main.c:2130 +msgid "'Flash' Cookies" +msgstr "cookies z flashe" -#. TODO: Preserve page icons of search engines and merge privacy items -#: ../midori/main.c:2108 ../midori/midori-preferences.c:505 -#: ../extensions/web-cache.c:461 ../extensions/web-cache.c:470 +#: ../midori/main.c:2133 +msgid "HTML5 _Databases" +msgstr "HTML5 _databáze" + +#: ../midori/main.c:2136 ../midori/midori-websettings.c:936 +#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471 msgid "Web Cache" -msgstr "Mezipaměť stránek" +msgstr "KeÅ¡ stránek" -#: ../midori/main.c:2111 -msgid "Website icons" -msgstr "Ikony webových stránek" +#: ../midori/main.c:2138 +msgid "Offline Application Cache" +msgstr "Cache pro offline aplikace" -#: ../midori/main.c:2215 +#: ../midori/main.c:2241 msgid "An unknown error occured" -msgstr "DoÅ¡lo k neznámé chybě" +msgstr "Nastala neznámá chyba." -#: ../midori/main.c:2330 +#: ../midori/main.c:2339 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" +msgstr "Midori sice již běží, ale neodpovídá.\n" -#: ../midori/main.c:2364 +#: ../midori/main.c:2375 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" -msgstr "Záložky nelze načíst: %s\n" +msgstr "Záložky nemohou být načteny: %s\n" -#: ../midori/main.c:2397 +#: ../midori/main.c:2423 #, c-format msgid "The trash couldn't be loaded: %s\n" -msgstr "Zavřené karty nelze načíst: %s\n" +msgstr "Zavřené karty nemohou být načteny: %s\n" -#: ../midori/main.c:2410 +#: ../midori/main.c:2436 #, c-format msgid "The history couldn't be loaded: %s\n" -msgstr "Historii nelze načíst: %s\n" +msgstr "Historie nemůže být načtena: %s\n" -#: ../midori/main.c:2425 +#: ../midori/main.c:2452 msgid "The following errors occured:" msgstr "DoÅ¡lo k následujícím chybám:" -#: ../midori/main.c:2441 +#: ../midori/main.c:2468 msgid "_Ignore" msgstr "_Ignorovat" -#: ../midori/midori-app.c:1156 ../midori/midori-browser.c:534 -#, c-format -msgid "Unexpected action '%s'." -msgstr "Neočekávaná akce '%s'." +#: ../midori/midori-app.c:1335 +msgid "_Bookmark" +msgstr "_Záložky" -#: ../midori/midori-app.c:1372 ../midori/midori-browser.c:6251 +#: ../midori/midori-app.c:1336 ../midori/midori-browser.c:5982 msgid "_Bookmarks" msgstr "_Záložky" -#: ../midori/midori-app.c:1373 +#: ../midori/midori-app.c:1337 msgid "Add Boo_kmark" msgstr "_Přidat záložku" -#: ../midori/midori-app.c:1374 +#: ../midori/midori-app.c:1338 +msgid "_Console" +msgstr "_Konzola" + +#: ../midori/midori-app.c:1339 msgid "_Extensions" msgstr "_Rozšíření" #. i18n: Browsing history, visited web pages, closed tabs -#: ../midori/midori-app.c:1375 ../midori/midori-browser.c:4700 +#: ../midori/midori-app.c:1340 ../midori/midori-browser.c:4577 msgid "_History" msgstr "_Historie" -#: ../midori/midori-app.c:1376 +#: ../midori/midori-app.c:1341 +msgid "_Homepage" +msgstr "_Domovská stránka" + +#: ../midori/midori-app.c:1342 msgid "_Userscripts" msgstr "_Uživatelské skripty" -#: ../midori/midori-app.c:1377 -msgid "User_styles" -msgstr "Uživatelské _styly" - -#: ../midori/midori-app.c:1378 +#: ../midori/midori-app.c:1343 msgid "New _Tab" msgstr "Nová _karta" -#: ../midori/midori-app.c:1379 +#: ../midori/midori-app.c:1344 msgid "_Transfers" msgstr "_Přenosy" -#: ../midori/midori-app.c:1380 +#: ../midori/midori-app.c:1345 msgid "Netscape p_lugins" -msgstr "Zásuvné moduly ap_likace Netscape" +msgstr "Netscape p_luginy" -#: ../midori/midori-app.c:1381 +#: ../midori/midori-app.c:1346 msgid "_Closed Tabs" msgstr "_Zavřené karty" -#: ../midori/midori-app.c:1382 ../midori/midori-browser.c:5387 +#: ../midori/midori-app.c:1347 ../midori/midori-browser.c:5165 msgid "New _Window" msgstr "Nové _okno" -#: ../midori/midori-app.c:1383 +#: ../midori/midori-app.c:1348 msgid "New _Folder" msgstr "Nová _složka" -#: ../midori/midori-app.c:1437 -msgid "[Addresses]" -msgstr "[Adresy]" - #: ../midori/midori-array.c:522 msgid "File not found." msgstr "Soubor nebyl nalezen." @@ -443,115 +398,126 @@ msgstr "Neznámý formát záložek." #: ../midori/midori-array.c:915 msgid "Writing failed." -msgstr "Zápis se nezdařil." - -#: ../midori/midori-browser.c:347 ../midori/midori-browser.c:5526 -msgid "Go forward to the next page" -msgstr "Přejít vpřed (na následující stránku)" - -#. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:354 ../midori/midori-browser.c:5534 -#: ../midori/midori-browser.c:5537 -msgid "Go to the next sub-page" -msgstr "Přejít na následující podstránku" +msgstr "Nepodařilo se zapsat." -#: ../midori/midori-browser.c:441 ../midori/midori-browser.c:5475 -#: ../midori/midori-browser.c:5484 +#: ../midori/midori-browser.c:329 ../midori/midori-browser.c:5247 +#: ../midori/midori-browser.c:5256 msgid "Reload the current page" -msgstr "Znovu načíst tuto stránku" +msgstr "Znovu načíst stránku" -#: ../midori/midori-browser.c:449 ../midori/midori-browser.c:5481 +#: ../midori/midori-browser.c:337 ../midori/midori-browser.c:5253 msgid "Stop loading the current page" -msgstr "Zastavit načítání této stránky" +msgstr "Zastavit načítání stránky" -#: ../midori/midori-browser.c:519 +#: ../midori/midori-browser.c:462 #, c-format msgid "Failed to update title: %s\n" -msgstr "Nepodařilo se aktualizovat titulek: %s\n" +msgstr "Nepodařilo se zaktualizovat titulek: %s\n" -#: ../midori/midori-browser.c:614 +#: ../midori/midori-browser.c:475 +#, c-format +msgid "Unexpected action '%s'." +msgstr "Neočekávaná akce '%s'." + +#: ../midori/midori-browser.c:576 #, c-format msgid "%s (Private Browsing)" msgstr "%s (Soukromé prohlížení)" -#: ../midori/midori-browser.c:724 ../midori/midori-browser.c:766 -#: ../panels/midori-bookmarks.c:114 -msgid "Bookmarks" -msgstr "Záložky" +#: ../midori/midori-browser.c:687 ../midori/midori-browser.c:720 +msgid "Toplevel folder" +msgstr "Hlavní adresář" -#: ../midori/midori-browser.c:826 +#: ../midori/midori-browser.c:777 msgid "New folder" -msgstr "Nová složka" +msgstr "Nový adresář" -#: ../midori/midori-browser.c:826 +#: ../midori/midori-browser.c:777 msgid "Edit folder" -msgstr "Upravit složku" +msgstr "Upravit adresář" -#: ../midori/midori-browser.c:828 +#: ../midori/midori-browser.c:779 msgid "New bookmark" msgstr "Nová záložka" -#: ../midori/midori-browser.c:828 +#: ../midori/midori-browser.c:779 msgid "Edit bookmark" msgstr "Upravit záložku" -#: ../midori/midori-browser.c:862 -msgid "Type a name for this bookmark and choose where to keep it." -msgstr "Zadejte název záložky a zařaďte ji." +#: ../midori/midori-browser.c:810 +msgid "_Title:" +msgstr "_Nadpis:" + +#: ../midori/midori-browser.c:830 ../midori/midori-searchaction.c:966 +#: ../extensions/feed-panel/main.c:377 +msgid "_Address:" +msgstr "_Adresa:" + +#: ../midori/midori-browser.c:853 ../midori/midori-browser.c:4312 +msgid "_Folder:" +msgstr "_Adresář:" -#: ../midori/midori-browser.c:923 +#: ../midori/midori-browser.c:869 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:929 +#: ../midori/midori-browser.c:882 msgid "Show in the tool_bar" -msgstr "Zobrazit v panelu _nástrojů" +msgstr "Zobrazit v _nástrojové liÅ¡tě" -#: ../midori/midori-browser.c:937 +#: ../midori/midori-browser.c:897 msgid "Run as _web application" msgstr "Spustit jako _webovou aplikaci" -#: ../midori/midori-browser.c:1055 ../midori/midori-browser.c:4504 +#: ../midori/midori-browser.c:968 +#, c-format +msgid "The file \"%s\" can't be saved in this folder." +msgstr "Soubor \"%s\" nemůže být do této složky uložen." + +#: ../midori/midori-browser.c:970 +#, c-format +msgid "You don't have permission to write in this location." +msgstr "Nemáte oprávnění k zápisu." + +#: ../midori/midori-browser.c:977 +#, c-format +msgid "There is not enough free space to download \"%s\"." +msgstr "Není dost místa pro stažení \"%s\"." + +#: ../midori/midori-browser.c:980 +#, c-format +msgid "The file needs %s but only %s are left." +msgstr "Požadováno je %s, ale k dispozici jen %s." + +#: ../midori/midori-browser.c:1024 ../midori/midori-browser.c:4382 msgid "Save file as" msgstr "Uložit soubor jako" -#: ../midori/midori-browser.c:1065 -msgid "Save associated _resources" -msgstr "Uložit připojené _zdroje" +#: ../midori/midori-browser.c:1333 +msgid "New Window" +msgstr "Nové okno" -#: ../midori/midori-browser.c:1323 +#: ../midori/midori-browser.c:1333 msgid "A new window has been opened" msgstr "Bylo otevřeno nové okno" -#: ../midori/midori-browser.c:1326 +#: ../midori/midori-browser.c:1336 +msgid "New Tab" +msgstr "Nová karta" + +#: ../midori/midori-browser.c:1336 msgid "A new tab has been opened" msgstr "Byla otevřena nová karta" -#: ../midori/midori-browser.c:1343 -msgid "Error opening the image!" -msgstr "Chyba při otevírání obrázku!" - -#: ../midori/midori-browser.c:1344 -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:1350 -msgid "Error downloading the image!" -msgstr "Chyba při stahování obrázku." - -#: ../midori/midori-browser.c:1351 -msgid "Can not download selected image." -msgstr "Vybraný obrázek se nepodařilo stáhnout." - -#: ../midori/midori-browser.c:1408 +#: ../midori/midori-browser.c:1373 msgid "Save file" msgstr "Uložit soubor" -#: ../midori/midori-browser.c:2335 +#: ../midori/midori-browser.c:2265 msgid "Open file" msgstr "Otevřít soubor" -#: ../midori/midori-browser.c:2467 +#: ../midori/midori-browser.c:2396 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" @@ -559,163 +525,147 @@ msgid "" "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." +"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." -#: ../midori/midori-browser.c:2473 ../extensions/feed-panel/main.c:365 +#: ../midori/midori-browser.c:2402 ../extensions/feed-panel/main.c:365 msgid "New feed" msgstr "Nový kanál" -#: ../midori/midori-browser.c:2516 ../midori/midori-browser.c:5550 -#: ../panels/midori-bookmarks.c:527 +#: ../midori/midori-browser.c:2445 ../midori/midori-browser.c:5316 +#: ../panels/midori-bookmarks.c:432 msgid "Add a new bookmark" msgstr "Přidat novou záložku" -#: ../midori/midori-browser.c:3060 ../midori/midori-searchaction.c:487 +#: ../midori/midori-browser.c:2971 ../midori/midori-searchaction.c:487 msgid "Empty" msgstr "Prázdné" -#: ../midori/midori-browser.c:3506 ../midori/midori-browser.c:3507 +#: ../midori/midori-browser.c:3461 msgid "Toggle text cursor navigation" msgstr "Přepíná navigaci pomocí kurzoru" -#: ../midori/midori-browser.c:3509 -msgid "" -"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in " -"all websites." -msgstr "" -"Stisk klávesy F7 přepíná funkci ovládání pomocí kurzoru. Když je aktivní, na " -"vÅ¡ech stránkách se objevuje kurzor." - -#: ../midori/midori-browser.c:3512 -msgid "_Enable Caret Browsing" -msgstr "Povolit ovládání ku_rzorem" - -#: ../midori/midori-browser.c:3904 ../midori/midori-browser.c:5944 +#: ../midori/midori-browser.c:3773 ../midori/midori-browser.c:5723 #, 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:4230 ../panels/midori-bookmarks.c:850 -#: ../panels/midori-history.c:806 +#: ../midori/midori-browser.c:4109 ../panels/midori-bookmarks.c:748 +#: ../panels/midori-history.c:747 msgid "Open all in _Tabs" msgstr "Otevřít vÅ¡echny v _kartách" -#: ../midori/midori-browser.c:4237 ../panels/midori-bookmarks.c:856 -#: ../panels/midori-history.c:812 ../extensions/feed-panel/feed-panel.c:528 +#: ../midori/midori-browser.c:4116 ../panels/midori-bookmarks.c:754 +#: ../panels/midori-history.c:753 ../extensions/feed-panel/feed-panel.c:528 msgid "Open in New _Tab" msgstr "Otevřít v nové _kartě" -#: ../midori/midori-browser.c:4240 ../midori/midori-view.c:2952 -#: ../midori/midori-view.c:4928 ../panels/midori-bookmarks.c:858 -#: ../panels/midori-history.c:814 ../extensions/feed-panel/feed-panel.c:530 +#: ../midori/midori-browser.c:4119 ../midori/midori-view.c:2530 +#: ../midori/midori-view.c:4357 ../panels/midori-bookmarks.c:756 +#: ../panels/midori-history.c:755 ../extensions/feed-panel/feed-panel.c:530 msgid "Open in New _Window" msgstr "Otevřít v novém _okně" -#: ../midori/midori-browser.c:4329 +#: ../midori/midori-browser.c:4199 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4330 +#: ../midori/midori-browser.c:4200 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4331 +#: ../midori/midori-browser.c:4201 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4332 +#: ../midori/midori-browser.c:4202 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4333 +#: ../midori/midori-browser.c:4203 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4334 +#: ../midori/midori-browser.c:4204 #, c-format msgid "Firefox (%s)" msgstr "Firefox (%s)" -#: ../midori/midori-browser.c:4335 -msgid "Midori 0.2.6" -msgstr "Midori 0.2.6" +#: ../midori/midori-browser.c:4225 +msgid "Import bookmarks..." +msgstr "Importovat záložky..." -#: ../midori/midori-browser.c:4356 -msgid "Import bookmarks…" -msgstr "Importovat záložky…" - -#: ../midori/midori-browser.c:4359 ../midori/midori-browser.c:5555 +#: ../midori/midori-browser.c:4228 ../midori/midori-browser.c:5321 msgid "_Import bookmarks" msgstr "_Importovat záložky" -#: ../midori/midori-browser.c:4370 +#: ../midori/midori-browser.c:4239 msgid "_Application:" msgstr "_Aplikace:" -#: ../midori/midori-browser.c:4435 +#: ../midori/midori-browser.c:4304 msgid "Import from XBEL or HTML file" msgstr "Importovat ze souboru typu XBEL, nebo HTML" -#: ../midori/midori-browser.c:4463 +#: ../midori/midori-browser.c:4339 msgid "Import from a file" msgstr "Importovat ze souboru" -#: ../midori/midori-browser.c:4475 +#: ../midori/midori-browser.c:4351 msgid "Failed to import bookmarks" msgstr "Nepodařilo se naimportovat záložky" -#: ../midori/midori-browser.c:4509 +#: ../midori/midori-browser.c:4387 msgid "XBEL Bookmarks" msgstr "Záložky ve formátu XBEL" -#: ../midori/midori-browser.c:4514 +#: ../midori/midori-browser.c:4392 msgid "Netscape Bookmarks" -msgstr "Záložky z aplikace Netscape" +msgstr "Záložky z Netscape" -#: ../midori/midori-browser.c:4528 +#: ../midori/midori-browser.c:4406 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)" +"Z Midori lze exportovat záložky pouze ve formátech XBEL (*.xbel) a Netscape " +"(*.html)" -#: ../midori/midori-browser.c:4543 +#: ../midori/midori-browser.c:4422 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:4665 +#: ../midori/midori-browser.c:4544 msgid "Clear Private Data" msgstr "Vymazat osobní data" -#: ../midori/midori-browser.c:4669 +#: ../midori/midori-browser.c:4548 msgid "_Clear private data" msgstr "_Vymazat osobní data" -#: ../midori/midori-browser.c:4684 +#: ../midori/midori-browser.c:4561 msgid "Clear the following data:" msgstr "Vymazat následující data:" -#: ../midori/midori-browser.c:4694 +#: ../midori/midori-browser.c:4571 msgid "Last open _tabs" msgstr "Naposledy otevřené _karty" -#: ../midori/midori-browser.c:4720 +#: ../midori/midori-browser.c:4597 msgid "Clear private data when _quitting Midori" -msgstr "Vymazat _osobní data při ukončení aplikace Midori" +msgstr "_Vymazat osobní data při ukončení Midori" -#: ../midori/midori-browser.c:4935 +#: ../midori/midori-browser.c:4773 msgid "A lightweight web browser." msgstr "Odlehčený internetový prohlížeč." -#: ../midori/midori-browser.c:4936 +#: ../midori/midori-browser.c:4774 msgid "See about:version for version info." msgstr "about:version zobrazí informace o verzi" -#: ../midori/midori-browser.c:4938 +#: ../midori/midori-browser.c:4776 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 " @@ -726,605 +676,908 @@ msgstr "" "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:4968 +#: ../midori/midori-browser.c:4797 msgid "translator-credits" -msgstr "" -"David Å tancl \n" -"Michal Várady " +msgstr "David Å tancl " -#: ../midori/midori-browser.c:5385 +#: ../midori/midori-browser.c:5163 msgid "_File" msgstr "_Soubor" -#: ../midori/midori-browser.c:5388 +#: ../midori/midori-browser.c:5166 msgid "Open a new window" msgstr "Otevřít nové okno" -#: ../midori/midori-browser.c:5391 +#: ../midori/midori-browser.c:5169 msgid "Open a new tab" msgstr "Otevřít novou kartu" -#: ../midori/midori-browser.c:5393 +#: ../midori/midori-browser.c:5171 msgid "New P_rivate Browsing Window" -msgstr "Nové okno souk_romého prohlížení" +msgstr "Nové okno sou_kromého prohlížení" -#: ../midori/midori-browser.c:5397 +#: ../midori/midori-browser.c:5175 msgid "Open a file" msgstr "Otevřít soubor" -#: ../midori/midori-browser.c:5399 -msgid "_Save Page As…" -msgstr "Uložit stránku j_ako…" +#: ../midori/midori-browser.c:5177 +msgid "_Save Page As..." +msgstr "Uložit stránku j_ako..." -#: ../midori/midori-browser.c:5400 +#: ../midori/midori-browser.c:5178 msgid "Save to a file" msgstr "Uložit do souboru" -#: ../midori/midori-browser.c:5402 +#: ../midori/midori-browser.c:5180 msgid "Add to Speed _dial" msgstr "Přidat do rychlého _přístupu" -#: ../midori/midori-browser.c:5406 +#: ../midori/midori-browser.c:5184 msgid "Add Shortcut to the _desktop" msgstr "Přidat záložku na _plochu" -#: ../midori/midori-browser.c:5408 +#: ../midori/midori-browser.c:5186 msgid "Create _Launcher" msgstr "Vytvořit _spouÅ¡těč" -#: ../midori/midori-browser.c:5412 +#: ../midori/midori-browser.c:5190 msgid "Subscribe to News _feed" -msgstr "Přihlásit se k odběru _kanálu" +msgstr "Přidat _kanál" -#: ../midori/midori-browser.c:5418 +#: ../midori/midori-browser.c:5196 msgid "_Close Tab" msgstr "_Zavřít kartu" -#: ../midori/midori-browser.c:5419 +#: ../midori/midori-browser.c:5197 msgid "Close the current tab" msgstr "Zavřít aktivní kartu" -#: ../midori/midori-browser.c:5421 +#: ../midori/midori-browser.c:5199 msgid "C_lose Window" -msgstr "Z_avřít okno" +msgstr "Za_vřít okno" -#: ../midori/midori-browser.c:5425 -msgid "_Share" -msgstr "_Sdílet" - -#: ../midori/midori-browser.c:5430 +#: ../midori/midori-browser.c:5203 msgid "Print the current page" -msgstr "Vytisknout tuto stránku" +msgstr "Vytisknout aktuální stránku" -#: ../midori/midori-browser.c:5433 +#: ../midori/midori-browser.c:5205 msgid "Close a_ll Windows" msgstr "Zavřít _vÅ¡echna okna" -#: ../midori/midori-browser.c:5436 +#: ../midori/midori-browser.c:5208 msgid "_Edit" msgstr "_Upravit" -#: ../midori/midori-browser.c:5459 -msgid "_Find…" -msgstr "Na_jít…" +#: ../midori/midori-browser.c:5231 +msgid "_Find..." +msgstr "Na_jít..." -#: ../midori/midori-browser.c:5460 +#: ../midori/midori-browser.c:5232 msgid "Find a word or phrase in the page" msgstr "Najít slovo nebo frázi na stránce" -#: ../midori/midori-browser.c:5462 +#: ../midori/midori-browser.c:5234 msgid "Find _Next" msgstr "Najít _další" -#: ../midori/midori-browser.c:5465 +#: ../midori/midori-browser.c:5237 msgid "Find _Previous" msgstr "Najít _předchozí" -#: ../midori/midori-browser.c:5469 +#: ../midori/midori-browser.c:5241 msgid "Configure the application preferences" msgstr "Změnit nastavení aplikace" -#: ../midori/midori-browser.c:5471 +#: ../midori/midori-browser.c:5243 msgid "_View" msgstr "_Zobrazit" -#: ../midori/midori-browser.c:5472 +#: ../midori/midori-browser.c:5244 msgid "_Toolbars" -msgstr "Pane_ly nástrojů" +msgstr "_LiÅ¡ty" -#: ../midori/midori-browser.c:5477 +#: ../midori/midori-browser.c:5249 msgid "Reload page without caching" -msgstr "Znovu načíst stránku bez použití mezipaměti" +msgstr "Znovu načíst stránku bez použití keÅ¡e" -#: ../midori/midori-browser.c:5487 +#: ../midori/midori-browser.c:5259 msgid "Increase the zoom level" msgstr "Přiblížit" -#: ../midori/midori-browser.c:5490 +#: ../midori/midori-browser.c:5262 msgid "Decrease the zoom level" msgstr "Oddálit" -#: ../midori/midori-browser.c:5494 +#: ../midori/midori-browser.c:5266 msgid "_Encoding" msgstr "_Kódování" -#: ../midori/midori-browser.c:5496 +#: ../midori/midori-browser.c:5268 msgid "View So_urce" -msgstr "Zobrazit zdro_jový kód" +msgstr "Zobrazit zdrojový _kód" -#: ../midori/midori-browser.c:5499 +#: ../midori/midori-browser.c:5271 msgid "Ca_ret Browsing" msgstr "Prohlížení ku_rzorem" -#: ../midori/midori-browser.c:5503 +#: ../midori/midori-browser.c:5275 msgid "Toggle fullscreen view" msgstr "Přepnout zobrazení na celou obrazovku" -#: ../midori/midori-browser.c:5505 +#: ../midori/midori-browser.c:5277 msgid "Scroll _Left" -msgstr "Posunout v_levo" +msgstr "Rolovat v_levo" -#: ../midori/midori-browser.c:5508 +#: ../midori/midori-browser.c:5280 msgid "Scroll _Down" -msgstr "Posunout _dolů" +msgstr "Rolovat _dolů" -#: ../midori/midori-browser.c:5511 +#: ../midori/midori-browser.c:5283 msgid "Scroll _Up" -msgstr "Posunout nahor_u" +msgstr "Rolovat nahor_u" -#: ../midori/midori-browser.c:5514 +#: ../midori/midori-browser.c:5286 msgid "Scroll _Right" -msgstr "Posunout vp_ravo" - -#: ../midori/midori-browser.c:5517 -msgid "_Readable" -msgstr "Č_tecí mód" +msgstr "Rolovat vp_ravo" -#: ../midori/midori-browser.c:5520 +#: ../midori/midori-browser.c:5289 msgid "_Go" msgstr "_Přejít" -#: ../midori/midori-browser.c:5523 +#: ../midori/midori-browser.c:5292 msgid "Go back to the previous page" msgstr "Přejít zpět (na předchozí stránku)" +#: ../midori/midori-browser.c:5295 +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:5530 +#: ../midori/midori-browser.c:5299 msgid "Go to the previous sub-page" msgstr "Přejít na předchozí podstránku" -#: ../midori/midori-browser.c:5539 -msgid "_Homepage" -msgstr "_Domovská stránka" +#. i18n: Visit the following logical page, ie. in a forum or blog +#: ../midori/midori-browser.c:5303 +msgid "Go to the next sub-page" +msgstr "Přejít na následující podstránku" -#: ../midori/midori-browser.c:5540 +#: ../midori/midori-browser.c:5306 msgid "Go to your homepage" msgstr "Přejít na domovskou stránku" -#: ../midori/midori-browser.c:5542 +#: ../midori/midori-browser.c:5308 msgid "Empty Trash" msgstr "Vyprázdnit seznam zavřených karet" -#: ../midori/midori-browser.c:5545 +#: ../midori/midori-browser.c:5311 msgid "Undo _Close Tab" -msgstr "_Znovu otevřít zavřenou kartu" +msgstr "Vrátit _zavření karty" -#: ../midori/midori-browser.c:5552 +#: ../midori/midori-browser.c:5318 msgid "Add a new _folder" msgstr "Přidat novou _složku" -#: ../midori/midori-browser.c:5558 +#: ../midori/midori-browser.c:5324 msgid "_Export bookmarks" msgstr "_Exportovat záložky" -#: ../midori/midori-browser.c:5561 ../midori/midori-searchaction.c:496 +#: ../midori/midori-browser.c:5327 ../midori/midori-searchaction.c:496 msgid "_Manage Search Engines" -msgstr "Nastavit vy_hledávací nástroje" +msgstr "Nastavit _vyhledávací nástroje" -#: ../midori/midori-browser.c:5564 +#: ../midori/midori-browser.c:5330 msgid "_Clear Private Data" msgstr "_Vymazat osobní data" -#: ../midori/midori-browser.c:5567 +#: ../midori/midori-browser.c:5333 msgid "_Inspect Page" msgstr "Pro_zkoumat stránku" -#: ../midori/midori-browser.c:5571 +#: ../midori/midori-browser.c:5337 msgid "_Previous Tab" msgstr "_Předchozí karta" -#: ../midori/midori-browser.c:5574 +#: ../midori/midori-browser.c:5340 msgid "_Next Tab" msgstr "_Další karta" -#: ../midori/midori-browser.c:5576 +#: ../midori/midori-browser.c:5342 msgid "Move Tab _Backward" msgstr "Přesunout kartu v_zad" -#: ../midori/midori-browser.c:5578 +#: ../midori/midori-browser.c:5344 msgid "_Move Tab Forward" msgstr "Přesunout kartu v_před" -#: ../midori/midori-browser.c:5581 +#: ../midori/midori-browser.c:5347 msgid "Focus _Current Tab" -msgstr "_Přepnout kurzor na tuto kartu" +msgstr "Jít na _domovskou stránku" -#: ../midori/midori-browser.c:5584 +#: ../midori/midori-browser.c:5350 msgid "Focus _Next view" msgstr "Přepnout na _další" -#: ../midori/midori-browser.c:5587 +#: ../midori/midori-browser.c:5353 msgid "Only show the Icon of the _Current Tab" msgstr "Zobrazit pouze ikonu a_ktuální karty" -#: ../midori/midori-browser.c:5590 +#: ../midori/midori-browser.c:5356 msgid "_Duplicate Current Tab" msgstr "Z_dvojit aktuální kartu" -#: ../midori/midori-browser.c:5593 +#: ../midori/midori-browser.c:5359 msgid "Close Ot_her Tabs" msgstr "_Zavřít ostatní karty" -#: ../midori/midori-browser.c:5596 +#: ../midori/midori-browser.c:5362 msgid "Open last _session" -msgstr "Otevřít poslední _relaci" +msgstr "Otevřít poslední _sezení" -#: ../midori/midori-browser.c:5599 +#: ../midori/midori-browser.c:5365 msgid "_Help" msgstr "_Nápověda" -#: ../midori/midori-browser.c:5601 +#: ../midori/midori-browser.c:5367 msgid "_Frequent Questions" msgstr "Časté _otázky" -#: ../midori/midori-browser.c:5604 -msgid "_Report a Problem…" -msgstr "Ohlásit chy_bu…" +#: ../midori/midori-browser.c:5370 +msgid "_Report a Problem..." +msgstr "Ohlásit chy_bu..." -#: ../midori/midori-browser.c:5609 ../midori/midori-browser.c:6270 -msgid "_Tools" -msgstr "Ná_stroje" - -#: ../midori/midori-browser.c:5616 +#: ../midori/midori-browser.c:5382 msgid "_Menubar" msgstr "_Nabídka" -#: ../midori/midori-browser.c:5620 +#: ../midori/midori-browser.c:5386 msgid "_Navigationbar" -msgstr "_Navigační panel" +msgstr "_Navigační liÅ¡ta" -#: ../midori/midori-browser.c:5624 +#: ../midori/midori-browser.c:5390 msgid "Side_panel" -msgstr "Postranní _panel" +msgstr "Boční _panel" -#: ../midori/midori-browser.c:5625 +#: ../midori/midori-browser.c:5391 msgid "Sidepanel" -msgstr "Postranní panel" +msgstr "Boční panel" -#: ../midori/midori-browser.c:5628 +#: ../midori/midori-browser.c:5394 msgid "_Bookmarkbar" -msgstr "Panel _záložek" +msgstr "LiÅ¡ta _záložek" -#: ../midori/midori-browser.c:5632 +#: ../midori/midori-browser.c:5398 msgid "_Statusbar" -msgstr "_Stavový panel" +msgstr "_Stavová liÅ¡ta" -#: ../midori/midori-browser.c:5641 ../midori/midori-websettings.c:199 +#: ../midori/midori-browser.c:5407 ../midori/midori-websettings.c:302 msgid "_Automatic" msgstr "_Automatické" -#: ../midori/midori-browser.c:5644 ../midori/midori-websettings.c:123 -msgid "Chinese Traditional (BIG5)" -msgstr "Čínské tradiční (BIG5)" - -#: ../midori/midori-browser.c:5647 ../midori/midori-websettings.c:124 -msgid "Chinese Simplified (GB18030)" -msgstr "Čínské zjednoduÅ¡ené (GB18030)" +#: ../midori/midori-browser.c:5410 ../midori/midori-websettings.c:227 +msgid "Chinese (BIG5)" +msgstr "Čínské (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5651 +#: ../midori/midori-browser.c:5414 msgid "Japanese (SHIFT__JIS)" msgstr "Japonské (SHIFT__JIS)" -#: ../midori/midori-browser.c:5654 ../midori/midori-websettings.c:126 +#: ../midori/midori-browser.c:5417 ../midori/midori-websettings.c:229 msgid "Korean (EUC-KR)" msgstr "Korejské (EUC-KR)" -#: ../midori/midori-browser.c:5657 ../midori/midori-websettings.c:127 +#: ../midori/midori-browser.c:5420 ../midori/midori-websettings.c:230 msgid "Russian (KOI8-R)" msgstr "Ruské (KOI8-R)" -#: ../midori/midori-browser.c:5660 ../midori/midori-websettings.c:128 +#: ../midori/midori-browser.c:5423 ../midori/midori-websettings.c:231 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5663 ../midori/midori-websettings.c:129 +#: ../midori/midori-browser.c:5426 ../midori/midori-websettings.c:232 msgid "Western (ISO-8859-1)" msgstr "Západní (ISO-8859-1)" -#: ../midori/midori-browser.c:5666 -msgid "Custom…" -msgstr "Vlastní…" +#: ../midori/midori-browser.c:5429 ../midori/midori-websettings.c:233 +#: ../midori/midori-websettings.c:308 ../katze/katze-utils.c:635 +msgid "Custom..." +msgstr "Vlastní..." -#: ../midori/midori-browser.c:6176 +#: ../midori/midori-browser.c:5909 msgid "_Separator" msgstr "_Oddělovač" -#: ../midori/midori-browser.c:6183 -msgid "_Location…" -msgstr "U_místění…" +#: ../midori/midori-browser.c:5916 +msgid "_Location..." +msgstr "U_místění..." -#: ../midori/midori-browser.c:6185 +#: ../midori/midori-browser.c:5918 msgid "Open a particular location" -msgstr "Otevřít konkrétní umístění" +msgstr "Otevřít umístění" -#: ../midori/midori-browser.c:6207 -msgid "_Web Search…" -msgstr "_Hledat na webu…" +#: ../midori/midori-browser.c:5940 +msgid "_Web Search..." +msgstr "_Hledat na webu..." -#: ../midori/midori-browser.c:6209 +#: ../midori/midori-browser.c:5942 msgid "Run a web search" msgstr "Spustí vyhledávání na webu" -#: ../midori/midori-browser.c:6236 +#: ../midori/midori-browser.c:5969 msgid "Reopen a previously closed tab or window" msgstr "Znovu otevřít zavřenou kartu nebo okno" -#: ../midori/midori-browser.c:6253 +#: ../midori/midori-browser.c:5984 msgid "Show the saved bookmarks" msgstr "Zobrazit uložené záložky" -#: ../midori/midori-browser.c:6286 +#: ../midori/midori-browser.c:5998 +msgid "_Tools" +msgstr "Ná_stroje" + +#: ../midori/midori-browser.c:6013 msgid "_Window" msgstr "_Okno" -#: ../midori/midori-browser.c:6288 +#: ../midori/midori-browser.c:6015 msgid "Show a list of all open tabs" msgstr "Zobrazit seznam vÅ¡ech otevřených karet" -#: ../midori/midori-browser.c:6302 +#: ../midori/midori-browser.c:6029 msgid "_Menu" msgstr "_Nabídka" -#: ../midori/midori-browser.c:6304 +#: ../midori/midori-browser.c:6031 msgid "Menu" msgstr "Nabídka" -#: ../midori/midori-browser.c:7134 +#: ../midori/midori-browser.c:6679 #, c-format msgid "Unexpected setting '%s'" msgstr "Neočekávané nastavení '%s'" -#: ../midori/midori-extension.c:330 +#: ../midori/midori-extension.c:310 #, c-format msgid "The configuration of the extension '%s' couldn't be loaded: %s\n" -msgstr "Nastavení rozšíření '%s' nelze načíst: %s\n" +msgstr "Nastavení rozšíření '%s' nemůže být načteno: %s\n" -#: ../midori/midori-extension.c:752 ../midori/midori-extension.c:849 -#: ../midori/midori-extension.c:946 ../midori/midori-extension.c:1058 -#: ../extensions/addons.c:1686 +#: ../midori/midori-extension.c:721 ../midori/midori-extension.c:818 +#: ../midori/midori-extension.c:915 ../midori/midori-extension.c:1027 +#: ../extensions/addons.c:1690 #, c-format msgid "The configuration of the extension '%s' couldn't be saved: %s\n" -msgstr "Nastavení rozšíření '%s' nelze uložit: %s\n" +msgstr "Nastavení rozšíření '%s' nemůže být uloženo: %s\n" -#: ../midori/midori-locationaction.c:398 -#, c-format -msgid "Search with %s" -msgstr "Hledat %s" - -#: ../midori/midori-locationaction.c:418 -msgid "Search with…" -msgstr "Hledat pomocí…" - -#: ../midori/midori-locationaction.c:545 +#: ../midori/midori-locationaction.c:425 #, c-format msgid "Failed to select from history\n" msgstr "Nepodařilo se načíst údaje z historie\n" -#: ../midori/midori-locationaction.c:632 +#: ../midori/midori-locationaction.c:509 #, c-format msgid "Search for %s" msgstr "Vyhledat %s" -#: ../midori/midori-locationaction.c:1227 -msgid "Export certificate" -msgstr "Exportovat certifikát" - -#: ../midori/midori-locationaction.c:1259 -msgid "The signing certificate authority is not known." -msgstr "Podepsaný certifikát není znám." - -#: ../midori/midori-locationaction.c:1261 -msgid "" -"The certificate does not match the expected identity of the site that it was " -"retrieved from." -msgstr "Certifikát neodpovídá zobrazené stránce (byl vydán pro jiný web)." - -#: ../midori/midori-locationaction.c:1263 -msgid "The certificate's activation time is still in the future." -msgstr "Datum zahájení platnosti certifikátu je v budoucnu." - -#: ../midori/midori-locationaction.c:1265 -msgid "The certificate has expired" -msgstr "Platnost certifikátu vyprÅ¡ela" - -#: ../midori/midori-locationaction.c:1267 -msgid "" -"The certificate has been revoked according to the GTlsConnection's " -"certificate revocation list." -msgstr "" -"Certifikát byl odmítnut na základě seznamu odvolaných certifikátů od " -"GTIsConnection." - -#: ../midori/midori-locationaction.c:1269 -msgid "The certificate's algorithm is considered insecure." -msgstr "Certifikační algoritmus není považován za důvěryhodný." - -#: ../midori/midori-locationaction.c:1271 -msgid "Some other error occurred validating the certificate." -msgstr "Při ověřování certifikátu doÅ¡lo k chybě." - -#: ../midori/midori-locationaction.c:1318 -msgid "_Export certificate" -msgstr "_Exportovat certifikát" - -#: ../midori/midori-locationaction.c:1333 -msgid "Self-signed" -msgstr "Podepsán sebou samým (self-signed)" - -#: ../midori/midori-locationaction.c:1367 -msgid "Security details" -msgstr "Podrobnosti o zabezpečení" +#: ../midori/midori-locationaction.c:535 +#, c-format +msgid "Search with %s" +msgstr "Hledat %s" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1650 +#: ../midori/midori-locationaction.c:1287 msgid "Paste and p_roceed" msgstr "Vložit a s_pustit" -#: ../midori/midori-locationaction.c:1974 +#: ../midori/midori-locationaction.c:1656 msgid "Not verified" msgstr "Neověřené spojení" -#: ../midori/midori-locationaction.c:1982 +#: ../midori/midori-locationaction.c:1671 msgid "Verified and encrypted connection" -msgstr "Ověřené a Å¡ifrované spojení" +msgstr "Ověřené a kódované spojení" -#: ../midori/midori-locationaction.c:1989 -msgid "Open, unencrypted connection" -msgstr "Ověřené, neÅ¡ifrované spojení" - -#: ../midori/midori-panel.c:317 ../midori/midori-panel.c:319 -#: ../midori/midori-panel.c:483 ../midori/midori-panel.c:486 +#: ../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 postranní panel vpravo" +msgstr "Umístit boční panel vpravo" -#: ../midori/midori-panel.c:329 ../midori/midori-panel.c:330 +#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410 msgid "Close panel" msgstr "Zavřít panel" -#: ../midori/midori-panel.c:484 ../midori/midori-panel.c:487 +#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566 msgid "Align sidepanel to the left" -msgstr "Umístit postranní panel vlevo" +msgstr "Umístit boční panel vlevo" -#: ../midori/midori-websettings.c:105 +#: ../midori/midori-websettings.c:209 msgid "Show Speed Dial" msgstr "zobrazit rychlý přístup" -#: ../midori/midori-websettings.c:106 +#: ../midori/midori-websettings.c:210 msgid "Show Homepage" msgstr "zobrazit domovskou stránku" -#: ../midori/midori-websettings.c:125 +#: ../midori/midori-websettings.c:228 msgid "Japanese (SHIFT_JIS)" msgstr "Japonské (SHIFT_JIS)" -#: ../midori/midori-websettings.c:130 ../midori/midori-websettings.c:206 -#: ../katze/katze-utils.c:633 -msgid "Custom..." -msgstr "Vlastní…" - -#: ../midori/midori-websettings.c:145 +#: ../midori/midori-websettings.c:248 msgid "New tab" msgstr "nové kartě" -#: ../midori/midori-websettings.c:146 +#: ../midori/midori-websettings.c:249 msgid "New window" msgstr "novém okně" -#: ../midori/midori-websettings.c:147 +#: ../midori/midori-websettings.c:250 msgid "Current tab" msgstr "aktuální kartě" -#: ../midori/midori-websettings.c:162 +#: ../midori/midori-websettings.c:265 msgid "Default" msgstr "výchozí" -#: ../midori/midori-websettings.c:163 +#: ../midori/midori-websettings.c:266 msgid "Icons" msgstr "ikony" -#: ../midori/midori-websettings.c:164 +#: ../midori/midori-websettings.c:267 msgid "Small icons" msgstr "malé ikony" -#: ../midori/midori-websettings.c:165 +#: ../midori/midori-websettings.c:268 msgid "Text" msgstr "text" -#: ../midori/midori-websettings.c:166 +#: ../midori/midori-websettings.c:269 msgid "Icons and text" msgstr "ikony a text" -#: ../midori/midori-websettings.c:167 +#: ../midori/midori-websettings.c:270 msgid "Text beside icons" msgstr "text pod ikonami" -#: ../midori/midori-websettings.c:182 +#: ../midori/midori-websettings.c:285 msgid "Automatic (GNOME or environment)" msgstr "automaticky (GNOME, nebo jiné prostředí)" -#: ../midori/midori-websettings.c:183 +#: ../midori/midori-websettings.c:286 msgid "HTTP proxy server" -msgstr "server proxy HTTP" +msgstr "HTTP proxy server" -#: ../midori/midori-websettings.c:184 +#: ../midori/midori-websettings.c:287 msgid "No proxy server" -msgstr "žádný server proxy" - -#: ../midori/midori-websettings.c:201 -msgid "Chrome" -msgstr "Chrome" +msgstr "žádný" -#: ../midori/midori-websettings.c:202 +#: ../midori/midori-websettings.c:304 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:203 +#: ../midori/midori-websettings.c:305 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:306 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:307 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:278 +#: ../midori/midori-websettings.c:360 +msgid "Remember last window size" +msgstr "Pamatovat si velikost okna" + +#: ../midori/midori-websettings.c:361 +msgid "Whether to save the last window size" +msgstr "Ukládat rozměry okna?" + +#: ../midori/midori-websettings.c:369 +msgid "Last window width" +msgstr "Šířka okna" + +#: ../midori/midori-websettings.c:370 +msgid "The last saved window width" +msgstr "Naposledy uložená šířka okna" + +#: ../midori/midori-websettings.c:378 +msgid "Last window height" +msgstr "Výška okna" + +#: ../midori/midori-websettings.c:379 +msgid "The last saved window height" +msgstr "Naposledy uložená výška okna" + +#: ../midori/midori-websettings.c:404 +msgid "Last panel position" +msgstr "Poslední pozice panelu" + +#: ../midori/midori-websettings.c:405 +msgid "The last saved panel position" +msgstr "Uložená poslední pozice panelu" + +#. i18n: The internal index of the last opened panel +#: ../midori/midori-websettings.c:414 +msgid "Last panel page" +msgstr "Poslední otevřená stránka" + +#: ../midori/midori-websettings.c:415 +msgid "The last saved panel page" +msgstr "Uložená stránka" + +#: ../midori/midori-websettings.c:423 +msgid "Last Web search" +msgstr "Rychlé hledání na webu" + +#: ../midori/midori-websettings.c:424 +msgid "The last saved Web search" +msgstr "Uložené poslední vyhledávání na webu" + +#: ../midori/midori-websettings.c:433 +msgid "Show Menubar" +msgstr "Zobrazit nabídku" + +#: ../midori/midori-websettings.c:434 +msgid "Whether to show the menubar" +msgstr "Zobrazit nabídku?" + +#: ../midori/midori-websettings.c:442 +msgid "Show Navigationbar" +msgstr "Zobrazit vyhledávání" + +#: ../midori/midori-websettings.c:443 +msgid "Whether to show the navigationbar" +msgstr "Zobrazit liÅ¡tu vyhledávání?" + +#: ../midori/midori-websettings.c:451 +msgid "Show Bookmarkbar" +msgstr "Zobrazit záložky" + +#: ../midori/midori-websettings.c:452 +msgid "Whether to show the bookmarkbar" +msgstr "Zobrazit liÅ¡tu se záložkami?" + +#: ../midori/midori-websettings.c:460 +msgid "Show Panel" +msgstr "Zobrazit panel" + +#: ../midori/midori-websettings.c:461 +msgid "Whether to show the panel" +msgstr "Zobrazit panel?" + +#: ../midori/midori-websettings.c:469 +msgid "Show Statusbar" +msgstr "Zobrazit stavový řádek" + +#: ../midori/midori-websettings.c:470 +msgid "Whether to show the statusbar" +msgstr "Zobrazit stavový řádek?" + +#: ../midori/midori-websettings.c:479 msgid "Toolbar Style:" -msgstr "Styl panelu nástrojů:" +msgstr "Styl liÅ¡ty:" -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-websettings.c:480 msgid "The style of the toolbar" -msgstr "Styl panelu nástrojů" +msgstr "Nastaví styl liÅ¡ty (zobrazení textu a ikon)." + +#: ../midori/midori-websettings.c:489 +msgid "Toolbar Items" +msgstr "Položky nástrojové liÅ¡ty" + +#: ../midori/midori-websettings.c:490 +msgid "The items to show on the toolbar" +msgstr "Položky, které se budou zobrazovat na nástrojové liÅ¡tě" + +#: ../midori/midori-websettings.c:498 +msgid "Compact Sidepanel" +msgstr "Kompaktní boční panel" + +#: ../midori/midori-websettings.c:499 +msgid "Whether to make the sidepanel compact" +msgstr "Má se zobrazit boční panel kompaktně?" + +#: ../midori/midori-websettings.c:514 +msgid "Align sidepanel on the right" +msgstr "Umístit boční panel vpravo" + +#: ../midori/midori-websettings.c:515 +msgid "Whether to align the sidepanel on the right" +msgstr "Přesunout boční panel na opačnou stranu" + +#: ../midori/midori-websettings.c:530 +msgid "Open panels in separate windows" +msgstr "Otvírat panely v samostatných oknech" + +#: ../midori/midori-websettings.c:531 +msgid "Whether to always open panels in separate windows" +msgstr "Zda vždy otevřít panel v samostatné okno" -#: ../midori/midori-websettings.c:288 +#: ../midori/midori-websettings.c:540 msgid "When Midori starts:" -msgstr "Po spuÅ¡tění aplikace Midori:" +msgstr "Když Midori nastartuje:" + +#: ../midori/midori-websettings.c:541 +msgid "What to do when Midori starts" +msgstr "Co udělat, když je Midori spuÅ¡těno" + +#: ../midori/midori-websettings.c:550 +msgid "Homepage:" +msgstr "Domovská stránka:" + +#: ../midori/midori-websettings.c:551 +msgid "The homepage" +msgstr "Domovská stránka" + +#: ../midori/midori-websettings.c:566 +msgid "Show crash dialog" +msgstr "Zobrazit dialog po pádu" + +#: ../midori/midori-websettings.c:567 +msgid "Show a dialog after Midori crashed" +msgstr "Zobrazit dialog po pádu Midori" + +#: ../midori/midori-websettings.c:575 +msgid "Save downloaded files to:" +msgstr "Ukládat stažené soubory do:" + +#: ../midori/midori-websettings.c:576 +msgid "The folder downloaded files are saved to" +msgstr "Kam se budou ukládat stažené soubory" + +#: ../midori/midori-websettings.c:584 +msgid "Text Editor" +msgstr "Textový editor" -#: ../midori/midori-websettings.c:298 +#: ../midori/midori-websettings.c:585 +msgid "An external text editor" +msgstr "Externí textový editor" + +#: ../midori/midori-websettings.c:600 +msgid "News Aggregator" +msgstr "Čtečka RSS" + +#: ../midori/midori-websettings.c:601 +msgid "An external news aggregator" +msgstr "Externí čtečka zpráv RSS" + +#: ../midori/midori-websettings.c:609 +msgid "Location entry Search" +msgstr "Vyhledávání v adresním řádku" + +#: ../midori/midori-websettings.c:610 +msgid "The search to perform inside the location entry" +msgstr "Vyhledávání použité v řádku s adresou" + +#: ../midori/midori-websettings.c:618 msgid "Preferred Encoding" -msgstr "Upřednostňované kódování" +msgstr "Preferované kódování" + +#: ../midori/midori-websettings.c:619 +msgid "The preferred character encoding" +msgstr "Preferované kódování stránek" + +#: ../midori/midori-websettings.c:629 +msgid "Always Show Tabbar" +msgstr "Vždy zobrazovat karty" + +#: ../midori/midori-websettings.c:630 +msgid "Always show the tabbar" +msgstr "Zobrazit karty, i když je jen jedna?" + +#: ../midori/midori-websettings.c:638 +msgid "Close Buttons on Tabs" +msgstr "Ikona zavření karty" + +#: ../midori/midori-websettings.c:639 +msgid "Whether tabs have close buttons" +msgstr "Zobrazovat ikonu pro zavření karty?" -#: ../midori/midori-websettings.c:325 +#: ../midori/midori-websettings.c:664 msgid "Open new pages in:" msgstr "Nové stránky otevírat v:" +#: ../midori/midori-websettings.c:665 +msgid "Where to open new pages" +msgstr "Kde se budou otevírat nové stránky" + +#: ../midori/midori-websettings.c:674 +msgid "Middle click opens Selection" +msgstr "Kliknutím prostř. tlačítka otevřít vybraný text" + +#: ../midori/midori-websettings.c:675 +msgid "Load an address from the selection via middle click" +msgstr "Prostřední tlačítko myÅ¡i otevře adresu, která je ve vybraném textu" + +#: ../midori/midori-websettings.c:683 +msgid "Open tabs in the background" +msgstr "Otevírat karty na pozadí" + +#: ../midori/midori-websettings.c:684 +msgid "Whether to open new tabs in the background" +msgstr "Karty se otevírají na pozadí" + +#: ../midori/midori-websettings.c:692 +msgid "Open Tabs next to Current" +msgstr "Otevřít kartu vedle aktivní" + +#: ../midori/midori-websettings.c:693 +msgid "Whether to open new tabs next to the current tab or after the last one" +msgstr "Nová karta se otevře vedle aktivní" + +#: ../midori/midori-websettings.c:701 +msgid "Open popups in tabs" +msgstr "Otevírat vyskakovací okna v kartách" + +#: ../midori/midori-websettings.c:702 +msgid "Whether to open popup windows in tabs" +msgstr "Vyskakovací okno se otevře v nové kartě" + +#: ../midori/midori-websettings.c:712 ../extensions/statusbar-features.c:131 +msgid "Load images automatically" +msgstr "Automaticky načítat obrázky" + +#: ../midori/midori-websettings.c:713 +msgid "Load and display images automatically" +msgstr "Automaticky načítat a zobrazovat obrázky" + +#: ../midori/midori-websettings.c:720 ../extensions/statusbar-features.c:140 +msgid "Enable scripts" +msgstr "Povolit skripty" + +#: ../midori/midori-websettings.c:721 +msgid "Enable embedded scripting languages" +msgstr "Povolit vložené skriptové jazyky" + +#: ../midori/midori-websettings.c:728 ../extensions/statusbar-features.c:149 +msgid "Enable Netscape plugins" +msgstr "Povolit pluginy z Netscape (Mozilly)" + +#: ../midori/midori-websettings.c:729 +msgid "Enable embedded Netscape plugin objects" +msgstr "Povolit pluginové objekty prohlížeče Netscape (Mozilla)" + +#: ../midori/midori-websettings.c:749 +msgid "Enable Spell Checking" +msgstr "Povolit kontrolu pravopisu" + +#: ../midori/midori-websettings.c:750 +msgid "Enable spell checking while typing" +msgstr "Povolit kontrolu pravopisu při psaní" + +#: ../midori/midori-websettings.c:756 +msgid "Enable HTML5 database support" +msgstr "Povolit HTML5 databázi" + +#: ../midori/midori-websettings.c:757 +msgid "Whether to enable HTML5 database support" +msgstr "Zda povolit HTML5 databázi" + +#: ../midori/midori-websettings.c:763 +msgid "Enable HTML5 local storage support" +msgstr "Povolit místní úložiÅ¡tě pro HTML5" + +#: ../midori/midori-websettings.c:764 +msgid "Whether to enable HTML5 local storage support" +msgstr "Zda povolit místní úložiÅ¡tě dat pro HTML5" + +#: ../midori/midori-websettings.c:770 +msgid "Enable offline web application cache" +msgstr "Povolit cache pro offline aplikace" + +#: ../midori/midori-websettings.c:771 +msgid "Whether to enable offline web application cache" +msgstr "Zda povolit používání cache pro offline aplikace" + +#: ../midori/midori-websettings.c:787 +msgid "Flash window on background tabs" +msgstr "Bliknout oknem při otevření karty na pozadí" + +#: ../midori/midori-websettings.c:788 +msgid "Flash the browser window if a new tab was opened in the background" +msgstr "Okno prohlížeče blikne při otevření karty na pozadí" + +#: ../midori/midori-websettings.c:803 +msgid "Zoom Text and Images" +msgstr "ZvětÅ¡ovat text i obrázky" + +#: ../midori/midori-websettings.c:804 +msgid "Whether to zoom text and images" +msgstr "Při přibližování zvětÅ¡ovat text i obrázky?" + +#: ../midori/midori-websettings.c:819 +msgid "Find inline while typing" +msgstr "Hledat při psaní" + +#: ../midori/midori-websettings.c:820 +msgid "Whether to automatically find inline while typing" +msgstr "Při psaní hledat text?" + +#: ../midori/midori-websettings.c:835 +msgid "Kinetic scrolling" +msgstr "Kinetické rolování" + +#: ../midori/midori-websettings.c:836 +msgid "Whether scrolling should kinetically move according to speed" +msgstr "Zda naklápěním zařízení rolovat" + +#: ../midori/midori-websettings.c:844 +msgid "Delete old Cookies after:" +msgstr "Smazat stará cookies po:" + +#: ../midori/midori-websettings.c:845 +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:861 +msgid "Only accept Cookies from sites you visit" +msgstr "Přijímat cookies jen z navÅ¡tívených stránek" + +#: ../midori/midori-websettings.c:862 +msgid "Block cookies sent by third-party websites" +msgstr "Blokovat cookies z jiných stránek" + +#: ../midori/midori-websettings.c:876 +msgid "Delete pages from history after:" +msgstr "Smazat stránky z historie po:" + +#: ../midori/midori-websettings.c:877 +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:892 +msgid "Proxy server" +msgstr "Proxy server" + +#: ../midori/midori-websettings.c:893 +msgid "The type of proxy server to use" +msgstr "Jaký typ proxy serveru chcete použít" + +#: ../midori/midori-websettings.c:902 +msgid "HTTP Proxy Server" +msgstr "HTTP proxy server" + +#: ../midori/midori-websettings.c:903 +msgid "The proxy server used for HTTP connections" +msgstr "Proxy server, který bude použit pro HTTP spojení" + +#: ../midori/midori-websettings.c:918 +msgid "Port" +msgstr "Port" + +#: ../midori/midori-websettings.c:919 +msgid "The proxy server port used for HTTP connections" +msgstr "Proxy server, který bude použit pro HTTP spojení" + +#: ../midori/midori-websettings.c:937 +msgid "The maximum size of cached pages on disk" +msgstr "Maximální velikost diskové keÅ¡e" + #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:954 msgid "Identify as" msgstr "Hlásit se jako" -#: ../midori/midori-websettings.c:389 +#: ../midori/midori-websettings.c:955 msgid "What to identify as to web pages" -msgstr "Určuje, jak se bude aplikace identifikovat webovým stránkám" +msgstr "Jak se hlásit webovým stránkám" + +#: ../midori/midori-websettings.c:971 +msgid "Identification string" +msgstr "Identifikační řetězec" -#: ../midori/midori-websettings.c:422 +#: ../midori/midori-websettings.c:972 +msgid "The application identification string" +msgstr "Identifikační řetězec aplikace" + +#: ../midori/midori-websettings.c:988 msgid "Preferred languages" -msgstr "Upřednostňované jazyky" +msgstr "Preferované jazyky" -#: ../midori/midori-websettings.c:423 +#: ../midori/midori-websettings.c:989 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\"" @@ -1332,737 +1585,564 @@ 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:472 +#: ../midori/midori-websettings.c:1004 +msgid "Clear private data" +msgstr "_Vymazat osobní data" + +#: ../midori/midori-websettings.c:1005 +msgid "The private data selected for deletion" +msgstr "Osobní data byla označena ke smazání" + +#: ../midori/midori-websettings.c:1020 +msgid "Clear data" +msgstr "Vymazat data" + +#: ../midori/midori-websettings.c:1021 +msgid "The data selected for deletion" +msgstr "Data, která budou vymazána" + +#. i18n: Reworded: Shorten details propagated when going to another page +#: ../midori/midori-websettings.c:1054 +msgid "Strip referrer details sent to websites" +msgstr "Odstranit detaily z referrer při odesílání" + +#. i18n: Referer here is not a typo but a technical term +#: ../midori/midori-websettings.c:1056 +msgid "Whether the \"Referer\" header should be shortened to the hostname" +msgstr "Zda zkrátit položku \"Referer\" v hlavičce jen na název webu" + +#: ../midori/midori-websettings.c:1070 msgid "Always use my font choices" -msgstr "Vždy použít mnou zvolená písma" +msgstr "Vždy použít vybraná písma" -#: ../midori/midori-websettings.c:473 +#: ../midori/midori-websettings.c:1071 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:1012 ../midori/midori-view.c:1151 -msgid "Trust this website" -msgstr "Důvěřovat tomuto webu" - -#: ../midori/midori-view.c:1149 -msgid "Security unknown" -msgstr "Neznámé zabezpečení" - -#: ../midori/midori-view.c:1447 +#: ../midori/midori-view.c:1343 #, c-format msgid "%s wants to save an HTML5 database." -msgstr "%s chce uložit data do databáze HTML5." +msgstr "%s požaduje uložit data do HTML5 databáze." -#: ../midori/midori-view.c:1451 ../midori/midori-view.c:1485 +#: ../midori/midori-view.c:1347 ../midori/midori-view.c:1377 msgid "_Deny" msgstr "_Zakázat" -#: ../midori/midori-view.c:1451 ../midori/midori-view.c:1485 +#: ../midori/midori-view.c:1347 ../midori/midori-view.c:1377 msgid "_Allow" msgstr "_Povolit" -#: ../midori/midori-view.c:1480 +#: ../midori/midori-view.c:1373 #, c-format msgid "%s wants to know your location." -msgstr "%s chce zjistit vaÅ¡i polohu." +msgstr "%s požaduje zjistit vaÅ¡i polohu." -#: ../midori/midori-view.c:1576 +#: ../midori/midori-view.c:1461 #, c-format msgid "Error - %s" msgstr "Chyba - %s" -#: ../midori/midori-view.c:1577 +#: ../midori/midori-view.c:1462 #, c-format msgid "The page '%s' couldn't be loaded." -msgstr "Stránku '%s' nelze načíst." +msgstr "Stránka '%s' nemůže být načtena." -#: ../midori/midori-view.c:1579 +#: ../midori/midori-view.c:1464 msgid "Try again" msgstr "Zkusit znovu" -#: ../midori/midori-view.c:1775 ../midori/midori-view.c:2887 +#: ../midori/midori-view.c:1626 ../midori/midori-view.c:2471 #, c-format msgid "Send a message to %s" -msgstr "Poslat zprávu pro %s" +msgstr "Poslat %s zprávu" -#: ../midori/midori-view.c:2673 -msgid "Add _search engine..." -msgstr "Přidat vy_hledávací nástroj..." - -#: ../midori/midori-view.c:2717 ../midori/midori-view.c:3043 +#: ../midori/midori-view.c:2313 ../midori/midori-view.c:2624 msgid "Inspect _Element" -msgstr "Prozkouma_t prvek" +msgstr "Prozkoumat _prvek" -#: ../midori/midori-view.c:2769 +#: ../midori/midori-view.c:2363 msgid "Open Link in New _Tab" msgstr "Otevřít odkaz v nové _kartě" -#: ../midori/midori-view.c:2773 +#: ../midori/midori-view.c:2367 msgid "Open Link in _Foreground Tab" msgstr "Otevřít odkaz v nové kartě a _zobrazit ji" -#: ../midori/midori-view.c:2774 +#: ../midori/midori-view.c:2368 msgid "Open Link in _Background Tab" msgstr "Otevřít odkaz v nové kartě na _pozadí" -#: ../midori/midori-view.c:2777 +#: ../midori/midori-view.c:2371 msgid "Open Link in New _Window" msgstr "Otevřít odkaz v novém _okně" -#: ../midori/midori-view.c:2780 +#: ../midori/midori-view.c:2374 msgid "Open Link as Web A_pplication" msgstr "Otevřít odkaz jako _webovou aplikaci" -#: ../midori/midori-view.c:2785 +#: ../midori/midori-view.c:2377 msgid "Copy Link de_stination" msgstr "Zkopírovat _cíl odkazu" -#: ../midori/midori-view.c:2801 +#: ../midori/midori-view.c:2389 msgid "Open _Image in New Tab" msgstr "Otevřít _obrázek v nové kartě" -#: ../midori/midori-view.c:2804 +#: ../midori/midori-view.c:2392 msgid "Copy Image _Address" msgstr "Zkopírovat _adresu obrázku" -#: ../midori/midori-view.c:2807 +#: ../midori/midori-view.c:2395 msgid "Save I_mage" msgstr "Uložit o_brázek" -#: ../midori/midori-view.c:2810 -msgid "Open in Image _Viewer" -msgstr "Otevřít v prohlížeči _obrázků" - -#: ../midori/midori-view.c:2817 +#: ../midori/midori-view.c:2402 msgid "Copy Video _Address" msgstr "Zkopírovat _adresu videa" -#: ../midori/midori-view.c:2820 +#: ../midori/midori-view.c:2405 msgid "Save _Video" msgstr "Uložit _video" -#: ../midori/midori-view.c:2820 +#: ../midori/midori-view.c:2405 msgid "Download _Video" msgstr "Stáhnout _video" -#: ../midori/midori-view.c:2846 +#: ../midori/midori-view.c:2431 msgid "Search _with" -msgstr "Hledat _pomocí" +msgstr "Hledat _s" -#: ../midori/midori-view.c:2878 +#: ../midori/midori-view.c:2463 msgid "_Search the Web" msgstr "_Hledat na webu" -#: ../midori/midori-view.c:2895 +#: ../midori/midori-view.c:2479 msgid "Open Address in New _Tab" msgstr "Otevřít adresu v nové _kartě" -#: ../midori/midori-view.c:2948 -msgid "Open _Frame in New Tab" -msgstr "Otevřít _rám v nové kartě" - -#: ../midori/midori-view.c:3203 -#, c-format -msgid "Open or download file from %s" -msgstr "Otevřít nebo stáhnout soubor z %s" +#: ../midori/midori-view.c:2775 +msgid "Open or download file" +msgstr "Otevřít nebo stáhnout soubor" -#: ../midori/midori-view.c:3216 -#, c-format -msgid "File Name: %s" -msgstr "Název souboru: %s" - -#: ../midori/midori-view.c:3221 +#: ../midori/midori-view.c:2794 #, c-format msgid "File Type: '%s'" msgstr "Typ souboru: '%s'" -#: ../midori/midori-view.c:3223 +#: ../midori/midori-view.c:2796 #, c-format msgid "File Type: %s ('%s')" msgstr "Typ souboru: %s ('%s')" -#: ../midori/midori-view.c:3260 -#, c-format -msgid "Size: %s" -msgstr "Velikost: %s" - #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:3271 +#: ../midori/midori-view.c:2813 #, c-format msgid "Open %s" msgstr "Otevřít %s" -#: ../midori/midori-view.c:3882 +#: ../midori/midori-view.c:3405 #, c-format msgid "Inspect page - %s" msgstr "Prohlížení stránky - %s" -#: ../midori/midori-view.c:4279 -#, c-format -msgid "No documentation installed" -msgstr "Dokumentace není nainstalována" - -#: ../midori/midori-view.c:4356 -msgid "Midori doesn't store any personal data:" -msgstr "Aplikace Midori neukládá žádné osobní údaje:" - -#: ../midori/midori-view.c:4357 -msgid "No history or web cookies are being saved." -msgstr "Neukládá se historie, ani cookies." - -#: ../midori/midori-view.c:4358 -msgid "Extensions are disabled." -msgstr "Rozšíření jsou zakázána." - -#: ../midori/midori-view.c:4359 -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:3692 +msgid "Speed Dial" +msgstr "Rychlý přístup" -#: ../midori/midori-view.c:4360 -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:3693 ../midori/midori-view.c:3789 +msgid "Click to add a shortcut" +msgstr "Záložku přidáte kliknutím" -#: ../midori/midori-view.c:4361 -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:3694 +msgid "Enter shortcut address" +msgstr "Vložte adresu záložky" -#: ../midori/midori-view.c:4362 -msgid "DNS prefetching is disabled." -msgstr "Přednačítání DNS záznamů je zakázáno." +#: ../midori/midori-view.c:3695 +msgid "Enter shortcut title" +msgstr "Vložte název záložky" -#: ../midori/midori-view.c:4363 -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:3696 +msgid "Are you sure you want to delete this shortcut?" +msgstr "Opravdu chcete smazat tuto záložku?" -#: ../midori/midori-view.c:4364 -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:3860 +#, c-format +msgid "No documentation installed" +msgstr "Dokumentace není nainstalována" -#: ../midori/midori-view.c:4450 +#: ../midori/midori-view.c:3910 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:4499 +#: ../midori/midori-view.c:3955 msgid "Page loading delayed" msgstr "Načítání stránky pozdrženo" -#: ../midori/midori-view.c:4500 +#: ../midori/midori-view.c:3956 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "" -"Načtení stránky bylo pozdrženo kvůli nedávnému pádu aplikace, nebo kvůli " -"nastavení po spuÅ¡tění." +"Načtení stránky bylo pozdrženo kvůli pádu aplikace, nebo protože je to tak " +"nastaveno." -#: ../midori/midori-view.c:4501 +#: ../midori/midori-view.c:3957 msgid "Load Page" msgstr "Načíst stránku" -#: ../midori/midori-view.c:4668 +#: ../midori/midori-view.c:4097 msgid "Blank page" msgstr "Prázdná stránka" -#: ../midori/midori-view.c:4932 +#: ../midori/midori-view.c:4361 msgid "_Duplicate Tab" msgstr "Z_dvojit kartu" -#: ../midori/midori-view.c:4937 +#: ../midori/midori-view.c:4366 msgid "Show Tab _Label" msgstr "Zobrazit _popisek karty" -#: ../midori/midori-view.c:4937 +#: ../midori/midori-view.c:4366 msgid "Show Tab _Icon Only" msgstr "Zobrazit jen _ikonu karty" -#: ../midori/midori-view.c:4944 -msgid "Close Ot_her Tab" -msgid_plural "Close Ot_her Tabs" -msgstr[0] "_Zavřít druhou kartu" -msgstr[1] "_Zavřít ostatní karty" -msgstr[2] "_Zavřít ostatní karty" +#: ../midori/midori-view.c:4372 +msgid "Close ot_her Tabs" +msgstr "_Zavřít ostatní karty" #. i18n: word stem of "previous page" type links, case is not important -#: ../midori/midori-view.c:5701 +#: ../midori/midori-view.c:4989 msgid "previous" msgstr "předchozí" #. i18n: word stem of "next page" type links, case is not important -#: ../midori/midori-view.c:5720 +#: ../midori/midori-view.c:5008 msgid "next" msgstr "následující" -#: ../midori/midori-view.c:5733 +#: ../midori/midori-view.c:5021 msgid "Print background images" msgstr "Tisknout obrázky na pozadí" -#: ../midori/midori-view.c:5734 +#: ../midori/midori-view.c:5022 msgid "Whether background images should be printed" -msgstr "Určuje, zda se vytisknou obrázky na pozadí" +msgstr "Mají být obrázky na pozadí tiÅ¡těny?" -#: ../midori/midori-view.c:5766 +#: ../midori/midori-view.c:5054 msgid "Features" msgstr "Rozšíření" -#. i18n: Download tooltip (size): 4KB of 43MB -#: ../midori/midori-download.vala:48 -#, c-format -msgid "%s of %s" -msgstr "%s z %s" - -#: ../midori/midori-download.vala:64 -#, c-format -msgid "%d hour" -msgid_plural "%d hours" -msgstr[0] "%d hodina" -msgstr[1] "%d hodiny" -msgstr[2] "%d hodin" - -#: ../midori/midori-download.vala:65 -#, c-format -msgid "%d minute" -msgid_plural "%d minutes" -msgstr[0] "%d minuta" -msgstr[1] "%d minuty" -msgstr[2] "%d minut" - -#: ../midori/midori-download.vala:66 -#, c-format -msgid "%d second" -msgid_plural "%d seconds" -msgstr[0] "%d sekunda" -msgstr[1] "%d sekundy" -msgstr[2] "%d sekund" - -#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning -#: ../midori/midori-download.vala:82 -#, c-format -msgid " - %s remaining" -msgstr "- zbývá %s" - -#. i18n: Unknown number of bytes, used for transfer rate like ?B/s -#: ../midori/midori-download.vala:92 -msgid "?B" -msgstr "? B" - -#. i18n: Download tooltip (transfer rate): (130KB/s) -#: ../midori/midori-download.vala:94 -#, c-format -msgid " (%s/s)" -msgstr "(%s/s)" - -#: ../midori/midori-download.vala:188 -msgid "The downloaded file is erroneous." -msgstr "Stažený soubor obsahuje chyby." - -#: ../midori/midori-download.vala:189 -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." - -#: ../midori/midori-download.vala:300 -#, 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-download.vala:302 -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-download.vala:305 -#, c-format -msgid "There is not enough free space to download \"%s\"." -msgstr "Ke stažení \"%s\" není k dispozici dostatek místa." - -#: ../midori/midori-download.vala:307 -#, c-format -msgid "The file needs %s but only %s are left." -msgstr "Požaduje se %s, ale k dispozici je pouze %s." - -#: ../midori/midori-speeddial.vala:180 -msgid "Speed Dial" -msgstr "Rychlý přístup" - -#: ../midori/midori-speeddial.vala:181 ../midori/midori-speeddial.vala:261 -msgid "Click to add a shortcut" -msgstr "Záložku přidáte kliknutím" - -#: ../midori/midori-speeddial.vala:182 -msgid "Enter shortcut address" -msgstr "Vložte adresu záložky" - -#: ../midori/midori-speeddial.vala:183 -msgid "Enter shortcut title" -msgstr "Vložte název záložky" - -#: ../midori/midori-speeddial.vala:184 -msgid "Are you sure you want to delete this shortcut?" -msgstr "Opravdu chcete smazat tuto záložku?" - -#: ../midori/midori-preferences.c:299 +#: ../midori/midori-preferences.c:297 msgid "Startup" msgstr "Při spuÅ¡tění" -#: ../midori/midori-preferences.c:305 -msgid "Homepage:" -msgstr "Domovská stránka:" - -#: ../midori/midori-preferences.c:313 +#: ../midori/midori-preferences.c:310 msgid "Use _current page" -msgstr "Použít _stávající stránku" +msgstr "Použít _aktivní stránku" -#: ../midori/midori-preferences.c:317 +#: ../midori/midori-preferences.c:314 msgid "Use current page as homepage" msgstr "Použít stávající stránku jako domovskou" #. Page "Appearance" -#: ../midori/midori-preferences.c:326 +#: ../midori/midori-preferences.c:323 msgid "Fonts" msgstr "Písma" -#: ../midori/midori-preferences.c:329 +#: ../midori/midori-preferences.c:326 msgid "Proportional Font Family" -msgstr "Proporcionální písmo" - -#: ../midori/midori-preferences.c:333 -msgid "The default font family used to display text" -msgstr "Výchozí písmo pro zobrazení textu" - -#: ../midori/midori-preferences.c:336 -msgid "The default font size used to display text" -msgstr "Výchozí velikost písma pro zobrazení textu" - -#: ../midori/midori-preferences.c:338 -msgid "Fixed-width Font Family" -msgstr "Neproporcionální písmo" - -#: ../midori/midori-preferences.c:342 -msgid "The font family used to display fixed-width text" -msgstr "Písmo pro zobrazení textu se stejnou šířkou písmen" - -#: ../midori/midori-preferences.c:345 -msgid "The font size used to display fixed-width text" -msgstr "Velikost písma pro zobrazení textu se stejnou šířkou písmen" - -#: ../midori/midori-preferences.c:347 -msgid "Minimum Font Size" -msgstr "Minimální velikost písma" - -#: ../midori/midori-preferences.c:351 -msgid "The minimum font size used to display text" -msgstr "Minimální velikost fontu použitého pro zobrazení" - -#. Page "Behavior" -#: ../midori/midori-preferences.c:362 -msgid "Behavior" -msgstr "Chování" - -#: ../midori/midori-preferences.c:366 ../extensions/statusbar-features.c:155 -msgid "Load images automatically" -msgstr "Automaticky načítat obrázky" - -#: ../midori/midori-preferences.c:369 -msgid "Enable Spell Checking" -msgstr "Povolit kontrolu pravopisu" - -#: ../midori/midori-preferences.c:383 ../extensions/statusbar-features.c:165 -msgid "Enable scripts" -msgstr "Povolit skripty" - -#: ../midori/midori-preferences.c:386 ../extensions/statusbar-features.c:177 -msgid "Enable Netscape plugins" -msgstr "Povolit zásuvné moduly aplikace Netscape" - -#: ../midori/midori-preferences.c:391 -msgid "Zoom Text and Images" -msgstr "ZvětÅ¡ovat text i obrázky" - -#: ../midori/midori-preferences.c:394 -msgid "Allow scripts to open popups" -msgstr "Povolit skriptům otevírat vyskakovací okna" - -#: ../midori/midori-preferences.c:395 -msgid "Whether scripts are allowed to open popup windows automatically" -msgstr "" -"Určuje, zda bude skriptům povoleno automaticky otevírat vyskakovací okna" - -#: ../midori/midori-preferences.c:401 -msgid "Kinetic scrolling" -msgstr "Kinetické posouvání" - -#: ../midori/midori-preferences.c:402 -msgid "Whether scrolling should kinetically move according to speed" -msgstr "Určuje, zda bude posouvání ovlivněno rychloistí" - -#: ../midori/midori-preferences.c:407 -msgid "Middle click opens Selection" -msgstr "Kliknutí prostředního tlačítka otevře vybraný text" - -#: ../midori/midori-preferences.c:408 -msgid "Load an address from the selection via middle click" -msgstr "Prostřední tlačítko myÅ¡i otevře adresu obsaženou ve vybraném textu" +msgstr "Proporcionální písmo" -#: ../midori/midori-preferences.c:414 -msgid "Enable WebGL support" -msgstr "Povolit podporu WebGL" +#: ../midori/midori-preferences.c:330 +msgid "The default font family used to display text" +msgstr "Výchozí font pro zobrazení textu" -#: ../midori/midori-preferences.c:419 -msgid "Flash window on background tabs" -msgstr "Blikání okna při otevření karty na pozadí" +#: ../midori/midori-preferences.c:333 +msgid "The default font size used to display text" +msgstr "Velikost textu" -#: ../midori/midori-preferences.c:428 -msgid "Save downloaded files to:" -msgstr "Ukládat stažené soubory do:" +#: ../midori/midori-preferences.c:335 +msgid "Fixed-width Font Family" +msgstr "Výchozí font písma se stejnou šířkou" -#. Page "Interface" -#: ../midori/midori-preferences.c:435 -msgid "Browsing" -msgstr "Prohlížení" +#: ../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" -#: ../midori/midori-preferences.c:451 -msgid "Close Buttons on Tabs" -msgstr "Ikona zavření karty" +#: ../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" -#: ../midori/midori-preferences.c:455 -msgid "Always Show Tabbar" -msgstr "Vždy zobrazit panel karet" +#: ../midori/midori-preferences.c:344 +msgid "Minimum Font Size" +msgstr "Minimální velikost textu" -#: ../midori/midori-preferences.c:459 -msgid "Open Tabs next to Current" -msgstr "Otevřít kartu vedle aktivní" +#: ../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í" -#: ../midori/midori-preferences.c:460 -msgid "Whether to open new tabs next to the current tab or after the last one" -msgstr "" -"Určuje, zda se budou nové karty otevírat vedle aktivní nebo vedle poslední " -"karty" +#. Page "Behavior" +#: ../midori/midori-preferences.c:359 +msgid "Behavior" +msgstr "Chování" -#: ../midori/midori-preferences.c:463 -msgid "Open tabs in the background" -msgstr "Otevírat karty na pozadí" +#: ../midori/midori-preferences.c:385 +msgid "Allow scripts to open popups" +msgstr "Povolit skriptům otevírat vyskakovací okna" -#: ../midori/midori-preferences.c:467 -msgid "Text Editor" -msgstr "Textový editor" +#: ../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:472 -msgid "News Aggregator" -msgstr "Čtečka RSS" +#. Page "Interface" +#: ../midori/midori-preferences.c:409 +msgid "Browsing" +msgstr "Prohlížení" #. Page "Network" -#: ../midori/midori-preferences.c:479 +#: ../midori/midori-preferences.c:447 msgid "Network" msgstr "Síť" -#: ../midori/midori-preferences.c:481 -msgid "Proxy server" -msgstr "Server proxy" - -#: ../midori/midori-preferences.c:486 +#: ../midori/midori-preferences.c:454 msgid "Hostname" -msgstr "Název hostitele" - -#: ../midori/midori-preferences.c:494 -msgid "Port" -msgstr "Port" +msgstr "Počítač" -#: ../midori/midori-preferences.c:506 ../midori/midori-preferences.c:509 -msgid "The maximum size of cached pages on disk" -msgstr "Maximální velikost diskové mezipaměti stránek" - -#: ../midori/midori-preferences.c:511 +#: ../midori/midori-preferences.c:478 msgid "MB" msgstr "MB" -#: ../midori/midori-searchaction.c:957 +#: ../midori/midori-searchaction.c:907 msgid "Add search engine" msgstr "Přidat vyhledávací nástroj" -#: ../midori/midori-searchaction.c:957 +#: ../midori/midori-searchaction.c:907 msgid "Edit search engine" msgstr "Upravit vyhledávací nástroj" -#: ../midori/midori-searchaction.c:985 +#: ../midori/midori-searchaction.c:936 msgid "_Name:" msgstr "_Název:" -#: ../midori/midori-searchaction.c:1000 +#: ../midori/midori-searchaction.c:952 msgid "_Description:" msgstr "_Popis:" -#: ../midori/midori-searchaction.c:1013 ../extensions/feed-panel/main.c:377 -msgid "_Address:" -msgstr "_Adresa:" +#: ../midori/midori-searchaction.c:985 +msgid "_Icon:" +msgstr "_Ikona:" -#: ../midori/midori-searchaction.c:1032 +#: ../midori/midori-searchaction.c:999 msgid "_Token:" msgstr "_Zkratka:" -#: ../midori/midori-searchaction.c:1330 +#: ../midori/midori-searchaction.c:1299 msgid "Manage Search Engines" -msgstr "Spravovat vyhledávací nástroje" +msgstr "Upravit vyhledávací nástroje" -#: ../midori/midori-searchaction.c:1432 +#: ../midori/midori-searchaction.c:1399 msgid "Use as _default" msgstr "Použít jako _výchozí" -#: ../midori/sokoke.c:353 +#: ../midori/sokoke.c:410 msgid "Open with" msgstr "Otevřít s" -#: ../midori/sokoke.c:361 +#: ../midori/sokoke.c:418 #, c-format msgid "Choose an application or command to open \"%s\":" msgstr "Vyberte aplikaci, nebo příkaz k otevření \"%s\":" -#: ../midori/sokoke.c:476 ../midori/sokoke.c:490 +#: ../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 "Nelze spustit externí program." +msgstr "Nemohu spustit externí program." + +#: ../midori/sokoke.c:1677 +#, c-format +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "%d hodina" +msgstr[1] "%d hodiny" +msgstr[2] "%d hodin" + +#: ../midori/sokoke.c:1678 +#, c-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "%d minuta" +msgstr[1] "%d minuty" +msgstr[2] "%d minut" + +#: ../midori/sokoke.c:1679 +#, c-format +msgid "%d second" +msgid_plural "%d seconds" +msgstr[0] "%d vteřina" +msgstr[1] "%d vteřiny" +msgstr[2] "%d vteřin" + +#. i18n: Download tooltip (size): 4KB of 43MB +#: ../midori/sokoke.c:1687 ../panels/midori-transfers.c:267 +#, c-format +msgid "%s of %s" +msgstr "%s z %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 "- zbývá %s" #. i18n: A panel at the bottom, to search text in pages -#: ../toolbars/midori-findbar.c:265 +#: ../toolbars/midori-findbar.c:264 msgid "_Inline Find:" msgstr "_Rychlé hledání" -#: ../toolbars/midori-findbar.c:287 +#: ../toolbars/midori-findbar.c:291 msgid "Previous" msgstr "Předchozí" -#: ../toolbars/midori-findbar.c:293 +#: ../toolbars/midori-findbar.c:297 msgid "Next" msgstr "Následující" -#: ../toolbars/midori-findbar.c:297 +#: ../toolbars/midori-findbar.c:301 msgid "Match Case" -msgstr "RozliÅ¡ovat velikost písmen" +msgstr "RozliÅ¡ovat velikost" -#: ../toolbars/midori-findbar.c:306 +#: ../toolbars/midori-findbar.c:310 msgid "Highlight Matches" msgstr "Zvýraznit nalezené" -#: ../toolbars/midori-findbar.c:317 +#: ../toolbars/midori-findbar.c:321 msgid "Close Findbar" -msgstr "Zavřít panel hledání" +msgstr "Zavřít vyhledávací liÅ¡tu" -#: ../toolbars/midori-transferbar.c:109 +#: ../toolbars/midori-transferbar.c:122 #, c-format msgid "The file '%s' has been downloaded." msgstr "Soubor %s byl stažen." -#: ../toolbars/midori-transferbar.c:114 +#: ../toolbars/midori-transferbar.c:125 msgid "Transfer completed" msgstr "Přenos dokončen" -#: ../toolbars/midori-transferbar.c:239 ../panels/midori-transfers.c:139 +#: ../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 není shodný s tím, který byl přiložen ke stahovanému " +"souboru. To znamená, že stažený soubor pravděpodobně není celý nebo byl " +"změněn." + +#: ../toolbars/midori-transferbar.c:331 ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "Smazat vÅ¡e" -#: ../toolbars/midori-transferbar.c:272 ../toolbars/midori-transferbar.c:274 +#: ../toolbars/midori-transferbar.c:368 ../toolbars/midori-transferbar.c:370 msgid "Some files are being downloaded" -msgstr "Některé soubory se stále stahují" +msgstr "JeÅ¡tě se stahují nějaké soubory." -#: ../toolbars/midori-transferbar.c:278 +#: ../toolbars/midori-transferbar.c:374 msgid "_Quit Midori" -msgstr "U_končit aplikaci Midori" +msgstr "U_končit Midori" -#: ../toolbars/midori-transferbar.c:280 +#: ../toolbars/midori-transferbar.c:376 msgid "The transfers will be cancelled if Midori quits." -msgstr "Pokud bude aplikace Midori ukončena, stahování se stornuje." +msgstr "Jestliže bude Midori ukončeno, stahování se stornuje." -#: ../panels/midori-bookmarks.c:308 -#, c-format -msgid "Failed to add bookmark item: %s\n" -msgstr "Přidání záložky se nezdařilo: %s\n" +#: ../panels/midori-bookmarks.c:113 +msgid "Bookmarks" +msgstr "Záložky" -#: ../panels/midori-bookmarks.c:475 +#: ../panels/midori-bookmarks.c:260 #, c-format -msgid "Failed to update bookmark : %s\n" -msgstr "Nepodařilo se aktualizovat záložku: %s\n" +msgid "Failed to add bookmark item: %s\n" +msgstr "Záložku se nepodařilo přidat: %s\n" -#: ../panels/midori-bookmarks.c:535 +#: ../panels/midori-bookmarks.c:440 msgid "Edit the selected bookmark" msgstr "Upravit vybranou záložku" -#: ../panels/midori-bookmarks.c:543 +#: ../panels/midori-bookmarks.c:448 msgid "Delete the selected bookmark" msgstr "Smazat vybranou záložku" -#: ../panels/midori-bookmarks.c:558 +#: ../panels/midori-bookmarks.c:463 msgid "Add a new folder" -msgstr "Přidat novou složku" +msgstr "Přidat složku" -#: ../panels/midori-bookmarks.c:697 ../panels/midori-history.c:638 +#: ../panels/midori-bookmarks.c:597 ../panels/midori-history.c:579 msgid "Separator" msgstr "Oddělovač" -#. Create the filter entry -#: ../panels/midori-bookmarks.c:1027 -msgid "Search Bookmarks" -msgstr "Hledat v záložkách" - -#: ../panels/midori-history.c:111 +#: ../panels/midori-history.c:110 msgid "History" msgstr "Historie" -#: ../panels/midori-history.c:158 ../panels/midori-history.c:189 -msgid "Today" -msgstr "Dnes" - -#: ../panels/midori-history.c:160 ../panels/midori-history.c:191 -msgid "Yesterday" -msgstr "Včera" +#: ../panels/midori-history.c:142 +msgid "A week ago" +msgstr "Před týdnem" -#: ../panels/midori-history.c:162 ../panels/midori-history.c:186 +#: ../panels/midori-history.c:144 #, c-format msgid "%d day ago" msgid_plural "%d days ago" -msgstr[0] "Před %d dnem" +msgstr[0] "Před %d dny" msgstr[1] "Před %d dny" msgstr[2] "Před %d dny" -#: ../panels/midori-history.c:165 ../panels/midori-history.c:184 -msgid "A week ago" -msgstr "Před týdnem" +#: ../panels/midori-history.c:147 +msgid "Today" +msgstr "Dnes" -#: ../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:149 +msgid "Yesterday" +msgstr "Včera" -#: ../panels/midori-history.c:360 +#: ../panels/midori-history.c:317 msgid "Are you sure you want to remove all history items?" msgstr "Opravdu chcete smazat vÅ¡echny položky historie?" -#: ../panels/midori-history.c:407 +#: ../panels/midori-history.c:363 msgid "Bookmark the selected history item" -msgstr "Uložit vybranou položku historie do záložek" +msgstr "Zazáložkovat vybranou položku historie" -#: ../panels/midori-history.c:416 +#: ../panels/midori-history.c:372 msgid "Delete the selected history item" msgstr "Smazat vybranou položku historie" -#: ../panels/midori-history.c:424 +#: ../panels/midori-history.c:380 msgid "Clear the entire history" msgstr "Smazat celou historii" -#. Create the filter entry -#: ../panels/midori-history.c:997 -msgid "Search History" -msgstr "Hledat v historii" - -#: ../panels/midori-transfers.c:87 +#: ../panels/midori-transfers.c:86 msgid "Transfers" msgstr "Přenosy" -#: ../panels/midori-transfers.c:435 +#: ../panels/midori-transfers.c:467 msgid "Open Destination _Folder" msgstr "Otevřít cílovou _složku" -#: ../panels/midori-transfers.c:438 +#: ../panels/midori-transfers.c:470 msgid "Copy Link Loc_ation" -msgstr "Kopírovat umís_tění odkazu" +msgstr "Kopírovat umís_tění" #: ../katze/katze-http-auth.c:210 msgid "Authentication Required" @@ -2072,13 +2152,11 @@ msgstr "Vyžadována autentikace" msgid "" "A username and a password are required\n" "to open this location:" -msgstr "" -"Pro otevření tohoto umístění je vyžadováno\n" -"jméno a heslo:" +msgstr "Pro otevření je vyžadováno jméno a heslo:" #: ../katze/katze-http-auth.c:240 msgid "Username" -msgstr "Jméno uživatele" +msgstr "Jméno" #: ../katze/katze-http-auth.c:253 msgid "Password" @@ -2088,209 +2166,205 @@ msgstr "Heslo" msgid "_Remember password" msgstr "Zapamatovat si _heslo" -#: ../katze/katze-throbber.c:949 +#: ../katze/katze-throbber.c:942 #, c-format msgid "Named icon '%s' couldn't be loaded" -msgstr "Ikonu '%s' nelze načíst" +msgstr "Ikona '%s' nemůže být načtena" -#: ../katze/katze-throbber.c:962 +#: ../katze/katze-throbber.c:955 #, c-format msgid "Stock icon '%s' couldn't be loaded" -msgstr "Uloženou ikonu '%s' nelze načíst" +msgstr "Uložená ikona '%s' nemůže být načtena" -#: ../katze/katze-throbber.c:1042 +#: ../katze/katze-throbber.c:1035 msgid "Animation frames are broken" msgstr "Snímky animace jsou poruÅ¡ené" -#: ../katze/katze-utils.c:443 ../katze/katze-utils.c:866 +#: ../katze/katze-utils.c:439 ../katze/katze-utils.c:873 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Vlastnost '%s' je pro %s neplatná" -#: ../katze/katze-utils.c:489 ../katze/katze-utils.c:518 -#: ../extensions/addons.c:309 +#: ../katze/katze-utils.c:485 ../katze/katze-utils.c:514 +#: ../extensions/addons.c:308 msgid "Choose file" -msgstr "Zvolit soubor" +msgstr "Vybrat soubor" -#: ../katze/katze-utils.c:504 +#: ../katze/katze-utils.c:500 msgid "Choose folder" -msgstr "Zvolit složku" +msgstr "Vybrat adresář" -#: ../katze/katze-utils.c:602 +#: ../katze/katze-utils.c:604 msgid "None" msgstr "není" -#: ../katze/katze-utils.c:717 +#: ../katze/katze-utils.c:719 msgid "1 hour" msgstr "1 hodině" -#: ../katze/katze-utils.c:718 +#: ../katze/katze-utils.c:720 msgid "1 day" msgstr "1 dni" -#: ../katze/katze-utils.c:719 +#: ../katze/katze-utils.c:721 msgid "1 week" msgstr "1 týdnu" -#: ../katze/katze-utils.c:720 +#: ../katze/katze-utils.c:722 msgid "1 month" msgstr "1 měsíci" -#: ../katze/katze-utils.c:721 +#: ../katze/katze-utils.c:723 msgid "1 year" msgstr "1 roce" -#: ../katze/katze-preferences.c:98 ../extensions/history-list.vala:235 +#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235 #, c-format msgid "Preferences for %s" msgstr "Nastavení pro %s" -#: ../katze/midori-uri.vala:173 -msgid "MD5-Checksum:" -msgstr "Kontrolní součet MD5:" - -#: ../katze/midori-uri.vala:180 -msgid "SHA1-Checksum:" -msgstr "Kontrolní součet SHA1:" - -#: ../extensions/adblock.c:495 +#: ../extensions/adblock.c:434 msgid "Configure Advertisement filters" msgstr "Nastavení filtrů blokování reklamy" -#: ../extensions/adblock.c:528 +#: ../extensions/adblock.c:465 #, 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 " -"tlačítko \"Přidat\" ji přidáte do seznamu. Více připravených filtrů " -"naleznete na adrese %s." +"\"Přidat\" ji přidáte do seznamu. Více připravených filtrů naleznete na " +"adrese %s." -#: ../extensions/adblock.c:944 +#: ../extensions/adblock.c:816 msgid "Edit rule" msgstr "Upravit pravidlo" -#: ../extensions/adblock.c:958 +#: ../extensions/adblock.c:830 msgid "_Rule:" msgstr "P_ravidlo:" -#: ../extensions/adblock.c:1012 +#: ../extensions/adblock.c:884 msgid "Bl_ock image" msgstr "Bl_okovat obrázek" -#: ../extensions/adblock.c:1017 +#: ../extensions/adblock.c:889 msgid "Bl_ock link" msgstr "Bl_okovat odkaz" -#: ../extensions/adblock.c:1915 +#: ../extensions/adblock.c:1483 msgid "Advertisement blocker" msgstr "Blokování reklamy" -#: ../extensions/adblock.c:1916 +#: ../extensions/adblock.c:1484 msgid "Block advertisements according to a filter list" -msgstr "Blokuvat reklamu podle seznamu filtrů" +msgstr "Blokuje reklamu podle filtrů" #. i18n: An infobar shows up when viewing a script on userscripts.org -#: ../extensions/addons.c:222 +#: ../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?" +msgstr "" +"Vypadá to, že na právě prohlížené stránce je uživatelský skript. Má se " +"spustit jeho instalace?" -#: ../extensions/addons.c:223 +#: ../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:228 +#: ../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?" +msgstr "" +"Vypadá to, že na právě prohlížené stránce je uživatelský styl. Má se spustit " +"jeho instalace?" -#: ../extensions/addons.c:229 +#: ../extensions/addons.c:228 msgid "_Install user style" msgstr "_Instalovat uživatelský styl" -#: ../extensions/addons.c:237 +#: ../extensions/addons.c:236 msgid "Don't install" msgstr "Neinstalovat" -#: ../extensions/addons.c:320 ../extensions/addons.c:675 +#: ../extensions/addons.c:319 ../extensions/addons.c:681 msgid "Userscripts" msgstr "Uživatelské skripty" -#: ../extensions/addons.c:325 ../extensions/addons.c:677 +#: ../extensions/addons.c:324 ../extensions/addons.c:683 msgid "Userstyles" msgstr "Uživatelské styly" -#: ../extensions/addons.c:371 ../extensions/addons.c:450 +#: ../extensions/addons.c:380 ../extensions/addons.c:459 #: ../extensions/feed-panel/main.c:129 msgid "Error" msgstr "Chyba" -#: ../extensions/addons.c:412 +#: ../extensions/addons.c:421 #, c-format msgid "Do you want to delete '%s'?" msgstr "Chcete smazat %s?" -#: ../extensions/addons.c:418 +#: ../extensions/addons.c:427 msgid "Delete user script" msgstr "Smazat uživatelský skript" -#: ../extensions/addons.c:419 +#: ../extensions/addons.c:428 msgid "Delete user style" -msgstr "Smazat uživatelský styl" +msgstr "Smazat uživatelův styl" -#: ../extensions/addons.c:422 +#: ../extensions/addons.c:431 #, c-format msgid "The file %s will be permanently deleted." msgstr "Soubor %s bude smazán." -#: ../extensions/addons.c:564 ../extensions/addons.c:641 +#: ../extensions/addons.c:570 ../extensions/addons.c:647 msgid "Open in Text Editor" msgstr "Otevřít v textovém editoru" -#: ../extensions/addons.c:566 ../extensions/addons.c:650 +#: ../extensions/addons.c:572 ../extensions/addons.c:656 msgid "Open Target Folder" msgstr "Otevřít cílovou složku" -#: ../extensions/addons.c:632 +#: ../extensions/addons.c:638 msgid "Add new addon" -msgstr "Přidat nový zásuvný přídavek" +msgstr "Přidat nový plugin" -#: ../extensions/addons.c:658 +#: ../extensions/addons.c:664 msgid "Remove selected addon" -msgstr "Odstranit vybraný přídavek" +msgstr "Odstranit vybraný plugin" -#: ../extensions/addons.c:1687 ../extensions/addons.c:1905 +#: ../extensions/addons.c:1691 ../extensions/addons.c:1909 msgid "User addons" -msgstr "Uživatelské přídavky" +msgstr "Uživatelova rozšíření" -#: ../extensions/addons.c:1817 +#: ../extensions/addons.c:1821 #, c-format msgid "Can't monitor folder '%s': %s" -msgstr "Nelze sledovat složku '%s': %s" +msgstr "Nemohu sledovat složku '%s': %s" -#: ../extensions/addons.c:1906 +#: ../extensions/addons.c:1910 msgid "Support for userscripts and userstyles" -msgstr "Podpora uživatelských skriptů a stylů." +msgstr "Podpora pro userscripts a userstyles." -#: ../extensions/colorful-tabs.c:201 +#: ../extensions/colorful-tabs.c:202 msgid "Colorful Tabs" -msgstr "Barevné karty" +msgstr "Obarvené karty" -#: ../extensions/colorful-tabs.c:202 +#: ../extensions/colorful-tabs.c:203 msgid "Tint each tab distinctly" msgstr "Obarvit každou kartu zvlášť" -#: ../extensions/cookie-manager/cookie-manager-page.c:73 +#: ../extensions/cookie-manager/cookie-manager-page.c:80 #: ../extensions/cookie-manager/main.c:35 msgid "Cookie Manager" msgstr "Správce cookies" -#: ../extensions/cookie-manager/cookie-manager-page.c:103 +#: ../extensions/cookie-manager/cookie-manager-page.c:110 msgid "Delete All" msgstr "Smazat vÅ¡e" -#: ../extensions/cookie-manager/cookie-manager-page.c:105 +#: ../extensions/cookie-manager/cookie-manager-page.c:112 msgid "" "Deletes all shown cookies. If a filter is set, only those cookies are " "deleted which match the filter." @@ -2298,31 +2372,31 @@ 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:120 +#: ../extensions/cookie-manager/cookie-manager-page.c:127 msgid "Expand All" msgstr "Rozbalit vÅ¡e" -#: ../extensions/cookie-manager/cookie-manager-page.c:127 +#: ../extensions/cookie-manager/cookie-manager-page.c:134 msgid "Collapse All" msgstr "Sbalit vÅ¡e" -#: ../extensions/cookie-manager/cookie-manager-page.c:572 +#: ../extensions/cookie-manager/cookie-manager-page.c:576 msgid "Do you really want to delete all cookies?" msgstr "Opravdu chcete smazat vÅ¡echna cookies?" -#: ../extensions/cookie-manager/cookie-manager-page.c:574 +#: ../extensions/cookie-manager/cookie-manager-page.c:578 msgid "Question" msgstr "Dotaz" -#: ../extensions/cookie-manager/cookie-manager-page.c:583 +#: ../extensions/cookie-manager/cookie-manager-page.c:587 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:671 +#: ../extensions/cookie-manager/cookie-manager-page.c:675 msgid "At the end of the session" -msgstr "Na konci relace" +msgstr "Na konci sezení" -#: ../extensions/cookie-manager/cookie-manager-page.c:674 +#: ../extensions/cookie-manager/cookie-manager-page.c:678 #, c-format msgid "" "Host: %s\n" @@ -2339,15 +2413,15 @@ msgstr "" "Zabezpečené: %s\n" "Vyprší: %s" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:684 msgid "Yes" msgstr "Ano" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:684 msgid "No" msgstr "Ne" -#: ../extensions/cookie-manager/cookie-manager-page.c:694 +#: ../extensions/cookie-manager/cookie-manager-page.c:698 #, c-format msgid "" "Domain: %s\n" @@ -2356,25 +2430,33 @@ msgstr "" "Doména: %s\n" "Cookies: %d" -#: ../extensions/cookie-manager/cookie-manager-page.c:1017 +#: ../extensions/cookie-manager/cookie-manager-page.c:1028 msgid "Name" msgstr "Název" -#: ../extensions/cookie-manager/cookie-manager-page.c:1069 +#: ../extensions/cookie-manager/cookie-manager-page.c:1081 msgid "_Expand All" msgstr "Rozbalit _vÅ¡e" -#: ../extensions/cookie-manager/cookie-manager-page.c:1077 +#: ../extensions/cookie-manager/cookie-manager-page.c:1089 msgid "_Collapse All" msgstr "_Sbalit vÅ¡e" -#: ../extensions/cookie-manager/cookie-manager-page.c:1129 -msgid "Search Cookies by Name or Domain" -msgstr "Hledat cookies podle názvu nebo domény" +#: ../extensions/cookie-manager/cookie-manager-page.c:1142 +msgid "Filter:" +msgstr "Filtr:" + +#: ../extensions/cookie-manager/cookie-manager-page.c:1147 +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:36 msgid "List, view and delete cookies" -msgstr "Seznam, prohlížení a mazání cookies" +msgstr "Seznam, detaily a mazání cookies" #: ../extensions/copy-tabs.c:38 msgid "Copy Tab _Addresses" @@ -2386,15 +2468,15 @@ msgstr "Zkopírovat adresy z karet" #: ../extensions/copy-tabs.c:96 msgid "Copy the addresses of all tabs to the clipboard" -msgstr "Zkopíruje do schránky adresy ze vÅ¡ech karet" +msgstr "Zkopíruje adresy vÅ¡ech karet do schránky" #: ../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 datech XML." +msgstr "Chyba při hledání vyžadované položky \"entry\" v XML datech." #: ../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 datech XML." +msgstr "Chyba při hledání vyžadované položky \"feed\" v XML datech." #. i18n: The local date a feed was last updated #: ../extensions/feed-panel/feed-panel.c:387 @@ -2422,7 +2504,7 @@ msgstr "_Kanály" #: ../extensions/feed-panel/feed-parse.c:195 #, c-format msgid "Failed to find root element in feed XML data." -msgstr "Nalezení kořenového elementu v datech XML se nezdařilo." +msgstr "Chyba při hledání kořenového elementu v XML datech." #: ../extensions/feed-panel/feed-parse.c:235 #, c-format @@ -2432,11 +2514,11 @@ msgstr "Nepodporovaný formát kanálu." #: ../extensions/feed-panel/feed-parse.c:265 #, c-format msgid "Failed to parse XML feed: %s" -msgstr "Nepodařilo se zpracovat kanál XML: %s" +msgstr "Nepodařilo se načíst XML kanál: %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 datech RSS XML." +msgstr "Nepodařilo se najít element \"channel\" v RSS XML datech." #: ../extensions/feed-panel/feed-rss.c:51 msgid "Unsupported RSS version found." @@ -2444,16 +2526,16 @@ msgstr "Nepodporovaná verze RSS." #: ../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 RSS \"item\" v datech XML." +msgstr "Nepodařilo se najít požadovaný element \"item\" v XML datech." #: ../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 RSS \"channel\" v datech XML." +msgstr "Nepodařilo se najít požadovaný element \"channel\" v XML datech." #: ../extensions/feed-panel/main.c:131 #, c-format msgid "Feed '%s' already exists" -msgstr "Kanál '%s' již existuje" +msgstr "Kanál '%s' byl již přidán" #: ../extensions/feed-panel/main.c:208 #, c-format @@ -2468,70 +2550,44 @@ msgstr "Panel kanálů" msgid "Read Atom/ RSS feeds" msgstr "Čte Atom/RSS kanály" -#: ../extensions/formhistory/formhistory.c:39 +#: ../extensions/formhistory.c:143 #, c-format msgid "Failed to add form value: %s\n" msgstr "Nepodařilo se přidat položku formuláře: %s\n" -#: ../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 +#: ../extensions/formhistory.c:295 msgid "Toggle form history state" -msgstr "Přepnout stav historie formulářových dat" +msgstr "Přepnout stav pamatování formulářových dat" -#: ../extensions/formhistory/formhistory.c:438 +#: ../extensions/formhistory.c:296 msgid "Activate or deactivate form history for the current tab." -msgstr "Zapnout, nebo vypnout historii formulářových dat pro aktivní kartu" +msgstr "Zapnout, nebo vypnout pamatování formulářových dat pro aktivní kartu" -#: ../extensions/formhistory/formhistory.c:549 -#: ../extensions/formhistory/formhistory.c:553 +#: ../extensions/formhistory.c:432 ../extensions/formhistory.c:436 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Nepodařilo se spustit databázový příkaz: %s\n" -#: ../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.c:511 +msgid "only activate form history via hotkey (Ctrl+Shift+F) per tab" +msgstr "zapamatování formulářových dat zapnout pomocí kláves (Ctrl+Shitf+F)" -#: ../extensions/formhistory/formhistory.c:669 +#: ../extensions/formhistory.c:570 msgid "Stores history of entered form data" -msgstr "Ukládá historii dat vložených do formulářů" +msgstr "Ukládat historii hodnot vložených do formuláře" -#: ../extensions/formhistory/formhistory-gdom-frontend.c:225 -#: ../extensions/formhistory/formhistory-js-frontend.c:106 +#: ../extensions/formhistory.c:574 #, c-format -msgid "Failed to select suggestions\n" -msgstr "Nepodařilo se vybrat návrh\n" +msgid "Not available: %s" +msgstr "Není k dispozici: %s" + +#: ../extensions/formhistory.c:575 +msgid "Resource files not installed" +msgstr "Nejsou nainstalovány soubory se zdrojem" + +#: ../extensions/formhistory.c:581 +msgid "Form history filler" +msgstr "Ukládání hodnot ve formuláři" #: ../extensions/history-list.vala:197 msgid "There are no unvisited tabs" @@ -2552,11 +2608,11 @@ msgstr "nedělat nic" #: ../extensions/history-list.vala:289 msgid "Switch to last viewed tab" -msgstr "přepnout na poslední prohlíženou kartu" +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" +msgstr "přepnout na naposledy přidanou" #: ../extensions/history-list.vala:423 msgid "Next new Tab (History List)" @@ -2568,7 +2624,7 @@ 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)" +msgstr "Předchozí nová karta (v historii)" #: ../extensions/history-list.vala:434 msgid "Previous new tab from history" @@ -2576,17 +2632,17 @@ 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)" +msgstr "Zobrazit kartu na pozadí (Historie)" #: ../extensions/history-list.vala:444 msgid "Display the current selected tab in background" -msgstr "Zobrazí vybranou kartu na pozadí" +msgstr "Zobrazí vybranou kartu na pozadí (nepřepne na ni)" -#: ../extensions/history-list.vala:566 +#: ../extensions/history-list.vala:569 msgid "History List" -msgstr "Seznam historie" +msgstr "Historie" -#: ../extensions/history-list.vala:567 +#: ../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" @@ -2596,7 +2652,7 @@ msgstr "Gesta myší" #: ../extensions/mouse-gestures.c:302 msgid "Control Midori by moving the mouse" -msgstr "Ovládat aplikaci Midori pomocí myÅ¡i" +msgstr "Ovládat Midori pomocí myÅ¡i" #: ../extensions/shortcuts.c:109 msgid "Reload page or stop loading" @@ -2604,17 +2660,17 @@ msgstr "Znovu načíst stránku, nebo načítání zastavit" #: ../extensions/shortcuts.c:176 msgid "Customize Keyboard shortcuts" -msgstr "Přizpůsobení klávesových zkratek" +msgstr "Nastavení klávesových zkratek" -#: ../extensions/shortcuts.c:283 +#: ../extensions/shortcuts.c:285 msgid "Customize Sh_ortcuts..." -msgstr "Přizpůsobení klávesových _zkratek…" +msgstr "Nastavení klávesových _zkratek..." -#: ../extensions/shortcuts.c:320 +#: ../extensions/shortcuts.c:322 msgid "Shortcuts" -msgstr "Klávesové zkratky" +msgstr "Zkratky" -#: ../extensions/shortcuts.c:321 +#: ../extensions/shortcuts.c:323 msgid "View and edit keyboard shortcuts" msgstr "Zobrazí a umožní změnu klávesových zkratek" @@ -2626,347 +2682,84 @@ msgstr "Hodiny ve stavovém řádku" msgid "Display date and time in the statusbar" msgstr "Zobrazuje datum a čas ve stavovém řádku" -#: ../extensions/statusbar-features.c:152 +#: ../extensions/statusbar-features.c:128 msgid "Images" msgstr "Obrázky" -#: ../extensions/statusbar-features.c:162 +#: ../extensions/statusbar-features.c:137 msgid "Scripts" msgstr "Uživatelské skripty" -#: ../extensions/statusbar-features.c:174 +#: ../extensions/statusbar-features.c:146 msgid "Netscape plugins" -msgstr "Zásuvné moduly aplikace Netscape" +msgstr "Netscape pluginy" -#: ../extensions/statusbar-features.c:259 +#: ../extensions/statusbar-features.c:192 msgid "Statusbar Features" msgstr "Rozšíření stavové liÅ¡ty" -#: ../extensions/statusbar-features.c:260 +#: ../extensions/statusbar-features.c:193 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:589 ../extensions/tab-panel.c:676 +#: ../extensions/tab-panel.c:596 ../extensions/tab-panel.c:683 msgid "Tab Panel" msgstr "Panel karet" -#: ../extensions/tab-panel.c:659 +#: ../extensions/tab-panel.c:666 msgid "T_ab Panel" msgstr "Panel _karet" -#: ../extensions/tab-panel.c:677 +#: ../extensions/tab-panel.c:684 msgid "Show tabs in a vertical panel" -msgstr "Zobrazí karty ve svislém panelu" +msgstr "Zobrazí karty ve vertikálním panelu" #: ../extensions/tabs-minimized.c:76 msgid "Only Icons on Tabs by default" -msgstr "Ve výchozím stavu na kartách zobrazovat pouze ikony " +msgstr "Na kartách zobrazovat jen ikony" #: ../extensions/tabs-minimized.c:77 msgid "New tabs have no label by default" -msgstr "Nové karty nebudou mít ve výchozím stavu popisek" +msgstr "Nové karty nebudou mít popisek" -#: ../extensions/toolbar-editor.c:395 +#: ../extensions/toolbar-editor.c:393 msgid "Customize Toolbar" -msgstr "Upravit panel nástrojů" +msgstr "Upravit liÅ¡tu" -#: ../extensions/toolbar-editor.c:411 +#: ../extensions/toolbar-editor.c:413 msgid "" -"Select items to be displayed on the toolbar. Items can be reordered by drag " +"Select items to be displayed on the toolbar. Items can be reodered 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." +"Vybrané položky se zobrazí na liÅ¡tě. Změnu pořadí provedete přetažením." -#: ../extensions/toolbar-editor.c:427 +#: ../extensions/toolbar-editor.c:429 msgid "Available Items" msgstr "Dostupné položky" -#: ../extensions/toolbar-editor.c:448 +#: ../extensions/toolbar-editor.c:450 msgid "Displayed Items" msgstr "Zobrazené položky" -#: ../extensions/toolbar-editor.c:588 -msgid "_Customize Toolbar…" -msgstr "Upravit pane_l nástrojů…" +#: ../extensions/toolbar-editor.c:585 +msgid "Customize _Toolbar..." +msgstr "Upravit _liÅ¡tu..." + +#: ../extensions/toolbar-editor.c:601 +msgid "_Customize..." +msgstr "_Vlastní..." -#: ../extensions/toolbar-editor.c:617 +#: ../extensions/toolbar-editor.c:631 msgid "Toolbar Editor" -msgstr "Editor panelu nástrojů" +msgstr "Editor liÅ¡ty" -#: ../extensions/toolbar-editor.c:618 +#: ../extensions/toolbar-editor.c:632 msgid "Easily edit the toolbar layout" -msgstr "Umožňuje jednoduÅ¡e změnit rozvržení panelu nástrojů" +msgstr "Umožňuje jednoduÅ¡e změnit liÅ¡tu" -#: ../extensions/web-cache.c:462 +#: ../extensions/web-cache.c:463 msgid "Cache HTTP communication on disk" -msgstr "Ukládá komunikaci HTTP do diskové mezipaměti" - -#~ msgid "Remember last window size" -#~ msgstr "Pamatovat si velikost okna" - -#~ msgid "Whether to save the last window size" -#~ msgstr "Určuje, zda se budou ukládat rozměry okna" - -#~ msgid "Last window width" -#~ msgstr "Poslední šířka okna" - -#~ msgid "The last saved window width" -#~ msgstr "Naposledy uložená šířka okna" - -#~ msgid "Last window height" -#~ msgstr "Poslední výška okna" - -#~ msgid "The last saved window height" -#~ msgstr "Naposledy uložená výška okna" - -#~ msgid "Last panel position" -#~ msgstr "Poslední pozice panelu" - -#~ msgid "The last saved panel position" -#~ msgstr "Naposledy uložená pozice panelu" - -#~ msgid "Last panel page" -#~ msgstr "Poslední stránka panelu" - -#~ msgid "The last saved panel page" -#~ msgstr "Naposledy uložená stránka panelu" - -#~ msgid "Last Web search" -#~ msgstr "Poslední hledání na webu" - -#~ msgid "The last saved Web search" -#~ msgstr "Poslední uložené vyhledávání na webu" - -#~ msgid "Show Menubar" -#~ msgstr "Zobrazit panel nabídky" - -#~ msgid "Whether to show the menubar" -#~ msgstr "Určuje, zda se bude zobrazovat panel nabídky" - -#~ msgid "Show Navigationbar" -#~ msgstr "Zobrazit panel vyhledávání" - -#~ msgid "Whether to show the navigationbar" -#~ msgstr "Určuje, zda se bude zobrazovat panel vyhledávání" - -#~ msgid "Show Bookmarkbar" -#~ msgstr "Zobrazit záložky" - -#~ msgid "Whether to show the bookmarkbar" -#~ msgstr "Určuje, zda se bude zobrazovat panel záložek" - -#~ msgid "Show Panel" -#~ msgstr "Zobrazit panel" - -#~ msgid "Whether to show the panel" -#~ msgstr "Určuje, zda se bude zobrazovat panel" - -#~ msgid "Show Statusbar" -#~ msgstr "Zobrazit stavový řádek" - -#~ msgid "Whether to show the statusbar" -#~ msgstr "Určuje, zda se bude zobrazovat panel stavu" - -#~ msgid "Toolbar Items" -#~ msgstr "Položky panelu nástrojů" - -#~ msgid "The items to show on the toolbar" -#~ msgstr "Položky zobrazované na panelu nástrojů" - -#~ msgid "Compact Sidepanel" -#~ msgstr "Kompaktní postranní panel" - -#~ msgid "Whether to make the sidepanel compact" -#~ msgstr "Určuje, zda bude postranní panel zobrazen ve zjednoduÅ¡ené podobě" - -#~ msgid "Align sidepanel on the right" -#~ msgstr "Umístit postranní panel vpravo" - -#~ msgid "Whether to align the sidepanel on the right" -#~ msgstr "Určuje, zda bude postranní panel umístěn napravo" - -#~ msgid "Open panels in separate windows" -#~ msgstr "Otevírat panely v samostatných oknech" - -#~ msgid "Whether to always open panels in separate windows" -#~ msgstr "Určuje, zda se budou panely vždy otevírat v samostatných oknech" - -#~ msgid "What to do when Midori starts" -#~ msgstr "Co se stane po spuÅ¡tění aplikace Midori" - -#~ msgid "The homepage" -#~ msgstr "Domovská stránka" - -#~ msgid "Show crash dialog" -#~ msgstr "Zobrazit dialog po pádu" - -#~ msgid "The folder downloaded files are saved to" -#~ msgstr "Složka, do níž se budou ukládat stažené soubory" - -#~ msgid "An external text editor" -#~ msgstr "Externí textový editor" - -#~ msgid "An external news aggregator" -#~ msgstr "Externí čtečka zpráv RSS" - -#~ msgid "Location entry Search" -#~ msgstr "Vyhledávání v adresním řádku" - -#~ msgid "The search to perform inside the location entry" -#~ msgstr "Vyhledávání použité v řádku s adresou" - -#~ msgid "The preferred character encoding" -#~ msgstr "Upřednostňované kódování stránek" - -#~ msgid "Always show the tabbar" -#~ msgstr "Vždy zobrazit panel karet" - -#~ msgid "Whether tabs have close buttons" -#~ msgstr "Určuje, zda budou na kartách přítomna tlačítka pro jejich zavření" - -#~ msgid "Where to open new pages" -#~ msgstr "Kde se budou otevírat nové stránky" - -#~ msgid "Whether to open new tabs in the background" -#~ msgstr "Určuje, zda se budou nové karty otevírat na pozadí" - -#~ msgid "Open popups in tabs" -#~ msgstr "Otevírat vyskakovací okna v kartách" - -#~ msgid "Whether to open popup windows in tabs" -#~ msgstr "Určuje, zda se vyskakovací okno otevře v kartě" - -#~ msgid "Load and display images automatically" -#~ msgstr "Automaticky načítat a zobrazovat obrázky" - -#~ msgid "Enable embedded scripting languages" -#~ msgstr "Povolit vložené skriptové jazyky" - -#~ msgid "Enable embedded Netscape plugin objects" -#~ msgstr "Povolit objekty zásuvných modulů aplikace Netscape" - -#~ msgid "Enable spell checking while typing" -#~ msgstr "Povolit kontrolu pravopisu při psaní" - -#~ msgid "Enable HTML5 database support" -#~ msgstr "Povolit podporu databází HTML5" - -#~ msgid "Whether to enable HTML5 database support" -#~ msgstr "Určuje, zda bude povolena podpora databází v jazyku HTML5" - -#~ msgid "Whether to enable HTML5 local storage support" -#~ msgstr "Určuje, zda budou povolena místní úložiÅ¡tě v jazyku HTML5" - -#~ msgid "Whether to enable offline web application cache" -#~ msgstr "Určuje, zda bude povoleno používání mezipaměti pro offline aplikace" - -#~ 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í" - -#~ msgid "Allow websites to use OpenGL rendering" -#~ msgstr "" -#~ "Umožnit webovým stránkám použití vykreslování pomocí knihovny OpenGL" - -#~ msgid "Whether to zoom text and images" -#~ msgstr "Určuje, zda se bude měnit velikost textu i obrázků" - -#~ msgid "Find inline while typing" -#~ msgstr "Hledat při psaní" - -#~ msgid "Whether to automatically find inline while typing" -#~ msgstr "Určuje, zda se v textu bude automaticky vyhledávat během psaní" - -#~ msgid "The type of proxy server to use" -#~ msgstr "Jaký typ serveru proxy chcete použít" - -#~ msgid "HTTP Proxy Server" -#~ msgstr "Serverproxy HTTP" - -#~ msgid "The proxy server used for HTTP connections" -#~ msgstr "Server proxy, který bude použit pro spojení HTTP" - -#~ msgid "The proxy server port used for HTTP connections" -#~ msgstr "Port serveru proxy, který bude použit pro spojení HTTP" - -#~ msgid "Identification string" -#~ msgstr "Identifikační řetězec" - -#~ msgid "The application identification string" -#~ msgstr "Identifikační řetězec aplikace" - -#~ msgid "Clear private data" -#~ msgstr "Vymazat osobní údaje" - -#~ msgid "The private data selected for deletion" -#~ msgstr "Osobní údaje byly označeny ke smazání" - -#~ msgid "Clear data" -#~ msgstr "Vymazat údaje" - -#~ msgid "The data selected for deletion" -#~ msgstr "Údaje označené pro vymazání" - -#~ msgid "Filter:" -#~ msgstr "Filtr:" - -#~ msgid "" -#~ "Enter a filter string to show only cookies whose name or domain field " -#~ "match the entered filter" -#~ msgstr "" -#~ "Vložte řetězec, podle kterého se budou cookies filtrovat. Filtruje se " -#~ "podle názvu nebo domény" - -#~ msgid "Close ot_her Tabs" -#~ msgstr "_Zavřít ostatní karty" - -#~ msgid "_Icon:" -#~ msgstr "_Ikona:" - -#~ msgid "_Bookmark" -#~ msgstr "_Záložky" - -#~ msgid "_Console" -#~ msgstr "_Konzola" - -#~ msgid "Toplevel folder" -#~ msgstr "Složka nejvyšší úrovně" - -#~ msgid "_Customize…" -#~ msgstr "_Vlastní…" - -#~ msgid "_Title:" -#~ msgstr "_Nadpis:" - -#~ msgid "_Folder:" -#~ msgstr "Složk_a:" - -#~ 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" +msgstr "KeÅ¡uje (ukládá) HTTP komunikaci na disk" #~ msgid "Don't save any private data while browsing" #~ msgstr "Neukládat při prohlížení žádná data" @@ -3043,14 +2836,14 @@ msgstr "Ukládá komunikaci HTTP do diskové mezipaměti" #~ 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 "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 "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 "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" @@ -3106,6 +2899,12 @@ msgstr "Ukládá komunikaci HTTP do diskové mezipaměti" #~ 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" @@ -3133,7 +2932,7 @@ msgstr "Ukládá komunikaci HTTP do diskové mezipaměti" #~ msgid "Reset the last _session" #~ msgstr "Vymazat poslední _sezení" -#~ msgid "Configure _Advertisement filters…" +#~ msgid "Configure _Advertisement filters..." #~ msgstr "_Blokování reklamy" #~ msgid "Not found - %s" @@ -3151,6 +2950,9 @@ msgstr "Ukládá komunikaci HTTP do diskové mezipaměti" #~ 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 "_Form History" +#~ msgstr "_Formulářová historie" + #~ msgid "Delete old cookies after 1 hour" #~ msgstr "Smazat stará cookies po hodině" @@ -3457,6 +3259,9 @@ msgstr "Ukládá komunikaci HTTP do diskové mezipaměti" #~ 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ů" @@ -3499,6 +3304,9 @@ msgstr "Ukládá komunikaci HTTP do diskové mezipaměti" #~ msgid "Encoding" #~ msgstr "Kódování" +#~ msgid "User_styles" +#~ msgstr "Uživatelské _styly" + #~ msgid "Resizable text areas" #~ msgstr "Roztažitelné oblasti pro text" @@ -3514,8 +3322,8 @@ msgstr "Ukládá komunikaci HTTP do diskové mezipaměti" #~ msgid "Load on Startup" #~ msgstr "Načíst při startu" -#~ msgid "Configure _Toolbar…" -#~ msgstr "Upravit _liÅ¡tu…" +#~ msgid "Configure _Toolbar..." +#~ msgstr "Upravit _liÅ¡tu..." #~ msgid "_Quick Find" #~ msgstr "_Rychlé hledání" @@ -3529,6 +3337,9 @@ msgstr "Ukládá komunikaci HTTP do diskové mezipaměti" #~ msgid "Warning: You are using a superuser account!" #~ msgstr "Varování: jste přihlášen(a) jako superuživatel (root)!" +#~ msgid "_Enable" +#~ msgstr "_Povolit" + #~ msgid "Enable" #~ msgstr "Povolit" diff --git a/po/da.po b/po/da.po index b8e723fe..ec3edc3e 100644 --- a/po/da.po +++ b/po/da.po @@ -8,48 +8,32 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.2.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-06 19:09+0000\n" +"POT-Creation-Date: 2011-12-14 12: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" -"X-Poedit-Country: Denmark\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 "Browse the Web" -msgstr "Gennemse internettet" - -#: ../data/midori.desktop.in.h:2 msgid "Internet;WWW;Explorer" msgstr "Internet;WWW;Stifinder" -#: ../data/midori.desktop.in.h:3 ../midori/main.c:2025 ../midori/main.c:2049 -#: ../midori/main.c:2063 ../midori/midori-websettings.c:315 +#: ../data/midori.desktop.in.h:2 +msgid "Lightweight web browser" +msgstr "Letvægtig webbrowser" + +#: ../data/midori.desktop.in.h:3 ../midori/main.c:1990 ../midori/main.c:2010 +#: ../midori/main.c:2021 ../midori/midori-websettings.c:303 msgid "Midori" msgstr "Midori" #: ../data/midori.desktop.in.h:4 -msgid "Midori Web Browser" -msgstr "Midori webbrowser" - -#: ../data/midori.desktop.in.h:5 -msgid "New Private Browsing Window" -msgstr "Nyt \"P_rivat browsing\"-vindue" - -#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1478 -msgid "New Tab" -msgstr "Nyt faneblad" - -#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1475 -msgid "New Window" -msgstr "Nyt vindue" - -#: ../data/midori.desktop.in.h:8 msgid "Web Browser" msgstr "Webbrowser" @@ -61,71 +45,81 @@ msgstr "Midori Privat browsing" 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:4494 +#: ../data/midori-private.desktop.in.h:3 msgid "Private Browsing" msgstr "Privat browsing" -#: ../midori/main.c:91 ../midori/main.c:97 +#: ../midori/main.c:96 ../midori/main.c:102 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Indstillingen kunne ikke indlæses: %s\n" -#: ../midori/main.c:145 +#: ../midori/main.c:150 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Værdien '%s' er ikke gyldig til %s" -#: ../midori/main.c:150 ../midori/main.c:254 +#: ../midori/main.c:155 ../midori/main.c:259 #, c-format msgid "Invalid configuration value '%s'" msgstr "Ugyldig indstillingsværdi '%s'" -#: ../midori/main.c:375 +#: ../midori/main.c:364 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Søgemaskinerne kunne ikke indlæses. %s\n" -#: ../midori/main.c:429 +#: ../midori/main.c:418 #, c-format msgid "Failed to clear history: %s\n" msgstr "Kunne ikke fjerne historik: %s\n" -#: ../midori/main.c:451 ../extensions/formhistory/formhistory.c:531 +#: ../midori/main.c:438 ../midori/main.c:559 ../extensions/formhistory.c:418 #, 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:523 +#: ../midori/main.c:502 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Kunne ikke fjerne gamle historikelementer: %s\n" -#: ../midori/main.c:545 +#: ../midori/main.c:542 ../panels/midori-history.c:189 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "Kunne ikke fjerne historikelementet: %s\n" + +#: ../midori/main.c:589 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "Bogmærkerne kunne ikke gemmes. %s" + +#: ../midori/main.c:611 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Indstillingen kunne ikke gemmes. %s" -#: ../midori/main.c:571 +#: ../midori/main.c:646 #, 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:608 +#: ../midori/main.c:683 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Papirkurven kunne ikke fyldes. %s" -#: ../midori/main.c:681 ../panels/midori-extensions.c:90 +#: ../midori/main.c:724 ../panels/midori-extensions.c:91 msgid "Extensions" msgstr "Udvidelser" -#: ../midori/main.c:695 +#: ../midori/main.c:738 msgid "Privacy" msgstr "Beskyttelse af privatliv" -#: ../midori/main.c:707 +#: ../midori/main.c:750 msgid "" "Cookies store login data, saved games, or user profiles for advertisement " "purposes." @@ -133,18 +127,18 @@ msgstr "" "Cookies gemmer loginddata, gemte spil eller brugerprofiler for " "marketingsformÃ¥l" -#: ../midori/main.c:763 +#: ../midori/main.c:806 #, c-format msgid "The session couldn't be saved. %s" msgstr "Sessionen kunne ikke gemmes. %s" -#: ../midori/main.c:1001 +#: ../midori/main.c:1021 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:1093 +#: ../midori/main.c:1089 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." @@ -153,225 +147,243 @@ msgstr "" "dette er sket gentagne gange, foreslÃ¥s det at prøve de følgende muligheder " "for at løse problemet." -#: ../midori/main.c:1112 +#: ../midori/main.c:1108 msgid "Modify _preferences" msgstr "Ændre _indstillinger" -#: ../midori/main.c:1116 +#: ../midori/main.c:1112 msgid "Disable all _extensions" msgstr "SlÃ¥ alle _udvidelser fra" -#: ../midori/main.c:1129 +#: ../midori/main.c:1125 msgid "Discard old tabs" msgstr "Kassér gamle faneblade" -#: ../midori/main.c:1130 ../midori/midori-websettings.c:223 +#: ../midori/main.c:1126 ../midori/midori-websettings.c:212 msgid "Show last tabs without loading" msgstr "Vis sidste faneblad uden at indlæse" -#: ../midori/main.c:1131 ../midori/midori-websettings.c:222 +#: ../midori/main.c:1127 ../midori/midori-websettings.c:211 msgid "Show last open tabs" msgstr "Vis sidste Ã¥bne faneblade" -#: ../midori/main.c:1379 ../midori/main.c:2433 +#: ../midori/main.c:1335 ../midori/main.c:2399 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Sessionen kunne ikke indlæses: %s\n" -#: ../midori/main.c:1517 +#: ../midori/main.c:1473 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Øjebliksbillede gem til: %s\n" -#: ../midori/main.c:1933 +#: ../midori/main.c:1893 msgid "Run ADDRESS as a web application" msgstr "Kør ADRESSE som et webprogram" -#: ../midori/main.c:1933 +#: ../midori/main.c:1893 msgid "ADDRESS" msgstr "ADRESSE" -#: ../midori/main.c:1936 +#: ../midori/main.c:1896 msgid "Use FOLDER as configuration folder" msgstr "Brug MAPPE som en indstillingsmappe" -#: ../midori/main.c:1936 +#: ../midori/main.c:1896 msgid "FOLDER" msgstr "MAPPE" -#: ../midori/main.c:1939 +#: ../midori/main.c:1899 msgid "Private browsing, no changes are saved" msgstr "Privat browsing. Ingen ændringer bliver gemt" -#: ../midori/main.c:1941 +#: ../midori/main.c:1901 msgid "Show a diagnostic dialog" msgstr "Vis en nedbrudsdialog" -#: ../midori/main.c:1943 +#: ../midori/main.c:1903 msgid "Run the specified filename as javascript" msgstr "Kør det angivne filnavn som javascript" -#: ../midori/main.c:1945 +#: ../midori/main.c:1905 msgid "Take a snapshot of the specified URI" msgstr "Tag et øjebliksbillede at det angivne URI" -#: ../midori/main.c:1947 +#: ../midori/main.c:1907 msgid "Execute the specified command" msgstr "Kør den angivne kommando" -#: ../midori/main.c:1949 +#: ../midori/main.c:1909 msgid "List available commands to execute with -e/ --execute" msgstr "Vis tilgængelige kommandoer for kør med -e/ --execute" -#: ../midori/main.c:1951 +#: ../midori/main.c:1911 msgid "Display program version" msgstr "Vis programversion" -#: ../midori/main.c:1953 +#: ../midori/main.c:1913 msgid "Addresses" msgstr "Adresser" -#: ../midori/main.c:1955 +#: ../midori/main.c:1915 msgid "Block URIs according to regular expression PATTERN" msgstr "Blokér URI'er i overensstemmelse med regulære udtryks-MØNSTRE" -#: ../midori/main.c:1955 +#: ../midori/main.c:1915 msgid "PATTERN" msgstr "MØNSTRE" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1959 +#: ../midori/main.c:1919 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "Nulstil Midori efter SECONDS sekunders inaktivitet" -#: ../midori/main.c:1959 +#: ../midori/main.c:1919 msgid "SECONDS" msgstr "SEKUNDER" -#: ../midori/main.c:1962 +#: ../midori/main.c:1922 msgid "Redirects console warnings to the specified FILENAME" msgstr "Videresender konsoladvarsler til det angivne FILENAME" -#: ../midori/main.c:1962 +#: ../midori/main.c:1922 msgid "FILENAME" msgstr "FILENAME" -#: ../midori/main.c:2064 +#: ../midori/main.c:1987 +msgid "[Addresses]" +msgstr "[Adresser]" + +#: ../midori/main.c:1997 +msgid "The specified configuration folder is invalid." +msgstr "Den angivne indstillingsmappe er ikke gyldig." + +#: ../midori/main.c:2022 msgid "Please report comments, suggestions and bugs to:" msgstr "Rapportér venligst kommentarer, forslag og fejl til:" -#: ../midori/main.c:2066 +#: ../midori/main.c:2024 msgid "Check for new versions at:" msgstr "Tjek for nye versioner hos:" +#: ../midori/main.c:2107 +msgid "Website icons" +msgstr "Webstedikoner" + #. i18n: Logins and passwords in websites and web forms -#: ../midori/main.c:2161 +#: ../midori/main.c:2110 msgid "Saved logins and _passwords" msgstr "Gemte logins og _adgangskoder" -#: ../midori/main.c:2163 -msgid "Cookies and Website data" -msgstr "Cookies og websideinformation" +#: ../midori/main.c:2112 +msgid "Cookies" +msgstr "Cookies" -#. TODO: Preserve page icons of search engines and merge privacy items -#: ../midori/main.c:2167 ../midori/midori-websettings.c:1020 +#: ../midori/main.c:2115 +msgid "'Flash' Cookies" +msgstr "'Flash' cookies" + +#: ../midori/main.c:2118 +msgid "HTML5 _Databases" +msgstr "HTML5-databaser" + +#: ../midori/main.c:2121 ../midori/midori-websettings.c:936 #: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471 msgid "Web Cache" msgstr "Webcache" -#: ../midori/main.c:2170 -msgid "Website icons" -msgstr "Webstedikoner" +#: ../midori/main.c:2123 +msgid "Offline Application Cache" +msgstr "Ikke tilsluttet program-cache" -#: ../midori/main.c:2274 +#: ../midori/main.c:2228 msgid "An unknown error occured" msgstr "En ukendt fejl opstod" -#: ../midori/main.c:2381 +#: ../midori/main.c:2330 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:2415 +#: ../midori/main.c:2366 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Bogmærkerne kunne ikke indlæses: %s\n" -#: ../midori/main.c:2448 +#: ../midori/main.c:2414 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Papirkurven kunne ikke indlæses: %s\n" -#: ../midori/main.c:2461 +#: ../midori/main.c:2427 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Historikken kunne ikke indlæses: %s\n" -#: ../midori/main.c:2476 +#: ../midori/main.c:2443 msgid "The following errors occured:" msgstr "De følgende fejl opstod:" -#: ../midori/main.c:2492 +#: ../midori/main.c:2459 msgid "_Ignore" msgstr "_Ignorér" -#: ../midori/midori-app.c:1155 ../midori/midori-browser.c:545 -#, c-format -msgid "Unexpected action '%s'." -msgstr "Uventet handling '%s'." +#: ../midori/midori-app.c:1333 +msgid "_Bookmark" +msgstr "_Bogmærke" -#: ../midori/midori-app.c:1457 ../midori/midori-browser.c:6431 +#: ../midori/midori-app.c:1334 ../midori/midori-browser.c:5982 msgid "_Bookmarks" msgstr "_Bogmærker" -#: ../midori/midori-app.c:1458 +#: ../midori/midori-app.c:1335 msgid "Add Boo_kmark" msgstr "_Tilføj bogmærke" -#: ../midori/midori-app.c:1459 +#: ../midori/midori-app.c:1336 +msgid "_Console" +msgstr "_Konsol" + +#: ../midori/midori-app.c:1337 msgid "_Extensions" msgstr "_Udvidelser" #. i18n: Browsing history, visited web pages, closed tabs -#: ../midori/midori-app.c:1460 ../midori/midori-browser.c:4887 +#: ../midori/midori-app.c:1338 ../midori/midori-browser.c:4544 msgid "_History" msgstr "Hi_storik" -#: ../midori/midori-app.c:1461 +#: ../midori/midori-app.c:1339 +msgid "_Homepage" +msgstr "_Hjemmeside" + +#: ../midori/midori-app.c:1340 msgid "_Userscripts" msgstr "Brugerskri_pter" -#: ../midori/midori-app.c:1462 -msgid "User_styles" -msgstr "Bruger_grænseflader" - -#: ../midori/midori-app.c:1463 +#: ../midori/midori-app.c:1341 msgid "New _Tab" msgstr "Nyt _faneblad" -#: ../midori/midori-app.c:1464 +#: ../midori/midori-app.c:1342 msgid "_Transfers" msgstr "_Overførsler" -#: ../midori/midori-app.c:1465 +#: ../midori/midori-app.c:1343 msgid "Netscape p_lugins" msgstr "Netscape-u_dvidelsesmoduler" -#: ../midori/midori-app.c:1466 +#: ../midori/midori-app.c:1344 msgid "_Closed Tabs" msgstr "_Luk faneblade" -#: ../midori/midori-app.c:1467 ../midori/midori-browser.c:5570 +#: ../midori/midori-app.c:1345 ../midori/midori-browser.c:5129 msgid "New _Window" msgstr "Nyt _vindue" -#: ../midori/midori-app.c:1468 +#: ../midori/midori-app.c:1346 msgid "New _Folder" msgstr "Ny __mappe" -#: ../midori/midori-app.c:1497 -msgid "[Addresses]" -msgstr "[Adresser]" - #: ../midori/midori-array.c:522 msgid "File not found." msgstr "Fil blev ikke fundet." @@ -389,123 +401,124 @@ msgstr "Ukendt bogmærkeformat." msgid "Writing failed." msgstr "Skrivning fejlede." -#: ../midori/midori-browser.c:364 ../midori/midori-browser.c:5658 -#: ../midori/midori-browser.c:5667 +#: ../midori/midori-browser.c:332 ../midori/midori-browser.c:5211 +#: ../midori/midori-browser.c:5220 msgid "Reload the current page" msgstr "Genindlæs den nuværende side" -#: ../midori/midori-browser.c:373 ../midori/midori-browser.c:5664 +#: ../midori/midori-browser.c:341 ../midori/midori-browser.c:5217 msgid "Stop loading the current page" msgstr "Stop indlæsning af nuværende side" -#: ../midori/midori-browser.c:530 +#: ../midori/midori-browser.c:466 #, c-format msgid "Failed to update title: %s\n" msgstr "Kunne ikke opdatere titel: %s\n" -#: ../midori/midori-browser.c:625 +#: ../midori/midori-browser.c:479 +#, c-format +msgid "Unexpected action '%s'." +msgstr "Uventet handling '%s'." + +#: ../midori/midori-browser.c:572 #, c-format msgid "%s (Private Browsing)" msgstr "%s (Privat browsing)" -#: ../midori/midori-browser.c:735 ../midori/midori-browser.c:777 -#: ../panels/midori-bookmarks.c:114 -msgid "Bookmarks" -msgstr "Bogmærker" +#: ../midori/midori-browser.c:682 ../midori/midori-browser.c:715 +msgid "Toplevel folder" +msgstr "Øverste mappe" -#: ../midori/midori-browser.c:837 +#: ../midori/midori-browser.c:772 msgid "New folder" msgstr "Ny mappe" -#: ../midori/midori-browser.c:837 +#: ../midori/midori-browser.c:772 msgid "Edit folder" msgstr "Redigér mappe" -#: ../midori/midori-browser.c:839 +#: ../midori/midori-browser.c:774 msgid "New bookmark" msgstr "Nyt bogmærke" -#: ../midori/midori-browser.c:839 +#: ../midori/midori-browser.c:774 msgid "Edit bookmark" msgstr "Redigér bogmærke" -#: ../midori/midori-browser.c:873 -msgid "Type a name for this bookmark and choose where to keep it." -msgstr "Indtast et navn til dette bogmærker og vælg hvor det skal gemmes." +#: ../midori/midori-browser.c:805 +msgid "_Title:" +msgstr "_Titel:" -#: ../midori/midori-browser.c:934 +#: ../midori/midori-browser.c:825 ../midori/midori-searchaction.c:966 +#: ../extensions/feed-panel/main.c:377 +msgid "_Address:" +msgstr "_Adresse:" + +#: ../midori/midori-browser.c:848 ../midori/midori-browser.c:4279 +msgid "_Folder:" +msgstr "_Mappe:" + +#: ../midori/midori-browser.c:864 msgid "Add to _Speed Dial" msgstr "Tilføj til hurtig_opkald" -#: ../midori/midori-browser.c:940 +#: ../midori/midori-browser.c:877 msgid "Show in the tool_bar" msgstr "Vis pÃ¥ vær_ktøjsbjælken" -#: ../midori/midori-browser.c:948 +#: ../midori/midori-browser.c:892 msgid "Run as _web application" msgstr "Kør so_m et webprogram" -#: ../midori/midori-browser.c:1019 +#: ../midori/midori-browser.c:963 #, 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:1021 +#: ../midori/midori-browser.c:965 #, 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:1028 +#: ../midori/midori-browser.c:972 #, 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:1031 +#: ../midori/midori-browser.c:975 #, 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:1167 ../midori/midori-browser.c:4691 +#: ../midori/midori-browser.c:1019 ../midori/midori-browser.c:4349 msgid "Save file as" msgstr "Gem fil som" -#: ../midori/midori-browser.c:1173 -msgid "Save associated _resources" -msgstr "Gem associerede _ressourcer" +#: ../midori/midori-browser.c:1328 +msgid "New Window" +msgstr "Nyt vindue" -#: ../midori/midori-browser.c:1475 +#: ../midori/midori-browser.c:1328 msgid "A new window has been opened" msgstr "Et nyt vindue er blevet Ã¥bnet" -#: ../midori/midori-browser.c:1478 +#: ../midori/midori-browser.c:1331 +msgid "New Tab" +msgstr "Nyt faneblad" + +#: ../midori/midori-browser.c:1331 msgid "A new tab has been opened" msgstr "Et nyt faneblad er blevet Ã¥bnet" -#: ../midori/midori-browser.c:1495 -msgid "Error opening the image!" -msgstr "Fejl ved Ã¥bning af billedet!" - -#: ../midori/midori-browser.c:1496 -msgid "Can not open selected image in a default viewer." -msgstr "Kan ikke Ã¥bne billedet i standardfremviser." - -#: ../midori/midori-browser.c:1502 -msgid "Error downloading the image!" -msgstr "Fejl ved hentning af billedet!" - -#: ../midori/midori-browser.c:1503 -msgid "Can not download selected image." -msgstr "Kan ikke hente valgte billede." - -#: ../midori/midori-browser.c:1624 +#: ../midori/midori-browser.c:1368 msgid "Save file" msgstr "Gem fil" -#: ../midori/midori-browser.c:2527 +#: ../midori/midori-browser.c:2260 msgid "Open file" msgstr "Åbn fil" -#: ../midori/midori-browser.c:2659 +#: ../midori/midori-browser.c:2391 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" @@ -520,153 +533,139 @@ msgstr "" "nyhedslæser. Næste kan man trykker pÃ¥ ikonet med nyhedsfeed, vil det " "automatisk blive tilføjet." -#: ../midori/midori-browser.c:2665 ../extensions/feed-panel/main.c:365 +#: ../midori/midori-browser.c:2397 ../extensions/feed-panel/main.c:365 msgid "New feed" msgstr "Nyt feed" -#: ../midori/midori-browser.c:2708 ../midori/midori-browser.c:5730 -#: ../panels/midori-bookmarks.c:527 +#: ../midori/midori-browser.c:2440 ../midori/midori-browser.c:5280 +#: ../panels/midori-bookmarks.c:426 msgid "Add a new bookmark" msgstr "Tilføj et nyt bogmærke" -#: ../midori/midori-browser.c:3252 ../midori/midori-searchaction.c:487 +#: ../midori/midori-browser.c:2937 ../midori/midori-searchaction.c:487 msgid "Empty" msgstr "Tom" -#: ../midori/midori-browser.c:3695 ../midori/midori-browser.c:3696 +#: ../midori/midori-browser.c:3432 msgid "Toggle text cursor navigation" msgstr "SlÃ¥ cursorbaseret navigation til og fra" -#: ../midori/midori-browser.c:3698 -msgid "" -"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in " -"all websites." -msgstr "" - -#: ../midori/midori-browser.c:3701 -msgid "_Enable Caret Browsing" -msgstr "SlÃ¥ Ca_ret browsing til" - -#: ../midori/midori-browser.c:4091 ../midori/midori-browser.c:6124 +#: ../midori/midori-browser.c:3741 ../midori/midori-browser.c:5679 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Kunne ikke indsætte nyt historikelement: %s\n" -#: ../midori/midori-browser.c:4417 ../panels/midori-bookmarks.c:850 -#: ../panels/midori-history.c:806 +#: ../midori/midori-browser.c:4076 ../panels/midori-bookmarks.c:742 +#: ../panels/midori-history.c:747 msgid "Open all in _Tabs" msgstr "Åbn alt i _faneblade" -#: ../midori/midori-browser.c:4424 ../panels/midori-bookmarks.c:856 -#: ../panels/midori-history.c:812 ../extensions/feed-panel/feed-panel.c:528 +#: ../midori/midori-browser.c:4083 ../panels/midori-bookmarks.c:748 +#: ../panels/midori-history.c:753 ../extensions/feed-panel/feed-panel.c:528 msgid "Open in New _Tab" msgstr "Åbn i nyt _faneblad" -#: ../midori/midori-browser.c:4427 ../midori/midori-view.c:2940 -#: ../midori/midori-view.c:5071 ../panels/midori-bookmarks.c:858 -#: ../panels/midori-history.c:814 ../extensions/feed-panel/feed-panel.c:530 +#: ../midori/midori-browser.c:4086 ../midori/midori-view.c:2517 +#: ../midori/midori-view.c:4367 ../panels/midori-bookmarks.c:750 +#: ../panels/midori-history.c:755 ../extensions/feed-panel/feed-panel.c:530 msgid "Open in New _Window" msgstr "Åbn i nyt _vindue" -#: ../midori/midori-browser.c:4516 +#: ../midori/midori-browser.c:4166 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4517 +#: ../midori/midori-browser.c:4167 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4518 +#: ../midori/midori-browser.c:4168 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4519 +#: ../midori/midori-browser.c:4169 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4520 +#: ../midori/midori-browser.c:4170 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4521 +#: ../midori/midori-browser.c:4171 #, c-format msgid "Firefox (%s)" msgstr "Firefox (%s)" -#: ../midori/midori-browser.c:4522 -msgid "Midori 0.2.6" -msgstr "Midori 0.2.6" - -#: ../midori/midori-browser.c:4543 -msgid "Import bookmarks…" -msgstr "Importér bogmærker…" +#: ../midori/midori-browser.c:4192 +msgid "Import bookmarks..." +msgstr "Importér bogmærker..." -#: ../midori/midori-browser.c:4546 ../midori/midori-browser.c:5735 +#: ../midori/midori-browser.c:4195 ../midori/midori-browser.c:5285 msgid "_Import bookmarks" msgstr "_Importér bogmærker" -#: ../midori/midori-browser.c:4557 +#: ../midori/midori-browser.c:4206 msgid "_Application:" msgstr "_Program:" -#: ../midori/midori-browser.c:4622 +#: ../midori/midori-browser.c:4271 msgid "Import from XBEL or HTML file" msgstr "Importér fra XBEL- eller HTML-fil" -#: ../midori/midori-browser.c:4650 +#: ../midori/midori-browser.c:4306 msgid "Import from a file" msgstr "Importér fra en fil" -#: ../midori/midori-browser.c:4662 +#: ../midori/midori-browser.c:4318 msgid "Failed to import bookmarks" msgstr "Kunne ikke importere bogmærker" -#: ../midori/midori-browser.c:4696 +#: ../midori/midori-browser.c:4354 msgid "XBEL Bookmarks" msgstr "XBEL bogmærker" -#: ../midori/midori-browser.c:4701 +#: ../midori/midori-browser.c:4359 msgid "Netscape Bookmarks" msgstr "Netscape bogmærker" -#: ../midori/midori-browser.c:4715 +#: ../midori/midori-browser.c:4373 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:4730 +#: ../midori/midori-browser.c:4389 msgid "Failed to export bookmarks" msgstr "Kunne ikke eksportere bogmærker" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4852 +#: ../midori/midori-browser.c:4511 msgid "Clear Private Data" msgstr "Ryd private data" -#: ../midori/midori-browser.c:4856 +#: ../midori/midori-browser.c:4515 msgid "_Clear private data" msgstr "_Ryd private data" -#: ../midori/midori-browser.c:4871 +#: ../midori/midori-browser.c:4528 msgid "Clear the following data:" msgstr "Ryd de følgende data:" -#: ../midori/midori-browser.c:4881 +#: ../midori/midori-browser.c:4538 msgid "Last open _tabs" msgstr "Sidste Ã¥bne _faneblade" -#: ../midori/midori-browser.c:4907 +#: ../midori/midori-browser.c:4564 msgid "Clear private data when _quitting Midori" msgstr "_Ryd private data nÃ¥r Midori afsluttes" -#: ../midori/midori-browser.c:5122 +#: ../midori/midori-browser.c:4740 msgid "A lightweight web browser." msgstr "En letvægt-webbrowser." -#: ../midori/midori-browser.c:5123 +#: ../midori/midori-browser.c:4741 msgid "See about:version for version info." msgstr "Se about:version for versionsinfo." -#: ../midori/midori-browser.c:5125 +#: ../midori/midori-browser.c:4743 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 " @@ -678,7 +677,7 @@ msgstr "" "publiceret af Free Software Foundation: Enten version 2.1 af licensen eller " "(dit frie valg) en senere version." -#: ../midori/midori-browser.c:5155 +#: ../midori/midori-browser.c:4764 msgid "translator-credits" msgstr "" "Per Kongstad \n" @@ -686,993 +685,905 @@ msgstr "" "Dansk-gruppen \n" "Mere info: http://www.dansk-gruppen.dk" -#: ../midori/midori-browser.c:5568 +#: ../midori/midori-browser.c:5127 msgid "_File" msgstr "_Fil" -#: ../midori/midori-browser.c:5571 +#: ../midori/midori-browser.c:5130 msgid "Open a new window" msgstr "Åbn et nyt vindue" -#: ../midori/midori-browser.c:5574 +#: ../midori/midori-browser.c:5133 msgid "Open a new tab" msgstr "Åbn et nyt faneblad" -#: ../midori/midori-browser.c:5576 +#: ../midori/midori-browser.c:5135 msgid "New P_rivate Browsing Window" msgstr "Nyt vindue til p_rivat browsing" -#: ../midori/midori-browser.c:5580 +#: ../midori/midori-browser.c:5139 msgid "Open a file" msgstr "Åbn en fil" -#: ../midori/midori-browser.c:5582 -msgid "_Save Page As…" -msgstr "Gem side _som…" +#: ../midori/midori-browser.c:5141 +msgid "_Save Page As..." +msgstr "Gem side _som..." -#: ../midori/midori-browser.c:5583 +#: ../midori/midori-browser.c:5142 msgid "Save to a file" msgstr "Gem til en fil" -#: ../midori/midori-browser.c:5585 +#: ../midori/midori-browser.c:5144 msgid "Add to Speed _dial" msgstr "Tilføj til hurtig_opkald" -#: ../midori/midori-browser.c:5589 +#: ../midori/midori-browser.c:5148 msgid "Add Shortcut to the _desktop" msgstr "Tilføj genvej til _skrivebordet" -#: ../midori/midori-browser.c:5591 +#: ../midori/midori-browser.c:5150 msgid "Create _Launcher" msgstr "Opret _opstarter" -#: ../midori/midori-browser.c:5595 +#: ../midori/midori-browser.c:5154 msgid "Subscribe to News _feed" msgstr "Abonnér pÃ¥ _nyhedskilder" -#: ../midori/midori-browser.c:5601 +#: ../midori/midori-browser.c:5160 msgid "_Close Tab" msgstr "_Luk faneblad" -#: ../midori/midori-browser.c:5602 +#: ../midori/midori-browser.c:5161 msgid "Close the current tab" msgstr "Luk nuværende faneblad" -#: ../midori/midori-browser.c:5604 +#: ../midori/midori-browser.c:5163 msgid "C_lose Window" msgstr "Lu_k vinduet" -#: ../midori/midori-browser.c:5608 -msgid "_Share" -msgstr "_Del" - -#: ../midori/midori-browser.c:5613 +#: ../midori/midori-browser.c:5167 msgid "Print the current page" msgstr "Udskriv nuværende side" -#: ../midori/midori-browser.c:5616 +#: ../midori/midori-browser.c:5169 msgid "Close a_ll Windows" msgstr "Luk a_lle vinduer" -#: ../midori/midori-browser.c:5619 +#: ../midori/midori-browser.c:5172 msgid "_Edit" msgstr "_Redigér" -#: ../midori/midori-browser.c:5642 -msgid "_Find…" -msgstr "_Find…" +#: ../midori/midori-browser.c:5195 +msgid "_Find..." +msgstr "_Find..." -#: ../midori/midori-browser.c:5643 +#: ../midori/midori-browser.c:5196 msgid "Find a word or phrase in the page" msgstr "Find et ord eller sætning pÃ¥ siden" -#: ../midori/midori-browser.c:5645 +#: ../midori/midori-browser.c:5198 msgid "Find _Next" msgstr "Find _næste" -#: ../midori/midori-browser.c:5648 +#: ../midori/midori-browser.c:5201 msgid "Find _Previous" msgstr "Find _forrige" -#: ../midori/midori-browser.c:5652 +#: ../midori/midori-browser.c:5205 msgid "Configure the application preferences" msgstr "Indstil programindstillingerne" -#: ../midori/midori-browser.c:5654 +#: ../midori/midori-browser.c:5207 msgid "_View" msgstr "_Vis" -#: ../midori/midori-browser.c:5655 +#: ../midori/midori-browser.c:5208 msgid "_Toolbars" msgstr "_Værktøjsbjælker" -#: ../midori/midori-browser.c:5660 +#: ../midori/midori-browser.c:5213 msgid "Reload page without caching" msgstr "Genindlæs side uden caching" -#: ../midori/midori-browser.c:5670 +#: ../midori/midori-browser.c:5223 msgid "Increase the zoom level" msgstr "Forøg forstørrelsesniveauet" -#: ../midori/midori-browser.c:5673 +#: ../midori/midori-browser.c:5226 msgid "Decrease the zoom level" msgstr "Formindsk forstørrelsesniveauet" -#: ../midori/midori-browser.c:5677 +#: ../midori/midori-browser.c:5230 msgid "_Encoding" msgstr "_Kodning" -#: ../midori/midori-browser.c:5679 +#: ../midori/midori-browser.c:5232 msgid "View So_urce" msgstr "Vis _kilde" -#: ../midori/midori-browser.c:5682 +#: ../midori/midori-browser.c:5235 msgid "Ca_ret Browsing" msgstr "Ca_ret browsing" -#: ../midori/midori-browser.c:5686 +#: ../midori/midori-browser.c:5239 msgid "Toggle fullscreen view" msgstr "SlÃ¥ fuldskærmstilstande til/fra" -#: ../midori/midori-browser.c:5688 +#: ../midori/midori-browser.c:5241 msgid "Scroll _Left" msgstr "Rul til _venstre" -#: ../midori/midori-browser.c:5691 +#: ../midori/midori-browser.c:5244 msgid "Scroll _Down" msgstr "Rul _ned" -#: ../midori/midori-browser.c:5694 +#: ../midori/midori-browser.c:5247 msgid "Scroll _Up" msgstr "Rul _op" -#: ../midori/midori-browser.c:5697 +#: ../midori/midori-browser.c:5250 msgid "Scroll _Right" msgstr "Rul til _højre" -#: ../midori/midori-browser.c:5700 -msgid "_Readable" -msgstr "_Læsbar" - -#: ../midori/midori-browser.c:5703 +#: ../midori/midori-browser.c:5253 msgid "_Go" msgstr "_GÃ¥ til" -#: ../midori/midori-browser.c:5706 +#: ../midori/midori-browser.c:5256 msgid "Go back to the previous page" msgstr "GÃ¥ til forrige side" -#: ../midori/midori-browser.c:5709 +#: ../midori/midori-browser.c:5259 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:5713 +#: ../midori/midori-browser.c:5263 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:5717 +#: ../midori/midori-browser.c:5267 msgid "Go to the next sub-page" msgstr "GÃ¥ til den næste underside" -#: ../midori/midori-browser.c:5719 -msgid "_Homepage" -msgstr "_Hjemmeside" - -#: ../midori/midori-browser.c:5720 +#: ../midori/midori-browser.c:5270 msgid "Go to your homepage" msgstr "GÃ¥ til din hjemmeside" -#: ../midori/midori-browser.c:5722 +#: ../midori/midori-browser.c:5272 msgid "Empty Trash" msgstr "Tøm papirkurven" -#: ../midori/midori-browser.c:5725 +#: ../midori/midori-browser.c:5275 msgid "Undo _Close Tab" msgstr "Fortryd lu_k faneblad" -#: ../midori/midori-browser.c:5732 +#: ../midori/midori-browser.c:5282 msgid "Add a new _folder" msgstr "Tilføj en ny _mappe" -#: ../midori/midori-browser.c:5738 +#: ../midori/midori-browser.c:5288 msgid "_Export bookmarks" msgstr "_Eksportér bogmærker" -#: ../midori/midori-browser.c:5741 ../midori/midori-searchaction.c:496 +#: ../midori/midori-browser.c:5291 ../midori/midori-searchaction.c:496 msgid "_Manage Search Engines" msgstr "_HÃ¥ndtér søgemaskiner" -#: ../midori/midori-browser.c:5744 +#: ../midori/midori-browser.c:5294 msgid "_Clear Private Data" msgstr "_Ryd private data" -#: ../midori/midori-browser.c:5747 +#: ../midori/midori-browser.c:5297 msgid "_Inspect Page" msgstr "_Undersøg side" -#: ../midori/midori-browser.c:5751 +#: ../midori/midori-browser.c:5301 msgid "_Previous Tab" msgstr "_Forrige faneblad" -#: ../midori/midori-browser.c:5754 +#: ../midori/midori-browser.c:5304 msgid "_Next Tab" msgstr "_Næste faneblad" -#: ../midori/midori-browser.c:5756 +#: ../midori/midori-browser.c:5306 msgid "Move Tab _Backward" msgstr "Flyt faneblad _tilbage" -#: ../midori/midori-browser.c:5758 +#: ../midori/midori-browser.c:5308 msgid "_Move Tab Forward" msgstr "Flyt faneblad _frem" -#: ../midori/midori-browser.c:5761 +#: ../midori/midori-browser.c:5311 msgid "Focus _Current Tab" msgstr "Fokus pÃ¥ _nuværende faneblad" -#: ../midori/midori-browser.c:5764 +#: ../midori/midori-browser.c:5314 msgid "Focus _Next view" msgstr "Fokus _næste visning" -#: ../midori/midori-browser.c:5767 +#: ../midori/midori-browser.c:5317 msgid "Only show the Icon of the _Current Tab" msgstr "Vis kun ikonet for _nuværende faneblad" -#: ../midori/midori-browser.c:5770 +#: ../midori/midori-browser.c:5320 msgid "_Duplicate Current Tab" msgstr "_Dublér nuværende faneblad" -#: ../midori/midori-browser.c:5773 +#: ../midori/midori-browser.c:5323 msgid "Close Ot_her Tabs" msgstr "Luk a_ndre faneblade" -#: ../midori/midori-browser.c:5776 +#: ../midori/midori-browser.c:5326 msgid "Open last _session" msgstr "Åbn den sidste _session" -#: ../midori/midori-browser.c:5779 +#: ../midori/midori-browser.c:5329 msgid "_Help" msgstr "_Hjælp" -#: ../midori/midori-browser.c:5781 +#: ../midori/midori-browser.c:5331 msgid "_Frequent Questions" msgstr "_Ofte stillede spørgsmÃ¥l" -#: ../midori/midori-browser.c:5784 -msgid "_Report a Problem…" -msgstr "_Rapportér en fejl…" +#: ../midori/midori-browser.c:5334 +msgid "_Report a Problem..." +msgstr "_Rapportér en fejl..." -#: ../midori/midori-browser.c:5789 ../midori/midori-browser.c:6450 -msgid "_Tools" -msgstr "Værk_tøjer" - -#: ../midori/midori-browser.c:5796 +#: ../midori/midori-browser.c:5346 msgid "_Menubar" msgstr "_Menubjælke" -#: ../midori/midori-browser.c:5800 +#: ../midori/midori-browser.c:5350 msgid "_Navigationbar" msgstr "_Navigeringsbjælke" -#: ../midori/midori-browser.c:5804 +#: ../midori/midori-browser.c:5354 msgid "Side_panel" msgstr "Side_panel" -#: ../midori/midori-browser.c:5805 +#: ../midori/midori-browser.c:5355 msgid "Sidepanel" msgstr "Sidepanel" -#: ../midori/midori-browser.c:5808 +#: ../midori/midori-browser.c:5358 msgid "_Bookmarkbar" msgstr "_Bogmærkebjælke" -#: ../midori/midori-browser.c:5812 +#: ../midori/midori-browser.c:5362 msgid "_Statusbar" msgstr "_Statusbjælke" -#: ../midori/midori-browser.c:5821 ../midori/midori-websettings.c:314 +#: ../midori/midori-browser.c:5371 ../midori/midori-websettings.c:302 msgid "_Automatic" msgstr "_Automatisk" -#: ../midori/midori-browser.c:5824 ../midori/midori-websettings.c:238 -msgid "Chinese Traditional (BIG5)" -msgstr "Traditionel kinesisk (BIG5)" - -#: ../midori/midori-browser.c:5827 ../midori/midori-websettings.c:239 -msgid "Chinese Simplified (GB18030)" -msgstr "Simpelt kinesisk (GB18030)" +#: ../midori/midori-browser.c:5374 ../midori/midori-websettings.c:227 +msgid "Chinese (BIG5)" +msgstr "Kinesisk (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5831 +#: ../midori/midori-browser.c:5378 msgid "Japanese (SHIFT__JIS)" msgstr "Japansk (SHIFT__JIS)" -#: ../midori/midori-browser.c:5834 ../midori/midori-websettings.c:241 +#: ../midori/midori-browser.c:5381 ../midori/midori-websettings.c:229 msgid "Korean (EUC-KR)" msgstr "Koreansk (EUC-KR)" -#: ../midori/midori-browser.c:5837 ../midori/midori-websettings.c:242 +#: ../midori/midori-browser.c:5384 ../midori/midori-websettings.c:230 msgid "Russian (KOI8-R)" msgstr "Russisk (KOI8-R)" -#: ../midori/midori-browser.c:5840 ../midori/midori-websettings.c:243 +#: ../midori/midori-browser.c:5387 ../midori/midori-websettings.c:231 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5843 ../midori/midori-websettings.c:244 +#: ../midori/midori-browser.c:5390 ../midori/midori-websettings.c:232 msgid "Western (ISO-8859-1)" msgstr "Vestlig (ISO-8859-1)" -#: ../midori/midori-browser.c:5846 -msgid "Custom…" -msgstr "Tilpasset…" +#: ../midori/midori-browser.c:5393 ../midori/midori-websettings.c:233 +#: ../midori/midori-websettings.c:308 ../katze/katze-utils.c:635 +msgid "Custom..." +msgstr "Tilpasset..." -#: ../midori/midori-browser.c:6356 +#: ../midori/midori-browser.c:5909 msgid "_Separator" msgstr "_Separator" -#: ../midori/midori-browser.c:6363 -msgid "_Location…" -msgstr "_Sted…" +#: ../midori/midori-browser.c:5916 +msgid "_Location..." +msgstr "_Sted..." -#: ../midori/midori-browser.c:6365 +#: ../midori/midori-browser.c:5918 msgid "Open a particular location" msgstr "Åbn et særligt sted" -#: ../midori/midori-browser.c:6387 -msgid "_Web Search…" -msgstr "_Websøgning…" +#: ../midori/midori-browser.c:5940 +msgid "_Web Search..." +msgstr "_Websøgning..." -#: ../midori/midori-browser.c:6389 +#: ../midori/midori-browser.c:5942 msgid "Run a web search" msgstr "Kør en websøgnig" -#: ../midori/midori-browser.c:6416 +#: ../midori/midori-browser.c:5969 msgid "Reopen a previously closed tab or window" msgstr "GenÃ¥bn et tidligere lukket faneblad eller vindue" -#: ../midori/midori-browser.c:6433 +#: ../midori/midori-browser.c:5984 msgid "Show the saved bookmarks" msgstr "Vis de gemte bogmærker" -#: ../midori/midori-browser.c:6466 +#: ../midori/midori-browser.c:5998 +msgid "_Tools" +msgstr "Værk_tøjer" + +#: ../midori/midori-browser.c:6013 msgid "_Window" msgstr "Vin_due" -#: ../midori/midori-browser.c:6468 +#: ../midori/midori-browser.c:6015 msgid "Show a list of all open tabs" msgstr "Vis en liste med alle Ã¥bne faneblade" -#: ../midori/midori-browser.c:6482 +#: ../midori/midori-browser.c:6029 msgid "_Menu" msgstr "_Menu" -#: ../midori/midori-browser.c:6484 +#: ../midori/midori-browser.c:6031 msgid "Menu" msgstr "Menu" -#: ../midori/midori-browser.c:7309 +#: ../midori/midori-browser.c:6711 #, c-format msgid "Unexpected setting '%s'" msgstr "Uventet indstilling '%s'" -#: ../midori/midori-extension.c:329 +#: ../midori/midori-extension.c:310 #, c-format 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-extension.c:747 ../midori/midori-extension.c:844 -#: ../midori/midori-extension.c:941 ../midori/midori-extension.c:1053 -#: ../extensions/addons.c:1688 +#: ../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 "Indstillingen af udvidelsesmodulet '%s' kunne ikke gemmes: %s\n" -#: ../midori/midori-locationaction.c:394 -#, c-format -msgid "Search with %s" -msgstr "Søg med %s" - -#: ../midori/midori-locationaction.c:414 -msgid "Search with…" -msgstr "Søg med…" - -#: ../midori/midori-locationaction.c:541 +#: ../midori/midori-locationaction.c:425 #, c-format msgid "Failed to select from history\n" msgstr "Kunne ikke vælge fra historik\n" -#: ../midori/midori-locationaction.c:628 +#: ../midori/midori-locationaction.c:509 #, c-format msgid "Search for %s" msgstr "Søg efter %s" -#: ../midori/midori-locationaction.c:1195 -msgid "Export certificate" -msgstr "Eksportér certifikat" - -#: ../midori/midori-locationaction.c:1227 -msgid "The signing certificate authority is not known." -msgstr "" - -#: ../midori/midori-locationaction.c:1229 -msgid "" -"The certificate does not match the expected identity of the site that it was " -"retrieved from." -msgstr "" - -#: ../midori/midori-locationaction.c:1231 -msgid "The certificate's activation time is still in the future." -msgstr "" - -#: ../midori/midori-locationaction.c:1233 -msgid "The certificate has expired" -msgstr "" - -#: ../midori/midori-locationaction.c:1235 -msgid "" -"The certificate has been revoked according to the GTlsConnection's " -"certificate revocation list." -msgstr "" - -#: ../midori/midori-locationaction.c:1237 -msgid "The certificate's algorithm is considered insecure." -msgstr "" - -#: ../midori/midori-locationaction.c:1239 -msgid "Some other error occurred validating the certificate." -msgstr "" - -#: ../midori/midori-locationaction.c:1286 -msgid "_Export certificate" -msgstr "_Eksportér certifikat" - -#: ../midori/midori-locationaction.c:1301 -msgid "Self-signed" -msgstr "Selv-signeret" - -#: ../midori/midori-locationaction.c:1335 -msgid "Security details" -msgstr "Sikkerhedsdetaljer" +#: ../midori/midori-locationaction.c:535 +#, c-format +msgid "Search with %s" +msgstr "Søg med %s" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1618 +#: ../midori/midori-locationaction.c:1287 msgid "Paste and p_roceed" msgstr "Indsæt og f_ortsæt" -#: ../midori/midori-locationaction.c:1942 +#: ../midori/midori-locationaction.c:1656 msgid "Not verified" msgstr "Ikke bekræftet" -#: ../midori/midori-locationaction.c:1950 +#: ../midori/midori-locationaction.c:1671 msgid "Verified and encrypted connection" msgstr "Bekræftet og kodet forbindelse" -#: ../midori/midori-locationaction.c:1957 -msgid "Open, unencrypted connection" -msgstr "Åben og ukrypteret forbindelse" - -#: ../midori/midori-panel.c:317 ../midori/midori-panel.c:319 -#: ../midori/midori-panel.c:483 ../midori/midori-panel.c:486 +#: ../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:329 ../midori/midori-panel.c:330 +#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410 msgid "Close panel" msgstr "Luk panel" -#: ../midori/midori-panel.c:484 ../midori/midori-panel.c:487 +#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566 msgid "Align sidepanel to the left" msgstr "Opstil sidepanel til venstre" -#: ../midori/midori-websettings.c:220 +#: ../midori/midori-websettings.c:209 msgid "Show Speed Dial" msgstr "Vis hurtigopkald" -#: ../midori/midori-websettings.c:221 +#: ../midori/midori-websettings.c:210 msgid "Show Homepage" msgstr "Vis hjemmeside" -#: ../midori/midori-websettings.c:240 +#: ../midori/midori-websettings.c:228 msgid "Japanese (SHIFT_JIS)" msgstr "Japansk (SHIFT_JIS)" -#: ../midori/midori-websettings.c:245 ../midori/midori-websettings.c:321 -#: ../katze/katze-utils.c:633 -msgid "Custom..." -msgstr "Tilpasset…" - -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:248 msgid "New tab" msgstr "Nyt faneblad" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:249 msgid "New window" msgstr "Nyt vindue" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:250 msgid "Current tab" msgstr "Nuværende faneblad" -#: ../midori/midori-websettings.c:277 +#: ../midori/midori-websettings.c:265 msgid "Default" msgstr "Standard" -#: ../midori/midori-websettings.c:278 +#: ../midori/midori-websettings.c:266 msgid "Icons" msgstr "Ikoner" -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-websettings.c:267 msgid "Small icons" msgstr "SmÃ¥ ikoner" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:268 msgid "Text" msgstr "Tekst" -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:269 msgid "Icons and text" msgstr "Ikoner og tekst" -#: ../midori/midori-websettings.c:282 +#: ../midori/midori-websettings.c:270 msgid "Text beside icons" msgstr "Tekst ved siden af ikoner" -#: ../midori/midori-websettings.c:297 +#: ../midori/midori-websettings.c:285 msgid "Automatic (GNOME or environment)" msgstr "Automatisk (GNOME eller miljø)" -#: ../midori/midori-websettings.c:298 +#: ../midori/midori-websettings.c:286 msgid "HTTP proxy server" msgstr "HTTP-proxyserver" -#: ../midori/midori-websettings.c:299 +#: ../midori/midori-websettings.c:287 msgid "No proxy server" msgstr "Ingen proxyserver" -#: ../midori/midori-websettings.c:316 -msgid "Chrome" -msgstr "Chrome" - -#: ../midori/midori-websettings.c:317 +#: ../midori/midori-websettings.c:304 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:318 +#: ../midori/midori-websettings.c:305 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:319 +#: ../midori/midori-websettings.c:306 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:320 +#: ../midori/midori-websettings.c:307 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:404 +#: ../midori/midori-websettings.c:360 msgid "Remember last window size" msgstr "Husk sidste vinduesstørrelse" -#: ../midori/midori-websettings.c:405 +#: ../midori/midori-websettings.c:361 msgid "Whether to save the last window size" msgstr "Skal sidste vinduesstørrelse gemmes" -#: ../midori/midori-websettings.c:413 +#: ../midori/midori-websettings.c:369 msgid "Last window width" msgstr "Sidste vinduesbredde" -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:370 msgid "The last saved window width" msgstr "Sidste gemte vinduesbredde" -#: ../midori/midori-websettings.c:422 +#: ../midori/midori-websettings.c:378 msgid "Last window height" msgstr "Sidste vindueshøjde" -#: ../midori/midori-websettings.c:423 +#: ../midori/midori-websettings.c:379 msgid "The last saved window height" msgstr "Sidste gemte vindueshøjde" -#: ../midori/midori-websettings.c:448 +#: ../midori/midori-websettings.c:404 msgid "Last panel position" msgstr "Sidste panelplacering" -#: ../midori/midori-websettings.c:449 +#: ../midori/midori-websettings.c:405 msgid "The last saved panel position" msgstr "Sidste gemte panelplacering" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:458 +#: ../midori/midori-websettings.c:414 msgid "Last panel page" msgstr "Sidste panelside" -#: ../midori/midori-websettings.c:459 +#: ../midori/midori-websettings.c:415 msgid "The last saved panel page" msgstr "Sidste gemte panelside" -#: ../midori/midori-websettings.c:467 +#: ../midori/midori-websettings.c:423 msgid "Last Web search" msgstr "Sidste websøgning" -#: ../midori/midori-websettings.c:468 +#: ../midori/midori-websettings.c:424 msgid "The last saved Web search" msgstr "Den sidste gemte websøgning" -#: ../midori/midori-websettings.c:492 +#: ../midori/midori-websettings.c:433 msgid "Show Menubar" msgstr "Vis menubjælke" -#: ../midori/midori-websettings.c:493 +#: ../midori/midori-websettings.c:434 msgid "Whether to show the menubar" msgstr "Om menubjælke vises" -#: ../midori/midori-websettings.c:501 +#: ../midori/midori-websettings.c:442 msgid "Show Navigationbar" msgstr "Vis navigeringsbjælke" -#: ../midori/midori-websettings.c:502 +#: ../midori/midori-websettings.c:443 msgid "Whether to show the navigationbar" msgstr "Om navigeringsbjælke vises" -#: ../midori/midori-websettings.c:510 +#: ../midori/midori-websettings.c:451 msgid "Show Bookmarkbar" msgstr "Vis bogmærkebjælke" -#: ../midori/midori-websettings.c:511 +#: ../midori/midori-websettings.c:452 msgid "Whether to show the bookmarkbar" msgstr "Om bogmærkebjælke vises" -#: ../midori/midori-websettings.c:519 +#: ../midori/midori-websettings.c:460 msgid "Show Panel" msgstr "Vis panel" -#: ../midori/midori-websettings.c:520 +#: ../midori/midori-websettings.c:461 msgid "Whether to show the panel" msgstr "Om panel vises" -#: ../midori/midori-websettings.c:528 +#: ../midori/midori-websettings.c:469 msgid "Show Statusbar" msgstr "Vis statusbjælke" -#: ../midori/midori-websettings.c:529 +#: ../midori/midori-websettings.c:470 msgid "Whether to show the statusbar" msgstr "Om statusbjælke vises" -#: ../midori/midori-websettings.c:538 +#: ../midori/midori-websettings.c:479 msgid "Toolbar Style:" msgstr "Værktøjsbjælkestil:" -#: ../midori/midori-websettings.c:539 +#: ../midori/midori-websettings.c:480 msgid "The style of the toolbar" msgstr "Stilen for værktøjsbjælke" -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:489 msgid "Toolbar Items" msgstr "Værktøjsbjælkes elementer" -#: ../midori/midori-websettings.c:549 +#: ../midori/midori-websettings.c:490 msgid "The items to show on the toolbar" msgstr "Elementer der vises pÃ¥ værktøjsbjælken" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:498 msgid "Compact Sidepanel" msgstr "Kompakt sidepanel" -#: ../midori/midori-websettings.c:558 +#: ../midori/midori-websettings.c:499 msgid "Whether to make the sidepanel compact" msgstr "Om sidepanelet skal være kompakt" -#: ../midori/midori-websettings.c:573 +#: ../midori/midori-websettings.c:514 msgid "Align sidepanel on the right" msgstr "Opstil sidepanel til højre" -#: ../midori/midori-websettings.c:574 +#: ../midori/midori-websettings.c:515 msgid "Whether to align the sidepanel on the right" msgstr "Om sidepanelet skal være opstilles til højre" -#: ../midori/midori-websettings.c:589 +#: ../midori/midori-websettings.c:530 msgid "Open panels in separate windows" msgstr "Åbn paneler i separate vinduer" -#: ../midori/midori-websettings.c:590 +#: ../midori/midori-websettings.c:531 msgid "Whether to always open panels in separate windows" msgstr "Om paneler altid skal Ã¥bnes i separate vinduer" -#: ../midori/midori-websettings.c:599 +#: ../midori/midori-websettings.c:540 msgid "When Midori starts:" msgstr "NÃ¥r Midori starter:" -#: ../midori/midori-websettings.c:600 +#: ../midori/midori-websettings.c:541 msgid "What to do when Midori starts" msgstr "Hvad der skal ske nÃ¥r Midori startes" -#: ../midori/midori-websettings.c:609 +#: ../midori/midori-websettings.c:550 msgid "Homepage:" msgstr "Hjemmeside:" -#: ../midori/midori-websettings.c:610 +#: ../midori/midori-websettings.c:551 msgid "The homepage" msgstr "Hjemmesiden" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:566 msgid "Show crash dialog" msgstr "Vis nedbrudsdialog" -#: ../midori/midori-websettings.c:626 +#: ../midori/midori-websettings.c:567 msgid "Show a dialog after Midori crashed" msgstr "Vis en dialog efter nedbrud af Midori" -#: ../midori/midori-websettings.c:634 +#: ../midori/midori-websettings.c:575 msgid "Save downloaded files to:" msgstr "Gem hentede filer til:" -#: ../midori/midori-websettings.c:635 +#: ../midori/midori-websettings.c:576 msgid "The folder downloaded files are saved to" msgstr "Mappen hvor nedhentede filer skal gemmes" -#: ../midori/midori-websettings.c:643 +#: ../midori/midori-websettings.c:584 msgid "Text Editor" msgstr "Tekstbehandler" -#: ../midori/midori-websettings.c:644 +#: ../midori/midori-websettings.c:585 msgid "An external text editor" msgstr "En ekstern tekstbehandler" -#: ../midori/midori-websettings.c:659 +#: ../midori/midori-websettings.c:600 msgid "News Aggregator" msgstr "Nyhedssamler" -#: ../midori/midori-websettings.c:660 +#: ../midori/midori-websettings.c:601 msgid "An external news aggregator" msgstr "En ekstern nyhedssamler" -#: ../midori/midori-websettings.c:668 +#: ../midori/midori-websettings.c:609 msgid "Location entry Search" msgstr "Søg for stedindgang" -#: ../midori/midori-websettings.c:669 +#: ../midori/midori-websettings.c:610 msgid "The search to perform inside the location entry" msgstr "Søgningen som skal foretages i placeringsindgang" -#: ../midori/midori-websettings.c:677 +#: ../midori/midori-websettings.c:618 msgid "Preferred Encoding" msgstr "Foretrukne tegnsæt" -#: ../midori/midori-websettings.c:678 +#: ../midori/midori-websettings.c:619 msgid "The preferred character encoding" msgstr "Foretrukne tegnsæt" -#: ../midori/midori-websettings.c:688 +#: ../midori/midori-websettings.c:629 msgid "Always Show Tabbar" msgstr "Vis altid fanebladsbjælke" -#: ../midori/midori-websettings.c:689 +#: ../midori/midori-websettings.c:630 msgid "Always show the tabbar" msgstr "Vis altid fanebladsbjælken" -#: ../midori/midori-websettings.c:702 +#: ../midori/midori-websettings.c:638 msgid "Close Buttons on Tabs" msgstr "Lukkeknapper pÃ¥ faneblade" -#: ../midori/midori-websettings.c:703 +#: ../midori/midori-websettings.c:639 msgid "Whether tabs have close buttons" msgstr "Om faneblade har lukkeknapper" -#: ../midori/midori-websettings.c:728 +#: ../midori/midori-websettings.c:664 msgid "Open new pages in:" msgstr "Åbn nye sider i:" -#: ../midori/midori-websettings.c:729 +#: ../midori/midori-websettings.c:665 msgid "Where to open new pages" msgstr "Hvor skal nye sider Ã¥bnes" -#: ../midori/midori-websettings.c:738 +#: ../midori/midori-websettings.c:674 msgid "Middle click opens Selection" msgstr "Midterklik Ã¥bner for markering" -#: ../midori/midori-websettings.c:739 +#: ../midori/midori-websettings.c:675 msgid "Load an address from the selection via middle click" msgstr "Indlæs en adresse fra markeringen med midterklik" -#: ../midori/midori-websettings.c:747 +#: ../midori/midori-websettings.c:683 msgid "Open tabs in the background" msgstr "Åbn faneblade i baggrunden" -#: ../midori/midori-websettings.c:748 +#: ../midori/midori-websettings.c:684 msgid "Whether to open new tabs in the background" msgstr "Om nye faneblade skal Ã¥bnes i baggrunden" -#: ../midori/midori-websettings.c:756 +#: ../midori/midori-websettings.c:692 msgid "Open Tabs next to Current" msgstr "Åbn faneblad ved siden af nuværende" -#: ../midori/midori-websettings.c:757 +#: ../midori/midori-websettings.c:693 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "" "Om Ã¥bning af faneblade skal ske ved siden af nuværende eller efter sidste " "faneblad" -#: ../midori/midori-websettings.c:765 +#: ../midori/midori-websettings.c:701 msgid "Open popups in tabs" msgstr "Åbn pop op i faneblade" -#: ../midori/midori-websettings.c:766 +#: ../midori/midori-websettings.c:702 msgid "Whether to open popup windows in tabs" msgstr "Om pop op-vinduer skal Ã¥bnes i faneblade" -#: ../midori/midori-websettings.c:776 ../extensions/statusbar-features.c:155 +#: ../midori/midori-websettings.c:712 ../extensions/statusbar-features.c:131 msgid "Load images automatically" msgstr "Indlæs billeder automatisk" -#: ../midori/midori-websettings.c:777 +#: ../midori/midori-websettings.c:713 msgid "Load and display images automatically" msgstr "Indlæs og vis billeder automatisk" -#: ../midori/midori-websettings.c:784 ../extensions/statusbar-features.c:165 +#: ../midori/midori-websettings.c:720 ../extensions/statusbar-features.c:140 msgid "Enable scripts" msgstr "Brug skripter" -#: ../midori/midori-websettings.c:785 +#: ../midori/midori-websettings.c:721 msgid "Enable embedded scripting languages" msgstr "SlÃ¥ indlejret skriptsprog til" -#: ../midori/midori-websettings.c:792 ../extensions/statusbar-features.c:177 +#: ../midori/midori-websettings.c:728 ../extensions/statusbar-features.c:149 msgid "Enable Netscape plugins" msgstr "SlÃ¥ Netscape-udvidelsesmoduler til" -#: ../midori/midori-websettings.c:793 +#: ../midori/midori-websettings.c:729 msgid "Enable embedded Netscape plugin objects" msgstr "SlÃ¥ indlejrede Netscape-udvidelsesobjekter til" -#: ../midori/midori-websettings.c:808 +#: ../midori/midori-websettings.c:749 msgid "Enable Spell Checking" msgstr "SlÃ¥ stavekontrol til" -#: ../midori/midori-websettings.c:809 +#: ../midori/midori-websettings.c:750 msgid "Enable spell checking while typing" msgstr "SlÃ¥ stavekontrol til mens du taster" -#: ../midori/midori-websettings.c:815 +#: ../midori/midori-websettings.c:756 msgid "Enable HTML5 database support" msgstr "SlÃ¥ HTML5 databaseunderstøttelse til" -#: ../midori/midori-websettings.c:816 +#: ../midori/midori-websettings.c:757 msgid "Whether to enable HTML5 database support" msgstr "Om understøttelse af database til HTML5 skal slÃ¥s til" -#: ../midori/midori-websettings.c:822 +#: ../midori/midori-websettings.c:763 msgid "Enable HTML5 local storage support" msgstr "SlÃ¥ understøttelse af lokal lagring af HTML5 til" -#: ../midori/midori-websettings.c:823 +#: ../midori/midori-websettings.c:764 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:829 +#: ../midori/midori-websettings.c:770 msgid "Enable offline web application cache" msgstr "SlÃ¥ ikke forbundet webprograms mellemlager til" -#: ../midori/midori-websettings.c:830 +#: ../midori/midori-websettings.c:771 msgid "Whether to enable offline web application cache" msgstr "Om ikke forbundet webprograms mellemlager skal slÃ¥s til" -#: ../midori/midori-websettings.c:851 +#: ../midori/midori-websettings.c:787 msgid "Flash window on background tabs" msgstr "Lad vindue pÃ¥ baggrundsfaneblade blinke" -#: ../midori/midori-websettings.c:852 +#: ../midori/midori-websettings.c:788 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:860 -msgid "Enable WebGL support" -msgstr "SlÃ¥ WebGL databaseunderstøttelse til" - -#: ../midori/midori-websettings.c:861 -msgid "Allow websites to use OpenGL rendering" -msgstr "Tillad netsider at bruge OpenGL-rendering" - -#: ../midori/midori-websettings.c:887 +#: ../midori/midori-websettings.c:803 msgid "Zoom Text and Images" msgstr "Zoom tekst og billeder" -#: ../midori/midori-websettings.c:888 +#: ../midori/midori-websettings.c:804 msgid "Whether to zoom text and images" msgstr "Om zoom af tekst og billeder" -#: ../midori/midori-websettings.c:903 +#: ../midori/midori-websettings.c:819 msgid "Find inline while typing" msgstr "Find indlejret mens du taster" -#: ../midori/midori-websettings.c:904 +#: ../midori/midori-websettings.c:820 msgid "Whether to automatically find inline while typing" msgstr "Om indlejret skal findes automatisk, mens du taster" -#: ../midori/midori-websettings.c:919 +#: ../midori/midori-websettings.c:835 msgid "Kinetic scrolling" msgstr "Bevægelsesrulning" -#: ../midori/midori-websettings.c:920 +#: ../midori/midori-websettings.c:836 msgid "Whether scrolling should kinetically move according to speed" msgstr "Om rulning skal ske med bevægelseshastighed eller ej" -#: ../midori/midori-websettings.c:928 +#: ../midori/midori-websettings.c:844 msgid "Delete old Cookies after:" msgstr "Slet gamle cookies efter:" -#: ../midori/midori-websettings.c:929 +#: ../midori/midori-websettings.c:845 msgid "The maximum number of days to save cookies for" msgstr "Maksimal antal dage cookies skal gemmes" -#: ../midori/midori-websettings.c:945 +#: ../midori/midori-websettings.c:861 msgid "Only accept Cookies from sites you visit" msgstr "Tillad kun cookies fra sider du besøger" -#: ../midori/midori-websettings.c:946 +#: ../midori/midori-websettings.c:862 msgid "Block cookies sent by third-party websites" msgstr "Blokér cookies send fra trejdepartsider" -#: ../midori/midori-websettings.c:960 +#: ../midori/midori-websettings.c:876 msgid "Delete pages from history after:" msgstr "Slet sider fra historik efter:" -#: ../midori/midori-websettings.c:961 +#: ../midori/midori-websettings.c:877 msgid "The maximum number of days to save the history for" msgstr "Maksimale antal dage som historik skal gemmes" -#: ../midori/midori-websettings.c:976 +#: ../midori/midori-websettings.c:892 msgid "Proxy server" msgstr "Proxyserver" -#: ../midori/midori-websettings.c:977 +#: ../midori/midori-websettings.c:893 msgid "The type of proxy server to use" msgstr "Proxyservertypen som skal bruges" -#: ../midori/midori-websettings.c:986 +#: ../midori/midori-websettings.c:902 msgid "HTTP Proxy Server" msgstr "HTTP-proxyserver" -#: ../midori/midori-websettings.c:987 +#: ../midori/midori-websettings.c:903 msgid "The proxy server used for HTTP connections" msgstr "Proxyserveren som bruges til HTTP-forbindelser" -#: ../midori/midori-websettings.c:1002 +#: ../midori/midori-websettings.c:918 msgid "Port" msgstr "Port" -#: ../midori/midori-websettings.c:1003 +#: ../midori/midori-websettings.c:919 msgid "The proxy server port used for HTTP connections" msgstr "Porten pÃ¥ proxyserveren som bruges til HTTP-forbindelser" -#: ../midori/midori-websettings.c:1021 +#: ../midori/midori-websettings.c:937 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:1038 +#: ../midori/midori-websettings.c:954 msgid "Identify as" msgstr "Identificér som" -#: ../midori/midori-websettings.c:1039 +#: ../midori/midori-websettings.c:955 msgid "What to identify as to web pages" msgstr "Hvad skal genkendes som web-sider" -#: ../midori/midori-websettings.c:1055 +#: ../midori/midori-websettings.c:971 msgid "Identification string" msgstr "Identifikationsstreng" -#: ../midori/midori-websettings.c:1056 +#: ../midori/midori-websettings.c:972 msgid "The application identification string" msgstr "Programmets identifikationsstreng" -#: ../midori/midori-websettings.c:1072 +#: ../midori/midori-websettings.c:988 msgid "Preferred languages" msgstr "Foretrukne sprog" -#: ../midori/midori-websettings.c:1073 +#: ../midori/midori-websettings.c:989 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\"" @@ -1680,461 +1591,391 @@ 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:1088 +#: ../midori/midori-websettings.c:1004 msgid "Clear private data" msgstr "Ryd private data" -#: ../midori/midori-websettings.c:1089 +#: ../midori/midori-websettings.c:1005 msgid "The private data selected for deletion" msgstr "De private data valgt til sletning" -#: ../midori/midori-websettings.c:1104 +#: ../midori/midori-websettings.c:1020 msgid "Clear data" msgstr "Ryd data" -#: ../midori/midori-websettings.c:1105 +#: ../midori/midori-websettings.c:1021 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:1154 +#: ../midori/midori-websettings.c:1054 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:1156 +#: ../midori/midori-websettings.c:1056 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:1170 +#: ../midori/midori-websettings.c:1070 msgid "Always use my font choices" msgstr "Brug altid mit valg af fonte" -#: ../midori/midori-websettings.c:1171 +#: ../midori/midori-websettings.c:1071 msgid "Override fonts picked by websites with user preferences" msgstr "Brug mine fonte fremfor fonte fra internetsider" -#: ../midori/midori-view.c:1002 ../midori/midori-view.c:1140 -msgid "Trust this website" -msgstr "Betro denne webside" - -#: ../midori/midori-view.c:1138 -msgid "Security unknown" -msgstr "Sikkerhed ukendt" - -#: ../midori/midori-view.c:1436 +#: ../midori/midori-view.c:1330 #, c-format msgid "%s wants to save an HTML5 database." msgstr "%s ønsker at gemme en HTML5-database." -#: ../midori/midori-view.c:1440 ../midori/midori-view.c:1474 +#: ../midori/midori-view.c:1334 ../midori/midori-view.c:1364 msgid "_Deny" msgstr "_Afvis" -#: ../midori/midori-view.c:1440 ../midori/midori-view.c:1474 +#: ../midori/midori-view.c:1334 ../midori/midori-view.c:1364 msgid "_Allow" msgstr "_Tillad" -#: ../midori/midori-view.c:1469 +#: ../midori/midori-view.c:1360 #, c-format msgid "%s wants to know your location." msgstr "%s ønsker at kende dit sted." -#: ../midori/midori-view.c:1565 +#: ../midori/midori-view.c:1448 #, c-format msgid "Error - %s" msgstr "Fejl - %s" -#: ../midori/midori-view.c:1566 +#: ../midori/midori-view.c:1449 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "Siden '%s' kunne ikke indlæses." -#: ../midori/midori-view.c:1568 +#: ../midori/midori-view.c:1451 msgid "Try again" msgstr "Prøv igen" -#: ../midori/midori-view.c:1766 ../midori/midori-view.c:2875 +#: ../midori/midori-view.c:1613 ../midori/midori-view.c:2458 #, c-format msgid "Send a message to %s" msgstr "Send en besked til %s" -#: ../midori/midori-view.c:2661 -msgid "Add _search engine..." -msgstr "Tilføj _søgemaskine..." - -#: ../midori/midori-view.c:2705 ../midori/midori-view.c:3031 +#: ../midori/midori-view.c:2300 ../midori/midori-view.c:2607 msgid "Inspect _Element" msgstr "Undersøg _element" -#: ../midori/midori-view.c:2757 +#: ../midori/midori-view.c:2350 msgid "Open Link in New _Tab" msgstr "Åbn henvisning i nyt _faneblad" -#: ../midori/midori-view.c:2761 +#: ../midori/midori-view.c:2354 msgid "Open Link in _Foreground Tab" msgstr "Åbn henvisning i _fanebladet i forgrunden" -#: ../midori/midori-view.c:2762 +#: ../midori/midori-view.c:2355 msgid "Open Link in _Background Tab" msgstr "Åbn henvisning i _faneblad i baggrunden" -#: ../midori/midori-view.c:2765 +#: ../midori/midori-view.c:2358 msgid "Open Link in New _Window" msgstr "Åbn henvisning i nyt _vindue" -#: ../midori/midori-view.c:2768 +#: ../midori/midori-view.c:2361 msgid "Open Link as Web A_pplication" msgstr "Åbn henvisning som et _webprogram" -#: ../midori/midori-view.c:2773 +#: ../midori/midori-view.c:2364 msgid "Copy Link de_stination" msgstr "Kopiér _henvisningsdestination" -#: ../midori/midori-view.c:2789 +#: ../midori/midori-view.c:2376 msgid "Open _Image in New Tab" msgstr "Åbn _billede i nyt faneblad" -#: ../midori/midori-view.c:2792 +#: ../midori/midori-view.c:2379 msgid "Copy Image _Address" msgstr "Kopiér billed_adresse" -#: ../midori/midori-view.c:2795 +#: ../midori/midori-view.c:2382 msgid "Save I_mage" msgstr "Gem _billede" -#: ../midori/midori-view.c:2798 -msgid "Open in Image _Viewer" -msgstr "Åbn i Image_Viewer" - -#: ../midori/midori-view.c:2805 +#: ../midori/midori-view.c:2389 msgid "Copy Video _Address" msgstr "Kopiér vide_oadresse" -#: ../midori/midori-view.c:2808 +#: ../midori/midori-view.c:2392 msgid "Save _Video" msgstr "Gem _video" -#: ../midori/midori-view.c:2808 +#: ../midori/midori-view.c:2392 msgid "Download _Video" msgstr "Hent _video" -#: ../midori/midori-view.c:2834 +#: ../midori/midori-view.c:2418 msgid "Search _with" msgstr "Søg _med" -#: ../midori/midori-view.c:2866 +#: ../midori/midori-view.c:2450 msgid "_Search the Web" msgstr "_Søg internettet" -#: ../midori/midori-view.c:2883 +#: ../midori/midori-view.c:2466 msgid "Open Address in New _Tab" msgstr "Åbn adresse i nyt _faneblad" -#: ../midori/midori-view.c:2936 -msgid "Open _Frame in New Tab" -msgstr "Åbn _ramme i nyt faneblad" - -#: ../midori/midori-view.c:3190 +#: ../midori/midori-view.c:2757 msgid "Open or download file" msgstr "Åbn eller hent fil" -#: ../midori/midori-view.c:3214 -#, c-format -msgid "File Name: %s" -msgstr "Filnavn: %s" - -#: ../midori/midori-view.c:3219 +#: ../midori/midori-view.c:2776 #, c-format msgid "File Type: '%s'" msgstr "Filtype: '%s'" -#: ../midori/midori-view.c:3221 +#: ../midori/midori-view.c:2778 #, c-format msgid "File Type: %s ('%s')" msgstr "Filtype: %s ('%s')" -#: ../midori/midori-view.c:3256 -#, c-format -msgid "Size: %s" -msgstr "Størrelse: %s" - #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:3267 +#: ../midori/midori-view.c:2795 #, c-format msgid "Open %s" msgstr "Åbn %s" -#: ../midori/midori-view.c:3886 +#: ../midori/midori-view.c:3419 #, c-format msgid "Inspect page - %s" msgstr "Undersøg side - %s" -#: ../midori/midori-view.c:4241 +#: ../midori/midori-view.c:3706 msgid "Speed Dial" msgstr "Hurtigopkald" -#: ../midori/midori-view.c:4242 ../midori/midori-view.c:4348 +#: ../midori/midori-view.c:3707 ../midori/midori-view.c:3803 msgid "Click to add a shortcut" msgstr "Klik for at tilføje en genvej" -#: ../midori/midori-view.c:4243 +#: ../midori/midori-view.c:3708 msgid "Enter shortcut address" msgstr "Tast genvejsadresse" -#: ../midori/midori-view.c:4244 +#: ../midori/midori-view.c:3709 msgid "Enter shortcut title" msgstr "Tast en genvejstitel" -#: ../midori/midori-view.c:4245 +#: ../midori/midori-view.c:3710 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:4418 +#: ../midori/midori-view.c:3870 #, c-format msgid "No documentation installed" msgstr "Ingen dokumentation installeret" -#: ../midori/midori-view.c:4495 -msgid "Midori doesn't store any personal data:" -msgstr "Midori gemmer ikke nogen personlige data:" - -#: ../midori/midori-view.c:4496 -msgid "No history or web cookies are being saved." -msgstr "Ingen historik eller internet-cookies bliver gemt." - -#: ../midori/midori-view.c:4497 -msgid "Extensions are disabled." -msgstr "Udvidelser er slÃ¥et fra." - -#: ../midori/midori-view.c:4498 -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:4499 -msgid "Midori prevents websites from tracking the user:" -msgstr "Midori beskytter mod netsiders sporing' af brugere:" - -#: ../midori/midori-view.c:4500 -msgid "Referrer URLs are stripped down to the hostname." -msgstr "Referende URL-er er forkortet til værtsnavnet." - -#: ../midori/midori-view.c:4501 -msgid "DNS prefetching is disabled." -msgstr "Hent pÃ¥ forhÃ¥nd DNS er slÃ¥et fra." - -#: ../midori/midori-view.c:4502 -msgid "The language and timezone are not revealed to websites." -msgstr "Sprogindstillingen og tidzone bliver ikke oplyst til internetsider." - -#: ../midori/midori-view.c:4503 -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:4592 +#: ../midori/midori-view.c:3921 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:4642 +#: ../midori/midori-view.c:3968 msgid "Page loading delayed" msgstr "Forsinket sideindlæsning" -#: ../midori/midori-view.c:4643 +#: ../midori/midori-view.c:3969 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "" "Indlæsning forsinket pga. et nyligt sammenbrud eller startopindstillinger." -#: ../midori/midori-view.c:4644 +#: ../midori/midori-view.c:3970 msgid "Load Page" msgstr "Indlæs side" -#: ../midori/midori-view.c:4811 +#: ../midori/midori-view.c:4109 msgid "Blank page" msgstr "Blank side" -#: ../midori/midori-view.c:5075 +#: ../midori/midori-view.c:4371 msgid "_Duplicate Tab" msgstr "_Dublér faneblad" -#: ../midori/midori-view.c:5080 +#: ../midori/midori-view.c:4376 msgid "Show Tab _Label" msgstr "Vis faneblad_titel" -#: ../midori/midori-view.c:5080 +#: ../midori/midori-view.c:4376 msgid "Show Tab _Icon Only" msgstr "Vis kun faneblad_ikon" -#: ../midori/midori-view.c:5087 -msgid "Close Ot_her Tab" -msgid_plural "Close Ot_her Tabs" -msgstr[0] "Luk a_ndet faneblad" -msgstr[1] "Luk a_ndre faneblade" +#: ../midori/midori-view.c:4382 +msgid "Close ot_her Tabs" +msgstr "Luk a_ndre faneblade" #. i18n: word stem of "previous page" type links, case is not important -#: ../midori/midori-view.c:5923 +#: ../midori/midori-view.c:5036 msgid "previous" msgstr "forrige" #. i18n: word stem of "next page" type links, case is not important -#: ../midori/midori-view.c:5942 +#: ../midori/midori-view.c:5055 msgid "next" msgstr "næste" -#: ../midori/midori-view.c:5955 +#: ../midori/midori-view.c:5068 msgid "Print background images" msgstr "Udskriv baggrundsbilleder" -#: ../midori/midori-view.c:5956 +#: ../midori/midori-view.c:5069 msgid "Whether background images should be printed" msgstr "Om baggrundsbilleder skal udskrives" -#: ../midori/midori-view.c:5988 +#: ../midori/midori-view.c:5101 msgid "Features" msgstr "Funktionalitet" -#: ../midori/midori-preferences.c:298 +#: ../midori/midori-preferences.c:297 msgid "Startup" msgstr "Opstart" -#: ../midori/midori-preferences.c:311 +#: ../midori/midori-preferences.c:310 msgid "Use _current page" msgstr "Anvend _nuværende side" -#: ../midori/midori-preferences.c:315 +#: ../midori/midori-preferences.c:314 msgid "Use current page as homepage" msgstr "Brug nuværende side som hjemmeside" #. Page "Appearance" -#: ../midori/midori-preferences.c:324 +#: ../midori/midori-preferences.c:323 msgid "Fonts" msgstr "Skrifttyper" -#: ../midori/midori-preferences.c:327 +#: ../midori/midori-preferences.c:326 msgid "Proportional Font Family" msgstr "Proportionel skrifttypefamilie" -#: ../midori/midori-preferences.c:331 +#: ../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:334 +#: ../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:336 +#: ../midori/midori-preferences.c:335 msgid "Fixed-width Font Family" msgstr "Fastbredde skrifttype" -#: ../midori/midori-preferences.c:340 +#: ../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:343 +#: ../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:345 +#: ../midori/midori-preferences.c:344 msgid "Minimum Font Size" msgstr "Minimal skriftstørrelse" -#: ../midori/midori-preferences.c:349 +#: ../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:360 +#: ../midori/midori-preferences.c:359 msgid "Behavior" msgstr "Opførsel" -#: ../midori/midori-preferences.c:386 +#: ../midori/midori-preferences.c:385 msgid "Allow scripts to open popups" msgstr "Tillad skripter at Ã¥bne pop op." -#: ../midori/midori-preferences.c:387 +#: ../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" #. Page "Interface" -#: ../midori/midori-preferences.c:418 +#: ../midori/midori-preferences.c:409 msgid "Browsing" msgstr "Browsing" #. Page "Network" -#: ../midori/midori-preferences.c:458 +#: ../midori/midori-preferences.c:447 msgid "Network" msgstr "Netværk" -#: ../midori/midori-preferences.c:465 +#: ../midori/midori-preferences.c:454 msgid "Hostname" msgstr "Værtsnavn" -#: ../midori/midori-preferences.c:489 +#: ../midori/midori-preferences.c:478 msgid "MB" msgstr "MB" -#: ../midori/midori-searchaction.c:957 +#: ../midori/midori-searchaction.c:907 msgid "Add search engine" msgstr "Tilføj søgemaskine" -#: ../midori/midori-searchaction.c:957 +#: ../midori/midori-searchaction.c:907 msgid "Edit search engine" msgstr "Redigér søgemaskine" -#: ../midori/midori-searchaction.c:985 +#: ../midori/midori-searchaction.c:936 msgid "_Name:" msgstr "_Navn:" -#: ../midori/midori-searchaction.c:1000 +#: ../midori/midori-searchaction.c:952 msgid "_Description:" msgstr "_Beskrivelse:" -#: ../midori/midori-searchaction.c:1013 ../extensions/feed-panel/main.c:377 -msgid "_Address:" -msgstr "_Adresse:" +#: ../midori/midori-searchaction.c:985 +msgid "_Icon:" +msgstr "_Ikon:" -#: ../midori/midori-searchaction.c:1032 +#: ../midori/midori-searchaction.c:999 msgid "_Token:" msgstr "_Symbol:" -#: ../midori/midori-searchaction.c:1330 +#: ../midori/midori-searchaction.c:1299 msgid "Manage Search Engines" msgstr "HÃ¥ndtér søgemaskiner" -#: ../midori/midori-searchaction.c:1432 +#: ../midori/midori-searchaction.c:1399 msgid "Use as _default" msgstr "Brug som _standard" -#: ../midori/sokoke.c:346 +#: ../midori/sokoke.c:410 msgid "Open with" msgstr "Åbn med" -#: ../midori/sokoke.c:354 +#: ../midori/sokoke.c:418 #, 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:468 ../midori/sokoke.c:482 +#: ../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 "Kunne ikke køre eksternt program." -#: ../midori/sokoke.c:1529 +#: ../midori/sokoke.c:1677 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d time" msgstr[1] "%d timer" -#: ../midori/sokoke.c:1530 +#: ../midori/sokoke.c:1678 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minut" msgstr[1] "%d minutter" -#: ../midori/sokoke.c:1531 +#: ../midori/sokoke.c:1679 #, c-format msgid "%d second" msgid_plural "%d seconds" @@ -2142,67 +1983,67 @@ msgstr[0] "%d sekund" msgstr[1] "%d sekunder" #. i18n: Download tooltip (size): 4KB of 43MB -#: ../midori/sokoke.c:1539 ../panels/midori-transfers.c:269 +#: ../midori/sokoke.c:1687 ../panels/midori-transfers.c:267 #, c-format msgid "%s of %s" msgstr "%s af %s" #. i18n: Unknown number of bytes, used for transfer rate like ?B/s -#: ../midori/sokoke.c:1548 +#: ../midori/sokoke.c:1696 msgid "?B" msgstr "?B" #. i18n: Download tooltip (transfer rate): (130KB/s) -#: ../midori/sokoke.c:1551 +#: ../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:1568 +#: ../midori/sokoke.c:1716 #, c-format msgid " - %s remaining" msgstr " - %s tilbage" #. i18n: A panel at the bottom, to search text in pages -#: ../toolbars/midori-findbar.c:265 +#: ../toolbars/midori-findbar.c:264 msgid "_Inline Find:" msgstr "_Indlejret søgning:" -#: ../toolbars/midori-findbar.c:287 +#: ../toolbars/midori-findbar.c:291 msgid "Previous" msgstr "Forrige" -#: ../toolbars/midori-findbar.c:293 +#: ../toolbars/midori-findbar.c:297 msgid "Next" msgstr "Næste" -#: ../toolbars/midori-findbar.c:297 +#: ../toolbars/midori-findbar.c:301 msgid "Match Case" msgstr "Versalfølsom" -#: ../toolbars/midori-findbar.c:306 +#: ../toolbars/midori-findbar.c:310 msgid "Highlight Matches" msgstr "Fremhæv fundne" -#: ../toolbars/midori-findbar.c:317 +#: ../toolbars/midori-findbar.c:321 msgid "Close Findbar" msgstr "Luk søgebjælke" -#: ../toolbars/midori-transferbar.c:124 +#: ../toolbars/midori-transferbar.c:122 #, c-format msgid "The file '%s' has been downloaded." msgstr "Filen '%s' er blevet hentet." -#: ../toolbars/midori-transferbar.c:129 +#: ../toolbars/midori-transferbar.c:125 msgid "Transfer completed" msgstr "Overførsel gennemført" -#: ../toolbars/midori-transferbar.c:201 +#: ../toolbars/midori-transferbar.c:193 msgid "The downloaded file is erroneous." msgstr "Den hentede fil indeholder fejl." -#: ../toolbars/midori-transferbar.c:202 +#: ../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." @@ -2210,111 +2051,95 @@ msgstr "" "Checksummen opgivet med linket stemmer ikke. Dette betyder, at filen " "formentligt er ufuldendt eller blev modificeret efterfølgende." -#: ../toolbars/midori-transferbar.c:345 ../panels/midori-transfers.c:142 +#: ../toolbars/midori-transferbar.c:331 ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "Ryd alle" -#: ../toolbars/midori-transferbar.c:382 ../toolbars/midori-transferbar.c:384 +#: ../toolbars/midori-transferbar.c:368 ../toolbars/midori-transferbar.c:370 msgid "Some files are being downloaded" msgstr "Nogle filer bliver overført" -#: ../toolbars/midori-transferbar.c:388 +#: ../toolbars/midori-transferbar.c:374 msgid "_Quit Midori" msgstr "_Afslut Midori" -#: ../toolbars/midori-transferbar.c:390 +#: ../toolbars/midori-transferbar.c:376 msgid "The transfers will be cancelled if Midori quits." msgstr "Overførslen vil blive afbrudt hvis Midori afsluttes." -#: ../panels/midori-bookmarks.c:308 +#: ../panels/midori-bookmarks.c:113 +msgid "Bookmarks" +msgstr "Bogmærker" + +#: ../panels/midori-bookmarks.c:256 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "Kunne ikke tilføje historikelementet: %s\n" -#: ../panels/midori-bookmarks.c:475 -#, c-format -msgid "Failed to update bookmark : %s\n" -msgstr "Kunne ikke opdatere bogmærke: %s\n" - -#: ../panels/midori-bookmarks.c:535 +#: ../panels/midori-bookmarks.c:434 msgid "Edit the selected bookmark" msgstr "Redigér det valgte bogmærke" -#: ../panels/midori-bookmarks.c:543 +#: ../panels/midori-bookmarks.c:442 msgid "Delete the selected bookmark" msgstr "Slet det valgte bogmærke" -#: ../panels/midori-bookmarks.c:558 +#: ../panels/midori-bookmarks.c:457 msgid "Add a new folder" msgstr "Tilføj en ny mappe" -#: ../panels/midori-bookmarks.c:697 ../panels/midori-history.c:638 +#: ../panels/midori-bookmarks.c:591 ../panels/midori-history.c:579 msgid "Separator" msgstr "Separator" -#. Create the filter entry -#: ../panels/midori-bookmarks.c:1027 -msgid "Search Bookmarks" -msgstr "Søg i bogmærker" - -#: ../panels/midori-history.c:111 +#: ../panels/midori-history.c:110 msgid "History" msgstr "Historik" -#: ../panels/midori-history.c:158 ../panels/midori-history.c:189 -msgid "Today" -msgstr "I dag" - -#: ../panels/midori-history.c:160 ../panels/midori-history.c:191 -msgid "Yesterday" -msgstr "I gÃ¥r" +#: ../panels/midori-history.c:142 +msgid "A week ago" +msgstr "For en uge siden" -#: ../panels/midori-history.c:162 ../panels/midori-history.c:186 +#: ../panels/midori-history.c:144 #, 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:165 ../panels/midori-history.c:184 -msgid "A week ago" -msgstr "For en uge siden" +#: ../panels/midori-history.c:147 +msgid "Today" +msgstr "I dag" -#: ../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:149 +msgid "Yesterday" +msgstr "I gÃ¥r" -#: ../panels/midori-history.c:360 +#: ../panels/midori-history.c:317 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:407 +#: ../panels/midori-history.c:363 msgid "Bookmark the selected history item" msgstr "Bogmærk det valgte historikelement" -#: ../panels/midori-history.c:416 +#: ../panels/midori-history.c:372 msgid "Delete the selected history item" msgstr "Slet det valgte historikelement" -#: ../panels/midori-history.c:424 +#: ../panels/midori-history.c:380 msgid "Clear the entire history" msgstr "Ryd hele historikken" -#. Create the filter entry -#: ../panels/midori-history.c:997 -msgid "Search History" -msgstr "Søg i historik" - -#: ../panels/midori-transfers.c:87 +#: ../panels/midori-transfers.c:86 msgid "Transfers" msgstr "Overførsler" -#: ../panels/midori-transfers.c:470 +#: ../panels/midori-transfers.c:467 msgid "Open Destination _Folder" msgstr "Åbn mÃ¥l_mappen" -#: ../panels/midori-transfers.c:473 +#: ../panels/midori-transfers.c:470 msgid "Copy Link Loc_ation" msgstr "Kopiér henvisnings_sted" @@ -2342,68 +2167,68 @@ msgstr "Adgangskode" msgid "_Remember password" msgstr "_Husk adgangskode" -#: ../katze/katze-throbber.c:949 +#: ../katze/katze-throbber.c:948 #, c-format msgid "Named icon '%s' couldn't be loaded" msgstr "Angivet ikon '%s' blev ikke indlæst" -#: ../katze/katze-throbber.c:962 +#: ../katze/katze-throbber.c:961 #, c-format msgid "Stock icon '%s' couldn't be loaded" msgstr "Lagerikon '%s' kunne ikke indlæses" -#: ../katze/katze-throbber.c:1042 +#: ../katze/katze-throbber.c:1041 msgid "Animation frames are broken" msgstr "Animeringsrammer er ødelagt" -#: ../katze/katze-utils.c:443 ../katze/katze-utils.c:867 +#: ../katze/katze-utils.c:439 ../katze/katze-utils.c:873 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Egenskab '%s' er ikke gyldig for %s" -#: ../katze/katze-utils.c:489 ../katze/katze-utils.c:518 +#: ../katze/katze-utils.c:485 ../katze/katze-utils.c:514 #: ../extensions/addons.c:308 msgid "Choose file" msgstr "Vælg fil" -#: ../katze/katze-utils.c:504 +#: ../katze/katze-utils.c:500 msgid "Choose folder" msgstr "Vælg mappe" -#: ../katze/katze-utils.c:602 +#: ../katze/katze-utils.c:604 msgid "None" msgstr "Ingen" -#: ../katze/katze-utils.c:717 +#: ../katze/katze-utils.c:719 msgid "1 hour" msgstr "1 time" -#: ../katze/katze-utils.c:718 +#: ../katze/katze-utils.c:720 msgid "1 day" msgstr "1 dag" -#: ../katze/katze-utils.c:719 +#: ../katze/katze-utils.c:721 msgid "1 week" msgstr "1 uge" -#: ../katze/katze-utils.c:720 +#: ../katze/katze-utils.c:722 msgid "1 month" msgstr "1 mÃ¥ned" -#: ../katze/katze-utils.c:721 +#: ../katze/katze-utils.c:723 msgid "1 year" msgstr "1 Ã¥r" -#: ../katze/katze-preferences.c:98 ../extensions/history-list.vala:235 +#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235 #, c-format msgid "Preferences for %s" msgstr "Indstillinger for %s" -#: ../extensions/adblock.c:470 +#: ../extensions/adblock.c:441 msgid "Configure Advertisement filters" msgstr "Indstil reklamefiltre" -#: ../extensions/adblock.c:503 +#: ../extensions/adblock.c:472 #, c-format msgid "" "Type the address of a preconfigured filter list in the text entry and click " @@ -2412,27 +2237,27 @@ 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:917 +#: ../extensions/adblock.c:823 msgid "Edit rule" msgstr "Redigér regel" -#: ../extensions/adblock.c:931 +#: ../extensions/adblock.c:837 msgid "_Rule:" msgstr "_Regel:" -#: ../extensions/adblock.c:985 +#: ../extensions/adblock.c:891 msgid "Bl_ock image" msgstr "Bl_okér billede" -#: ../extensions/adblock.c:990 +#: ../extensions/adblock.c:896 msgid "Bl_ock link" msgstr "Bl_okér henvisning" -#: ../extensions/adblock.c:1689 +#: ../extensions/adblock.c:1499 msgid "Advertisement blocker" msgstr "Blokering af reklamer" -#: ../extensions/adblock.c:1690 +#: ../extensions/adblock.c:1500 msgid "Block advertisements according to a filter list" msgstr "Blokér reklamer i henhold til en filterliste" @@ -2462,71 +2287,71 @@ msgstr "_Installér brugerstil" msgid "Don't install" msgstr "Undlad at installere" -#: ../extensions/addons.c:319 ../extensions/addons.c:677 +#: ../extensions/addons.c:319 ../extensions/addons.c:681 msgid "Userscripts" msgstr "Brugerskripter" -#: ../extensions/addons.c:324 ../extensions/addons.c:679 +#: ../extensions/addons.c:324 ../extensions/addons.c:683 msgid "Userstyles" msgstr "Brugerstile" -#: ../extensions/addons.c:370 ../extensions/addons.c:449 +#: ../extensions/addons.c:380 ../extensions/addons.c:459 #: ../extensions/feed-panel/main.c:129 msgid "Error" msgstr "Fejl" -#: ../extensions/addons.c:411 +#: ../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:417 +#: ../extensions/addons.c:427 msgid "Delete user script" msgstr "Slet brugerskript" -#: ../extensions/addons.c:418 +#: ../extensions/addons.c:428 msgid "Delete user style" msgstr "Slet brugerstil" -#: ../extensions/addons.c:421 +#: ../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:566 ../extensions/addons.c:643 +#: ../extensions/addons.c:570 ../extensions/addons.c:647 msgid "Open in Text Editor" msgstr "Åbn i tekstbehandler" -#: ../extensions/addons.c:568 ../extensions/addons.c:652 +#: ../extensions/addons.c:572 ../extensions/addons.c:656 msgid "Open Target Folder" msgstr "Åbn mÃ¥lmappen" -#: ../extensions/addons.c:634 +#: ../extensions/addons.c:638 msgid "Add new addon" msgstr "Tilføj nye moduler" -#: ../extensions/addons.c:660 +#: ../extensions/addons.c:664 msgid "Remove selected addon" msgstr "Fjern valgte modul" -#: ../extensions/addons.c:1689 ../extensions/addons.c:1907 +#: ../extensions/addons.c:1696 ../extensions/addons.c:1914 msgid "User addons" msgstr "Brugers udvidelsesmoduler" -#: ../extensions/addons.c:1819 +#: ../extensions/addons.c:1826 #, c-format msgid "Can't monitor folder '%s': %s" msgstr "Kan ikke overvÃ¥ge mappe '%s': %s" -#: ../extensions/addons.c:1908 +#: ../extensions/addons.c:1915 msgid "Support for userscripts and userstyles" msgstr "Understøttelse af brugerskripter og brugerstile" -#: ../extensions/colorful-tabs.c:201 +#: ../extensions/colorful-tabs.c:202 msgid "Colorful Tabs" msgstr "Farvefulde faneblade" -#: ../extensions/colorful-tabs.c:202 +#: ../extensions/colorful-tabs.c:203 msgid "Tint each tab distinctly" msgstr "Ton hvert faneblad tydeligt" @@ -2606,21 +2431,29 @@ msgstr "" "Domæne: %s\n" "Cookies: %d" -#: ../extensions/cookie-manager/cookie-manager-page.c:1017 +#: ../extensions/cookie-manager/cookie-manager-page.c:1024 msgid "Name" msgstr "Navn" -#: ../extensions/cookie-manager/cookie-manager-page.c:1069 +#: ../extensions/cookie-manager/cookie-manager-page.c:1077 msgid "_Expand All" msgstr "_Udfold alle" -#: ../extensions/cookie-manager/cookie-manager-page.c:1077 +#: ../extensions/cookie-manager/cookie-manager-page.c:1085 msgid "_Collapse All" msgstr "_Fold alle" -#: ../extensions/cookie-manager/cookie-manager-page.c:1129 -msgid "Search Cookies by Name or Domain" -msgstr "Søg cookies efter navn eller domæne" +#: ../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 "" +"Indtast en filterstreng for at vise kun cookies hvis navn eller domænefelt " +"passer til det indtastede filter" #: ../extensions/cookie-manager/main.c:36 msgid "List, view and delete cookies" @@ -2718,72 +2551,46 @@ msgstr "Feed-panel" msgid "Read Atom/ RSS feeds" msgstr "Læs Atom-/ RSS-feeds" -#: ../extensions/formhistory/formhistory.c:39 +#: ../extensions/formhistory.c:138 #, c-format msgid "Failed to add form value: %s\n" msgstr "Kunne ikke tilføje formularværdien: %s\n" -#: ../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 +#: ../extensions/formhistory.c:296 msgid "Toggle form history state" msgstr "Skift mellem tilstande for formularhistorik" -#: ../extensions/formhistory/formhistory.c:438 +#: ../extensions/formhistory.c:297 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 +#: ../extensions/formhistory.c:433 ../extensions/formhistory.c:437 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Kunne ikke køre databaseudtryk: %s\n" -#: ../extensions/formhistory/formhistory.c:629 -msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab" +#: ../extensions/formhistory.c:512 +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 +#: ../extensions/formhistory.c:571 msgid "Stores history of entered form data" msgstr "Gem historikken af indtastede formulardata" -#: ../extensions/formhistory/formhistory-gdom-frontend.c:225 -#: ../extensions/formhistory/formhistory-js-frontend.c:106 +#: ../extensions/formhistory.c:575 #, c-format -msgid "Failed to select suggestions\n" -msgstr "Kunne ikke vælge forslag\n" +msgid "Not available: %s" +msgstr "Ikke tilgængelig: %s" + +#: ../extensions/formhistory.c:576 +msgid "Resource files not installed" +msgstr "Resourcefiler er ikke installeret" + +#: ../extensions/formhistory.c:582 +msgid "Form history filler" +msgstr "Historikfylder til formular" #: ../extensions/history-list.vala:197 msgid "There are no unvisited tabs" @@ -2858,15 +2665,15 @@ msgstr "Genindlæs side eller stop indlæsning" msgid "Customize Keyboard shortcuts" msgstr "Tilpas tastaturgenveje" -#: ../extensions/shortcuts.c:283 +#: ../extensions/shortcuts.c:285 msgid "Customize Sh_ortcuts..." -msgstr "Tilpas gen_veje…" +msgstr "Tilpas gen_veje..." -#: ../extensions/shortcuts.c:320 +#: ../extensions/shortcuts.c:322 msgid "Shortcuts" msgstr "Genveje" -#: ../extensions/shortcuts.c:321 +#: ../extensions/shortcuts.c:323 msgid "View and edit keyboard shortcuts" msgstr "Vis og redigér tastaturgenveje" @@ -2878,35 +2685,35 @@ msgstr "Statusbjælkens ur" msgid "Display date and time in the statusbar" msgstr "Vis dato og tid pÃ¥ statusbjælken" -#: ../extensions/statusbar-features.c:152 +#: ../extensions/statusbar-features.c:128 msgid "Images" msgstr "Billeder" -#: ../extensions/statusbar-features.c:162 +#: ../extensions/statusbar-features.c:137 msgid "Scripts" msgstr "Skripter" -#: ../extensions/statusbar-features.c:174 +#: ../extensions/statusbar-features.c:146 msgid "Netscape plugins" msgstr "Netscape-udvidelsesmoduler" -#: ../extensions/statusbar-features.c:259 +#: ../extensions/statusbar-features.c:192 msgid "Statusbar Features" msgstr "Status funktioner" -#: ../extensions/statusbar-features.c:260 +#: ../extensions/statusbar-features.c:193 msgid "Easily toggle features on web pages on and off" msgstr "SlÃ¥ nemt netsiders funktioner til/fra" -#: ../extensions/tab-panel.c:589 ../extensions/tab-panel.c:676 +#: ../extensions/tab-panel.c:596 ../extensions/tab-panel.c:683 msgid "Tab Panel" msgstr "Fanebladpanel" -#: ../extensions/tab-panel.c:659 +#: ../extensions/tab-panel.c:666 msgid "T_ab Panel" msgstr "Faneblad_panel" -#: ../extensions/tab-panel.c:677 +#: ../extensions/tab-panel.c:684 msgid "Show tabs in a vertical panel" msgstr "Vis faneblade i et lodret panel" @@ -2918,35 +2725,39 @@ msgstr "Kun ikoner pÃ¥ faneblade som standard" msgid "New tabs have no label by default" msgstr "Nye faneblade har ingen titel som standard" -#: ../extensions/toolbar-editor.c:395 +#: ../extensions/toolbar-editor.c:393 msgid "Customize Toolbar" msgstr "Tilpas værktøjsbjælke" -#: ../extensions/toolbar-editor.c:411 +#: ../extensions/toolbar-editor.c:413 msgid "" -"Select items to be displayed on the toolbar. Items can be reordered by drag " +"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:427 +#: ../extensions/toolbar-editor.c:429 msgid "Available Items" msgstr "Tilgængelige elementer" -#: ../extensions/toolbar-editor.c:448 +#: ../extensions/toolbar-editor.c:450 msgid "Displayed Items" msgstr "Viste elementer" -#: ../extensions/toolbar-editor.c:588 -msgid "_Customize Toolbar…" -msgstr "_Tilpas værktøjsbjælke…" +#: ../extensions/toolbar-editor.c:585 +msgid "Customize _Toolbar..." +msgstr "Tilpas _værktøjsbjælke..." -#: ../extensions/toolbar-editor.c:617 +#: ../extensions/toolbar-editor.c:601 +msgid "_Customize..." +msgstr "_Tilpasset..." + +#: ../extensions/toolbar-editor.c:631 msgid "Toolbar Editor" msgstr "Redigering af værktøjsbjælke" -#: ../extensions/toolbar-editor.c:618 +#: ../extensions/toolbar-editor.c:632 msgid "Easily edit the toolbar layout" msgstr "Redigér nemt layout af værktøjsbjælken" @@ -2954,67 +2765,6 @@ msgstr "Redigér nemt layout af værktøjsbjælken" msgid "Cache HTTP communication on disk" msgstr "Cache HTTP-kommunikation pÃ¥ disk" -#~ msgid "_Bookmark" -#~ msgstr "_Bogmærke" - -#~ msgid "_Console" -#~ msgstr "_Konsol" - -#~ msgid "Toplevel folder" -#~ msgstr "Øverste mappe" - -#~ msgid "_Title:" -#~ msgstr "_Titel:" - -#~ msgid "_Folder:" -#~ msgstr "_Mappe:" - -#~ msgid "Close ot_her Tabs" -#~ msgstr "Luk a_ndre faneblade" - -#~ msgid "_Icon:" -#~ msgstr "_Ikon:" - -#~ msgid "Filter:" -#~ msgstr "Filter:" - -#~ 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" - -#~ msgid "_Customize…" -#~ msgstr "_Tilpasset…" - -#~ 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" @@ -3090,14 +2840,14 @@ msgstr "Cache HTTP-kommunikation pÃ¥ disk" #~ 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 "Add, edit and remove search engines..." +#~ msgstr "Tilføj, redigér og fjern søgemaskiner..." -#~ msgid "Clear private data…" -#~ msgstr "Ryd private data…" +#~ 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 "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" @@ -3186,8 +2936,8 @@ msgstr "Cache HTTP-kommunikation pÃ¥ disk" #~ msgid "Reset the last _session" #~ msgstr "Nulstil den sidste _session" -#~ msgid "Configure _Advertisement filters…" -#~ msgstr "Indstil _reklamefiltre…" +#~ msgid "Configure _Advertisement filters..." +#~ msgstr "Indstil _reklamefiltre..." #~ msgid "Not found - %s" #~ msgstr "Ikke fundet - %s" @@ -3282,6 +3032,9 @@ msgstr "Cache HTTP-kommunikation pÃ¥ disk" #~ msgid "Applications" #~ msgstr "Programmer" +#~ msgid "_Form History" +#~ msgstr "_Formularrhistorik" + #~ msgid "%d%% loaded" #~ msgstr "%d%% indlæst" @@ -3512,6 +3265,9 @@ msgstr "Cache HTTP-kommunikation pÃ¥ disk" #~ 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" @@ -3539,6 +3295,9 @@ msgstr "Cache HTTP-kommunikation pÃ¥ disk" #~ msgid "Whether text areas are resizable" #~ msgstr "Om tekstomrÃ¥der kan ændre størrelse" +#~ msgid "User_styles" +#~ msgstr "Bruger_grænseflader" + #~ msgid "_Quick Find" #~ msgstr "_Find hurtigt" @@ -3560,6 +3319,9 @@ msgstr "Cache HTTP-kommunikation pÃ¥ disk" #~ msgid "Warning: You are using a superuser account!" #~ msgstr "Advarsel: Du bruger en superbruger-konto!" +#~ msgid "_Enable" +#~ msgstr "_SlÃ¥ til" + #~ msgid "Enable" #~ msgstr "SlÃ¥ til" diff --git a/po/de.po b/po/de.po index 097a15f1..a08bfee0 100644 --- a/po/de.po +++ b/po/de.po @@ -8,138 +8,101 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.3.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-08 08:15+0000\n" +"POT-Creation-Date: 2011-10-31 22:18+0100\n" "PO-Revision-Date: 2009-04-30 00:15+0100\n" "Last-Translator: Christian Dywan \n" "Language-Team: German \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: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../data/midori.desktop.in.h:1 -msgid "Browse the Web" -msgstr "Im Web surfen" +msgid "Lightweight web browser" +msgstr "Schlanker Internetbetrachter" -#: ../data/midori.desktop.in.h:2 -msgid "Internet;WWW;Explorer" -msgstr "Internet;WWW;Explorer;Browser" - -#: ../data/midori.desktop.in.h:3 ../midori/main.c:1926 ../midori/main.c:1950 -#: ../midori/main.c:1964 ../midori/midori-websettings.c:199 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1432 ../midori/main.c:2006 +#: ../midori/main.c:2030 ../midori/main.c:2046 +#: ../midori/midori-websettings.c:293 msgid "Midori" msgstr "Midori" -#: ../data/midori.desktop.in.h:4 -msgid "Midori Web Browser" -msgstr "Webbrowser" - -#: ../data/midori.desktop.in.h:5 -msgid "New Private Browsing Window" -msgstr "Neues Fenster zum privaten Surfen" - -#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1406 -msgid "New Tab" -msgstr "Neuer Reiter" - -#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1403 -msgid "New Window" -msgstr "Neues Fenster" - -#: ../data/midori.desktop.in.h:8 +#: ../data/midori.desktop.in.h:3 msgid "Web Browser" msgstr "Internetbetrachter" -#: ../data/midori-private.desktop.in.h:1 -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:4364 -msgid "Private Browsing" -msgstr "Privat surfen" - -#: ../midori/main.c:91 ../midori/main.c:97 +#: ../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:145 +#: ../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:150 ../midori/main.c:254 +#: ../midori/main.c:155 ../midori/main.c:248 #, c-format msgid "Invalid configuration value '%s'" msgstr "Ungültiger Einstellungswert »%s«" -#: ../midori/main.c:365 +#: ../midori/main.c:353 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Die Suchmaschinen konnten nicht geladen werden. %s\n" -#: ../midori/main.c:419 +#: ../midori/main.c:407 #, c-format msgid "Failed to clear history: %s\n" msgstr "Verlauf konnte nicht geleert werden: %s\n" -#: ../midori/main.c:441 ../extensions/formhistory/formhistory.c:531 +#: ../midori/main.c:427 ../midori/main.c:548 ../extensions/formhistory.c:415 #, 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:513 +#: ../midori/main.c:491 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" -#: ../midori/main.c:535 +#: ../midori/main.c:531 ../panels/midori-history.c:189 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" + +#: ../midori/main.c:578 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "Die Lesezeichen konnten nicht gespeichert werden. %s" + +#: ../midori/main.c:613 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Die Konfiguration konnte nicht gespeichert werden. %s" -#: ../midori/main.c:561 +#: ../midori/main.c:648 #, 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:598 +#: ../midori/main.c:674 ../midori/main.c:694 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Der Papierkorb konnte nicht gespeichert werden. %s" -#: ../midori/main.c:671 ../panels/midori-extensions.c:90 +#: ../midori/main.c:728 ../panels/midori-extensions.c:91 msgid "Extensions" msgstr "Erweiterungen" -#: ../midori/main.c:685 +#: ../midori/main.c:742 msgid "Privacy" msgstr "Privatsphäre" -#: ../midori/main.c:687 -msgid "Delete old Cookies after:" -msgstr "Alte Cookies löschen nach:" - -#: ../midori/main.c:689 ../midori/main.c:692 -msgid "The maximum number of days to save cookies for" -msgstr "Die maximale Anzahl an Tagen, für die Cookies gespeichert werden" - -#: ../midori/main.c:696 -msgid "Only accept Cookies from sites you visit" -msgstr "Nur Cookies von Seiten annehmen, die ich besuche" - -#: ../midori/main.c:697 -msgid "Block cookies sent by third-party websites" -msgstr "Cookies von Drittanbietern blockieren" - -#: ../midori/main.c:702 +#: ../midori/main.c:754 msgid "" "Cookies store login data, saved games, or user profiles for advertisement " "purposes." @@ -147,47 +110,19 @@ msgstr "" "Cookies sind Profildateien, die Anmeldedaten, Spielstände oder " "Benutzerprofile zu Werbezwecken speichern." -#: ../midori/main.c:709 -msgid "Enable offline web application cache" -msgstr "HTML5-Anwendungsspeicher einschalten" - -#: ../midori/main.c:712 -msgid "Enable HTML5 local storage support" -msgstr "HTML5-Lokalspeicher einschalten" - -#. i18n: Reworded: Shorten details propagated when going to another page -#: ../midori/main.c:716 -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/main.c:718 -msgid "Whether the \"Referer\" header should be shortened to the hostname" -msgstr "" -"Legt fest, ob die »Referer«-Kopfzeile auf den Rechnernamen verkürzt werden " -"soll" - -#: ../midori/main.c:721 -msgid "Delete pages from history after:" -msgstr "Seiten aus dem Verlauf löschen nach:" - -#: ../midori/main.c:723 ../midori/main.c:726 -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/main.c:767 +#: ../midori/main.c:816 #, c-format msgid "The session couldn't be saved. %s" msgstr "Die Sitzung konnte nicht gespeichert werden. %s" -#: ../midori/main.c:993 +#: ../midori/main.c:1026 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:1088 +#: ../midori/main.c:1094 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." @@ -195,237 +130,243 @@ msgstr "" "Midori ist offenbar abgestürzt nachdem es das letzte Mal geöffnet wurde. " "Probieren Sie folgende Möglichkeiten falls dies vermehrt vorkommt." -#: ../midori/main.c:1107 +#: ../midori/main.c:1113 msgid "Modify _preferences" msgstr "_Einstellungen bearbeiten" -#: ../midori/main.c:1111 +#: ../midori/main.c:1117 msgid "Disable all _extensions" msgstr "Alle Er_weiterungen ausschalten" -#: ../midori/main.c:1120 -msgid "Show a dialog after Midori crashed" -msgstr "Absturzdialog anzeigen, nachdem Midori abgestürzt ist" - -#: ../midori/main.c:1125 +#: ../midori/main.c:1130 msgid "Discard old tabs" msgstr "Alte Reiter verwerfen" -#: ../midori/main.c:1126 ../midori/midori-websettings.c:107 +#: ../midori/main.c:1131 ../midori/midori-websettings.c:208 msgid "Show last tabs without loading" -msgstr "Letzte Reiter zeigen, ohne sie zu laden" +msgstr "Letzte Reiter zeigen ohne sie zu laden" -#: ../midori/main.c:1127 ../midori/midori-websettings.c:106 +#: ../midori/main.c:1132 ../midori/midori-websettings.c:207 msgid "Show last open tabs" msgstr "Zuletzt geöffnete Reiter anzeigen" -#: ../midori/main.c:1374 ../midori/main.c:2378 +#: ../midori/main.c:1342 ../midori/main.c:2423 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Die Sitzung konnte nicht geladen werden: %s\n" -#: ../midori/main.c:1512 +#: ../midori/main.c:1483 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Schnappschuss gespeichert: %s\n" -#: ../midori/main.c:1841 +#: ../midori/main.c:1907 msgid "Run ADDRESS as a web application" msgstr "ADRESSE als Internetanwendung starten" -#: ../midori/main.c:1841 +#: ../midori/main.c:1907 msgid "ADDRESS" msgstr "ADRESSE" -#: ../midori/main.c:1844 +#: ../midori/main.c:1910 msgid "Use FOLDER as configuration folder" msgstr "ORDNER als Konfigurationsordner benutzen" -#: ../midori/main.c:1844 +#: ../midori/main.c:1910 msgid "FOLDER" msgstr "ORDNER" -#: ../midori/main.c:1847 +#: ../midori/main.c:1913 msgid "Private browsing, no changes are saved" msgstr "Privat surfen, Änderungen werden nicht gespeichert" -#: ../midori/main.c:1850 -msgid "Portable mode, all runtime files are stored in one place" -msgstr "Portabler Modus, alle Laufzeitdateien werden an einem Ort gespeichert" - -#: ../midori/main.c:1853 -msgid "Plain GTK+ window with WebKit, akin to GtkLauncher" -msgstr "Einfaches GTK+-Fenster mit WebKit, verwandt mit GtkLauncher" - -#: ../midori/main.c:1855 +#: ../midori/main.c:1915 msgid "Show a diagnostic dialog" msgstr "Diagnosedialog anzeigen" -#: ../midori/main.c:1857 +#: ../midori/main.c:1917 msgid "Run the specified filename as javascript" -msgstr "Angegebenen Dateinamen als Javascript ausführen" +msgstr "Angegebenen Dateinamen als Javaskript ausführen" -#: ../midori/main.c:1859 +#: ../midori/main.c:1919 msgid "Take a snapshot of the specified URI" -msgstr "Schnappschuss der angegebenen Adresse aufnehmen" +msgstr "Schnappschuss der angegebenen URI aufnehmen" -#: ../midori/main.c:1861 +#: ../midori/main.c:1921 msgid "Execute the specified command" msgstr "Den angegebenen Befehl ausführen" -#: ../midori/main.c:1863 +#: ../midori/main.c:1923 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:1865 +#: ../midori/main.c:1925 msgid "Display program version" msgstr "Programmversion anzeigen" -#: ../midori/main.c:1867 +#: ../midori/main.c:1927 msgid "Addresses" msgstr "Adressen" -#: ../midori/main.c:1869 +#: ../midori/main.c:1929 msgid "Block URIs according to regular expression PATTERN" msgstr "URIs anhand des regulären Ausdrucks MUSTER blockieren" -#: ../midori/main.c:1869 +#: ../midori/main.c:1929 msgid "PATTERN" msgstr "MUSTER" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1873 +#: ../midori/main.c:1933 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "Midori nach SEKUNDEN Sekunden Untätigkeit zurücksetzen" -#: ../midori/main.c:1873 +#: ../midori/main.c:1933 msgid "SECONDS" msgstr "SEKUNDEN" -#: ../midori/main.c:1876 +#: ../midori/main.c:1936 msgid "Redirects console warnings to the specified FILENAME" msgstr "Konsolenwarnungen in DATEINAME umleiten" -#: ../midori/main.c:1876 +#: ../midori/main.c:1936 msgid "FILENAME" msgstr "Dateiname" -#: ../midori/main.c:1965 +#: ../midori/main.c:2001 +msgid "[Addresses]" +msgstr "[Adressen]" + +#: ../midori/main.c:2011 +msgid "The specified configuration folder is invalid." +msgstr "Der angegebene Konfigurationsordner konnte nicht geladen werden." + +#: ../midori/main.c:2041 msgid "Please report comments, suggestions and bugs to:" msgstr "Kommentare, Vorschläge und Fehlerberichte senden an:" -#: ../midori/main.c:1967 +#: ../midori/main.c:2043 msgid "Check for new versions at:" msgstr "Informieren Sie sich über neue Versionen unter:" +#: ../midori/main.c:2126 +msgid "Website icons" +msgstr "Symbole von Internetseiten" + #. i18n: Logins and passwords in websites and web forms -#: ../midori/main.c:2098 +#: ../midori/main.c:2129 msgid "Saved logins and _passwords" msgstr "Gespeicherte Anmeldungen und Passwörter" -#: ../midori/main.c:2100 -msgid "Cookies and Website data" -msgstr "Cookies und Webseitendaten" +#: ../midori/main.c:2131 +msgid "Cookies" +msgstr "Benutzerprofile/ Cookies" + +#: ../midori/main.c:2134 +msgid "'Flash' Cookies" +msgstr "»Flash« Cookies" -#. TODO: Preserve page icons of search engines and merge privacy items -#: ../midori/main.c:2104 ../midori/midori-preferences.c:505 -#: ../extensions/web-cache.c:461 ../extensions/web-cache.c:470 +#: ../midori/main.c:2137 +msgid "HTML5 _Databases" +msgstr "HTML5-_Datenbanken" + +#: ../midori/main.c:2140 ../midori/midori-websettings.c:932 +#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471 msgid "Web Cache" msgstr "Zwischenspeicher" -#: ../midori/main.c:2107 -msgid "Website icons" -msgstr "Symbole von Internetseiten" +#: ../midori/main.c:2142 +msgid "Offline Application Cache" +msgstr "HTML5-Anwendungsspeicher" -#: ../midori/main.c:2211 +#: ../midori/main.c:2245 msgid "An unknown error occured" msgstr "Ein unbekannter Fehler ist aufgetreten." -#: ../midori/main.c:2326 +#: ../midori/main.c:2354 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:2360 +#: ../midori/main.c:2390 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Die Lesezeichen konnten nicht geladen werden: %s\n" -#: ../midori/main.c:2393 +#: ../midori/main.c:2438 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Der Papierkorb konnte nicht geladen werden: %s\n" -#: ../midori/main.c:2406 +#: ../midori/main.c:2451 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Der Verlauf konnte nicht geladen werden: %s\n" -#: ../midori/main.c:2421 +#: ../midori/main.c:2467 msgid "The following errors occured:" msgstr "Folgende Fehler sind aufgetreten:" -#: ../midori/main.c:2437 +#: ../midori/main.c:2483 msgid "_Ignore" msgstr "_Ignorieren" -#: ../midori/midori-app.c:1156 ../midori/midori-browser.c:533 -#, c-format -msgid "Unexpected action '%s'." -msgstr "Unerwartete Aktion »%s«." +#: ../midori/midori-app.c:1321 +msgid "_Bookmark" +msgstr "_Lesezeichen" -#: ../midori/midori-app.c:1372 ../midori/midori-browser.c:6368 +#: ../midori/midori-app.c:1322 ../midori/midori-browser.c:6061 msgid "_Bookmarks" msgstr "_Lesezeichen" -#: ../midori/midori-app.c:1373 +#: ../midori/midori-app.c:1323 msgid "Add Boo_kmark" msgstr "Lesezeichen _hinzufügen" -#: ../midori/midori-app.c:1374 +#: ../midori/midori-app.c:1324 +msgid "_Console" +msgstr "_Konsole" + +#: ../midori/midori-app.c:1325 msgid "_Extensions" msgstr "_Erweiterungen" #. i18n: Browsing history, visited web pages, closed tabs -#: ../midori/midori-app.c:1375 ../midori/midori-browser.c:4821 +#: ../midori/midori-app.c:1326 ../midori/midori-browser.c:4606 msgid "_History" msgstr "_Verlauf" -#: ../midori/midori-app.c:1376 +#: ../midori/midori-app.c:1327 +msgid "_Homepage" +msgstr "_Startseite" + +#: ../midori/midori-app.c:1328 msgid "_Userscripts" msgstr "_Benutzerskripte" -#: ../midori/midori-app.c:1377 -msgid "User_styles" -msgstr "Benutzer_stile" - -#: ../midori/midori-app.c:1378 +#: ../midori/midori-app.c:1329 msgid "New _Tab" msgstr "Neuer _Reiter" -#: ../midori/midori-app.c:1379 +#: ../midori/midori-app.c:1330 msgid "_Transfers" msgstr "Über_tragungen" -#: ../midori/midori-app.c:1380 +#: ../midori/midori-app.c:1331 msgid "Netscape p_lugins" -msgstr "Netscape-Modu_le" +msgstr "Netscape-Module" -#: ../midori/midori-app.c:1381 +#: ../midori/midori-app.c:1332 msgid "_Closed Tabs" msgstr "Ges_chlossene Reiter" -#: ../midori/midori-app.c:1382 ../midori/midori-browser.c:5504 +#: ../midori/midori-app.c:1333 ../midori/midori-browser.c:5194 msgid "New _Window" msgstr "Neues _Fenster" -#: ../midori/midori-app.c:1383 +#: ../midori/midori-app.c:1334 msgid "New _Folder" msgstr "Neuer _Ordner" -#: ../midori/midori-app.c:1437 -msgid "[Addresses]" -msgstr "[Adressen]" - #: ../midori/midori-array.c:522 msgid "File not found." msgstr "Datei nicht gefunden." @@ -433,145 +374,134 @@ msgstr "Datei nicht gefunden." #: ../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." +msgstr "Fehlerhaftes Dokument" #: ../midori/midori-array.c:628 msgid "Unrecognized bookmark format." msgstr "Unbekanntes Lesezeichenformat." -#: ../midori/midori-array.c:915 +#: ../midori/midori-array.c:916 msgid "Writing failed." msgstr "Schreiben fehlgeschlagen." -#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:5643 -msgid "Go forward to the next page" -msgstr "Gehe weiter zur nächsten Seite" - -#. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:353 ../midori/midori-browser.c:5651 -#: ../midori/midori-browser.c:5654 -msgid "Go to the next sub-page" -msgstr "Gehe weiter zur nächsten Unterseite" - -#: ../midori/midori-browser.c:440 ../midori/midori-browser.c:5592 -#: ../midori/midori-browser.c:5601 +#: ../midori/midori-browser.c:328 ../midori/midori-browser.c:5279 +#: ../midori/midori-browser.c:5288 msgid "Reload the current page" msgstr "Diese Seite neu laden" -#: ../midori/midori-browser.c:448 ../midori/midori-browser.c:5598 +#: ../midori/midori-browser.c:339 ../midori/midori-browser.c:5285 msgid "Stop loading the current page" msgstr "Laden dieser Seite abbrechen" -#: ../midori/midori-browser.c:518 +#: ../midori/midori-browser.c:466 #, c-format msgid "Failed to update title: %s\n" msgstr "Titel konnte nicht aktualisiert werden: %s\n" -#: ../midori/midori-browser.c:613 +#: ../midori/midori-browser.c:479 +#, c-format +msgid "Unexpected action '%s'." +msgstr "Unerwartete Aktion »%s«." + +#: ../midori/midori-browser.c:580 #, c-format msgid "%s (Private Browsing)" msgstr "%s (Privat surfen)" -#: ../midori/midori-browser.c:723 ../midori/midori-browser.c:765 -#: ../panels/midori-bookmarks.c:114 -msgid "Bookmarks" -msgstr "Lesezeichen" +#: ../midori/midori-browser.c:691 ../midori/midori-browser.c:724 +msgid "Toplevel folder" +msgstr "Oberster Ordner" -#: ../midori/midori-browser.c:825 +#: ../midori/midori-browser.c:781 msgid "New folder" msgstr "Neuer Ordner" -#: ../midori/midori-browser.c:825 +#: ../midori/midori-browser.c:781 msgid "Edit folder" msgstr "Ordner bearbeiten" -#: ../midori/midori-browser.c:827 +#: ../midori/midori-browser.c:783 msgid "New bookmark" msgstr "Neues Lesezeichen" -#: ../midori/midori-browser.c:827 +#: ../midori/midori-browser.c:783 msgid "Edit bookmark" msgstr "Lesezeichen bearbeiten" -#: ../midori/midori-browser.c:861 -msgid "Type a name for this bookmark and choose where to keep it." -msgstr "" -"Namen des Lesezeichens eingeben und angeben, wo es gespeichert werden soll." +#: ../midori/midori-browser.c:814 +msgid "_Title:" +msgstr "_Titel:" -#: ../midori/midori-browser.c:922 +#: ../midori/midori-browser.c:834 ../midori/midori-searchaction.c:968 +#: ../extensions/feed-panel/main.c:377 +msgid "_Address:" +msgstr "_Adresse:" + +#: ../midori/midori-browser.c:857 ../midori/midori-browser.c:4341 +msgid "_Folder:" +msgstr "_Ordner:" + +#: ../midori/midori-browser.c:873 msgid "Add to _Speed Dial" msgstr "Zu Schnell_wahl hinzufügen" -#: ../midori/midori-browser.c:928 +#: ../midori/midori-browser.c:886 msgid "Show in the tool_bar" msgstr "In der Werkzeug_leiste anzeigen" -#: ../midori/midori-browser.c:936 +#: ../midori/midori-browser.c:901 msgid "Run as _web application" msgstr "Als _Internetanwendung starten" -#: ../midori/midori-browser.c:1007 +#: ../midori/midori-browser.c:972 #, 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:1009 +#: ../midori/midori-browser.c:974 #, 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:1016 +#: ../midori/midori-browser.c:981 #, c-format msgid "There is not enough free space to download \"%s\"." -msgstr "Der freie Speichersplatz reicht nicht aus, um »%s« herunterzuladen." +msgstr "Der freie Speichersplatz reicht nicht aus, um «%s» herunterzuladen." -#: ../midori/midori-browser.c:1019 +#: ../midori/midori-browser.c:984 #, 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:1155 ../midori/midori-browser.c:4625 +#: ../midori/midori-browser.c:1028 ../midori/midori-browser.c:4411 msgid "Save file as" msgstr "Datei speichern unter" -#: ../midori/midori-browser.c:1161 -msgid "Save associated _resources" -msgstr "Zugehörige _Ressourcen speichern" +#: ../midori/midori-browser.c:1344 +msgid "New Window" +msgstr "Neues Fenster" -#: ../midori/midori-browser.c:1403 +#: ../midori/midori-browser.c:1344 msgid "A new window has been opened" msgstr "Ein neues Fenster wurde geöffnet" -#: ../midori/midori-browser.c:1406 +#: ../midori/midori-browser.c:1347 +msgid "New Tab" +msgstr "Neuer Reiter" + +#: ../midori/midori-browser.c:1347 msgid "A new tab has been opened" msgstr "Ein neuer Reiter wurde geöffnet" -#: ../midori/midori-browser.c:1423 -msgid "Error opening the image!" -msgstr "Fehler beim Öffnen des Bildes!" - -#: ../midori/midori-browser.c:1424 -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:1430 -msgid "Error downloading the image!" -msgstr "Fehler beim Herunterladen des Bildes!" - -#: ../midori/midori-browser.c:1431 -msgid "Can not download selected image." -msgstr "Das Bild kann nicht heruntergeladen werden" - -#: ../midori/midori-browser.c:1553 +#: ../midori/midori-browser.c:1384 msgid "Save file" msgstr "Datei speichern" -#: ../midori/midori-browser.c:2456 +#: ../midori/midori-browser.c:2274 msgid "Open file" msgstr "Datei öffnen" -#: ../midori/midori-browser.c:2588 +#: ../midori/midori-browser.c:2404 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" @@ -586,155 +516,135 @@ msgstr "" "Nachrichtenaggregator auswählen. Dann wird beim nächsten Klick auf das " "Symbol für Nachrichtenquellen die Addresse automatisch hinzugefügt." -#: ../midori/midori-browser.c:2594 ../extensions/feed-panel/main.c:365 +#: ../midori/midori-browser.c:2410 ../extensions/feed-panel/main.c:365 msgid "New feed" msgstr "Neue Nachrichtenquelle" -#: ../midori/midori-browser.c:2637 ../midori/midori-browser.c:5667 -#: ../panels/midori-bookmarks.c:527 +#: ../midori/midori-browser.c:2453 ../midori/midori-browser.c:5348 +#: ../panels/midori-bookmarks.c:463 msgid "Add a new bookmark" msgstr "Ein neues Lesezeichen hinzufügen" -#: ../midori/midori-browser.c:3181 ../midori/midori-searchaction.c:487 +#: ../midori/midori-browser.c:3016 ../midori/midori-searchaction.c:489 msgid "Empty" msgstr "Leer" -#: ../midori/midori-browser.c:3627 ../midori/midori-browser.c:3628 -msgid "Toggle text cursor navigation" -msgstr "Navigation mit Textmarke einschalten" - -#: ../midori/midori-browser.c:3630 -msgid "" -"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in " -"all websites." -msgstr "" -"Drücken von F7 aktiviert bzw. deaktiviert Caret Browsing. Falls aktiviert " -"wird auf allen Internetseiten ein Textcursor angezeigt." - -#: ../midori/midori-browser.c:3633 -msgid "_Enable Caret Browsing" -msgstr "Navigation mit Textcursor" - -#: ../midori/midori-browser.c:4025 ../midori/midori-browser.c:6061 +#: ../midori/midori-browser.c:3807 ../midori/midori-browser.c:5758 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Verlaufseintrag konnte nicht hinzugefügt werden: %s\n" -#: ../midori/midori-browser.c:4351 ../panels/midori-bookmarks.c:850 -#: ../panels/midori-history.c:806 +#: ../midori/midori-browser.c:4138 ../panels/midori-bookmarks.c:779 +#: ../panels/midori-history.c:747 msgid "Open all in _Tabs" msgstr "Alle in neuen _Reitern öffnen" -#: ../midori/midori-browser.c:4358 ../panels/midori-bookmarks.c:856 -#: ../panels/midori-history.c:812 ../extensions/feed-panel/feed-panel.c:528 +#: ../midori/midori-browser.c:4145 ../panels/midori-bookmarks.c:785 +#: ../panels/midori-history.c:753 ../extensions/feed-panel/feed-panel.c:528 msgid "Open in New _Tab" msgstr "In neuem _Reiter öffnen" -#: ../midori/midori-browser.c:4361 ../midori/midori-view.c:2953 -#: ../midori/midori-view.c:4937 ../panels/midori-bookmarks.c:858 -#: ../panels/midori-history.c:814 ../extensions/feed-panel/feed-panel.c:530 +#: ../midori/midori-browser.c:4148 ../midori/midori-view.c:2547 +#: ../midori/midori-view.c:4365 ../panels/midori-bookmarks.c:787 +#: ../panels/midori-history.c:755 ../extensions/feed-panel/feed-panel.c:530 msgid "Open in New _Window" msgstr "In neuem _Fenster öffnen" -#: ../midori/midori-browser.c:4450 +#: ../midori/midori-browser.c:4228 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4451 +#: ../midori/midori-browser.c:4229 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4452 +#: ../midori/midori-browser.c:4230 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4453 +#: ../midori/midori-browser.c:4231 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4454 +#: ../midori/midori-browser.c:4232 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4455 +#: ../midori/midori-browser.c:4233 #, c-format msgid "Firefox (%s)" msgstr "Firefox (%s)" -#: ../midori/midori-browser.c:4456 -msgid "Midori 0.2.6" -msgstr "Midori 0.2.6" +#: ../midori/midori-browser.c:4254 +msgid "Import bookmarks..." +msgstr "Lesezeichen importieren..." -#: ../midori/midori-browser.c:4477 -msgid "Import bookmarks…" -msgstr "Lesezeichen importieren …" - -#: ../midori/midori-browser.c:4480 ../midori/midori-browser.c:5672 +#: ../midori/midori-browser.c:4257 ../midori/midori-browser.c:5353 msgid "_Import bookmarks" msgstr "Lesezeichen _importieren" -#: ../midori/midori-browser.c:4491 +#: ../midori/midori-browser.c:4268 msgid "_Application:" msgstr "_Anwendung:" -#: ../midori/midori-browser.c:4556 +#: ../midori/midori-browser.c:4333 msgid "Import from XBEL or HTML file" msgstr "Aus einer XBEL- oder HTML-Datei importieren" -#: ../midori/midori-browser.c:4584 +#: ../midori/midori-browser.c:4368 msgid "Import from a file" msgstr "Aus einer Datei importieren" -#: ../midori/midori-browser.c:4596 +#: ../midori/midori-browser.c:4380 msgid "Failed to import bookmarks" msgstr "Fehler beim Importieren der Lesezeichen" -#: ../midori/midori-browser.c:4630 +#: ../midori/midori-browser.c:4416 msgid "XBEL Bookmarks" msgstr "XBEL-Lesezeichen" -#: ../midori/midori-browser.c:4635 +#: ../midori/midori-browser.c:4421 msgid "Netscape Bookmarks" msgstr "Netscape-Lesezeichen" -#: ../midori/midori-browser.c:4649 +#: ../midori/midori-browser.c:4435 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:4664 +#: ../midori/midori-browser.c:4451 msgid "Failed to export bookmarks" msgstr "Fehler beim Exportieren der Lesezeichen" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4786 +#: ../midori/midori-browser.c:4573 msgid "Clear Private Data" msgstr "Private Daten löschen" -#: ../midori/midori-browser.c:4790 +#: ../midori/midori-browser.c:4577 msgid "_Clear private data" msgstr "_Private Daten löschen" -#: ../midori/midori-browser.c:4805 +#: ../midori/midori-browser.c:4590 msgid "Clear the following data:" msgstr "Folgende Daten löschen:" -#: ../midori/midori-browser.c:4815 +#: ../midori/midori-browser.c:4600 msgid "Last open _tabs" msgstr "_Zuletzt geöffnete Seiten" -#: ../midori/midori-browser.c:4841 +#: ../midori/midori-browser.c:4626 msgid "Clear private data when _quitting Midori" msgstr "Private Daten beim _Beenden von Midori löschen" -#: ../midori/midori-browser.c:5056 +#: ../midori/midori-browser.c:4802 msgid "A lightweight web browser." msgstr "Ein schlanker Internetbetrachter." -#: ../midori/midori-browser.c:5057 +#: ../midori/midori-browser.c:4803 msgid "See about:version for version info." msgstr "Siehe about:version für Versionsinformationen." -#: ../midori/midori-browser.c:5059 +#: ../midori/midori-browser.c:4805 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 " @@ -746,610 +656,1097 @@ msgstr "" "veröffentlicht, weitergeben und/ oder modifizieren, entweder gemäß Version " "2.1 der Lizenz oder (wahlweise) jeder späteren Version." -#: ../midori/midori-browser.c:5089 +#: ../midori/midori-browser.c:4826 msgid "translator-credits" msgstr "" "Enrico Tröger \n" "Christian Dywan " -#: ../midori/midori-browser.c:5502 +#: ../midori/midori-browser.c:5192 msgid "_File" msgstr "_Datei" -#: ../midori/midori-browser.c:5505 +#: ../midori/midori-browser.c:5195 msgid "Open a new window" msgstr "Ein neues Fenster öffnen" -#: ../midori/midori-browser.c:5508 +#: ../midori/midori-browser.c:5198 msgid "Open a new tab" msgstr "Einen neuen Reiter öffnen" -#: ../midori/midori-browser.c:5510 +#: ../midori/midori-browser.c:5200 msgid "New P_rivate Browsing Window" msgstr "Neues Fenster zum _privaten Surfen" -#: ../midori/midori-browser.c:5514 +#: ../midori/midori-browser.c:5201 +msgid "Don't save any private data while browsing" +msgstr "Keinerlei private Daten während des Surfens speichern" + +#: ../midori/midori-browser.c:5205 msgid "Open a file" msgstr "Eine Datei öffnen" -#: ../midori/midori-browser.c:5516 -msgid "_Save Page As…" -msgstr "_Seite speichern unter …" +#: ../midori/midori-browser.c:5207 +msgid "_Save Page As..." +msgstr "_Seite speichern unter…" -#: ../midori/midori-browser.c:5517 +#: ../midori/midori-browser.c:5208 msgid "Save to a file" msgstr "In Datei speichern" -#: ../midori/midori-browser.c:5519 +#: ../midori/midori-browser.c:5210 msgid "Add to Speed _dial" msgstr "Zu Schnell_wahl hinzufügen" -#: ../midori/midori-browser.c:5523 +#: ../midori/midori-browser.c:5211 +msgid "Add shortcut to speed dial" +msgstr "Eine Verknüpfung zur Schnellwahl hinzufügen" + +#: ../midori/midori-browser.c:5214 msgid "Add Shortcut to the _desktop" msgstr "Verknüpfung auf dem _Schreibtisch" -#: ../midori/midori-browser.c:5525 +#: ../midori/midori-browser.c:5215 +msgid "Add shortcut to the desktop" +msgstr "Eine Verknüpfung auf dem Schreibtisch hinzufügen" + +#: ../midori/midori-browser.c:5217 msgid "Create _Launcher" msgstr "_Starter erstellen" -#: ../midori/midori-browser.c:5529 +#: ../midori/midori-browser.c:5218 +msgid "Create a launcher" +msgstr "Starter erstellen" + +#: ../midori/midori-browser.c:5221 msgid "Subscribe to News _feed" msgstr "Nachrichten_quelle abonnieren" -#: ../midori/midori-browser.c:5535 +#: ../midori/midori-browser.c:5222 +msgid "Subscribe to this news feed" +msgstr "Diese Nachrichtenquelle abonnieren" + +#: ../midori/midori-browser.c:5227 msgid "_Close Tab" msgstr "Reiter s_chließen" -#: ../midori/midori-browser.c:5536 +#: ../midori/midori-browser.c:5228 msgid "Close the current tab" msgstr "Den aktuellen Reiter schließen" -#: ../midori/midori-browser.c:5538 +#: ../midori/midori-browser.c:5230 msgid "C_lose Window" msgstr "_Fenster schließen" -#: ../midori/midori-browser.c:5542 -msgid "_Share" -msgstr "_Freigeben" +#: ../midori/midori-browser.c:5231 +msgid "Close this window" +msgstr "Dieses Fenster schließen" -#: ../midori/midori-browser.c:5547 +#: ../midori/midori-browser.c:5234 msgid "Print the current page" msgstr "Aktuelle Seite ausdrucken" -#: ../midori/midori-browser.c:5550 +#: ../midori/midori-browser.c:5236 msgid "Close a_ll Windows" msgstr "_Alle Fenster schließen" -#: ../midori/midori-browser.c:5553 +#: ../midori/midori-browser.c:5237 +msgid "Close all open windows" +msgstr "Alle offenen Fenster schließen" + +#: ../midori/midori-browser.c:5239 msgid "_Edit" msgstr "_Bearbeiten" -#: ../midori/midori-browser.c:5576 -msgid "_Find…" -msgstr "_Suchen …" +#: ../midori/midori-browser.c:5242 +msgid "Undo the last modification" +msgstr "Letzte Änderung rückgängig machen" + +#: ../midori/midori-browser.c:5245 +msgid "Redo the last modification" +msgstr "Die letzte Ä_nderung rückgängig machen" + +#: ../midori/midori-browser.c:5248 +msgid "Cut the selected text" +msgstr "Markierten Text ausschneiden" + +#: ../midori/midori-browser.c:5251 +msgid "Copy the selected text" +msgstr "Markierten Text kopieren" + +#: ../midori/midori-browser.c:5254 +msgid "Paste text from the clipboard" +msgstr "Text aus der Zwischenablage einfügen" + +#: ../midori/midori-browser.c:5257 +msgid "Delete the selected text" +msgstr "Markierten Text löschen" + +#: ../midori/midori-browser.c:5260 +msgid "Select all text" +msgstr "Gesamten Text auswählen" + +#: ../midori/midori-browser.c:5262 +msgid "_Find..." +msgstr "_Ort…" -#: ../midori/midori-browser.c:5577 +#: ../midori/midori-browser.c:5263 msgid "Find a word or phrase in the page" -msgstr "Ein Wort oder einen Satz auf der Seite suchen" +msgstr "Finde ein Wort oder einen Satz auf der Seite" -#: ../midori/midori-browser.c:5579 +#: ../midori/midori-browser.c:5265 msgid "Find _Next" msgstr "_Nächstes suchen" -#: ../midori/midori-browser.c:5582 +#: ../midori/midori-browser.c:5266 +msgid "Find the next occurrence of a word or phrase" +msgstr "Finde das nächste Auftreten eines Wortes oder Satzes" + +#: ../midori/midori-browser.c:5268 msgid "Find _Previous" msgstr "_Vorheriges suchen" -#: ../midori/midori-browser.c:5586 +#: ../midori/midori-browser.c:5269 +msgid "Find the previous occurrence of a word or phrase" +msgstr "Finde das voherige Auftreten eines Wortes oder Satzes" + +#: ../midori/midori-browser.c:5273 msgid "Configure the application preferences" -msgstr "Anwendungseinstellungen anpassen" +msgstr "Anwedungseinstellungen anpassen" -#: ../midori/midori-browser.c:5588 +#: ../midori/midori-browser.c:5275 msgid "_View" msgstr "_Ansicht" -#: ../midori/midori-browser.c:5589 +#: ../midori/midori-browser.c:5276 msgid "_Toolbars" msgstr "_Werkzeugleisten" -#: ../midori/midori-browser.c:5594 +#: ../midori/midori-browser.c:5281 ../midori/midori-browser.c:5282 msgid "Reload page without caching" msgstr "Seite ohne Zwischenspeicher neu laden" -#: ../midori/midori-browser.c:5604 +#: ../midori/midori-browser.c:5291 msgid "Increase the zoom level" -msgstr "Die Vergrößerungsstufe erhöhen" +msgstr "Erhöhe die Vergrößerungsstufe" -#: ../midori/midori-browser.c:5607 +#: ../midori/midori-browser.c:5294 msgid "Decrease the zoom level" -msgstr "Die Vergrößerungsstufe verringern" +msgstr "Verringere die Vergrößerungsstufe" -#: ../midori/midori-browser.c:5611 +#: ../midori/midori-browser.c:5297 +msgid "Reset the zoom level" +msgstr "Setzte die Vergrößerungsstufe zurück" + +#: ../midori/midori-browser.c:5298 msgid "_Encoding" msgstr "_Zeichensatz" -#: ../midori/midori-browser.c:5613 +#: ../midori/midori-browser.c:5300 msgid "View So_urce" msgstr "_Quelltext anzeigen" -#: ../midori/midori-browser.c:5616 +#: ../midori/midori-browser.c:5301 +msgid "View the source code of the page" +msgstr "Zeige den Quelltext der Seite an" + +#: ../midori/midori-browser.c:5303 msgid "Ca_ret Browsing" -msgstr "Navigation mit Textma_rke" +msgstr "Navigation mit Textmarke" -#: ../midori/midori-browser.c:5620 +#: ../midori/midori-browser.c:5304 +msgid "Toggle text cursor navigation" +msgstr "Navigation mit Textmarke einschalten" + +#: ../midori/midori-browser.c:5307 msgid "Toggle fullscreen view" msgstr "Vollbildmodus ein-/ ausschalten" -#: ../midori/midori-browser.c:5622 +#: ../midori/midori-browser.c:5309 msgid "Scroll _Left" msgstr "Nach _links rollen" -#: ../midori/midori-browser.c:5625 +#: ../midori/midori-browser.c:5310 +msgid "Scroll to the left" +msgstr "Nach links rollen" + +#: ../midori/midori-browser.c:5312 msgid "Scroll _Down" msgstr "_Herunter rollen" -#: ../midori/midori-browser.c:5628 +#: ../midori/midori-browser.c:5313 +msgid "Scroll down" +msgstr "Herunter rollen" + +#: ../midori/midori-browser.c:5315 msgid "Scroll _Up" msgstr "H_och rollen" -#: ../midori/midori-browser.c:5631 +#: ../midori/midori-browser.c:5316 +msgid "Scroll up" +msgstr "Hoch rollen" + +#: ../midori/midori-browser.c:5318 msgid "Scroll _Right" msgstr "Nach _rechts rollen" -#: ../midori/midori-browser.c:5634 -msgid "_Readable" -msgstr "Lesba_r" +#: ../midori/midori-browser.c:5319 +msgid "Scroll to the right" +msgstr "Nach rechts rollen" -#: ../midori/midori-browser.c:5637 +#: ../midori/midori-browser.c:5321 msgid "_Go" msgstr "_Gehe zu" -#: ../midori/midori-browser.c:5640 +#: ../midori/midori-browser.c:5324 msgid "Go back to the previous page" -msgstr "Zur vorherigen Seite zurück gehen" +msgstr "Gehe zur voherigen Seite zurück" + +#: ../midori/midori-browser.c:5327 +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:5647 +#: ../midori/midori-browser.c:5331 msgid "Go to the previous sub-page" -msgstr "Zur vorherigen Unterseite zurück gehen" +msgstr "Gehe zur voherigen Unterseite zurück" -#: ../midori/midori-browser.c:5656 -msgid "_Homepage" -msgstr "_Startseite" +#. i18n: Visit the following logical page, ie. in a forum or blog +#: ../midori/midori-browser.c:5335 +msgid "Go to the next sub-page" +msgstr "Gehe weiter zur nächsten Unterseite" -#: ../midori/midori-browser.c:5657 +#: ../midori/midori-browser.c:5338 msgid "Go to your homepage" -msgstr "Zu Ihrer Startseite gehen" +msgstr "Gehe zu Deiner Startseite" -#: ../midori/midori-browser.c:5659 +#: ../midori/midori-browser.c:5340 msgid "Empty Trash" msgstr "Papierkorb leeren" -#: ../midori/midori-browser.c:5662 +#: ../midori/midori-browser.c:5341 +msgid "Delete the contents of the trash" +msgstr "Inhalt des Papierkorbs löschen" + +#: ../midori/midori-browser.c:5343 msgid "Undo _Close Tab" msgstr "Reiter _zurückholen" -#: ../midori/midori-browser.c:5669 +#: ../midori/midori-browser.c:5344 +msgid "Open the last closed tab" +msgstr "Zuletzt geschlossenen Reiter öffnen" + +#: ../midori/midori-browser.c:5350 msgid "Add a new _folder" msgstr "Einen neuen _Ordner hinzufügen" -#: ../midori/midori-browser.c:5675 +#: ../midori/midori-browser.c:5351 +msgid "Add a new bookmark folder" +msgstr "Einen neuen Lesezeichenordner hinzufügen" + +#: ../midori/midori-browser.c:5356 msgid "_Export bookmarks" msgstr "Lesezeichen _exportieren" -#: ../midori/midori-browser.c:5678 ../midori/midori-searchaction.c:496 +#: ../midori/midori-browser.c:5359 ../midori/midori-searchaction.c:498 msgid "_Manage Search Engines" msgstr "_Suchmaschinen verwalten" -#: ../midori/midori-browser.c:5681 +#: ../midori/midori-browser.c:5360 +msgid "Add, edit and remove search engines..." +msgstr "Suchmaschinen hinzufügen, bearbeiten und löschen…" + +#: ../midori/midori-browser.c:5363 msgid "_Clear Private Data" msgstr "_Private Daten löschen" -#: ../midori/midori-browser.c:5684 +#: ../midori/midori-browser.c:5364 +msgid "Clear private data..." +msgstr "Private Daten löschen..." + +#: ../midori/midori-browser.c:5367 msgid "_Inspect Page" msgstr "Seite _untersuchen" -#: ../midori/midori-browser.c:5688 +#: ../midori/midori-browser.c:5368 +msgid "Inspect page details and access developer tools..." +msgstr "Einzelheiten der Seite untersuchen und Entwicklerwerkzeuge benutzen..." + +#: ../midori/midori-browser.c:5372 msgid "_Previous Tab" msgstr "_Vorheriger Reiter" -#: ../midori/midori-browser.c:5691 +#: ../midori/midori-browser.c:5373 +msgid "Switch to the previous tab" +msgstr "Zum voherigen Reiter wechseln" + +#: ../midori/midori-browser.c:5375 msgid "_Next Tab" msgstr "_Nächster Reiter" -#: ../midori/midori-browser.c:5693 +#: ../midori/midori-browser.c:5376 +msgid "Switch to the next tab" +msgstr "Zum nächsten Reiter wechseln" + +#: ../midori/midori-browser.c:5377 msgid "Move Tab _Backward" msgstr "Reiter _zurück schieben" -#: ../midori/midori-browser.c:5695 +#: ../midori/midori-browser.c:5378 +msgid "Move tab behind the previous tab" +msgstr "Reiter hinter den voherigen schieben" + +#: ../midori/midori-browser.c:5379 msgid "_Move Tab Forward" msgstr "Reiter v_orwärts schieben" -#: ../midori/midori-browser.c:5698 +#: ../midori/midori-browser.c:5380 +msgid "Move tab in front of the next tab" +msgstr "Reiter vor den nächsten schieben" + +#: ../midori/midori-browser.c:5382 msgid "Focus _Current Tab" -msgstr "_Aktuellen Reiter fokussieren" +msgstr "_Aktuellen Reiter fokusieren" + +#: ../midori/midori-browser.c:5383 +msgid "Focus the current tab" +msgstr "Den aktuellen Reiter fokussieren" -#: ../midori/midori-browser.c:5701 +#: ../midori/midori-browser.c:5385 msgid "Focus _Next view" -msgstr "_Nächste Ansicht fokussieren" +msgstr "_Nächste Ansicht foussieren" -#: ../midori/midori-browser.c:5704 +#: ../midori/midori-browser.c:5386 +msgid "Cycle focus between views" +msgstr "Fokus zwischen Ansichten wechseln" + +#: ../midori/midori-browser.c:5388 msgid "Only show the Icon of the _Current Tab" msgstr "Nur das Symbol des _aktuellen Reiters anziegen" -#: ../midori/midori-browser.c:5707 +#: ../midori/midori-browser.c:5389 +msgid "Only show the icon of the current tab" +msgstr "Nur das Symbol des aktuellen Reiters anzeigen" + +#: ../midori/midori-browser.c:5391 msgid "_Duplicate Current Tab" msgstr "Aktuellen Reiter _verdoppeln" -#: ../midori/midori-browser.c:5710 +#: ../midori/midori-browser.c:5392 +msgid "Duplicate the current tab" +msgstr "Den aktuellen Reiter verdoppeln" + +#: ../midori/midori-browser.c:5394 msgid "Close Ot_her Tabs" msgstr "Ande_re Reiter schließen" -#: ../midori/midori-browser.c:5713 +#: ../midori/midori-browser.c:5395 +msgid "Close all tabs except the current tab" +msgstr "Alle Reiter, bis auf den aktuellen Reiter schließen" + +#: ../midori/midori-browser.c:5397 msgid "Open last _session" msgstr "Die letzte _Sitzung öffnen" -#: ../midori/midori-browser.c:5716 +#: ../midori/midori-browser.c:5398 +msgid "Open the tabs saved in the last session" +msgstr "In der letzten Sitzung geöffnete Reiter öffnen" + +#: ../midori/midori-browser.c:5400 msgid "_Help" msgstr "_Hilfe" -#: ../midori/midori-browser.c:5718 +#: ../midori/midori-browser.c:5402 msgid "_Frequent Questions" msgstr "_Häufige Fragen" -#: ../midori/midori-browser.c:5721 -msgid "_Report a Problem…" -msgstr "Einen Fehler _melden …" +#: ../midori/midori-browser.c:5403 +msgid "Show the Frequently Asked Questions" +msgstr "Häufig gestellte Fragen anzeigen" -#: ../midori/midori-browser.c:5726 ../midori/midori-browser.c:6387 -msgid "_Tools" -msgstr "_Extras" +#: ../midori/midori-browser.c:5405 +msgid "_Report a Problem..." +msgstr "Einen Fehler _melden..." + +#: ../midori/midori-browser.c:5406 +msgid "Open Midori's bug tracker" +msgstr "Midoris Fehlerverfolgung öffnen" + +#: ../midori/midori-browser.c:5409 +msgid "Show information about the program" +msgstr "Zeige Informationen über das Programm" -#: ../midori/midori-browser.c:5733 +#: ../midori/midori-browser.c:5417 msgid "_Menubar" msgstr "_Menüleiste" -#: ../midori/midori-browser.c:5737 +#: ../midori/midori-browser.c:5418 +msgid "Show menubar" +msgstr "Menüleiste anzeigen" + +#: ../midori/midori-browser.c:5421 msgid "_Navigationbar" msgstr "_Navigationsleiste" -#: ../midori/midori-browser.c:5741 +#: ../midori/midori-browser.c:5422 +msgid "Show navigationbar" +msgstr "Navigationsleiste anzeigen" + +#: ../midori/midori-browser.c:5425 msgid "Side_panel" msgstr "Seiten_leiste" -#: ../midori/midori-browser.c:5742 -msgid "Sidepanel" -msgstr "Seitenleiste" +#: ../midori/midori-browser.c:5426 +msgid "Show sidepanel" +msgstr "Seitenleiste anzeigen" -#: ../midori/midori-browser.c:5745 +#: ../midori/midori-browser.c:5429 msgid "_Bookmarkbar" msgstr "_Lesezeichenleiste" -#: ../midori/midori-browser.c:5749 +#: ../midori/midori-browser.c:5430 +msgid "Show bookmarkbar" +msgstr "Lesezeichenleiste anzeigen" + +#: ../midori/midori-browser.c:5433 msgid "_Statusbar" msgstr "_Statusleiste" -#: ../midori/midori-browser.c:5758 ../midori/midori-websettings.c:198 +#: ../midori/midori-browser.c:5434 +msgid "Show statusbar" +msgstr "Statusleiste anzeigen" + +#: ../midori/midori-browser.c:5442 ../midori/midori-websettings.c:298 msgid "_Automatic" msgstr "_Automatisch" -#: ../midori/midori-browser.c:5761 ../midori/midori-websettings.c:122 -msgid "Chinese Traditional (BIG5)" -msgstr "Traditionelles Chinesisch (BIG5)" - -#: ../midori/midori-browser.c:5764 ../midori/midori-websettings.c:123 -msgid "Chinese Simplified (GB18030)" -msgstr "Vereinfachtes Chinesisch (GB18030)" +#: ../midori/midori-browser.c:5445 ../midori/midori-websettings.c:223 +msgid "Chinese (BIG5)" +msgstr "Chinesisch (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5768 +#: ../midori/midori-browser.c:5449 msgid "Japanese (SHIFT__JIS)" msgstr "Japanisch (SHIFT__JIS)" -#: ../midori/midori-browser.c:5771 ../midori/midori-websettings.c:125 +#: ../midori/midori-browser.c:5452 ../midori/midori-websettings.c:225 msgid "Korean (EUC-KR)" msgstr "Koreanisch (EUC-KR)" -#: ../midori/midori-browser.c:5774 ../midori/midori-websettings.c:126 +#: ../midori/midori-browser.c:5455 ../midori/midori-websettings.c:226 msgid "Russian (KOI8-R)" msgstr "Russisch (KOI8-R)" -#: ../midori/midori-browser.c:5777 ../midori/midori-websettings.c:127 +#: ../midori/midori-browser.c:5458 ../midori/midori-websettings.c:227 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5780 ../midori/midori-websettings.c:128 +#: ../midori/midori-browser.c:5461 ../midori/midori-websettings.c:228 msgid "Western (ISO-8859-1)" msgstr "Westlich (ISO-8859-1)" -#: ../midori/midori-browser.c:5783 -msgid "Custom…" -msgstr "Benutzerdefiniert …" +#: ../midori/midori-browser.c:5464 ../midori/midori-websettings.c:229 +#: ../midori/midori-websettings.c:304 ../katze/katze-utils.c:635 +msgid "Custom..." +msgstr "Benutzerdefiniert…" -#: ../midori/midori-browser.c:6293 +#: ../midori/midori-browser.c:5994 msgid "_Separator" msgstr "_Trennlinie" -#: ../midori/midori-browser.c:6300 -msgid "_Location…" -msgstr "_Ort …" +#: ../midori/midori-browser.c:6001 +msgid "_Location..." +msgstr "_Ort…" -#: ../midori/midori-browser.c:6302 +#: ../midori/midori-browser.c:6003 msgid "Open a particular location" -msgstr "Einen bestimmten Ort öffnen" +msgstr "Öffne einen bestimmten Ort" -#: ../midori/midori-browser.c:6324 -msgid "_Web Search…" -msgstr "Im _Netz suchen …" +#: ../midori/midori-browser.c:6025 +msgid "_Web Search..." +msgstr "Im _Netz suchen…" -#: ../midori/midori-browser.c:6326 +#: ../midori/midori-browser.c:6027 msgid "Run a web search" -msgstr "Eine Suche im Netz starten" +msgstr "Starte eine Suche im Netz" -#: ../midori/midori-browser.c:6353 +#: ../midori/midori-browser.c:6048 msgid "Reopen a previously closed tab or window" msgstr "Reiter oder Fenster zurückholen" -#: ../midori/midori-browser.c:6370 +#: ../midori/midori-browser.c:6063 msgid "Show the saved bookmarks" msgstr "Die gespeicherten Lesezeichen anzeigen" -#: ../midori/midori-browser.c:6403 +#: ../midori/midori-browser.c:6077 +msgid "_Tools" +msgstr "_Extras" + +#: ../midori/midori-browser.c:6092 msgid "_Window" msgstr "_Fenster" -#: ../midori/midori-browser.c:6405 +#: ../midori/midori-browser.c:6094 msgid "Show a list of all open tabs" -msgstr "Eine Übersicht aller offenen Reiter zeigen" +msgstr "Zeige eine Übersicht aller offenen Reiter" -#: ../midori/midori-browser.c:6419 +#: ../midori/midori-browser.c:6108 msgid "_Menu" msgstr "_Menü" -#: ../midori/midori-browser.c:6421 +#: ../midori/midori-browser.c:6110 msgid "Menu" msgstr "Menü" -#: ../midori/midori-browser.c:7246 +#: ../midori/midori-browser.c:6677 #, c-format msgid "Unexpected setting '%s'" msgstr "Unerwartete Einstellung »%s«" -#: ../midori/midori-extension.c:330 +#: ../midori/midori-extension.c:310 #, c-format 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-extension.c:749 ../midori/midori-extension.c:846 -#: ../midori/midori-extension.c:943 ../midori/midori-extension.c:1055 -#: ../extensions/addons.c:1685 +#: ../midori/midori-extension.c:708 ../midori/midori-extension.c:805 +#: ../midori/midori-extension.c:902 ../midori/midori-extension.c:1014 +#: ../extensions/addons.c:1712 #, 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" -#: ../midori/midori-locationaction.c:398 -#, c-format -msgid "Search with %s" -msgstr "Suchen mit %s" - -#: ../midori/midori-locationaction.c:418 -msgid "Search with…" -msgstr "Suchen mit …" - -#: ../midori/midori-locationaction.c:545 +#: ../midori/midori-locationaction.c:425 #, c-format msgid "Failed to select from history\n" msgstr "Auswahl aus Verlauf schlug fehl\n" -#: ../midori/midori-locationaction.c:632 +#: ../midori/midori-locationaction.c:509 #, c-format msgid "Search for %s" msgstr "Nach %s suchen" -#: ../midori/midori-locationaction.c:1227 -msgid "Export certificate" -msgstr "Zertifikat exportieren" - -#: ../midori/midori-locationaction.c:1259 -msgid "The signing certificate authority is not known." -msgstr "Die signierende Zertifizierungsstelle ist unbekannt." - -#: ../midori/midori-locationaction.c:1261 -msgid "" -"The certificate does not match the expected identity of the site that it was " -"retrieved from." -msgstr "" -"Das Zertifikat entspricht nicht der erwarteten Identität der Seite, von der " -"es empfangen wurde." - -#: ../midori/midori-locationaction.c:1263 -msgid "The certificate's activation time is still in the future." -msgstr "Die Aktivierungszeit des Zertifikats liegt in der Zukunft." - -#: ../midori/midori-locationaction.c:1265 -msgid "The certificate has expired" -msgstr "Das Zertifikat ist abgelaufen" - -#: ../midori/midori-locationaction.c:1267 -#, fuzzy -msgid "" -"The certificate has been revoked according to the GTlsConnection's " -"certificate revocation list." -msgstr "" -"Das Zertifikat wurde widerrufen, entsprechend der Widerrufliste von " -"GTIsConnections." - -#: ../midori/midori-locationaction.c:1269 -msgid "The certificate's algorithm is considered insecure." -msgstr "Der Algorithmus des Zertifikats wurde als unsicher erkannt." - -#: ../midori/midori-locationaction.c:1271 -msgid "Some other error occurred validating the certificate." -msgstr "Ein anderer Fehler trat bei der Überprüfung des Zertifikats auf." - -#: ../midori/midori-locationaction.c:1318 -msgid "_Export certificate" -msgstr "Zertifikat _exportieren" - -#: ../midori/midori-locationaction.c:1333 -msgid "Self-signed" -msgstr "Selbstsigniert" - -#: ../midori/midori-locationaction.c:1367 -msgid "Security details" -msgstr "Sicherheitsdetails" +#: ../midori/midori-locationaction.c:535 +#, c-format +msgid "Search with %s" +msgstr "Suchen mit %s" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1650 +#: ../midori/midori-locationaction.c:1285 msgid "Paste and p_roceed" msgstr "Einfügen und _fortfahren" -#: ../midori/midori-locationaction.c:1974 +#: ../midori/midori-locationaction.c:1680 msgid "Not verified" msgstr "Nicht überprüft" -#: ../midori/midori-locationaction.c:1982 +#: ../midori/midori-locationaction.c:1695 msgid "Verified and encrypted connection" msgstr "Überprüfte und verschlüsselte Verbindung" -#: ../midori/midori-locationaction.c:1989 -msgid "Open, unencrypted connection" -msgstr "Offene, unverschlüsselte Verbindung" - -#: ../midori/midori-panel.c:317 ../midori/midori-panel.c:319 -#: ../midori/midori-panel.c:483 ../midori/midori-panel.c:486 +#: ../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:329 ../midori/midori-panel.c:330 +#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410 msgid "Close panel" msgstr "Leiste schließen" -#: ../midori/midori-panel.c:484 ../midori/midori-panel.c:487 +#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566 msgid "Align sidepanel to the left" msgstr "Seitenleiste links anordnen" -#: ../midori/midori-websettings.c:104 +#: ../midori/midori-websettings.c:205 msgid "Show Speed Dial" msgstr "Schnellwahl anzeigen" -#: ../midori/midori-websettings.c:105 +#: ../midori/midori-websettings.c:206 msgid "Show Homepage" msgstr "Startseite anzeigen" -#: ../midori/midori-websettings.c:124 +#: ../midori/midori-websettings.c:224 msgid "Japanese (SHIFT_JIS)" msgstr "Japanisch (SHIFT_JIS)" -#: ../midori/midori-websettings.c:129 ../midori/midori-websettings.c:205 -#: ../katze/katze-utils.c:633 -msgid "Custom..." -msgstr "Benutzerdefiniert …" - -#: ../midori/midori-websettings.c:144 +#: ../midori/midori-websettings.c:244 msgid "New tab" msgstr "Neuer Reiter" -#: ../midori/midori-websettings.c:145 +#: ../midori/midori-websettings.c:245 msgid "New window" msgstr "Neues Fenster" -#: ../midori/midori-websettings.c:146 +#: ../midori/midori-websettings.c:246 msgid "Current tab" msgstr "Aktueller Reiter" -#: ../midori/midori-websettings.c:161 +#: ../midori/midori-websettings.c:261 msgid "Default" msgstr "Standard" -#: ../midori/midori-websettings.c:162 +#: ../midori/midori-websettings.c:262 msgid "Icons" msgstr "Symbole" -#: ../midori/midori-websettings.c:163 +#: ../midori/midori-websettings.c:263 msgid "Small icons" msgstr "Kleine Symbole" -#: ../midori/midori-websettings.c:164 +#: ../midori/midori-websettings.c:264 msgid "Text" msgstr "Text" -#: ../midori/midori-websettings.c:165 +#: ../midori/midori-websettings.c:265 msgid "Icons and text" msgstr "Symbole und Text" -#: ../midori/midori-websettings.c:166 +#: ../midori/midori-websettings.c:266 msgid "Text beside icons" msgstr "Text neben Symbolen" -#: ../midori/midori-websettings.c:181 +#: ../midori/midori-websettings.c:281 msgid "Automatic (GNOME or environment)" msgstr "Automatisch (GNOME oder Umgebung)" -#: ../midori/midori-websettings.c:182 +#: ../midori/midori-websettings.c:282 msgid "HTTP proxy server" msgstr "HTTP-Zwischenrechner" -#: ../midori/midori-websettings.c:183 +#: ../midori/midori-websettings.c:283 msgid "No proxy server" msgstr "Kein Zwischenrechner" -#: ../midori/midori-websettings.c:200 -msgid "Chrome" -msgstr "Chrome" - -#: ../midori/midori-websettings.c:201 +#: ../midori/midori-websettings.c:300 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:202 +#: ../midori/midori-websettings.c:301 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:203 +#: ../midori/midori-websettings.c:302 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:303 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:277 +#: ../midori/midori-websettings.c:356 +msgid "Remember last window size" +msgstr "Letzte Fenstergröße merken" + +#: ../midori/midori-websettings.c:357 +msgid "Whether to save the last window size" +msgstr "Die letzte Fenstergröße speichern oder nicht" + +#: ../midori/midori-websettings.c:365 +msgid "Last window width" +msgstr "Letzte Fensterbreite" + +#: ../midori/midori-websettings.c:366 +msgid "The last saved window width" +msgstr "Die zuletzt gespeicherte Fensterbreite" + +#: ../midori/midori-websettings.c:374 +msgid "Last window height" +msgstr "Letzte Fensterhöhe" + +#: ../midori/midori-websettings.c:375 +msgid "The last saved window height" +msgstr "Die zuletzt gespeicherte Fensterhöhe" + +#: ../midori/midori-websettings.c:400 +msgid "Last panel position" +msgstr "Letzte Leistenposition" + +#: ../midori/midori-websettings.c:401 +msgid "The last saved panel position" +msgstr "Die zuletzt gespeicherte Leistenposition" + +#. i18n: The internal index of the last opened panel +#: ../midori/midori-websettings.c:410 +msgid "Last panel page" +msgstr "Letzte Leistenseite" + +#: ../midori/midori-websettings.c:411 +msgid "The last saved panel page" +msgstr "Die zuletzt gespeicherte Leistenseite" + +#: ../midori/midori-websettings.c:419 +msgid "Last Web search" +msgstr "Letzte Suche im Netz" + +#: ../midori/midori-websettings.c:420 +msgid "The last saved Web search" +msgstr "Die zuletzt gespeicherte Suche im Netz" + +#: ../midori/midori-websettings.c:429 +msgid "Show Menubar" +msgstr "Menüleiste anzeigen" + +#: ../midori/midori-websettings.c:430 +msgid "Whether to show the menubar" +msgstr "Die Menüleiste anzeigen oder verbergen" + +#: ../midori/midori-websettings.c:438 +msgid "Show Navigationbar" +msgstr "Navigationsleiste anzeigen" + +#: ../midori/midori-websettings.c:439 +msgid "Whether to show the navigationbar" +msgstr "Die Navigationsleiste anzeigen oder verbergen" + +#: ../midori/midori-websettings.c:447 +msgid "Show Bookmarkbar" +msgstr "Lesezeichenleiste anzeigen" + +#: ../midori/midori-websettings.c:448 +msgid "Whether to show the bookmarkbar" +msgstr "Die Lesezeichenleiste anzeigen oder verbergen" + +#: ../midori/midori-websettings.c:456 +msgid "Show Panel" +msgstr "Leiste anzeigen" + +#: ../midori/midori-websettings.c:457 +msgid "Whether to show the panel" +msgstr "Die Leiste anzeigen oder verbergen" + +#: ../midori/midori-websettings.c:465 +msgid "Show Statusbar" +msgstr "Statusleiste anzeigen" + +#: ../midori/midori-websettings.c:466 +msgid "Whether to show the statusbar" +msgstr "Die Statusleiste anzeigen oder verbergen" + +#: ../midori/midori-websettings.c:475 msgid "Toolbar Style:" msgstr "Werkzeugleistenstil:" -#: ../midori/midori-websettings.c:278 +#: ../midori/midori-websettings.c:476 msgid "The style of the toolbar" msgstr "Der Stil der Werkzeugleiste" -#: ../midori/midori-websettings.c:287 +#: ../midori/midori-websettings.c:485 +msgid "Toolbar Items" +msgstr "Werkzeugleistenelemente" + +#: ../midori/midori-websettings.c:486 +msgid "The items to show on the toolbar" +msgstr "Die in der Werkzeugleiste anzuzeigenden Elemente" + +#: ../midori/midori-websettings.c:494 +msgid "Compact Sidepanel" +msgstr "Kompakte Seitenleiste" + +#: ../midori/midori-websettings.c:495 +msgid "Whether to make the sidepanel compact" +msgstr "Die Seitenleiste anzeigen oder verbergen" + +#: ../midori/midori-websettings.c:510 +msgid "Align sidepanel on the right" +msgstr "Seitenleiste rechts anordnen" + +#: ../midori/midori-websettings.c:511 +msgid "Whether to align the sidepanel on the right" +msgstr "Die Seitenleiste auf der rechten Seite anordnen" + +#: ../midori/midori-websettings.c:526 +msgid "Open panels in separate windows" +msgstr "Leisten in eigenen Fenstern öffnen" + +#: ../midori/midori-websettings.c:527 +msgid "Whether to always open panels in separate windows" +msgstr "Ob Seitenleisten immer in eigenen Fenstern geöffnet werden sollen" + +#: ../midori/midori-websettings.c:536 msgid "When Midori starts:" msgstr "Beim Starten von Midori:" -#: ../midori/midori-websettings.c:297 +#: ../midori/midori-websettings.c:537 +msgid "What to do when Midori starts" +msgstr "Was beim Starten von Midori passieren soll" + +#: ../midori/midori-websettings.c:546 +msgid "Homepage:" +msgstr "Startseite:" + +#: ../midori/midori-websettings.c:547 +msgid "The homepage" +msgstr "Die Startseite" + +#: ../midori/midori-websettings.c:562 +msgid "Show crash dialog" +msgstr "Absturzdialog anzeigen" + +#: ../midori/midori-websettings.c:563 +msgid "Show a dialog after Midori crashed" +msgstr "Absturzdialog anzeigen nachdem Midori abgestürzt ist" + +#: ../midori/midori-websettings.c:571 +msgid "Save downloaded files to:" +msgstr "Heruntergeladene Dateien speichern:" + +#: ../midori/midori-websettings.c:572 +msgid "The folder downloaded files are saved to" +msgstr "Der Ordner, in dem heruntergeladene Dateien gespeichert werden" + +#: ../midori/midori-websettings.c:580 +msgid "Text Editor" +msgstr "Texteditor" + +#: ../midori/midori-websettings.c:581 +msgid "An external text editor" +msgstr "Ein externer Texteditor" + +#: ../midori/midori-websettings.c:596 +msgid "News Aggregator" +msgstr "Nachrichtenaggregator" + +#: ../midori/midori-websettings.c:597 +msgid "An external news aggregator" +msgstr "Ein externer Nachrichtenaggregator" + +#: ../midori/midori-websettings.c:605 +msgid "Location entry Search" +msgstr "Adressfeldsuche" + +#: ../midori/midori-websettings.c:606 +msgid "The search to perform inside the location entry" +msgstr "Die Suche, die über das Adressfeld ausgeführt wird" + +#: ../midori/midori-websettings.c:614 msgid "Preferred Encoding" msgstr "Bevorzugter Zeichensatz" -#: ../midori/midori-websettings.c:324 +#: ../midori/midori-websettings.c:615 +msgid "The preferred character encoding" +msgstr "Der bevorzugte Zeichensatz" + +#: ../midori/midori-websettings.c:625 +msgid "Always Show Tabbar" +msgstr "Reiterleiste immer anzeigen" + +#: ../midori/midori-websettings.c:626 +msgid "Always show the tabbar" +msgstr "Die Reiterleiste immer anzeigen" + +#: ../midori/midori-websettings.c:634 +msgid "Close Buttons on Tabs" +msgstr "Schließenschaltflächen auf Reitern" + +#: ../midori/midori-websettings.c:635 +msgid "Whether tabs have close buttons" +msgstr "Schließenschaltflächen auf Reitern anzeigen oder verbergen" + +#: ../midori/midori-websettings.c:660 msgid "Open new pages in:" -msgstr "Neue Seiten öffnen in:" +msgstr "Öffne neue Seiten in:" + +#: ../midori/midori-websettings.c:661 +msgid "Where to open new pages" +msgstr "Wo neue Seiten geöffnet werden sollen" + +#: ../midori/midori-websettings.c:670 +msgid "Middle click opens Selection" +msgstr "Mittelklick öffnet Markierung" + +#: ../midori/midori-websettings.c:671 +msgid "Load an address from the selection via middle click" +msgstr "Lade eine markierte Adresse mit der mittleren Maustaste" + +#: ../midori/midori-websettings.c:679 +msgid "Open tabs in the background" +msgstr "Reiter im Hintergrund öffnen" + +#: ../midori/midori-websettings.c:680 +msgid "Whether to open new tabs in the background" +msgstr "Neue Reiter im Hintergrund öffnen" + +#: ../midori/midori-websettings.c:688 +msgid "Open Tabs next to Current" +msgstr "Reiter neben aktuellem öffnen" + +#: ../midori/midori-websettings.c:689 +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:697 +msgid "Open popups in tabs" +msgstr "Aufklappfenster in Reitern öffnen" + +#: ../midori/midori-websettings.c:698 +msgid "Whether to open popup windows in tabs" +msgstr "Aufklappfenster in neuen Reitern öffnen" + +#: ../midori/midori-websettings.c:708 ../extensions/statusbar-features.c:131 +msgid "Load images automatically" +msgstr "Bilder automatisch laden" + +#: ../midori/midori-websettings.c:709 +msgid "Load and display images automatically" +msgstr "Bilder automatisch laden und anzeigen" + +#: ../midori/midori-websettings.c:716 ../extensions/statusbar-features.c:140 +msgid "Enable scripts" +msgstr "Skripte einschalten" + +#: ../midori/midori-websettings.c:717 +msgid "Enable embedded scripting languages" +msgstr "Eingebettete Skriptsprachen einschalten" + +#: ../midori/midori-websettings.c:724 ../extensions/statusbar-features.c:149 +msgid "Enable Netscape plugins" +msgstr "Netscape-Module einschalten" + +#: ../midori/midori-websettings.c:725 +msgid "Enable embedded Netscape plugin objects" +msgstr "Eingebettete Netscape-Module einschalten" + +#: ../midori/midori-websettings.c:745 +msgid "Enable Spell Checking" +msgstr "Rechtschreibprüfung einschalten" + +#: ../midori/midori-websettings.c:746 +msgid "Enable spell checking while typing" +msgstr "Rechtschreibprüfung beim Eintippen einschalten" + +#: ../midori/midori-websettings.c:752 +msgid "Enable HTML5 database support" +msgstr "HTML5-Datenbanken einschalten" + +#: ../midori/midori-websettings.c:753 +msgid "Whether to enable HTML5 database support" +msgstr "Unterstützung für HTML5-Datenbank einschalten" + +#: ../midori/midori-websettings.c:759 +msgid "Enable HTML5 local storage support" +msgstr "HTML5-Lokalspeicher einschalten" + +#: ../midori/midori-websettings.c:760 +msgid "Whether to enable HTML5 local storage support" +msgstr "Unterstützung für HTML5-Lokalspeicher einschalten" + +#: ../midori/midori-websettings.c:766 +msgid "Enable offline web application cache" +msgstr "HTML5-Anwendungsspeicher einschalten" + +#: ../midori/midori-websettings.c:767 +msgid "Whether to enable offline web application cache" +msgstr "HTML5-Zwischenspeicher für Internetanwendungen einschalten" + +#: ../midori/midori-websettings.c:783 +msgid "Flash window on background tabs" +msgstr "Fenster bei Hintergrund-Reitern blinken lassen" + +#: ../midori/midori-websettings.c:784 +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:799 +msgid "Zoom Text and Images" +msgstr "Text und Bilder vergrößern" + +#: ../midori/midori-websettings.c:800 +msgid "Whether to zoom text and images" +msgstr "Ob Text und Bilder gleichermaßen vergrößert werden sollen" + +#: ../midori/midori-websettings.c:815 +msgid "Find inline while typing" +msgstr "Inkrementelle Suche beim Eintippen" + +#: ../midori/midori-websettings.c:816 +msgid "Whether to automatically find inline while typing" +msgstr "Ob die inkrementelle Suche automatisch beim Eintippen starten soll" + +#: ../midori/midori-websettings.c:831 +msgid "Kinetic scrolling" +msgstr "Sanfter Bildlauf" + +#: ../midori/midori-websettings.c:832 +msgid "Whether scrolling should kinetically move according to speed" +msgstr "Ob der Bildlauf sanft schneller und langsamer wird" + +#: ../midori/midori-websettings.c:840 +msgid "Delete old Cookies after:" +msgstr "Alte Cookies löschen nach:" + +#: ../midori/midori-websettings.c:841 +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:857 +msgid "Only accept Cookies from sites you visit" +msgstr "Nur Cookies von Seiten annehmen, die ich besuche" + +#: ../midori/midori-websettings.c:858 +msgid "Block cookies sent by third-party websites" +msgstr "Cookies von Drittanbietern blockieren" + +#: ../midori/midori-websettings.c:872 +msgid "Delete pages from history after:" +msgstr "Seiten aus dem Verlauf löschen nach:" + +#: ../midori/midori-websettings.c:873 +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:888 +msgid "Proxy server" +msgstr "Proxy-Server" + +#: ../midori/midori-websettings.c:889 +msgid "The type of proxy server to use" +msgstr "Die Art des zu verwendenden Zwischenrechners" + +#: ../midori/midori-websettings.c:898 +msgid "HTTP Proxy Server" +msgstr "HTTP-Zwischenrechner" + +#: ../midori/midori-websettings.c:899 +msgid "The proxy server used for HTTP connections" +msgstr "Der Zwischenrechner für HTTP-Verbindungen" + +#: ../midori/midori-websettings.c:914 +msgid "Port" +msgstr "Port" + +#: ../midori/midori-websettings.c:915 +msgid "The proxy server port used for HTTP connections" +msgstr "Der Port des Zwischenrechners für HTTP-Verbindungen" + +#: ../midori/midori-websettings.c:933 +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:387 +#: ../midori/midori-websettings.c:950 msgid "Identify as" msgstr "Ausgeben als" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:951 msgid "What to identify as to web pages" -msgstr "Legt fest, wie gegenüber Seiten im Internet identifiziert werden soll" +msgstr "Wie gegenüber Seiten im Internet identifiziert werden soll" + +#: ../midori/midori-websettings.c:967 +msgid "Identification string" +msgstr "Identifikationskennung" + +#: ../midori/midori-websettings.c:968 +msgid "The application identification string" +msgstr "Die Identifikationskennung der Anwedung" -#: ../midori/midori-websettings.c:421 +#: ../midori/midori-websettings.c:984 msgid "Preferred languages" msgstr "Bevorzugte Sprachen" -#: ../midori/midori-websettings.c:422 +#: ../midori/midori-websettings.c:985 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\"" @@ -1358,531 +1755,398 @@ msgstr "" "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:471 +#: ../midori/midori-websettings.c:1000 +msgid "Clear private data" +msgstr "Private Daten löschen" + +#: ../midori/midori-websettings.c:1001 +msgid "The private data selected for deletion" +msgstr "Zum Löschen ausgewählte private Daten" + +#: ../midori/midori-websettings.c:1016 +msgid "Clear data" +msgstr "Daten löschen" + +#: ../midori/midori-websettings.c:1017 +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:1050 +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:1052 +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:1066 msgid "Always use my font choices" msgstr "Immer meine Schriften benutzen" -#: ../midori/midori-websettings.c:472 +#: ../midori/midori-websettings.c:1067 msgid "Override fonts picked by websites with user preferences" -msgstr "" -"Schriftarten auf Internetseiten mit Benutzereinstellungen überschreiben" - -#: ../midori/midori-view.c:1012 ../midori/midori-view.c:1151 -msgid "Trust this website" -msgstr "Dieser Webseite vertrauen" - -#: ../midori/midori-view.c:1149 -msgid "Security unknown" -msgstr "Sicherheitsstufe unbekannt" +msgstr "Schriftarten auf Internetseiten mit Benutzereinstellungen überschreiben" -#: ../midori/midori-view.c:1447 +#: ../midori/midori-view.c:1353 #, c-format msgid "%s wants to save an HTML5 database." msgstr "%s möchte eine HTML5-Datenbank speichern." -#: ../midori/midori-view.c:1451 ../midori/midori-view.c:1485 +#: ../midori/midori-view.c:1357 ../midori/midori-view.c:1386 msgid "_Deny" msgstr "_Verweigern" -#: ../midori/midori-view.c:1451 ../midori/midori-view.c:1485 +#: ../midori/midori-view.c:1357 ../midori/midori-view.c:1386 msgid "_Allow" msgstr "_Zulassen" -#: ../midori/midori-view.c:1480 +#: ../midori/midori-view.c:1382 #, c-format msgid "%s wants to know your location." msgstr "%s möchte Ihren Standort wissen." -#: ../midori/midori-view.c:1576 +#: ../midori/midori-view.c:1469 #, c-format msgid "Error - %s" msgstr "Fehler - %s" -#: ../midori/midori-view.c:1577 +#: ../midori/midori-view.c:1470 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "Die Seite »%s« konnte nicht geladen werden." -#: ../midori/midori-view.c:1579 +#: ../midori/midori-view.c:1472 msgid "Try again" msgstr "Erneut versuchen" -#: ../midori/midori-view.c:1775 ../midori/midori-view.c:2888 +#: ../midori/midori-view.c:1641 ../midori/midori-view.c:2488 #, c-format msgid "Send a message to %s" msgstr "Nachricht an %s schicken" -#: ../midori/midori-view.c:2674 -msgid "Add _search engine..." -msgstr "_Suchmaschine hinzufügen …" - -#: ../midori/midori-view.c:2718 ../midori/midori-view.c:3044 +#: ../midori/midori-view.c:2328 ../midori/midori-view.c:2641 msgid "Inspect _Element" msgstr "Element _untersuchen" -#: ../midori/midori-view.c:2770 +#: ../midori/midori-view.c:2378 msgid "Open Link in New _Tab" msgstr "Verweis in neuem _Reiter öffnen" -#: ../midori/midori-view.c:2774 +#: ../midori/midori-view.c:2382 msgid "Open Link in _Foreground Tab" msgstr "Verweis in _Vordergrund-Reiter öffnen" -#: ../midori/midori-view.c:2775 +#: ../midori/midori-view.c:2383 msgid "Open Link in _Background Tab" msgstr "Verweis in _Hintergrund-Reiter öffnen" -#: ../midori/midori-view.c:2778 +#: ../midori/midori-view.c:2386 msgid "Open Link in New _Window" msgstr "Verweis in neuem _Fenster öffnen" -#: ../midori/midori-view.c:2781 +#: ../midori/midori-view.c:2389 msgid "Open Link as Web A_pplication" msgstr "Verweis als _Internetanwendung öffnen" -#: ../midori/midori-view.c:2786 +#: ../midori/midori-view.c:2392 msgid "Copy Link de_stination" msgstr "Verweisziel k_opieren" -#: ../midori/midori-view.c:2802 +#: ../midori/midori-view.c:2404 msgid "Open _Image in New Tab" msgstr "_Bild in neuem Reiter öffnen" -#: ../midori/midori-view.c:2805 +#: ../midori/midori-view.c:2407 msgid "Copy Image _Address" msgstr "Bild_adresse kopieren" -#: ../midori/midori-view.c:2808 +#: ../midori/midori-view.c:2410 msgid "Save I_mage" msgstr "Bi_ld speichern" -#: ../midori/midori-view.c:2811 -msgid "Open in Image _Viewer" -msgstr "In _Bildbetrachter öffnen" - -#: ../midori/midori-view.c:2818 +#: ../midori/midori-view.c:2417 msgid "Copy Video _Address" msgstr "Video_adresse kopieren" -#: ../midori/midori-view.c:2821 +#: ../midori/midori-view.c:2420 msgid "Save _Video" msgstr "_Video speichern" -#: ../midori/midori-view.c:2821 +#: ../midori/midori-view.c:2420 msgid "Download _Video" msgstr "_Video herunterladen" -#: ../midori/midori-view.c:2847 +#: ../midori/midori-view.c:2446 msgid "Search _with" msgstr "Suchen _mit" -#: ../midori/midori-view.c:2879 +#: ../midori/midori-view.c:2480 msgid "_Search the Web" msgstr "Im Netz _suchen" -#: ../midori/midori-view.c:2896 +#: ../midori/midori-view.c:2496 msgid "Open Address in New _Tab" msgstr "Adresse in neuem _Reiter öffnen" -#: ../midori/midori-view.c:2949 -msgid "Open _Frame in New Tab" -msgstr "_Rahmen in neuem Reiter öffnen" - -#: ../midori/midori-view.c:3206 -#, c-format -msgid "Open or download file from %s" -msgstr "Datei öffnen oder von %s herunterladen" - -#: ../midori/midori-view.c:3230 -#, c-format -msgid "File Name: %s" -msgstr "Dateiname: %s" +#: ../midori/midori-view.c:2780 +msgid "Open or download file" +msgstr "Datei öffnen oder herunterladen" -#: ../midori/midori-view.c:3235 +#: ../midori/midori-view.c:2799 #, c-format msgid "File Type: '%s'" msgstr "Dateityp: »%s«" -#: ../midori/midori-view.c:3237 +#: ../midori/midori-view.c:2801 #, c-format msgid "File Type: %s ('%s')" msgstr "Dateityp: %s (»%s«)" -#: ../midori/midori-view.c:3272 -#, c-format -msgid "Size: %s" -msgstr "Größe: %s" +#: ../midori/midori-view.c:2812 +msgid "MD5-Checksum:" +msgstr "MD5-Prüfsumme:" + +#: ../midori/midori-view.c:2819 +msgid "SHA1-Checksum:" +msgstr "SHA1-Prüfsumme:" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:3283 +#: ../midori/midori-view.c:2829 #, c-format msgid "Open %s" msgstr "%s öffnen" -#: ../midori/midori-view.c:3889 +#: ../midori/midori-view.c:3415 #, c-format msgid "Inspect page - %s" msgstr "Seite untersuchen - %s" -#: ../midori/midori-view.c:4288 -#, c-format -msgid "No documentation installed" -msgstr "Keine Dokumentation installiert" - -#: ../midori/midori-view.c:4365 -msgid "Midori doesn't store any personal data:" -msgstr "Midori speichert keine persönlichen Daten:" - -#: ../midori/midori-view.c:4366 -msgid "No history or web cookies are being saved." -msgstr "Es werden weder Verlauf noch Web-Cookies gespeichert." - -#: ../midori/midori-view.c:4367 -msgid "Extensions are disabled." -msgstr "Erweiterungen sind deaktiviert." - -#: ../midori/midori-view.c:4368 -msgid "HTML5 storage, local database and application caches are disabled." -msgstr "" -"HTML5-Speicher, lokale Datenbank und Anwendungszwischenspeicher sind " -"deaktiviert." +#: ../midori/midori-view.c:3702 +msgid "Speed Dial" +msgstr "Schnellwahl" -#: ../midori/midori-view.c:4369 -msgid "Midori prevents websites from tracking the user:" -msgstr "Midori verhindert, dass Webseiten ihre Nutzer verfolgen:" +#: ../midori/midori-view.c:3703 ../midori/midori-view.c:3791 +msgid "Click to add a shortcut" +msgstr "Klicken um eine Verknüpfung hinzuzufügen" -#: ../midori/midori-view.c:4370 -msgid "Referrer URLs are stripped down to the hostname." -msgstr "" -"Weiterleitende URLs werden bis hintunter auf den Rechnernamen aufgelöst." +#: ../midori/midori-view.c:3704 +msgid "Enter shortcut address" +msgstr "Ziel der Verknüpfung eingeben" -#: ../midori/midori-view.c:4371 -msgid "DNS prefetching is disabled." -msgstr "DNS-Auflösung im Voraus ist deaktiviert." +#: ../midori/midori-view.c:3705 +msgid "Enter shortcut title" +msgstr "Titel der Verknüpfung eingeben" -#: ../midori/midori-view.c:4372 -msgid "The language and timezone are not revealed to websites." -msgstr "" -"Die Sprach- und Zeitzoneneinstellungen werden Webseiten nicht verraten." +#: ../midori/midori-view.c:3706 +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:4373 -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:3868 +#, c-format +msgid "No documentation installed" +msgstr "Keine Dokumentation installiert" -#: ../midori/midori-view.c:4459 +#: ../midori/midori-view.c:3918 msgid "Version numbers in brackets show the version used at runtime." msgstr "Versionsnummern in Klammern geben Versionen zur Laufzeit an." -#: ../midori/midori-view.c:4508 +#: ../midori/midori-view.c:3963 msgid "Page loading delayed" msgstr "Laden der Seite verzögert" -#: ../midori/midori-view.c:4509 +#: ../midori/midori-view.c:3964 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:4510 +#: ../midori/midori-view.c:3965 msgid "Load Page" msgstr "Seite laden" -#: ../midori/midori-view.c:4677 +#: ../midori/midori-view.c:4105 msgid "Blank page" msgstr "Leere Seite" -#: ../midori/midori-view.c:4941 +#: ../midori/midori-view.c:4369 msgid "_Duplicate Tab" msgstr "Reiter _verdoppeln" -#: ../midori/midori-view.c:4946 +#: ../midori/midori-view.c:4374 msgid "Show Tab _Label" msgstr "Reiterleiste anzeigen" -#: ../midori/midori-view.c:4946 +#: ../midori/midori-view.c:4374 msgid "Show Tab _Icon Only" msgstr "Nur Reiter_symbol anzeigen" -#: ../midori/midori-view.c:4953 -msgid "Close Ot_her Tab" -msgid_plural "Close Ot_her Tabs" -msgstr[0] "Ande_ren Reiter schließen" -msgstr[1] "Ande_re Reiter schließen" +#: ../midori/midori-view.c:4380 +msgid "Close ot_her Tabs" +msgstr "Ande_re Reiter schließen" #. i18n: word stem of "previous page" type links, case is not important -#: ../midori/midori-view.c:5760 +#: ../midori/midori-view.c:4997 msgid "previous" msgstr "vorige" #. i18n: word stem of "next page" type links, case is not important -#: ../midori/midori-view.c:5779 +#: ../midori/midori-view.c:5016 msgid "next" msgstr "nächste" -#: ../midori/midori-view.c:5792 +#: ../midori/midori-view.c:5029 msgid "Print background images" msgstr "Hintergrundbilder drucken" -#: ../midori/midori-view.c:5793 +#: ../midori/midori-view.c:5030 msgid "Whether background images should be printed" -msgstr "Leget fest, ob Hintergrundbilder gedruckt werden sollen oder nicht" +msgstr "Sollen Hintergrundbilder gedruckt werden oder nicht" -#: ../midori/midori-view.c:5825 +#: ../midori/midori-view.c:5062 msgid "Features" msgstr "Inhalte" -#: ../midori/midori-speeddial.vala:160 -msgid "Speed Dial" -msgstr "Schnellwahl" - -#: ../midori/midori-speeddial.vala:161 ../midori/midori-speeddial.vala:246 -msgid "Click to add a shortcut" -msgstr "Klicken um eine Verknüpfung hinzuzufügen" - -#: ../midori/midori-speeddial.vala:162 -msgid "Enter shortcut address" -msgstr "Ziel der Verknüpfung eingeben" - -#: ../midori/midori-speeddial.vala:163 -msgid "Enter shortcut title" -msgstr "Titel der Verknüpfung eingeben" - -#: ../midori/midori-speeddial.vala:164 -msgid "Are you sure you want to delete this shortcut?" -msgstr "Sind Sie sicher, dass Sie diese Verknüpfung löschen wollen?" - -#: ../midori/midori-preferences.c:299 +#: ../midori/midori-preferences.c:297 msgid "Startup" msgstr "Programmstart" -#: ../midori/midori-preferences.c:305 -msgid "Homepage:" -msgstr "Startseite:" - -#: ../midori/midori-preferences.c:313 +#: ../midori/midori-preferences.c:310 msgid "Use _current page" msgstr "_Aktuelle Seite benutzen" -#: ../midori/midori-preferences.c:317 +#: ../midori/midori-preferences.c:314 msgid "Use current page as homepage" msgstr "Aktuelle Seite als Startseite benutzen" #. Page "Appearance" -#: ../midori/midori-preferences.c:326 +#: ../midori/midori-preferences.c:323 msgid "Fonts" msgstr "Schriften" -#: ../midori/midori-preferences.c:329 +#: ../midori/midori-preferences.c:326 msgid "Proportional Font Family" msgstr "Proportionale Schriftart" -#: ../midori/midori-preferences.c:333 +#: ../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:336 +#: ../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:338 +#: ../midori/midori-preferences.c:335 msgid "Fixed-width Font Family" msgstr "Dicktengleiche Schriftart" -#: ../midori/midori-preferences.c:342 +#: ../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:345 -msgid "The font size used to display fixed-width text" -msgstr "Die Schriftgröße, in der dicktengleicher Text angezeigt wird" - -#: ../midori/midori-preferences.c:347 -msgid "Minimum Font Size" -msgstr "Mindestschriftgröße" - -#: ../midori/midori-preferences.c:351 -msgid "The minimum font size used to display text" -msgstr "Die Mindestschriftgröße, in der Text angezeigt wird" - -#. Page "Behavior" -#: ../midori/midori-preferences.c:362 -msgid "Behavior" -msgstr "Verhalten" - -#: ../midori/midori-preferences.c:366 ../extensions/statusbar-features.c:155 -msgid "Load images automatically" -msgstr "Bilder automatisch laden" - -#: ../midori/midori-preferences.c:369 -msgid "Enable Spell Checking" -msgstr "Rechtschreibprüfung einschalten" - -#: ../midori/midori-preferences.c:383 ../extensions/statusbar-features.c:165 -msgid "Enable scripts" -msgstr "Skripte einschalten" - -#: ../midori/midori-preferences.c:386 ../extensions/statusbar-features.c:177 -msgid "Enable Netscape plugins" -msgstr "Netscape-Module einschalten" - -#: ../midori/midori-preferences.c:391 -msgid "Zoom Text and Images" -msgstr "Text und Bilder vergrößern" - -#: ../midori/midori-preferences.c:394 -msgid "Allow scripts to open popups" -msgstr "Skripte können Aufklappfenster öffnen" - -#: ../midori/midori-preferences.c:395 -msgid "Whether scripts are allowed to open popup windows automatically" -msgstr "Skripte können selbstständig neue Fenster öffnen" - -#: ../midori/midori-preferences.c:401 -msgid "Kinetic scrolling" -msgstr "Sanfter Bildlauf" - -#: ../midori/midori-preferences.c:402 -msgid "Whether scrolling should kinetically move according to speed" -msgstr "Legt fest ob der Bildlauf sanft schneller und langsamer wird" - -#: ../midori/midori-preferences.c:407 -msgid "Middle click opens Selection" -msgstr "Mittelklick öffnet Auswahl" - -#: ../midori/midori-preferences.c:408 -msgid "Load an address from the selection via middle click" -msgstr "Eine markierte Adresse mit der mittleren Maustaste laden" - -#: ../midori/midori-preferences.c:414 -msgid "Enable WebGL support" -msgstr "WebGL-Unterstützung einschalten" - -#: ../midori/midori-preferences.c:419 -msgid "Flash window on background tabs" -msgstr "Fenster bei Hintergrund-Reitern blinken lassen" - -#: ../midori/midori-preferences.c:428 -msgid "Save downloaded files to:" -msgstr "Heruntergeladene Dateien speichern in:" - -#. Page "Interface" -#: ../midori/midori-preferences.c:435 -msgid "Browsing" -msgstr "Navigation" - -#: ../midori/midori-preferences.c:451 -msgid "Close Buttons on Tabs" -msgstr "Knöpfe zum Schließen auf Reitern" +#: ../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:455 -msgid "Always Show Tabbar" -msgstr "Reiterleiste immer anzeigen" +#: ../midori/midori-preferences.c:344 +msgid "Minimum Font Size" +msgstr "Mindestschriftgröße" -#: ../midori/midori-preferences.c:459 -msgid "Open Tabs next to Current" -msgstr "Reiter neben aktuellem öffnen" +#: ../midori/midori-preferences.c:348 +msgid "The minimum font size used to display text" +msgstr "Die Mindestschriftgröße, in der Text angezeigt wird" -#: ../midori/midori-preferences.c:460 -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" +#. Page "Behavior" +#: ../midori/midori-preferences.c:359 +msgid "Behavior" +msgstr "Verhalten" -#: ../midori/midori-preferences.c:463 -msgid "Open tabs in the background" -msgstr "Reiter im Hintergrund öffnen" +#: ../midori/midori-preferences.c:385 +msgid "Allow scripts to open popups" +msgstr "Skripte können Aufklappfenster öffnen" -#: ../midori/midori-preferences.c:467 -msgid "Text Editor" -msgstr "Texteditor" +#: ../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:472 -msgid "News Aggregator" -msgstr "Nachrichtenaggregator" +#. Page "Interface" +#: ../midori/midori-preferences.c:409 +msgid "Browsing" +msgstr "Navigation" #. Page "Network" -#: ../midori/midori-preferences.c:479 +#: ../midori/midori-preferences.c:447 msgid "Network" msgstr "Netzwerk" -#: ../midori/midori-preferences.c:481 -msgid "Proxy server" -msgstr "Proxy-Server" - -#: ../midori/midori-preferences.c:486 +#: ../midori/midori-preferences.c:454 msgid "Hostname" msgstr "Rechnername" -#: ../midori/midori-preferences.c:494 -msgid "Port" -msgstr "Port" - -#: ../midori/midori-preferences.c:506 ../midori/midori-preferences.c:509 -msgid "The maximum size of cached pages on disk" -msgstr "Die maximale Größe zwischengespeicherter Seiten auf der Festplatte" - -#: ../midori/midori-preferences.c:511 +#: ../midori/midori-preferences.c:478 msgid "MB" msgstr "MB" -#: ../midori/midori-searchaction.c:957 +#: ../midori/midori-searchaction.c:909 msgid "Add search engine" msgstr "Suchmaschine hinzufügen" -#: ../midori/midori-searchaction.c:957 +#: ../midori/midori-searchaction.c:909 msgid "Edit search engine" msgstr "Suchmaschine bearbeiten" -#: ../midori/midori-searchaction.c:985 +#: ../midori/midori-searchaction.c:938 msgid "_Name:" msgstr "_Name:" -#: ../midori/midori-searchaction.c:1000 +#: ../midori/midori-searchaction.c:954 msgid "_Description:" msgstr "_Beschreibung:" -#: ../midori/midori-searchaction.c:1013 ../extensions/feed-panel/main.c:377 -msgid "_Address:" -msgstr "_Adresse:" +#: ../midori/midori-searchaction.c:987 +msgid "_Icon:" +msgstr "_Symbol:" -#: ../midori/midori-searchaction.c:1032 +#: ../midori/midori-searchaction.c:1001 msgid "_Token:" msgstr "_Kürzel:" -#: ../midori/midori-searchaction.c:1330 +#: ../midori/midori-searchaction.c:1301 msgid "Manage Search Engines" msgstr "Suchmaschinen verwalten" -#: ../midori/midori-searchaction.c:1432 +#: ../midori/midori-searchaction.c:1401 msgid "Use as _default" msgstr "Als _Standard" -#: ../midori/sokoke.c:353 +#: ../midori/sokoke.c:406 msgid "Open with" msgstr "Öffnen mit" -#: ../midori/sokoke.c:361 +#: ../midori/sokoke.c:414 #, c-format msgid "Choose an application or command to open \"%s\":" msgstr "Anwendung oder Befehl zum Öffnen von »%s« wählen:" -#: ../midori/sokoke.c:475 ../midori/sokoke.c:489 +#: ../midori/sokoke.c:455 ../midori/sokoke.c:465 ../midori/sokoke.c:493 +#: ../midori/sokoke.c:522 ../midori/sokoke.c:536 msgid "Could not run external program." -msgstr "Externes Programm konnte nicht ausgeführt werden." +msgstr "Konnte externes Programm nicht ausführen." -#: ../midori/sokoke.c:1327 +#: ../midori/sokoke.c:1793 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d Stunde" msgstr[1] "%d Stunden" -#: ../midori/sokoke.c:1328 +#: ../midori/sokoke.c:1794 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d Minute" msgstr[1] "%d Minuten" -#: ../midori/sokoke.c:1329 +#: ../midori/sokoke.c:1795 #, c-format msgid "%d second" msgid_plural "%d seconds" @@ -1890,67 +2154,67 @@ msgstr[0] "%d Sekunde" msgstr[1] "%d Sekunden" #. i18n: Download tooltip (size): 4KB of 43MB -#: ../midori/sokoke.c:1337 ../panels/midori-transfers.c:268 +#: ../midori/sokoke.c:1803 ../panels/midori-transfers.c:267 #, c-format msgid "%s of %s" msgstr "%s von %s" #. i18n: Unknown number of bytes, used for transfer rate like ?B/s -#: ../midori/sokoke.c:1346 +#: ../midori/sokoke.c:1812 msgid "?B" msgstr "?B" #. i18n: Download tooltip (transfer rate): (130KB/s) -#: ../midori/sokoke.c:1349 +#: ../midori/sokoke.c:1815 #, c-format msgid " (%s/s)" msgstr " (%s/s)" #. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning -#: ../midori/sokoke.c:1366 +#: ../midori/sokoke.c:1832 #, c-format msgid " - %s remaining" msgstr " - %s verbleibend" #. i18n: A panel at the bottom, to search text in pages -#: ../toolbars/midori-findbar.c:265 +#: ../toolbars/midori-findbar.c:264 msgid "_Inline Find:" msgstr "_Inkrementelle Suche:" -#: ../toolbars/midori-findbar.c:287 +#: ../toolbars/midori-findbar.c:291 msgid "Previous" msgstr "Zurück" -#: ../toolbars/midori-findbar.c:293 +#: ../toolbars/midori-findbar.c:297 msgid "Next" msgstr "Weiter" -#: ../toolbars/midori-findbar.c:297 +#: ../toolbars/midori-findbar.c:301 msgid "Match Case" msgstr "Groß-/ Kleinschreibung" -#: ../toolbars/midori-findbar.c:306 +#: ../toolbars/midori-findbar.c:310 msgid "Highlight Matches" msgstr "Treffer hervorheben" -#: ../toolbars/midori-findbar.c:317 +#: ../toolbars/midori-findbar.c:321 msgid "Close Findbar" msgstr "Suchleiste schließen" -#: ../toolbars/midori-transferbar.c:124 +#: ../toolbars/midori-transferbar.c:123 #, c-format msgid "The file '%s' has been downloaded." msgstr "Die Datei »%s« wurde heruntergeladen." -#: ../toolbars/midori-transferbar.c:129 +#: ../toolbars/midori-transferbar.c:126 msgid "Transfer completed" msgstr "Übertragung abgeschlossen" -#: ../toolbars/midori-transferbar.c:198 +#: ../toolbars/midori-transferbar.c:215 msgid "The downloaded file is erroneous." msgstr "Die heruntergeladene Datei ist fehlerhaft." -#: ../toolbars/midori-transferbar.c:199 +#: ../toolbars/midori-transferbar.c:216 msgid "" "The checksum provided with the link did not match. This means the file is " "probably incomplete or was modified afterwards." @@ -1959,111 +2223,95 @@ msgstr "" "normalerweise, dass die Datei unvollständig ist oder im Nachhinein verändert " "wurde." -#: ../toolbars/midori-transferbar.c:342 ../panels/midori-transfers.c:142 +#: ../toolbars/midori-transferbar.c:361 ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "Alle entfernen" -#: ../toolbars/midori-transferbar.c:379 ../toolbars/midori-transferbar.c:381 +#: ../toolbars/midori-transferbar.c:398 ../toolbars/midori-transferbar.c:400 msgid "Some files are being downloaded" msgstr "Einige Dateien werden gerade heruntergeladen." -#: ../toolbars/midori-transferbar.c:385 +#: ../toolbars/midori-transferbar.c:404 msgid "_Quit Midori" msgstr "Midori _beenden" -#: ../toolbars/midori-transferbar.c:387 +#: ../toolbars/midori-transferbar.c:406 msgid "The transfers will be cancelled if Midori quits." -msgstr "Die Übertragungen werden abgebrochen, wenn Midori beendet wird." +msgstr "Die Übertragungen werden abgebrochen wenn Midori beendet wird." + +#: ../panels/midori-bookmarks.c:113 +msgid "Bookmarks" +msgstr "Lesezeichen" -#: ../panels/midori-bookmarks.c:308 +#: ../panels/midori-bookmarks.c:291 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "Lesezeichen konnte nicht hinzugefügt werden: %s\n" -#: ../panels/midori-bookmarks.c:475 -#, c-format -msgid "Failed to update bookmark : %s\n" -msgstr "Lesezeichen konnte nicht aktualisiert werden: %s\n" - -#: ../panels/midori-bookmarks.c:535 +#: ../panels/midori-bookmarks.c:471 msgid "Edit the selected bookmark" msgstr "Markiertes Lesezeichen bearbeiten" -#: ../panels/midori-bookmarks.c:543 +#: ../panels/midori-bookmarks.c:479 msgid "Delete the selected bookmark" msgstr "Markiertes Lesezeichen löschen" -#: ../panels/midori-bookmarks.c:558 +#: ../panels/midori-bookmarks.c:494 msgid "Add a new folder" msgstr "Einen neuen Ordner hinzufügen" -#: ../panels/midori-bookmarks.c:697 ../panels/midori-history.c:638 +#: ../panels/midori-bookmarks.c:628 ../panels/midori-history.c:579 msgid "Separator" msgstr "Trennlinie" -#. Create the filter entry -#: ../panels/midori-bookmarks.c:1027 -msgid "Search Bookmarks" -msgstr "Lesezeichen durchsuchen" - -#: ../panels/midori-history.c:111 +#: ../panels/midori-history.c:110 msgid "History" msgstr "Verlauf" -#: ../panels/midori-history.c:158 ../panels/midori-history.c:189 -msgid "Today" -msgstr "Heute" - -#: ../panels/midori-history.c:160 ../panels/midori-history.c:191 -msgid "Yesterday" -msgstr "Gestern" +#: ../panels/midori-history.c:142 +msgid "A week ago" +msgstr "Vor einer Woche" -#: ../panels/midori-history.c:162 ../panels/midori-history.c:186 +#: ../panels/midori-history.c:144 #, 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:165 ../panels/midori-history.c:184 -msgid "A week ago" -msgstr "Vor einer Woche" +#: ../panels/midori-history.c:147 +msgid "Today" +msgstr "Heute" -#: ../panels/midori-history.c:232 -#, c-format -msgid "Failed to remove history item: %s\n" -msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" +#: ../panels/midori-history.c:149 +msgid "Yesterday" +msgstr "Gestern" -#: ../panels/midori-history.c:360 +#: ../panels/midori-history.c:317 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:407 +#: ../panels/midori-history.c:363 msgid "Bookmark the selected history item" msgstr "Lesezeichen für ausgewählten Verlaufseintrag hinzufügen" -#: ../panels/midori-history.c:416 +#: ../panels/midori-history.c:372 msgid "Delete the selected history item" msgstr "Ausgewählten Verlaufseintrag löschen" -#: ../panels/midori-history.c:424 +#: ../panels/midori-history.c:380 msgid "Clear the entire history" msgstr "Den gesamten Verlauf löschen" -#. Create the filter entry -#: ../panels/midori-history.c:997 -msgid "Search History" -msgstr "Verlauf durchsuchen" - -#: ../panels/midori-transfers.c:87 +#: ../panels/midori-transfers.c:86 msgid "Transfers" msgstr "Übertragungen" -#: ../panels/midori-transfers.c:470 +#: ../panels/midori-transfers.c:467 msgid "Open Destination _Folder" msgstr "Zielordner ö_ffnen" -#: ../panels/midori-transfers.c:473 +#: ../panels/midori-transfers.c:470 msgid "Copy Link Loc_ation" msgstr "Verweisziel ko_pieren" @@ -2085,82 +2333,74 @@ msgstr "Benutzername" #: ../katze/katze-http-auth.c:253 msgid "Password" -msgstr "Passwort" +msgstr "Kennwort" #: ../katze/katze-http-auth.c:267 msgid "_Remember password" -msgstr "Passwort _merken" +msgstr "Kennwort _merken" -#: ../katze/katze-throbber.c:949 +#: ../katze/katze-throbber.c:942 #, c-format msgid "Named icon '%s' couldn't be loaded" msgstr "Das benannte Symbol »%s« konnte nicht geladen werden" -#: ../katze/katze-throbber.c:962 +#: ../katze/katze-throbber.c:955 #, c-format msgid "Stock icon '%s' couldn't be loaded" msgstr "Das Bestandssymbol »%s« konnte nicht geladen werden" -#: ../katze/katze-throbber.c:1042 +#: ../katze/katze-throbber.c:1035 msgid "Animation frames are broken" msgstr "Animationsbilder sind fehlerhaft" -#: ../katze/katze-utils.c:443 ../katze/katze-utils.c:866 +#: ../katze/katze-utils.c:439 ../katze/katze-utils.c:873 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Eigenschaft »%s« ist ungültig für %s" -#: ../katze/katze-utils.c:489 ../katze/katze-utils.c:518 -#: ../extensions/addons.c:309 +#: ../katze/katze-utils.c:485 ../katze/katze-utils.c:514 +#: ../extensions/addons.c:308 msgid "Choose file" msgstr "Datei wählen" -#: ../katze/katze-utils.c:504 +#: ../katze/katze-utils.c:500 msgid "Choose folder" msgstr "Dateispeicherordner auswählen" -#: ../katze/katze-utils.c:602 +#: ../katze/katze-utils.c:604 msgid "None" msgstr "Keine" -#: ../katze/katze-utils.c:717 +#: ../katze/katze-utils.c:719 msgid "1 hour" msgstr "1 Stunde" -#: ../katze/katze-utils.c:718 +#: ../katze/katze-utils.c:720 msgid "1 day" msgstr "1 Tag" -#: ../katze/katze-utils.c:719 +#: ../katze/katze-utils.c:721 msgid "1 week" msgstr "1 Woche" -#: ../katze/katze-utils.c:720 +#: ../katze/katze-utils.c:722 msgid "1 month" msgstr "1 Monat" -#: ../katze/katze-utils.c:721 +#: ../katze/katze-utils.c:723 msgid "1 year" msgstr "1 Jahr" -#: ../katze/katze-preferences.c:98 ../extensions/history-list.vala:235 +#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235 #, c-format msgid "Preferences for %s" msgstr "Einstellungen für %s" -#: ../katze/midori-uri.vala:158 -msgid "MD5-Checksum:" -msgstr "MD5-Prüfsumme:" - -#: ../katze/midori-uri.vala:165 -msgid "SHA1-Checksum:" -msgstr "SHA1-Prüfsumme:" - -#: ../extensions/adblock.c:475 +#: ../extensions/adblock.c:429 msgid "Configure Advertisement filters" msgstr "Werbefilter einstellen" -#: ../extensions/adblock.c:508 +#: ../extensions/adblock.c:460 #, c-format msgid "" "Type the address of a preconfigured filter list in the text entry and click " @@ -2170,132 +2410,132 @@ msgstr "" "ein und klicken Sie »Hinzufügen« um sie zur Liste hinzuzufügen. Weitere " "Listen finden Sie auf %s." -#: ../extensions/adblock.c:922 +#: ../extensions/adblock.c:824 msgid "Edit rule" msgstr "Regel bearbeiten" -#: ../extensions/adblock.c:936 +#: ../extensions/adblock.c:838 msgid "_Rule:" msgstr "_Regel:" -#: ../extensions/adblock.c:990 +#: ../extensions/adblock.c:892 msgid "Bl_ock image" msgstr "Bild bloc_kieren" -#: ../extensions/adblock.c:995 +#: ../extensions/adblock.c:897 msgid "Bl_ock link" msgstr "Verweis blo_ckieren" -#: ../extensions/adblock.c:1799 +#: ../extensions/adblock.c:1484 msgid "Advertisement blocker" msgstr "Werbeblocker" -#: ../extensions/adblock.c:1800 +#: ../extensions/adblock.c:1485 msgid "Block advertisements according to a filter list" msgstr "Werbung an Hand einer Filterliste blockieren" #. i18n: An infobar shows up when viewing a script on userscripts.org -#: ../extensions/addons.c:222 +#: ../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:223 +#: ../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:228 +#: ../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:229 +#: ../extensions/addons.c:228 msgid "_Install user style" msgstr "Benutzerstil _installieren" -#: ../extensions/addons.c:237 +#: ../extensions/addons.c:236 msgid "Don't install" msgstr "Nicht installieren" -#: ../extensions/addons.c:320 ../extensions/addons.c:675 +#: ../extensions/addons.c:319 ../extensions/addons.c:681 msgid "Userscripts" msgstr "Benutzerskripte" -#: ../extensions/addons.c:325 ../extensions/addons.c:677 +#: ../extensions/addons.c:324 ../extensions/addons.c:683 msgid "Userstyles" msgstr "Benutzerstile" -#: ../extensions/addons.c:371 ../extensions/addons.c:450 +#: ../extensions/addons.c:380 ../extensions/addons.c:459 #: ../extensions/feed-panel/main.c:129 msgid "Error" msgstr "Fehler" -#: ../extensions/addons.c:412 +#: ../extensions/addons.c:421 #, c-format msgid "Do you want to delete '%s'?" msgstr "Soll »%s« gelöscht werden?" -#: ../extensions/addons.c:418 +#: ../extensions/addons.c:427 msgid "Delete user script" msgstr "Benutzerskript löschen" -#: ../extensions/addons.c:419 +#: ../extensions/addons.c:428 msgid "Delete user style" msgstr "Benutzerstil löschen" -#: ../extensions/addons.c:422 +#: ../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:564 ../extensions/addons.c:641 +#: ../extensions/addons.c:570 ../extensions/addons.c:647 msgid "Open in Text Editor" msgstr "In Texteditor öffnen" -#: ../extensions/addons.c:566 ../extensions/addons.c:650 +#: ../extensions/addons.c:572 ../extensions/addons.c:656 msgid "Open Target Folder" msgstr "Zielordner öffnen" -#: ../extensions/addons.c:632 +#: ../extensions/addons.c:638 msgid "Add new addon" msgstr "Eine neue Erweiterung hinzufügen" -#: ../extensions/addons.c:658 +#: ../extensions/addons.c:664 msgid "Remove selected addon" msgstr "Ausgewählte Erweiterung löschen" -#: ../extensions/addons.c:1686 ../extensions/addons.c:1904 +#: ../extensions/addons.c:1713 ../extensions/addons.c:1884 msgid "User addons" msgstr "Benutzererweiterungen" -#: ../extensions/addons.c:1816 +#: ../extensions/addons.c:1837 #, c-format msgid "Can't monitor folder '%s': %s" msgstr "Der Ordner »%s« kann nicht überwacht werden: %s" -#: ../extensions/addons.c:1905 +#: ../extensions/addons.c:1885 msgid "Support for userscripts and userstyles" msgstr "Unterstützung für Benutzerskripte und -stile" -#: ../extensions/colorful-tabs.c:201 +#: ../extensions/colorful-tabs.c:202 msgid "Colorful Tabs" msgstr "Farbige Reiter" -#: ../extensions/colorful-tabs.c:202 +#: ../extensions/colorful-tabs.c:203 msgid "Tint each tab distinctly" msgstr "Alle Reiter unterschiedlich einfärben" -#: ../extensions/cookie-manager/cookie-manager-page.c:73 +#: ../extensions/cookie-manager/cookie-manager-page.c:80 #: ../extensions/cookie-manager/main.c:35 msgid "Cookie Manager" msgstr "Cookieverwaltung" -#: ../extensions/cookie-manager/cookie-manager-page.c:103 +#: ../extensions/cookie-manager/cookie-manager-page.c:110 msgid "Delete All" msgstr "Alle löschen" -#: ../extensions/cookie-manager/cookie-manager-page.c:105 +#: ../extensions/cookie-manager/cookie-manager-page.c:112 msgid "" "Deletes all shown cookies. If a filter is set, only those cookies are " "deleted which match the filter." @@ -2303,32 +2543,32 @@ msgstr "" "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:120 +#: ../extensions/cookie-manager/cookie-manager-page.c:127 msgid "Expand All" msgstr "Alle ausklappen" -#: ../extensions/cookie-manager/cookie-manager-page.c:127 +#: ../extensions/cookie-manager/cookie-manager-page.c:134 msgid "Collapse All" msgstr "Alle einklappen" -#: ../extensions/cookie-manager/cookie-manager-page.c:572 +#: ../extensions/cookie-manager/cookie-manager-page.c:576 msgid "Do you really want to delete all cookies?" -msgstr "Sind Sie sicher, dass alle Cookies entfernt werden sollen?" +msgstr "Sind Sie sicher, dass alle Profildateien entfernt werden sollen?" -#: ../extensions/cookie-manager/cookie-manager-page.c:574 +#: ../extensions/cookie-manager/cookie-manager-page.c:578 msgid "Question" msgstr "Frage" -#: ../extensions/cookie-manager/cookie-manager-page.c:583 +#: ../extensions/cookie-manager/cookie-manager-page.c:587 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:671 +#: ../extensions/cookie-manager/cookie-manager-page.c:675 msgid "At the end of the session" msgstr "Am Ende der Sitzung" -#: ../extensions/cookie-manager/cookie-manager-page.c:674 +#: ../extensions/cookie-manager/cookie-manager-page.c:678 #, c-format msgid "" "Host: %s\n" @@ -2345,15 +2585,15 @@ msgstr "" "Sicher: %s\n" "Verfällt: %s" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:686 msgid "Yes" msgstr "Ja" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:686 msgid "No" msgstr "Nein" -#: ../extensions/cookie-manager/cookie-manager-page.c:694 +#: ../extensions/cookie-manager/cookie-manager-page.c:700 #, c-format msgid "" "Domain: %s\n" @@ -2362,25 +2602,33 @@ msgstr "" "Domäne: %s\n" "Profildateien: %d" -#: ../extensions/cookie-manager/cookie-manager-page.c:1017 +#: ../extensions/cookie-manager/cookie-manager-page.c:1028 msgid "Name" msgstr "Name" -#: ../extensions/cookie-manager/cookie-manager-page.c:1069 +#: ../extensions/cookie-manager/cookie-manager-page.c:1081 msgid "_Expand All" msgstr "Alle _ausklappen" -#: ../extensions/cookie-manager/cookie-manager-page.c:1077 +#: ../extensions/cookie-manager/cookie-manager-page.c:1089 msgid "_Collapse All" msgstr "Alle _einklappen" -#: ../extensions/cookie-manager/cookie-manager-page.c:1129 -msgid "Search Cookies by Name or Domain" -msgstr "Cookies nach Name oder Rechner suchen" +#: ../extensions/cookie-manager/cookie-manager-page.c:1142 +msgid "Filter:" +msgstr "Filter:" + +#: ../extensions/cookie-manager/cookie-manager-page.c:1147 +msgid "" +"Enter a filter string to show only cookies whose name or domain field match " +"the entered filter" +msgstr "" +"Gib einen Filter ein, um nur Profildateien anzuzeigen, deren Name oder " +"Domöne auf den eingegebenen Filter passt." #: ../extensions/cookie-manager/main.c:36 msgid "List, view and delete cookies" -msgstr "Cookies auflisten, anzeigen und löschen" +msgstr "Profildateien auflisten, anzeigen und löschen" #: ../extensions/copy-tabs.c:38 msgid "Copy Tab _Addresses" @@ -2453,7 +2701,7 @@ msgstr "Nicht unterstützte RSS-Version gefunden." #: ../extensions/feed-panel/feed-rss.c:148 msgid "Failed to find required RSS \"item\" elements in XML data." -msgstr "Die für RSS benötigten »item«-Elemente wurden im XML nicht gefunden." +msgstr "Die für RSS benötigten \"item\"-Elemente wurden im XML nicht gefunden." #: ../extensions/feed-panel/feed-rss.c:248 msgid "Failed to find required RSS \"channel\" elements in XML data." @@ -2478,78 +2726,52 @@ msgstr "Nachrichtenquellenleiste" msgid "Read Atom/ RSS feeds" msgstr "Atom-/ RSS-Quellen (Feeds) lesen" -#: ../extensions/formhistory/formhistory.c:39 +#: ../extensions/formhistory.c:143 #, c-format msgid "Failed to add form value: %s\n" msgstr "Formularfeld konnte nicht hinzugefügt werden: %s\n" -#: ../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 +#: ../extensions/formhistory.c:295 msgid "Toggle form history state" -msgstr "Formulardatenstatus umschalten" +msgstr "Seiten aus dem Verlauf löschen nach:" -#: ../extensions/formhistory/formhistory.c:438 +#: ../extensions/formhistory.c:296 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 +#: ../extensions/formhistory.c:430 ../extensions/formhistory.c:434 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Datenbankabfrage konnte nicht ausgeführt werden: %s\n" -#: ../extensions/formhistory/formhistory.c:629 -msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab" +#: ../extensions/formhistory.c:509 +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 +#: ../extensions/formhistory.c:568 msgid "Stores history of entered form data" msgstr "Speichert zuvor eingegebene Formulareingaben" -#: ../extensions/formhistory/formhistory-gdom-frontend.c:225 -#: ../extensions/formhistory/formhistory-js-frontend.c:106 +#: ../extensions/formhistory.c:572 #, c-format -msgid "Failed to select suggestions\n" -msgstr "Vervollständigung schlug fehl\n" +msgid "Not available: %s" +msgstr "Nicht verfügbar: %s" + +#: ../extensions/formhistory.c:573 +msgid "Resource files not installed" +msgstr "Konfigurationsdateien nicht installiert" + +#: ../extensions/formhistory.c:579 +msgid "Form history filler" +msgstr "Formularvervollständigung" #: ../extensions/history-list.vala:197 msgid "There are no unvisited tabs" -msgstr "Keine unbesuchten Reiter vorhanden" +msgstr "Keine unbesuchten Reiter vorhanden." #: ../extensions/history-list.vala:235 #, c-format @@ -2612,25 +2834,25 @@ msgstr "Mausgesten" #: ../extensions/mouse-gestures.c:302 msgid "Control Midori by moving the mouse" -msgstr "Midori durch Bewegen der Maus steuern" +msgstr "Steuere Midori durch Bewegen der Maus" -#: ../extensions/shortcuts.c:109 +#: ../extensions/shortcuts.c:110 msgid "Reload page or stop loading" -msgstr "Seite neu laden oder Laden abbrechen" +msgstr "Seite neu laden oder laden abbrechen" #: ../extensions/shortcuts.c:176 msgid "Customize Keyboard shortcuts" msgstr "Tastaturkürzel anpassen" -#: ../extensions/shortcuts.c:283 +#: ../extensions/shortcuts.c:282 msgid "Customize Sh_ortcuts..." -msgstr "_Tastaturkürzel anpassen …" +msgstr "Tastaturkürzel anpassen..." -#: ../extensions/shortcuts.c:320 +#: ../extensions/shortcuts.c:319 msgid "Shortcuts" msgstr "Tastaturkürzel" -#: ../extensions/shortcuts.c:321 +#: ../extensions/shortcuts.c:320 msgid "View and edit keyboard shortcuts" msgstr "Tastaturkürzel ansehen und bearbeiten" @@ -2642,35 +2864,35 @@ msgstr "Uhr in der Statusleiste" msgid "Display date and time in the statusbar" msgstr "Datum und Zeit in der Statusleiste anzeigen" -#: ../extensions/statusbar-features.c:152 +#: ../extensions/statusbar-features.c:128 msgid "Images" msgstr "Bilder" -#: ../extensions/statusbar-features.c:162 +#: ../extensions/statusbar-features.c:137 msgid "Scripts" msgstr "Skripte" -#: ../extensions/statusbar-features.c:174 +#: ../extensions/statusbar-features.c:146 msgid "Netscape plugins" msgstr "Netscape-Module" -#: ../extensions/statusbar-features.c:259 +#: ../extensions/statusbar-features.c:192 msgid "Statusbar Features" msgstr "Funktionen in der Statusleiste" -#: ../extensions/statusbar-features.c:260 +#: ../extensions/statusbar-features.c:193 msgid "Easily toggle features on web pages on and off" msgstr "Funktionen auf Internetseiten leicht an- und abstellen" -#: ../extensions/tab-panel.c:589 ../extensions/tab-panel.c:676 +#: ../extensions/tab-panel.c:596 ../extensions/tab-panel.c:683 msgid "Tab Panel" msgstr "Reiterleiste" -#: ../extensions/tab-panel.c:659 +#: ../extensions/tab-panel.c:666 msgid "T_ab Panel" msgstr "_Reiterleiste" -#: ../extensions/tab-panel.c:677 +#: ../extensions/tab-panel.c:684 msgid "Show tabs in a vertical panel" msgstr "Reiter in einer senkrechten Leiste anzeigen" @@ -2682,453 +2904,46 @@ msgstr "Nur Symbole in Reitern anzeigen" msgid "New tabs have no label by default" msgstr "Neue Reiter haben keine Beschriftung" -#: ../extensions/toolbar-editor.c:395 +#: ../extensions/toolbar-editor.c:393 msgid "Customize Toolbar" msgstr "Werkzeugleiste anpassen" -#: ../extensions/toolbar-editor.c:411 +#: ../extensions/toolbar-editor.c:413 msgid "" -"Select items to be displayed on the toolbar. Items can be reordered by drag " +"Select items to be displayed on the toolbar. Items can be reodered 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:427 +#: ../extensions/toolbar-editor.c:429 msgid "Available Items" msgstr "Verfügbare Elemente" -#: ../extensions/toolbar-editor.c:448 +#: ../extensions/toolbar-editor.c:450 msgid "Displayed Items" msgstr "Angezeigte Elemente" -#: ../extensions/toolbar-editor.c:588 -msgid "_Customize Toolbar…" -msgstr "_Werkzeugleiste anpassen …" +#: ../extensions/toolbar-editor.c:585 +msgid "Customize _Toolbar..." +msgstr "_Werkzeugleiste anpassen..." + +#: ../extensions/toolbar-editor.c:601 +msgid "_Customize..." +msgstr "_Anpassen…" -#: ../extensions/toolbar-editor.c:617 +#: ../extensions/toolbar-editor.c:631 msgid "Toolbar Editor" msgstr "Werkzeugleisteneditor" -#: ../extensions/toolbar-editor.c:618 +#: ../extensions/toolbar-editor.c:632 msgid "Easily edit the toolbar layout" msgstr "Werkzeugleisten leicht anpassen" -#: ../extensions/web-cache.c:462 +#: ../extensions/web-cache.c:463 msgid "Cache HTTP communication on disk" msgstr "HTTP-Kommunikation auf der Festplatte zwischenspeichern" -#~ msgid "Remember last window size" -#~ msgstr "Letzte Fenstergröße merken" - -#~ msgid "Whether to save the last window size" -#~ msgstr "Die letzte Fenstergröße speichern oder nicht" - -#~ msgid "Last window width" -#~ msgstr "Letzte Fensterbreite" - -#~ msgid "The last saved window width" -#~ msgstr "Die zuletzt gespeicherte Fensterbreite" - -#~ msgid "Last window height" -#~ msgstr "Letzte Fensterhöhe" - -#~ msgid "The last saved window height" -#~ msgstr "Die zuletzt gespeicherte Fensterhöhe" - -#~ msgid "Last panel position" -#~ msgstr "Letzte Leistenposition" - -#~ msgid "The last saved panel position" -#~ msgstr "Die zuletzt gespeicherte Leistenposition" - -#~ msgid "Last panel page" -#~ msgstr "Letzte Leistenseite" - -#~ msgid "The last saved panel page" -#~ msgstr "Die zuletzt gespeicherte Leistenseite" - -#~ msgid "Last Web search" -#~ msgstr "Letzte Suche im Netz" - -#~ msgid "The last saved Web search" -#~ msgstr "Die zuletzt gespeicherte Suche im Netz" - -#~ msgid "Show Menubar" -#~ msgstr "Menüleiste anzeigen" - -#~ msgid "Whether to show the menubar" -#~ msgstr "Die Menüleiste anzeigen oder verbergen" - -#~ msgid "Show Navigationbar" -#~ msgstr "Navigationsleiste anzeigen" - -#~ msgid "Whether to show the navigationbar" -#~ msgstr "Die Navigationsleiste anzeigen oder verbergen" - -#~ msgid "Show Bookmarkbar" -#~ msgstr "Lesezeichenleiste anzeigen" - -#~ msgid "Whether to show the bookmarkbar" -#~ msgstr "Die Lesezeichenleiste anzeigen oder verbergen" - -#~ msgid "Show Panel" -#~ msgstr "Leiste anzeigen" - -#~ msgid "Whether to show the panel" -#~ msgstr "Die Leiste anzeigen oder verbergen" - -#~ msgid "Show Statusbar" -#~ msgstr "Statusleiste anzeigen" - -#~ msgid "Whether to show the statusbar" -#~ msgstr "Die Statusleiste anzeigen oder verbergen" - -#~ msgid "Toolbar Items" -#~ msgstr "Werkzeugleistenelemente" - -#~ msgid "The items to show on the toolbar" -#~ msgstr "Die in der Werkzeugleiste anzuzeigenden Elemente" - -#~ msgid "Compact Sidepanel" -#~ msgstr "Kompakte Seitenleiste" - -#~ msgid "Whether to make the sidepanel compact" -#~ msgstr "Die Seitenleiste anzeigen oder verbergen" - -#~ msgid "Align sidepanel on the right" -#~ msgstr "Seitenleiste rechts anordnen" - -#~ msgid "Whether to align the sidepanel on the right" -#~ msgstr "Die Seitenleiste auf der rechten Seite anordnen" - -#~ msgid "Open panels in separate windows" -#~ msgstr "Leisten in eigenen Fenstern öffnen" - -#~ msgid "Whether to always open panels in separate windows" -#~ msgstr "" -#~ "Legt fest, ob Seitenleisten immer in eigenen Fenstern geöffnet werden " -#~ "sollen" - -#~ msgid "What to do when Midori starts" -#~ msgstr "Was beim Starten von Midori passieren soll" - -#~ msgid "The homepage" -#~ msgstr "Die Startseite" - -#~ msgid "Show crash dialog" -#~ msgstr "Absturzdialog anzeigen" - -#~ msgid "The folder downloaded files are saved to" -#~ msgstr "Der Ordner, in dem heruntergeladene Dateien gespeichert werden" - -#~ msgid "An external text editor" -#~ msgstr "Ein externer Texteditor" - -#~ msgid "An external news aggregator" -#~ msgstr "Ein externer Nachrichtenaggregator" - -#~ msgid "Location entry Search" -#~ msgstr "Adressfeldsuche" - -#~ msgid "The search to perform inside the location entry" -#~ msgstr "Die Suche, die über das Adressfeld ausgeführt wird" - -#~ msgid "The preferred character encoding" -#~ msgstr "Der bevorzugte Zeichensatz" - -#~ msgid "Always show the tabbar" -#~ msgstr "Die Reiterleiste immer anzeigen" - -#~ msgid "Whether tabs have close buttons" -#~ msgstr "Knöpfe zum Schließen auf Reitern anzeigen oder verbergen" - -#~ msgid "Where to open new pages" -#~ msgstr "Wo neue Seiten geöffnet werden sollen" - -#~ msgid "Whether to open new tabs in the background" -#~ msgstr "Neue Reiter im Hintergrund öffnen" - -#~ msgid "Open popups in tabs" -#~ msgstr "Aufklappfenster in Reitern öffnen" - -#~ msgid "Whether to open popup windows in tabs" -#~ msgstr "Aufklappfenster in neuen Reitern öffnen" - -#~ msgid "Load and display images automatically" -#~ msgstr "Bilder automatisch laden und anzeigen" - -#~ msgid "Enable embedded scripting languages" -#~ msgstr "Eingebettete Skriptsprachen einschalten" - -#~ msgid "Enable embedded Netscape plugin objects" -#~ msgstr "Eingebettete Netscape-Module einschalten" - -#~ msgid "Enable spell checking while typing" -#~ msgstr "Rechtschreibprüfung beim Eintippen einschalten" - -#~ msgid "Enable HTML5 database support" -#~ msgstr "HTML5-Datenbanken einschalten" - -#~ msgid "Whether to enable HTML5 database support" -#~ msgstr "Unterstützung für HTML5-Datenbank einschalten" - -#~ msgid "Whether to enable HTML5 local storage support" -#~ msgstr "Unterstützung für HTML5-Lokalspeicher einschalten" - -#~ msgid "Whether to enable offline web application cache" -#~ msgstr "HTML5-Zwischenspeicher für Internetanwendungen einschalten" - -#~ 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" - -#~ msgid "Allow websites to use OpenGL rendering" -#~ msgstr "Internetseiten erlauben, OpenGL zur Darstellung zu benutzen" - -#~ msgid "Whether to zoom text and images" -#~ msgstr "" -#~ "Legt fest, ob Text und Bilder gleichermaßen vergrößert werden sollen" - -#~ msgid "Find inline while typing" -#~ msgstr "Inkrementelle Suche beim Eintippen" - -#~ msgid "Whether to automatically find inline while typing" -#~ msgstr "" -#~ "Legt fest, ob die inkrementelle Suche automatisch beim Eintippen starten " -#~ "soll" - -#~ msgid "The type of proxy server to use" -#~ msgstr "Die Art des zu verwendenden Zwischenrechners" - -#~ msgid "HTTP Proxy Server" -#~ msgstr "HTTP-Zwischenrechner" - -#~ msgid "The proxy server used for HTTP connections" -#~ msgstr "Der Zwischenrechner für HTTP-Verbindungen" - -#~ msgid "The proxy server port used for HTTP connections" -#~ msgstr "Der Port des Zwischenrechners für HTTP-Verbindungen" - -#~ msgid "Identification string" -#~ msgstr "Identifikationskennung" - -#~ msgid "The application identification string" -#~ msgstr "Die Identifikationskennung der Anwendung" - -#~ msgid "Clear private data" -#~ msgstr "Private Daten löschen" - -#~ msgid "The private data selected for deletion" -#~ msgstr "Zum Löschen ausgewählte private Daten" - -#~ msgid "Clear data" -#~ msgstr "Daten löschen" - -#~ msgid "The data selected for deletion" -#~ msgstr "Zum Löschen ausgewählte Daten" - -#~ msgid "_Bookmark" -#~ msgstr "_Lesezeichen" - -#~ msgid "_Console" -#~ msgstr "_Konsole" - -#~ msgid "Close ot_her Tabs" -#~ msgstr "Ande_re Reiter schließen" - -#~ msgid "_Icon:" -#~ msgstr "_Symbol:" - -#~ msgid "Filter:" -#~ msgstr "Filter:" - -#~ msgid "" -#~ "Enter a filter string to show only cookies whose name or domain field " -#~ "match the entered filter" -#~ msgstr "" -#~ "Gib einen Filter ein, um nur Profildateien anzuzeigen, deren Name oder " -#~ "Domöne auf den eingegebenen Filter passt." - -#~ msgid "The bookmarks couldn't be saved. %s" -#~ msgstr "Die Lesezeichen konnten nicht gespeichert werden. %s" - -#~ msgid "Toplevel folder" -#~ msgstr "Oberster Ordner" - -#~ msgid "_Title:" -#~ msgstr "_Titel:" - -#~ msgid "_Folder:" -#~ msgstr "_Ordner:" - -#~ msgid "_Customize…" -#~ msgstr "_Anpassen…" - -#~ 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 "No filename specified" #~ msgstr "Kein Dateiname angegeben" @@ -3156,8 +2971,8 @@ msgstr "HTTP-Kommunikation auf der Festplatte zwischenspeichern" #~ msgid "Reset the last _session" #~ msgstr "Die letzte _Sitzung zurücksetzen" -#~ msgid "Configure _Advertisement filters…" -#~ msgstr "Werbefilter einstellen…" +#~ msgid "Configure _Advertisement filters..." +#~ msgstr "Werbefilter einstellen..." #~ msgid "Not found - %s" #~ msgstr "Nicht gefunden - %s" @@ -3186,6 +3001,9 @@ msgstr "HTTP-Kommunikation auf der Festplatte zwischenspeichern" #~ msgid "Delete old cookies after 1 year" #~ msgstr "Alte Cookies nach 1 Jahr löschen" +#~ msgid "Midori (Private Browsing)" +#~ msgstr "Midori (Privat surfen)" + #~ msgid "All cookies" #~ msgstr "Alle Profildateien" @@ -3249,6 +3067,9 @@ msgstr "HTTP-Kommunikation auf der Festplatte zwischenspeichern" #~ msgid "Appearance" #~ msgstr "Erscheinungsbild" +#~ msgid "_Form History" +#~ msgstr "Ausgefüllte _Formulare" + #~ msgid "Web Cookies" #~ msgstr "Benutzerprofile" @@ -3489,6 +3310,9 @@ msgstr "HTTP-Kommunikation auf der Festplatte zwischenspeichern" #~ 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" @@ -3519,6 +3343,9 @@ msgstr "HTTP-Kommunikation auf der Festplatte zwischenspeichern" #~ msgid "The character encoding to use by default" #~ msgstr "Der voreingestellte Zeichensatz" +#~ msgid "User_styles" +#~ msgstr "Benutzer_stile" + #~ msgid "Resizable text areas" #~ msgstr "Vergrößerbare Textfelder" @@ -3534,8 +3361,11 @@ msgstr "HTTP-Kommunikation auf der Festplatte zwischenspeichern" #~ msgid "Load on Startup" #~ msgstr "Beim Programmstart öffnen" -#~ msgid "Configure _Toolbar…" -#~ msgstr "Werkzeugleiste anpassen…" +#~ msgid "Configure _Toolbar..." +#~ msgstr "Werkzeugleiste anpassen..." + +#~ msgid "_Enable" +#~ msgstr "_Einschalten" #~ msgid "Enable" #~ msgstr "_Einschalten" diff --git a/po/el.po b/po/el.po index 724ed775..959e38b2 100644 --- a/po/el.po +++ b/po/el.po @@ -2,385 +2,395 @@ # 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: 2012-08-19 12:06+0000\n" -"PO-Revision-Date: 2012-08-24 00:38+0300\n" -"Last-Translator: Efstathios Iosifidis \n" -"Language-Team: Ελληνικά, Σύγχρονα \n" +"POT-Creation-Date: 2011-11-11 11:12+0000\n" +"PO-Revision-Date: 2011-11-11 13:52+0200\n" +"Last-Translator: Evaggelos Balaskas \n" +"Language-Team: Greek \n" "Language: el\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bits\n" -"Plural-Forms: nplurals=2; plural=(n!=1);\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\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 "Browse the Web" -msgstr "Αναζήτηση στον Ιστό" +msgid "Lightweight web browser" +msgstr "Ελαφρύς περιηγητής ιστού" #: ../data/midori.desktop.in.h:2 -msgid "Internet;WWW;Explorer" -msgstr "Internet;WWW;Explorer" - -#: ../data/midori.desktop.in.h:3 ../midori/main.c:2025 ../midori/main.c:2049 -#: ../midori/main.c:2063 ../midori/midori-websettings.c:315 +#: ../midori/main.c:2011 +#: ../midori/main.c:2031 +#: ../midori/main.c:2047 +#: ../midori/midori-websettings.c:300 msgid "Midori" -msgstr "Midori" - -#: ../data/midori.desktop.in.h:4 -msgid "Midori Web Browser" -msgstr "Περιηγητής Ιστού Midori" - -#: ../data/midori.desktop.in.h:5 -msgid "New Private Browsing Window" -msgstr "Νέο Παράθυρο Ιδιωτικής Περιήγησης" - -#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1479 -msgid "New Tab" -msgstr "Νέα καρτέλα" +msgstr "Μιντόρι" -#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1476 -msgid "New Window" -msgstr "Νέο παράθυρο" - -#: ../data/midori.desktop.in.h:8 +#: ../data/midori.desktop.in.h:3 msgid "Web Browser" 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 "Άνοιγμα ενός νέου παραθύρου ιδιωτικής περιήγησης" -#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4505 +#: ../data/midori-private.desktop.in.h:2 msgid "Private Browsing" msgstr "Ιδιωτική περιήγηση" -#: ../midori/main.c:91 ../midori/main.c:97 +#: ../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:145 +#: ../midori/main.c:150 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Η τιμή '%s' δεν είναι έγκυρη για το %s" -#: ../midori/main.c:150 ../midori/main.c:254 +#: ../midori/main.c:155 +#: ../midori/main.c:261 #, c-format msgid "Invalid configuration value '%s'" msgstr "Μη έγκυρη τιμή ρύθμισης '%s'" -#: ../midori/main.c:375 +#: ../midori/main.c:366 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Οι μηχανές αναζήτησης δεν μπόρεσαν να φορτωθούν. %s\n" -#: ../midori/main.c:429 +#: ../midori/main.c:420 #, c-format msgid "Failed to clear history: %s\n" msgstr "Αποτυχία κατά τον καθαρισμό του ιστορικού: %s\n" -#: ../midori/main.c:451 ../extensions/formhistory/formhistory.c:531 +#: ../midori/main.c:440 +#: ../midori/main.c:561 +#: ../extensions/formhistory.c:415 #, 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:523 +#: ../midori/main.c:504 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Αποτυχία στην διαγραφή των παλιών αντικειμένων από το ιστορικό: %s\n" -#: ../midori/main.c:545 +#: ../midori/main.c:544 +#: ../panels/midori-history.c:189 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "Αποτυχία στην διαγραφή του αντικειμένου από το ιστορικό: %s\n" + +#: ../midori/main.c:591 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "Οι σελιδοδείκτες δεν μπόρεσαν να αποθηκευτούν. %s" + +#: ../midori/main.c:626 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Οι ρυθμίσεις δεν μπορούν να αποθηκευτούν. %s" -#: ../midori/main.c:571 +#: ../midori/main.c:661 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Οι μηχανές αναζήτησης δεν μπόρεσαν να αποθηκευτούν. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:608 +#: ../midori/main.c:687 +#: ../midori/main.c:707 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Τα απορρίμματα δεν μπόρεσαν να αποθηκευτούν. %s" -#: ../midori/main.c:681 ../panels/midori-extensions.c:90 +#: ../midori/main.c:741 +#: ../panels/midori-extensions.c:91 msgid "Extensions" msgstr "Επεκτάσεις" -#: ../midori/main.c:695 +#: ../midori/main.c:755 msgid "Privacy" msgstr "Προσωπικό απόρρητο" -#: ../midori/main.c:707 -msgid "" -"Cookies store login data, saved games, or user profiles for advertisement " -"purposes." -msgstr "" -"Τα cookies αποθηκεύουν δεδομένα σύνδεσης, αποθηκεύουν παιχνίδια ή προφίλ " -"χρηστών για διαφημιστικούς λόγους." +#: ../midori/main.c:767 +msgid "Cookies store login data, saved games, or user profiles for advertisement purposes." +msgstr "Τα cookies αποθηκεύουν δεδομένα σύνδεσης, αποθηκεύουν παιχνίδια ή προφίλ χρηστών για διαφημιστικούς λόγους." -#: ../midori/main.c:763 +#: ../midori/main.c:823 #, c-format msgid "The session couldn't be saved. %s" msgstr "Η συνεδρία δεν μπόρεσε να αποθηκευτεί. %s" -#: ../midori/main.c:1001 -msgid "" -"No root certificate file is available. SSL certificates cannot be verified." -msgstr "" -"Δεν είναι διαθέσιμο κανένα πιστοποιητικό ρίζας. Πιστοποιητικά SSL δεν " -"μπορούν να επιβεβαιωθούν." +#: ../midori/main.c:1033 +msgid "No root certificate file is available. SSL certificates cannot be verified." +msgstr "Δεν είναι διαθέσιμο κανένα πιστοποιητικό ρίζας. Πιστοποιητικά SSL δεν μπορούν να επιβεβαιωθούν." -#: ../midori/main.c:1093 -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:1101 +msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." +msgstr "Το Μιντόρι φαίνεται ότι κρέμασε την τελευταία φορά που άνοιξε. Εάν αυτό συνεχίζει επανειλημμένα δοκιμάστε μία από τις παρακάτω επιλογές για να επιλύσετε το πρόβλημα." -#: ../midori/main.c:1112 +#: ../midori/main.c:1120 msgid "Modify _preferences" msgstr "Τροποποίηση _προτιμήσεων" -#: ../midori/main.c:1116 +#: ../midori/main.c:1124 msgid "Disable all _extensions" msgstr "Απενεργοποίηση όλων των επ_εκτάσεων" -#: ../midori/main.c:1129 +#: ../midori/main.c:1137 msgid "Discard old tabs" msgstr "Απόρριψη παλιών καρτελών" -#: ../midori/main.c:1130 ../midori/midori-websettings.c:223 +#: ../midori/main.c:1138 +#: ../midori/midori-websettings.c:209 msgid "Show last tabs without loading" msgstr "Εμφάνιση των τελευταίων καρτέλων χωρίς φόρτωση" -#: ../midori/main.c:1131 ../midori/midori-websettings.c:222 +#: ../midori/main.c:1139 +#: ../midori/midori-websettings.c:208 msgid "Show last open tabs" msgstr "Εμφάνιση των τελευταίων ανοιχτών καρτελών" -#: ../midori/main.c:1379 ../midori/main.c:2433 +#: ../midori/main.c:1349 +#: ../midori/main.c:2419 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Η συνεδρία δεν μπορεί να φορτωθεί: %s\n" -#: ../midori/main.c:1517 +#: ../midori/main.c:1490 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Το στιγμιότυπο αποθηκεύτηκε στο: %s\n" -#: ../midori/main.c:1933 +#: ../midori/main.c:1914 msgid "Run ADDRESS as a web application" msgstr "Άνοιγμα της διεύθυνσης ως διαδικτυακή εφαρμογή" -#: ../midori/main.c:1933 +#: ../midori/main.c:1914 msgid "ADDRESS" msgstr "Διεύθυνση" -#: ../midori/main.c:1936 +#: ../midori/main.c:1917 msgid "Use FOLDER as configuration folder" msgstr "Χρήση φακέλου ως φάκελος ρύθμισης" -#: ../midori/main.c:1936 +#: ../midori/main.c:1917 msgid "FOLDER" msgstr "ΦΑΚΕΛΟΣ" -#: ../midori/main.c:1939 +#: ../midori/main.c:1920 msgid "Private browsing, no changes are saved" msgstr "Ιδιωτική περιήγηση, οι τροποποιήσεις δεν αποθηκεύονται" -#: ../midori/main.c:1941 +#: ../midori/main.c:1922 msgid "Show a diagnostic dialog" msgstr "Εμφάνιση του διαλόγου διάγνωσης" -#: ../midori/main.c:1943 +#: ../midori/main.c:1924 msgid "Run the specified filename as javascript" msgstr "Τρέξε το συγκεκριμένο όνομα αρχείου ως javascript" -#: ../midori/main.c:1945 +#: ../midori/main.c:1926 msgid "Take a snapshot of the specified URI" msgstr "Αποθήκευση του συγκεκριμένου URI" -#: ../midori/main.c:1947 +#: ../midori/main.c:1928 msgid "Execute the specified command" msgstr "Εκτέλεση της συγκεκριμένης εντολής" -#: ../midori/main.c:1949 +#: ../midori/main.c:1930 msgid "List available commands to execute with -e/ --execute" msgstr "Εμφάνιση των διαθέσιμων εντολών προς εκτέλεση με e-/ --execute" -#: ../midori/main.c:1951 +#: ../midori/main.c:1932 msgid "Display program version" msgstr "Προβολή έκδοσης προγράμματος" -#: ../midori/main.c:1953 +#: ../midori/main.c:1934 msgid "Addresses" msgstr "Διευθύνσεις" -#: ../midori/main.c:1955 +#: ../midori/main.c:1936 msgid "Block URIs according to regular expression PATTERN" msgstr "Εμπόδισε URIs σύμφωνα με την κανονική έκφραση ΜΟΤΙΒΟ" -#: ../midori/main.c:1955 +#: ../midori/main.c:1936 msgid "PATTERN" msgstr "ΜΟΤΙΒΟ" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1959 +#: ../midori/main.c:1940 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "Επαναφορά midori μετά από SECONDS δευτερόλεπτα απραγίας" -#: ../midori/main.c:1959 +#: ../midori/main.c:1940 msgid "SECONDS" msgstr "ΔΕΥΤΕΡΟΛΕΠΤΑ" -#: ../midori/main.c:1962 +#: ../midori/main.c:1943 msgid "Redirects console warnings to the specified FILENAME" msgstr "Ανακατεύθυνση μηνυμάτων κονσόλας στο συγκεκριμένο ΑΡΧΕΙΟ" -#: ../midori/main.c:1962 +#: ../midori/main.c:1943 msgid "FILENAME" msgstr "ΟΝΟΜΑ ΑΡΧΕΙΟΥ" -#: ../midori/main.c:2064 +#: ../midori/main.c:2008 +msgid "[Addresses]" +msgstr "[Διευθύνσεις" + +#: ../midori/main.c:2018 +msgid "The specified configuration folder is invalid." +msgstr "Η συγκεκριμένη ρύθμιση φακέλου είναι άκυρη." + +#: ../midori/main.c:2048 msgid "Please report comments, suggestions and bugs to:" msgstr "Παρακαλώ αναφέρατε σχόλια, προτάσεις και σφάλματα στο:" -#: ../midori/main.c:2066 +#: ../midori/main.c:2050 msgid "Check for new versions at:" msgstr "Έλεγχος για νέα έκδοση στο:" +#: ../midori/main.c:2133 +msgid "Website icons" +msgstr "Εικονίδια ιστότοπων" + #. i18n: Logins and passwords in websites and web forms -#: ../midori/main.c:2161 +#: ../midori/main.c:2136 msgid "Saved logins and _passwords" msgstr "Αποθηκευμένες συνδέσεις και _συνθηματικά" -#: ../midori/main.c:2163 -msgid "Cookies and Website data" -msgstr "Δεδομένα ιστοσελίδας και Cookies" +#: ../midori/main.c:2138 +msgid "Cookies" +msgstr "Cookies" + +#: ../midori/main.c:2141 +msgid "'Flash' Cookies" +msgstr "Άδειασμα των cookies" + +#: ../midori/main.c:2144 +msgid "HTML5 _Databases" +msgstr "_Βάσεις δεδομένων HTML5" -#. TODO: Preserve page icons of search engines and merge privacy items -#: ../midori/main.c:2167 ../midori/midori-websettings.c:1020 -#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471 +#: ../midori/main.c:2147 +#: ../midori/midori-websettings.c:933 +#: ../extensions/web-cache.c:462 +#: ../extensions/web-cache.c:471 msgid "Web Cache" msgstr "Προσωρινής μνήμης ιστού" -#: ../midori/main.c:2170 -msgid "Website icons" -msgstr "Εικονίδια ιστότοπων" +#: ../midori/main.c:2149 +msgid "Offline Application Cache" +msgstr "Εκτός σύνδεσης προσωρινή μνήμη εφαρμογής" -#: ../midori/main.c:2274 +#: ../midori/main.c:2252 msgid "An unknown error occured" msgstr "Ένα άγνωστο σφάλμα προέκυψε" -#: ../midori/main.c:2381 +#: ../midori/main.c:2350 msgid "An instance of Midori is already running but not responding.\n" msgstr "Ένα στιγμιότυπο του Μιντόρι τρέχει ήδη αλλά δεν ανταποκρίνεται.\n" -#: ../midori/main.c:2415 +#: ../midori/main.c:2386 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Οι σελιδοδείκτες δεν μπορούν να φορτωθούν: %s\n" -#: ../midori/main.c:2448 +#: ../midori/main.c:2434 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Τα απορρίμματα δεν μπόρεσαν να φορτωθούν: %s\n" -#: ../midori/main.c:2461 +#: ../midori/main.c:2447 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Το ιστορικό δεν μπόρεσε να φορτωθεί: %s\n" -#: ../midori/main.c:2476 +#: ../midori/main.c:2463 msgid "The following errors occured:" msgstr "Δημιουργήθηκαν τα ακόλουθα σφάλματα:" -#: ../midori/main.c:2492 +#: ../midori/main.c:2479 msgid "_Ignore" msgstr "Α_γνόησε" -#: ../midori/midori-app.c:1155 ../midori/midori-browser.c:545 -#, c-format -msgid "Unexpected action '%s'." -msgstr "Αναπάντεχη ενέργεια '%s'." +#: ../midori/midori-app.c:1323 +msgid "_Bookmark" +msgstr "_Σελιδοδείκτης" -#: ../midori/midori-app.c:1459 ../midori/midori-browser.c:6435 +#: ../midori/midori-app.c:1324 +#: ../midori/midori-browser.c:5972 msgid "_Bookmarks" msgstr "_Σελιδοδείκτες" -#: ../midori/midori-app.c:1460 +#: ../midori/midori-app.c:1325 msgid "Add Boo_kmark" msgstr "Προσθήκη σ_ελιδοδείκτη" -#: ../midori/midori-app.c:1461 +#: ../midori/midori-app.c:1326 +msgid "_Console" +msgstr "_Τερματικό" + +#: ../midori/midori-app.c:1327 msgid "_Extensions" msgstr "_Επεκτάσεις" #. i18n: Browsing history, visited web pages, closed tabs -#: ../midori/midori-app.c:1462 ../midori/midori-browser.c:4891 +#: ../midori/midori-app.c:1328 +#: ../midori/midori-browser.c:4573 msgid "_History" msgstr "_Ιστορικό" -#: ../midori/midori-app.c:1463 +#: ../midori/midori-app.c:1329 +msgid "_Homepage" +msgstr "_Αρχική σελίδα" + +#: ../midori/midori-app.c:1330 msgid "_Userscripts" msgstr "_Δέσμες εντολών χρήστη" -#: ../midori/midori-app.c:1464 -msgid "User_styles" -msgstr "_Στυλ χρήστη" - -#: ../midori/midori-app.c:1465 +#: ../midori/midori-app.c:1331 msgid "New _Tab" msgstr "Νέα _καρτέλα" -#: ../midori/midori-app.c:1466 +#: ../midori/midori-app.c:1332 msgid "_Transfers" msgstr "_Μεταφορές" -#: ../midori/midori-app.c:1467 +#: ../midori/midori-app.c:1333 msgid "Netscape p_lugins" msgstr "Α_ρθρωμάτων netscape" -#: ../midori/midori-app.c:1468 +#: ../midori/midori-app.c:1334 msgid "_Closed Tabs" msgstr "_Κλειστές καρτέλες" -#: ../midori/midori-app.c:1469 ../midori/midori-browser.c:5574 +#: ../midori/midori-app.c:1335 +#: ../midori/midori-browser.c:5161 msgid "New _Window" msgstr "Νέο _παράθυρο" -#: ../midori/midori-app.c:1470 +#: ../midori/midori-app.c:1336 msgid "New _Folder" msgstr "Νέος _φάκελος" -#: ../midori/midori-app.c:1499 -msgid "[Addresses]" -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 +#: ../midori/midori-array.c:547 +#: ../midori/midori-array.c:586 +#: ../midori/midori-array.c:609 +#: ../midori/midori-array.c:619 msgid "Malformed document." msgstr "Κακοσχηματισμένο έγγραφο." @@ -388,1775 +398,1602 @@ msgstr "Κακοσχηματισμένο έγγραφο." msgid "Unrecognized bookmark format." msgstr "Άγνωστος τύπος συνδέσμου." -#: ../midori/midori-array.c:915 +#: ../midori/midori-array.c:916 msgid "Writing failed." msgstr "Αποτυχία εγγραφής." -#: ../midori/midori-browser.c:364 ../midori/midori-browser.c:5662 -#: ../midori/midori-browser.c:5671 +#: ../midori/midori-browser.c:328 +#: ../midori/midori-browser.c:5243 +#: ../midori/midori-browser.c:5252 msgid "Reload the current page" msgstr "Ανανέωση της τρέχουσας σελίδας" -#: ../midori/midori-browser.c:373 ../midori/midori-browser.c:5668 +#: ../midori/midori-browser.c:336 +#: ../midori/midori-browser.c:5249 msgid "Stop loading the current page" msgstr "Σταμάτημα φόρτωσης της τρέχουσας σελίδας" -#: ../midori/midori-browser.c:530 +#: ../midori/midori-browser.c:461 #, c-format msgid "Failed to update title: %s\n" msgstr "Αποτυχία κατά την ανανέωση του τίτλου: %s\n" -#: ../midori/midori-browser.c:625 +#: ../midori/midori-browser.c:474 +#, c-format +msgid "Unexpected action '%s'." +msgstr "Αναπάντεχη ενέργεια '%s'." + +#: ../midori/midori-browser.c:575 #, c-format msgid "%s (Private Browsing)" msgstr "%s (Ιδιωτική περιήγηση)" -#: ../midori/midori-browser.c:735 ../midori/midori-browser.c:777 -#: ../panels/midori-bookmarks.c:114 -msgid "Bookmarks" -msgstr "Σελιδοδείκτες" +#: ../midori/midori-browser.c:686 +#: ../midori/midori-browser.c:719 +msgid "Toplevel folder" +msgstr "Αρχικός φάκελος" -#: ../midori/midori-browser.c:837 +#: ../midori/midori-browser.c:776 msgid "New folder" msgstr "Νέος φάκελος" -#: ../midori/midori-browser.c:837 +#: ../midori/midori-browser.c:776 msgid "Edit folder" msgstr "Επεξεργασία φακέλου" -#: ../midori/midori-browser.c:839 +#: ../midori/midori-browser.c:778 msgid "New bookmark" msgstr "Νέος σελιδοδείκτης" -#: ../midori/midori-browser.c:839 +#: ../midori/midori-browser.c:778 msgid "Edit bookmark" msgstr "Επεξεργασία σελιδοδείκτη" -#: ../midori/midori-browser.c:873 -msgid "Type a name for this bookmark and choose where to keep it." -msgstr "" -"Πληκτρολογήστε ένα όνομα γι'αυτόν τον σελιδοδείκτη και επιλέξτε που θα τον " -"αποθηκεύσετε." +#: ../midori/midori-browser.c:809 +msgid "_Title:" +msgstr "_Τίτλος:" + +#: ../midori/midori-browser.c:829 +#: ../midori/midori-searchaction.c:966 +#: ../extensions/feed-panel/main.c:377 +msgid "_Address:" +msgstr "_Διεύθυνση:" + +#: ../midori/midori-browser.c:852 +#: ../midori/midori-browser.c:4308 +msgid "_Folder:" +msgstr "_Φάκελος:" -#: ../midori/midori-browser.c:934 +#: ../midori/midori-browser.c:868 msgid "Add to _Speed Dial" msgstr "Προσθήκη στην _γρήγορη σύνδεση" -#: ../midori/midori-browser.c:940 +#: ../midori/midori-browser.c:881 msgid "Show in the tool_bar" msgstr "Εμφάνιση στην εργαλειο_θήκη" -#: ../midori/midori-browser.c:948 +#: ../midori/midori-browser.c:896 msgid "Run as _web application" msgstr "Εκτέλεση ως _διαδικτυακή εφαρμογή" -#: ../midori/midori-browser.c:1019 +#: ../midori/midori-browser.c:967 #, c-format msgid "The file \"%s\" can't be saved in this folder." msgstr "Το αρχείο \"%s\" δεν μπορεί να αποθηκευτεί σε αυτόν τον φάκελο." -#: ../midori/midori-browser.c:1021 +#: ../midori/midori-browser.c:969 #, c-format msgid "You don't have permission to write in this location." msgstr "Δεν έχετε δικαιώματα εγγραφής σε αυτή την τοποθεσία" -#: ../midori/midori-browser.c:1028 +#: ../midori/midori-browser.c:976 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Δεν υπάρχει αρκετός ελεύθερος χώρος για να κατεβάσετε \"%s\"." -#: ../midori/midori-browser.c:1031 +#: ../midori/midori-browser.c:979 #, c-format msgid "The file needs %s but only %s are left." msgstr "Το αρχείο χρειάζεται %s αλλά έχουν απομείνει μόνο %s." -#: ../midori/midori-browser.c:1167 ../midori/midori-browser.c:4695 +#: ../midori/midori-browser.c:1023 +#: ../midori/midori-browser.c:4378 msgid "Save file as" msgstr "Αποθήκευση αρχείου ως" -#: ../midori/midori-browser.c:1173 -msgid "Save associated _resources" -msgstr "" +#: ../midori/midori-browser.c:1332 +msgid "New Window" +msgstr "Νέο παράθυρο" -#: ../midori/midori-browser.c:1476 +#: ../midori/midori-browser.c:1332 msgid "A new window has been opened" msgstr "Ένα νέο παράθυρο έχει ανοιχθεί" -#: ../midori/midori-browser.c:1479 +#: ../midori/midori-browser.c:1335 +msgid "New Tab" +msgstr "Νέα καρτέλα" + +#: ../midori/midori-browser.c:1335 msgid "A new tab has been opened" msgstr "Μια νέα καρτέλα έχει ανοιχθεί" -#: ../midori/midori-browser.c:1496 -msgid "Error opening the image!" -msgstr "Σφάλμα ανοίγματος εικόνας!" - -#: ../midori/midori-browser.c:1497 -msgid "Can not open selected image in a default viewer." -msgstr "" -"Αδυναμία ανοίγματος επιλεγμένης εικόνας στον προεπιλεγμένο πρόγραμμα " -"προβολής εικόνων." - -#: ../midori/midori-browser.c:1503 -msgid "Error downloading the image!" -msgstr "Σφάλμα κατά την λήψη της εικόνας!" - -#: ../midori/midori-browser.c:1504 -msgid "Can not download selected image." -msgstr "Αδυναμία λήψης επιλεγμένης εικόνας." - -#: ../midori/midori-browser.c:1625 +#: ../midori/midori-browser.c:1372 msgid "Save file" msgstr "Αποθήκευση αρχείου" -#: ../midori/midori-browser.c:2528 +#: ../midori/midori-browser.c:2262 msgid "Open file" msgstr "Άνοιγμα αρχείου" -#: ../midori/midori-browser.c:2660 +#: ../midori/midori-browser.c:2392 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:2666 ../extensions/feed-panel/main.c:365 +#: ../midori/midori-browser.c:2398 +#: ../extensions/feed-panel/main.c:365 msgid "New feed" msgstr "Νέα ροή" -#: ../midori/midori-browser.c:2709 ../midori/midori-browser.c:5734 -#: ../panels/midori-bookmarks.c:527 +#: ../midori/midori-browser.c:2441 +#: ../midori/midori-browser.c:5312 +#: ../panels/midori-bookmarks.c:463 msgid "Add a new bookmark" msgstr "Προσθήκη ενός νέου σελιδοδείκτη" -#: ../midori/midori-browser.c:3253 ../midori/midori-searchaction.c:487 +#: ../midori/midori-browser.c:2962 +#: ../midori/midori-searchaction.c:487 msgid "Empty" msgstr "Άδειο" -#: ../midori/midori-browser.c:3699 ../midori/midori-browser.c:3700 +#: ../midori/midori-browser.c:3457 msgid "Toggle text cursor navigation" msgstr "Εναλλαγή κειμένου κέρσορα πλοήγησης" -#: ../midori/midori-browser.c:3702 -msgid "" -"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in " -"all websites." -msgstr "" - -#: ../midori/midori-browser.c:3705 -msgid "_Enable Caret Browsing" -msgstr "_Ενεργοποίηση Περιήγησης Δρομέα" - -#: ../midori/midori-browser.c:4095 ../midori/midori-browser.c:6128 +#: ../midori/midori-browser.c:3769 +#: ../midori/midori-browser.c:5719 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Αποτυχία εισαγωγής νέου αντικειμένου στο ιστορικό: %s\n" -#: ../midori/midori-browser.c:4421 ../panels/midori-bookmarks.c:850 -#: ../panels/midori-history.c:806 +#: ../midori/midori-browser.c:4105 +#: ../panels/midori-bookmarks.c:779 +#: ../panels/midori-history.c:747 msgid "Open all in _Tabs" msgstr "Άνοιγμα όλων σε _καρτέλες" -#: ../midori/midori-browser.c:4428 ../panels/midori-bookmarks.c:856 -#: ../panels/midori-history.c:812 ../extensions/feed-panel/feed-panel.c:528 +#: ../midori/midori-browser.c:4112 +#: ../panels/midori-bookmarks.c:785 +#: ../panels/midori-history.c:753 +#: ../extensions/feed-panel/feed-panel.c:528 msgid "Open in New _Tab" msgstr "Άνοιγμα σε νέα_καρτέλα" -#: ../midori/midori-browser.c:4431 ../midori/midori-view.c:2944 -#: ../midori/midori-view.c:5082 ../panels/midori-bookmarks.c:858 -#: ../panels/midori-history.c:814 ../extensions/feed-panel/feed-panel.c:530 +#: ../midori/midori-browser.c:4115 +#: ../midori/midori-view.c:2528 +#: ../midori/midori-view.c:4352 +#: ../panels/midori-bookmarks.c:787 +#: ../panels/midori-history.c:755 +#: ../extensions/feed-panel/feed-panel.c:530 msgid "Open in New _Window" msgstr "Άνοιγμα σε νέο _παράθυρο" -#: ../midori/midori-browser.c:4520 +#: ../midori/midori-browser.c:4195 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4521 +#: ../midori/midori-browser.c:4196 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4522 +#: ../midori/midori-browser.c:4197 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4523 +#: ../midori/midori-browser.c:4198 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4524 +#: ../midori/midori-browser.c:4199 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4525 +#: ../midori/midori-browser.c:4200 #, c-format msgid "Firefox (%s)" msgstr "Firefox (%s)" -#: ../midori/midori-browser.c:4526 -msgid "Midori 0.2.6" -msgstr "Μιντόρι 0.2.6" - -#: ../midori/midori-browser.c:4547 -msgid "Import bookmarks…" -msgstr "_Εισαγωγή σελιδοδεικτών..." +#: ../midori/midori-browser.c:4221 +msgid "Import bookmarks..." +msgstr "Εισαγωγή συνδέσμων..." -#: ../midori/midori-browser.c:4550 ../midori/midori-browser.c:5739 +#: ../midori/midori-browser.c:4224 +#: ../midori/midori-browser.c:5317 msgid "_Import bookmarks" -msgstr "_Εισαγωγή σελιδοδεικτών..." +msgstr "_Εισαγωγή συνδέσμων..." -#: ../midori/midori-browser.c:4561 +#: ../midori/midori-browser.c:4235 msgid "_Application:" msgstr "_Εφαρμογή:" -#: ../midori/midori-browser.c:4626 +#: ../midori/midori-browser.c:4300 msgid "Import from XBEL or HTML file" msgstr "Εισαγωγή από αρχείο XBEL ή HTML" -#: ../midori/midori-browser.c:4654 +#: ../midori/midori-browser.c:4335 msgid "Import from a file" msgstr "Εισαγωγή από αρχείο" -#: ../midori/midori-browser.c:4666 +#: ../midori/midori-browser.c:4347 msgid "Failed to import bookmarks" -msgstr "Αποτυχία εισαγωγής σελιδοδεικτών" +msgstr "Αποτυχία εισαγωγής συνδέσμων" -#: ../midori/midori-browser.c:4700 +#: ../midori/midori-browser.c:4383 msgid "XBEL Bookmarks" msgstr "Σελιδοδείκτες XBEL" -#: ../midori/midori-browser.c:4705 +#: ../midori/midori-browser.c:4388 msgid "Netscape Bookmarks" msgstr "Σελιδοδείκτες Netscape" -#: ../midori/midori-browser.c:4719 +#: ../midori/midori-browser.c:4402 msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)" -msgstr "" -"Το Midori μπορεί κάνει εξαγωγή μόνο σε XBEL (*.xbel) και Netscape (*.html)" +msgstr "Το Midori μπορεί κάνει εξαγωγή μόνο σε XBEL (*.xbel) και Netscape (*.html)" -#: ../midori/midori-browser.c:4734 +#: ../midori/midori-browser.c:4418 msgid "Failed to export bookmarks" -msgstr "Αποτυχία εξαγωγής σελιδοδεικτών" +msgstr "Αποτυχία εξαγωγής συνδέσμων" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4856 +#: ../midori/midori-browser.c:4540 msgid "Clear Private Data" msgstr "Καθαρισμός προσωπικών δεδομένων" -#: ../midori/midori-browser.c:4860 +#: ../midori/midori-browser.c:4544 msgid "_Clear private data" msgstr "_Καθαρισμός προσωπικών δεδομένων" -#: ../midori/midori-browser.c:4875 +#: ../midori/midori-browser.c:4557 msgid "Clear the following data:" msgstr "Καθαρισμός των παρακάτω δεδομένων:" -#: ../midori/midori-browser.c:4885 +#: ../midori/midori-browser.c:4567 msgid "Last open _tabs" msgstr "Τελευταίες ανοιχτές _καρτελές" -#: ../midori/midori-browser.c:4911 +#: ../midori/midori-browser.c:4593 msgid "Clear private data when _quitting Midori" msgstr "Καθαρισμός προσωπικών δεδομένων κατά τον _τερματισμό του Midori" -#: ../midori/midori-browser.c:5126 +#: ../midori/midori-browser.c:4769 msgid "A lightweight web browser." msgstr "Ένας ελαφρύς περιηγητής ιστού" -#: ../midori/midori-browser.c:5127 +#: ../midori/midori-browser.c:4770 msgid "See about:version for version info." msgstr "Δείτε στο about:version για πληροφορίες έκδοσης." -#: ../midori/midori-browser.c:5129 -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:4772 +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:5159 +#: ../midori/midori-browser.c:4793 msgid "translator-credits" msgstr "Ευάγγελος Μπαλάσκας 2008,2009" -#: ../midori/midori-browser.c:5572 +#: ../midori/midori-browser.c:5159 msgid "_File" msgstr "_Αρχείο" -#: ../midori/midori-browser.c:5575 +#: ../midori/midori-browser.c:5162 msgid "Open a new window" msgstr "Άνοιγμα ενός νέου παραθύρου" -#: ../midori/midori-browser.c:5578 +#: ../midori/midori-browser.c:5165 msgid "Open a new tab" msgstr "Άνοιγμα μίας νέας καρτέλας" -#: ../midori/midori-browser.c:5580 +#: ../midori/midori-browser.c:5167 msgid "New P_rivate Browsing Window" msgstr "Νέο παράθυρο ιδιωτικής περιήγησης" -#: ../midori/midori-browser.c:5584 +#: ../midori/midori-browser.c:5171 msgid "Open a file" msgstr "Άνοιγμα αρχείου" -#: ../midori/midori-browser.c:5586 -msgid "_Save Page As…" -msgstr "_Αποθήκευση Σελίδας ως..." +#: ../midori/midori-browser.c:5173 +msgid "_Save Page As..." +msgstr "_Αποθήκευση ως..." -#: ../midori/midori-browser.c:5587 +#: ../midori/midori-browser.c:5174 msgid "Save to a file" msgstr "Αποθήκευση σε αρχείου" -#: ../midori/midori-browser.c:5589 +#: ../midori/midori-browser.c:5176 msgid "Add to Speed _dial" msgstr "Προσθήκη σε γρήγορη σ_ύνδεση" -#: ../midori/midori-browser.c:5593 +#: ../midori/midori-browser.c:5180 msgid "Add Shortcut to the _desktop" msgstr "Προσθήκη συντόμευσης στην _επιφάνεια εργασίας" -#: ../midori/midori-browser.c:5595 +#: ../midori/midori-browser.c:5182 msgid "Create _Launcher" msgstr "Δημιουργία _εκκινητή" -#: ../midori/midori-browser.c:5599 +#: ../midori/midori-browser.c:5186 msgid "Subscribe to News _feed" msgstr "Εγγραφή σε _ροή νέων" -#: ../midori/midori-browser.c:5605 +#: ../midori/midori-browser.c:5192 msgid "_Close Tab" msgstr "_Κλείσιμο καρτέλας" -#: ../midori/midori-browser.c:5606 +#: ../midori/midori-browser.c:5193 msgid "Close the current tab" msgstr "Κλείσιμο της τρέχουσας καρτέλας" -#: ../midori/midori-browser.c:5608 +#: ../midori/midori-browser.c:5195 msgid "C_lose Window" msgstr "Κ_λείσιμο παραθύρου" -#: ../midori/midori-browser.c:5612 -msgid "_Share" -msgstr "_Κοινόχρηστο" - -#: ../midori/midori-browser.c:5617 +#: ../midori/midori-browser.c:5199 msgid "Print the current page" msgstr "Εκτύπωση της τρέχουσας σελίδας" -#: ../midori/midori-browser.c:5620 +#: ../midori/midori-browser.c:5201 msgid "Close a_ll Windows" msgstr "Κλείσιμο _όλων των παραθύρων" -#: ../midori/midori-browser.c:5623 +#: ../midori/midori-browser.c:5204 msgid "_Edit" msgstr "_Επεξεργασία" -#: ../midori/midori-browser.c:5646 -msgid "_Find…" +#: ../midori/midori-browser.c:5227 +msgid "_Find..." msgstr "_Εύρεση..." -#: ../midori/midori-browser.c:5647 +#: ../midori/midori-browser.c:5228 msgid "Find a word or phrase in the page" msgstr "Αναζήτηση μίας λέξης ή φράσης στην σελίδα" -#: ../midori/midori-browser.c:5649 +#: ../midori/midori-browser.c:5230 msgid "Find _Next" msgstr "Εύρεση επ_όμενο" -#: ../midori/midori-browser.c:5652 +#: ../midori/midori-browser.c:5233 msgid "Find _Previous" msgstr "Εύρεση _προηγούμενο" -#: ../midori/midori-browser.c:5656 +#: ../midori/midori-browser.c:5237 msgid "Configure the application preferences" msgstr "Παραμετροποίηση των ρυθμίσεων της εφαρμογής" -#: ../midori/midori-browser.c:5658 +#: ../midori/midori-browser.c:5239 msgid "_View" msgstr "_Εμφάνιση" -#: ../midori/midori-browser.c:5659 +#: ../midori/midori-browser.c:5240 msgid "_Toolbars" msgstr "_Εργαλειοθήκες" -#: ../midori/midori-browser.c:5664 +#: ../midori/midori-browser.c:5245 msgid "Reload page without caching" msgstr "Ανανέωση σελίδας χωρίς προσωρινή μνήμη" -#: ../midori/midori-browser.c:5674 +#: ../midori/midori-browser.c:5255 msgid "Increase the zoom level" msgstr "Αύξηση του επίπεδου εστίασης" -#: ../midori/midori-browser.c:5677 +#: ../midori/midori-browser.c:5258 msgid "Decrease the zoom level" msgstr "Μείωση του επιπέδου εστίασης" -#: ../midori/midori-browser.c:5681 +#: ../midori/midori-browser.c:5262 msgid "_Encoding" msgstr "_Κωδικοποίηση" -#: ../midori/midori-browser.c:5683 +#: ../midori/midori-browser.c:5264 msgid "View So_urce" msgstr "Προβολή κ_ώδικα" -#: ../midori/midori-browser.c:5686 +#: ../midori/midori-browser.c:5267 msgid "Ca_ret Browsing" msgstr "Περιήγηση κέρσορα κειμένου" -#: ../midori/midori-browser.c:5690 +#: ../midori/midori-browser.c:5271 msgid "Toggle fullscreen view" msgstr "Εναλλαγή σε πλήρη οθόνη" -#: ../midori/midori-browser.c:5692 +#: ../midori/midori-browser.c:5273 msgid "Scroll _Left" msgstr "Μετακίνηση _αριστερά" -#: ../midori/midori-browser.c:5695 +#: ../midori/midori-browser.c:5276 msgid "Scroll _Down" msgstr "Μετακίνηση _κάτω" -#: ../midori/midori-browser.c:5698 +#: ../midori/midori-browser.c:5279 msgid "Scroll _Up" msgstr "Μετακίνηση _επάνω" -#: ../midori/midori-browser.c:5701 +#: ../midori/midori-browser.c:5282 msgid "Scroll _Right" msgstr "Μετακίνηση _δεξιά" -#: ../midori/midori-browser.c:5704 -msgid "_Readable" -msgstr "_Αναγνώσιμο" - -#: ../midori/midori-browser.c:5707 +#: ../midori/midori-browser.c:5285 msgid "_Go" msgstr "_Μετάβαση" -#: ../midori/midori-browser.c:5710 +#: ../midori/midori-browser.c:5288 msgid "Go back to the previous page" msgstr "Μετάβαση στην προηγούμενη σελίδα" -#: ../midori/midori-browser.c:5713 +#: ../midori/midori-browser.c:5291 msgid "Go forward to the next page" msgstr "Μετάβαση στην επόμενη σελίδα" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5717 +#: ../midori/midori-browser.c:5295 msgid "Go to the previous sub-page" msgstr "Μετάβαση στην προηγούμενη υπό-σελίδα" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5721 +#: ../midori/midori-browser.c:5299 msgid "Go to the next sub-page" msgstr "Μετάβαση στην επόμενη υπό-σελίδα" -#: ../midori/midori-browser.c:5723 -msgid "_Homepage" -msgstr "_Αρχική σελίδα" - -#: ../midori/midori-browser.c:5724 +#: ../midori/midori-browser.c:5302 msgid "Go to your homepage" msgstr "Μετάβαση στην αρχική σελίδα" -#: ../midori/midori-browser.c:5726 +#: ../midori/midori-browser.c:5304 msgid "Empty Trash" msgstr "Άδειασμα απορριμμάτων" -#: ../midori/midori-browser.c:5729 +#: ../midori/midori-browser.c:5307 msgid "Undo _Close Tab" msgstr "Αναίρεση κλ_είσιμο καρτέλας" -#: ../midori/midori-browser.c:5736 +#: ../midori/midori-browser.c:5314 msgid "Add a new _folder" msgstr "Προσθήκη ενός νέου φ_ακέλου" -#: ../midori/midori-browser.c:5742 +#: ../midori/midori-browser.c:5320 msgid "_Export bookmarks" -msgstr "_Εξαγωγή σελιδοδεικτών" +msgstr "_Εξαγωγή συνδέσμων" -#: ../midori/midori-browser.c:5745 ../midori/midori-searchaction.c:496 +#: ../midori/midori-browser.c:5323 +#: ../midori/midori-searchaction.c:496 msgid "_Manage Search Engines" msgstr "_Διαχείριση των μηχανών αναζήτησης" -#: ../midori/midori-browser.c:5748 +#: ../midori/midori-browser.c:5326 msgid "_Clear Private Data" msgstr "_Καθαρισμός προσωπικών δεδομένων" -#: ../midori/midori-browser.c:5751 +#: ../midori/midori-browser.c:5329 msgid "_Inspect Page" msgstr "_Εξέταση σελίδας" -#: ../midori/midori-browser.c:5755 +#: ../midori/midori-browser.c:5333 msgid "_Previous Tab" msgstr "_Προηγούμενη καρτέλα" -#: ../midori/midori-browser.c:5758 +#: ../midori/midori-browser.c:5336 msgid "_Next Tab" msgstr "Επόμε_νη καρτέλα" -#: ../midori/midori-browser.c:5760 +#: ../midori/midori-browser.c:5338 msgid "Move Tab _Backward" msgstr "Μετακίνηση καρτέλας _πίσω" -#: ../midori/midori-browser.c:5762 +#: ../midori/midori-browser.c:5340 msgid "_Move Tab Forward" msgstr "_Μετακίνηση καρτέλας εμπρός" -#: ../midori/midori-browser.c:5765 +#: ../midori/midori-browser.c:5343 msgid "Focus _Current Tab" msgstr "Εστίαση στην _ισχύουσα καρτέλα" -#: ../midori/midori-browser.c:5768 +#: ../midori/midori-browser.c:5346 msgid "Focus _Next view" msgstr "Εστίαση στην _επόμενη προβολή" -#: ../midori/midori-browser.c:5771 +#: ../midori/midori-browser.c:5349 msgid "Only show the Icon of the _Current Tab" msgstr "Εμφάνιση μόνο του εικονιδίου της _τρέχουσας καρτέλας" -#: ../midori/midori-browser.c:5774 +#: ../midori/midori-browser.c:5352 msgid "_Duplicate Current Tab" msgstr "_Διπλασίασε την τρέχουσα καρτέλα" -#: ../midori/midori-browser.c:5777 +#: ../midori/midori-browser.c:5355 msgid "Close Ot_her Tabs" msgstr "Κλείσιμο των άλλ_ων καρτελών" -#: ../midori/midori-browser.c:5780 +#: ../midori/midori-browser.c:5358 msgid "Open last _session" msgstr "Επαναφορά της τελευταίας _συνεδρίας" -#: ../midori/midori-browser.c:5783 +#: ../midori/midori-browser.c:5361 msgid "_Help" msgstr "_Βοήθεια" -#: ../midori/midori-browser.c:5785 +#: ../midori/midori-browser.c:5363 msgid "_Frequent Questions" msgstr "Σ_υχνές ερωτήσεις" -#: ../midori/midori-browser.c:5788 -msgid "_Report a Problem…" +#: ../midori/midori-browser.c:5366 +msgid "_Report a Problem..." msgstr "_Αναφορά προβλήματος..." -#: ../midori/midori-browser.c:5793 ../midori/midori-browser.c:6454 -msgid "_Tools" -msgstr "_Εργαλεία" - -#: ../midori/midori-browser.c:5800 +#: ../midori/midori-browser.c:5378 msgid "_Menubar" msgstr "_Μπάρα μενού" -#: ../midori/midori-browser.c:5804 +#: ../midori/midori-browser.c:5382 msgid "_Navigationbar" msgstr "_Μπάρα περιήγησης" -#: ../midori/midori-browser.c:5808 +#: ../midori/midori-browser.c:5386 msgid "Side_panel" msgstr "Πλαϊνό _πλαίσιο" -#: ../midori/midori-browser.c:5809 +#: ../midori/midori-browser.c:5387 msgid "Sidepanel" msgstr "Πλαϊνό πλαίσιο" -#: ../midori/midori-browser.c:5812 +#: ../midori/midori-browser.c:5390 msgid "_Bookmarkbar" msgstr "_Μπάρα σελιδοδείκτη" -#: ../midori/midori-browser.c:5816 +#: ../midori/midori-browser.c:5394 msgid "_Statusbar" msgstr "_Γραμμή κατάστασης" -#: ../midori/midori-browser.c:5825 ../midori/midori-websettings.c:314 +#: ../midori/midori-browser.c:5403 +#: ../midori/midori-websettings.c:299 msgid "_Automatic" msgstr "_Αυτόματα" -#: ../midori/midori-browser.c:5828 ../midori/midori-websettings.c:238 -msgid "Chinese Traditional (BIG5)" -msgstr "Παραδοσιακά Κινέζικα (BIG5)" - -#: ../midori/midori-browser.c:5831 ../midori/midori-websettings.c:239 -msgid "Chinese Simplified (GB18030)" -msgstr "Απλοποιημένα Κινέζικα (GB18030)" +#: ../midori/midori-browser.c:5406 +#: ../midori/midori-websettings.c:224 +msgid "Chinese (BIG5)" +msgstr "Κινέζικα (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5835 +#: ../midori/midori-browser.c:5410 msgid "Japanese (SHIFT__JIS)" msgstr "Ιαπωνικά (SHIFT__JIS)" -#: ../midori/midori-browser.c:5838 ../midori/midori-websettings.c:241 +#: ../midori/midori-browser.c:5413 +#: ../midori/midori-websettings.c:226 msgid "Korean (EUC-KR)" msgstr "Κορεάτικα (EUC-KR)" -#: ../midori/midori-browser.c:5841 ../midori/midori-websettings.c:242 +#: ../midori/midori-browser.c:5416 +#: ../midori/midori-websettings.c:227 msgid "Russian (KOI8-R)" msgstr "Ρωσικά (KOI8-R)" -#: ../midori/midori-browser.c:5844 ../midori/midori-websettings.c:243 +#: ../midori/midori-browser.c:5419 +#: ../midori/midori-websettings.c:228 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5847 ../midori/midori-websettings.c:244 +#: ../midori/midori-browser.c:5422 +#: ../midori/midori-websettings.c:229 msgid "Western (ISO-8859-1)" msgstr "Δυτικά (ISO-8859-1)" -#: ../midori/midori-browser.c:5850 -msgid "Custom…" -msgstr "Προσαρμοσμένο..." +#: ../midori/midori-browser.c:5425 +#: ../midori/midori-websettings.c:230 +#: ../midori/midori-websettings.c:305 +#: ../katze/katze-utils.c:635 +msgid "Custom..." +msgstr "Προσαρμογή..." -#: ../midori/midori-browser.c:6360 +#: ../midori/midori-browser.c:5905 msgid "_Separator" msgstr "_Διαχωριστής" -#: ../midori/midori-browser.c:6367 -msgid "_Location…" -msgstr "_Τοποθεσία..." +#: ../midori/midori-browser.c:5912 +msgid "_Location..." +msgstr "_Τοποθεσία:" -#: ../midori/midori-browser.c:6369 +#: ../midori/midori-browser.c:5914 msgid "Open a particular location" msgstr "Άνοιγμα συγκεκριμένης τοποθεσίας" -#: ../midori/midori-browser.c:6391 -msgid "_Web Search…" +#: ../midori/midori-browser.c:5936 +msgid "_Web Search..." msgstr "_Αναζήτηση ιστού..." -#: ../midori/midori-browser.c:6393 +#: ../midori/midori-browser.c:5938 msgid "Run a web search" msgstr "Εκκίνηση μίας αναζήτησης ιστού" -#: ../midori/midori-browser.c:6420 +#: ../midori/midori-browser.c:5959 msgid "Reopen a previously closed tab or window" msgstr "Ξανα-άνοιγμα προηγούμενης καρτέλας ή παράθυρο που έχει κλείσει" -#: ../midori/midori-browser.c:6437 +#: ../midori/midori-browser.c:5974 msgid "Show the saved bookmarks" msgstr "Εμφάνιση των αποθηκευμένων σελιδοδεικτών" -#: ../midori/midori-browser.c:6470 +#: ../midori/midori-browser.c:5988 +msgid "_Tools" +msgstr "_Εργαλεία" + +#: ../midori/midori-browser.c:6003 msgid "_Window" msgstr "_Παράθυρο" -#: ../midori/midori-browser.c:6472 +#: ../midori/midori-browser.c:6005 msgid "Show a list of all open tabs" msgstr "Εμφάνιση μίας λίστας με όλες τις ανοιχτές καρτέλες" -#: ../midori/midori-browser.c:6486 +#: ../midori/midori-browser.c:6019 msgid "_Menu" msgstr "_Μενού" -#: ../midori/midori-browser.c:6488 +#: ../midori/midori-browser.c:6021 msgid "Menu" msgstr "Μενού" -#: ../midori/midori-browser.c:7313 +#: ../midori/midori-browser.c:6588 #, c-format msgid "Unexpected setting '%s'" msgstr "Αναπάντεχη ρύθμιση '%s'" -#: ../midori/midori-extension.c:329 +#: ../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:747 ../midori/midori-extension.c:844 -#: ../midori/midori-extension.c:941 ../midori/midori-extension.c:1053 -#: ../extensions/addons.c:1688 +#: ../midori/midori-extension.c:721 +#: ../midori/midori-extension.c:818 +#: ../midori/midori-extension.c:915 +#: ../midori/midori-extension.c:1027 +#: ../extensions/addons.c:1690 #, c-format msgid "The configuration of the extension '%s' couldn't be saved: %s\n" msgstr "Οι ρυθμίσεις της επέκτασης '%s' δεν μπορεί να αποθηκευτεί: %s\n" -#: ../midori/midori-locationaction.c:398 -#, c-format -msgid "Search with %s" -msgstr "Αναζήτηση με %s" - -#: ../midori/midori-locationaction.c:418 -msgid "Search with…" -msgstr "Αναζήτηση με..." - -#: ../midori/midori-locationaction.c:545 +#: ../midori/midori-locationaction.c:425 #, c-format msgid "Failed to select from history\n" msgstr "Αποτυχία επιλογής ιστορικό: \n" -#: ../midori/midori-locationaction.c:632 +#: ../midori/midori-locationaction.c:509 #, c-format msgid "Search for %s" msgstr "Αναζήτηση για %s" -#: ../midori/midori-locationaction.c:1227 -msgid "Export certificate" -msgstr "Εξαγωγή πιστοποιητικού" - -#: ../midori/midori-locationaction.c:1259 -msgid "The signing certificate authority is not known." -msgstr "Άγνωστος δημιουργός υπογεγραμμένου πιστοποιητικού." - -#: ../midori/midori-locationaction.c:1261 -msgid "" -"The certificate does not match the expected identity of the site that it was " -"retrieved from." -msgstr "" -"Το πιστοποιητικό δεν ταιριάζει με την αναμενόμενη ταυτότητα της ιστοσελίδας " -"από την οποία έχει ληφθεί." - -#: ../midori/midori-locationaction.c:1263 -msgid "The certificate's activation time is still in the future." -msgstr "Ο χρόνος ενεργοποίησης πιστοποιητικού εξακολουθεί να είναι στο μέλλον." - -#: ../midori/midori-locationaction.c:1265 -msgid "The certificate has expired" -msgstr "Το πιστοποιητικό έχει λήξει" - -#: ../midori/midori-locationaction.c:1267 -msgid "" -"The certificate has been revoked according to the GTlsConnection's " -"certificate revocation list." -msgstr "" - -#: ../midori/midori-locationaction.c:1269 -msgid "The certificate's algorithm is considered insecure." -msgstr "Ο αλγόριθμος του πιστοποιητικού θεωρείται μη ασφαλής." - -#: ../midori/midori-locationaction.c:1271 -msgid "Some other error occurred validating the certificate." -msgstr "Παρουσιάστηκαν άλλα σφάλματα κατά τον έλεγχο του πιστοποιητικού." - -#: ../midori/midori-locationaction.c:1318 -msgid "_Export certificate" -msgstr "_Εξαγωγή πιστοποιητικού" - -#: ../midori/midori-locationaction.c:1333 -msgid "Self-signed" -msgstr "" - -#: ../midori/midori-locationaction.c:1367 -msgid "Security details" -msgstr "Λεπτομέρειες ασφαλείας" +#: ../midori/midori-locationaction.c:535 +#, c-format +msgid "Search with %s" +msgstr "Αναζήτηση με %s" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1650 +#: ../midori/midori-locationaction.c:1285 msgid "Paste and p_roceed" msgstr "Επικόλληση και σ_υνέχεια" -#: ../midori/midori-locationaction.c:1974 +#: ../midori/midori-locationaction.c:1652 msgid "Not verified" msgstr "Μη επαληθευμένο" -#: ../midori/midori-locationaction.c:1982 +#: ../midori/midori-locationaction.c:1667 msgid "Verified and encrypted connection" msgstr "Επαληθευμένη και κρυπτογραφημένη σύνδεση" -#: ../midori/midori-locationaction.c:1989 -msgid "Open, unencrypted connection" -msgstr "Άνοιγμα, μη κρυπτογραφημένης σύνδεσης" - -#: ../midori/midori-panel.c:317 ../midori/midori-panel.c:319 -#: ../midori/midori-panel.c:483 ../midori/midori-panel.c:486 +#: ../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:329 ../midori/midori-panel.c:330 +#: ../midori/midori-panel.c:409 +#: ../midori/midori-panel.c:410 msgid "Close panel" msgstr "Κλείσιμο πλαισίου" -#: ../midori/midori-panel.c:484 ../midori/midori-panel.c:487 +#: ../midori/midori-panel.c:563 +#: ../midori/midori-panel.c:566 msgid "Align sidepanel to the left" msgstr "Ευθυγράμμιση πλαϊνού πλαισίου στα αριστερά" -#: ../midori/midori-websettings.c:220 +#: ../midori/midori-websettings.c:206 msgid "Show Speed Dial" msgstr "Εμφάνιση γρήγορης κλήσης" -#: ../midori/midori-websettings.c:221 +#: ../midori/midori-websettings.c:207 msgid "Show Homepage" msgstr "Εμφάνιση αρχικής σελίδας" -#: ../midori/midori-websettings.c:240 +#: ../midori/midori-websettings.c:225 msgid "Japanese (SHIFT_JIS)" msgstr "Ιαπωνικά (SHIFT_JIS)" -#: ../midori/midori-websettings.c:245 ../midori/midori-websettings.c:321 -#: ../katze/katze-utils.c:633 -msgid "Custom..." -msgstr "Προσαρμογή..." - -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:245 msgid "New tab" msgstr "Νέα καρτέλα" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:246 msgid "New window" msgstr "Νέο παράθυρο" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:247 msgid "Current tab" msgstr "Τρέχον καρτέλα" -#: ../midori/midori-websettings.c:277 +#: ../midori/midori-websettings.c:262 msgid "Default" msgstr "Προκαθορισμένο" -#: ../midori/midori-websettings.c:278 +#: ../midori/midori-websettings.c:263 msgid "Icons" msgstr "Εικονίδια" -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-websettings.c:264 msgid "Small icons" msgstr "Μικρά εικονίδια" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:265 msgid "Text" msgstr "Κείμενο" -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:266 msgid "Icons and text" msgstr "Εικονίδια με κείμενο" -#: ../midori/midori-websettings.c:282 +#: ../midori/midori-websettings.c:267 msgid "Text beside icons" msgstr "Κείμενο δίπλα στα εικονίδια" -#: ../midori/midori-websettings.c:297 +#: ../midori/midori-websettings.c:282 msgid "Automatic (GNOME or environment)" msgstr "Αυτόματα (Gnome ή περιβάλλον)" -#: ../midori/midori-websettings.c:298 +#: ../midori/midori-websettings.c:283 msgid "HTTP proxy server" msgstr "HTTP διακομιστής μεσολάβησης" -#: ../midori/midori-websettings.c:299 +#: ../midori/midori-websettings.c:284 msgid "No proxy server" msgstr "Κανένας διακομιστής μεσολάβησης" -#: ../midori/midori-websettings.c:316 -msgid "Chrome" -msgstr "Chrome" - -#: ../midori/midori-websettings.c:317 +#: ../midori/midori-websettings.c:301 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:318 +#: ../midori/midori-websettings.c:302 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:319 +#: ../midori/midori-websettings.c:303 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:320 +#: ../midori/midori-websettings.c:304 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:404 +#: ../midori/midori-websettings.c:357 msgid "Remember last window size" msgstr "Απομνημόνευση μεγέθους τελευταίου παραθύρου" -#: ../midori/midori-websettings.c:405 +#: ../midori/midori-websettings.c:358 msgid "Whether to save the last window size" msgstr "Εάν θα αποθηκεύεται το μέγεθος του τελευταίου παραθύρου" -#: ../midori/midori-websettings.c:413 +#: ../midori/midori-websettings.c:366 msgid "Last window width" msgstr "Πλάτος τελευταίου παραθύρου" -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:367 msgid "The last saved window width" msgstr "Το τελευταίο αποθηκευμένο πλάτος παραθύρου" -#: ../midori/midori-websettings.c:422 +#: ../midori/midori-websettings.c:375 msgid "Last window height" msgstr "Ύψος τελευταίου παραθύρου" -#: ../midori/midori-websettings.c:423 +#: ../midori/midori-websettings.c:376 msgid "The last saved window height" msgstr "Το τελευταίο ύψος αποθηκευμένου παραθύρου" -#: ../midori/midori-websettings.c:448 +#: ../midori/midori-websettings.c:401 msgid "Last panel position" msgstr "Η τελευταία θέση πλαισίου" -#: ../midori/midori-websettings.c:449 +#: ../midori/midori-websettings.c:402 msgid "The last saved panel position" msgstr "Η τελευταία αποθηκευμένη θέση πλαισίου" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:458 +#: ../midori/midori-websettings.c:411 msgid "Last panel page" msgstr "Η τελευταία σελίδα πλαισίου" -#: ../midori/midori-websettings.c:459 +#: ../midori/midori-websettings.c:412 msgid "The last saved panel page" msgstr "Η τελευταία αποθηκευμένη σελίδα πλαισίου" -#: ../midori/midori-websettings.c:467 +#: ../midori/midori-websettings.c:420 msgid "Last Web search" msgstr "Τελευταία αναζήτηση ιστού" -#: ../midori/midori-websettings.c:468 +#: ../midori/midori-websettings.c:421 msgid "The last saved Web search" msgstr "Η τελευταία αποθηκευμένη αναζήτηση ιστού" -#: ../midori/midori-websettings.c:492 +#: ../midori/midori-websettings.c:430 msgid "Show Menubar" msgstr "Εμφάνιση γραμμής μενού" -#: ../midori/midori-websettings.c:493 +#: ../midori/midori-websettings.c:431 msgid "Whether to show the menubar" msgstr "Εάν θα φαίνεται η μπάρα του μενού" -#: ../midori/midori-websettings.c:501 +#: ../midori/midori-websettings.c:439 msgid "Show Navigationbar" msgstr "Εμφάνιση της γραμμής πλοήγησης" -#: ../midori/midori-websettings.c:502 +#: ../midori/midori-websettings.c:440 msgid "Whether to show the navigationbar" msgstr "Εάν θα φαίνεται η γραμμή πλοήγησης" -#: ../midori/midori-websettings.c:510 +#: ../midori/midori-websettings.c:448 msgid "Show Bookmarkbar" msgstr "Εμφάνιση μπάρας σελιδοδεικτών" -#: ../midori/midori-websettings.c:511 +#: ../midori/midori-websettings.c:449 msgid "Whether to show the bookmarkbar" msgstr "Εάν θα φαίνεται η μπάρα των σελιδοδεικτών" -#: ../midori/midori-websettings.c:519 +#: ../midori/midori-websettings.c:457 msgid "Show Panel" msgstr "Εμφάνιση πλαισίου" -#: ../midori/midori-websettings.c:520 +#: ../midori/midori-websettings.c:458 msgid "Whether to show the panel" msgstr "Εάν θα φαίνεται το πλαίσιο" -#: ../midori/midori-websettings.c:528 +#: ../midori/midori-websettings.c:466 msgid "Show Statusbar" msgstr "Εμφάνιση γραμμής κατάστασης" -#: ../midori/midori-websettings.c:529 +#: ../midori/midori-websettings.c:467 msgid "Whether to show the statusbar" msgstr "Εάν θα φαίνεται η γραμμή κατάστασης" -#: ../midori/midori-websettings.c:538 +#: ../midori/midori-websettings.c:476 msgid "Toolbar Style:" msgstr "Στυλ εργαλειοθήκης:" -#: ../midori/midori-websettings.c:539 +#: ../midori/midori-websettings.c:477 msgid "The style of the toolbar" msgstr "Το στυλ της εργαλειοθήκης" -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:486 msgid "Toolbar Items" msgstr "Αντικείμενα εργαλειοθήκης" -#: ../midori/midori-websettings.c:549 +#: ../midori/midori-websettings.c:487 msgid "The items to show on the toolbar" msgstr "Τι αντικείμενα να εμφανίζονται στην εργαλειοθήκη" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:495 msgid "Compact Sidepanel" msgstr "Σύμπτυξη πλαϊνού πλαισίου" -#: ../midori/midori-websettings.c:558 +#: ../midori/midori-websettings.c:496 msgid "Whether to make the sidepanel compact" msgstr "Εάν θα γίνει σύμπτυξη του πλαϊνού πλαισίου" -#: ../midori/midori-websettings.c:573 +#: ../midori/midori-websettings.c:511 msgid "Align sidepanel on the right" msgstr "Ευθυγράμμιση πλαϊνού πλαισίου στα δεξιά" -#: ../midori/midori-websettings.c:574 +#: ../midori/midori-websettings.c:512 msgid "Whether to align the sidepanel on the right" msgstr "Εάν θα ευθυγραμμίζεται το πλαϊνό πλαίσιο στα δεξιά" -#: ../midori/midori-websettings.c:589 +#: ../midori/midori-websettings.c:527 msgid "Open panels in separate windows" msgstr "Άνοιγμα ταμπλών σε ξεχωριστά παράθυρα" -#: ../midori/midori-websettings.c:590 +#: ../midori/midori-websettings.c:528 msgid "Whether to always open panels in separate windows" msgstr "Εάν θα ανοίγουν πάντα τα ταμπλό σε ξεχωριστά παράθυρα" -#: ../midori/midori-websettings.c:599 +#: ../midori/midori-websettings.c:537 msgid "When Midori starts:" msgstr "Κατά την εκκίνηση του midori:" -#: ../midori/midori-websettings.c:600 +#: ../midori/midori-websettings.c:538 msgid "What to do when Midori starts" msgstr "Κατά την εκκίνηση του midori να φορτώνει:" -#: ../midori/midori-websettings.c:609 +#: ../midori/midori-websettings.c:547 msgid "Homepage:" msgstr "Αρχική σελίδα:" -#: ../midori/midori-websettings.c:610 +#: ../midori/midori-websettings.c:548 msgid "The homepage" msgstr "Η αρχική σελίδα" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:563 msgid "Show crash dialog" msgstr "Εμφάνιση παραθύρου αποτυχίας" -#: ../midori/midori-websettings.c:626 +#: ../midori/midori-websettings.c:564 msgid "Show a dialog after Midori crashed" msgstr "Εμφάνιση διαλόγου μετά από αποτυχία" -#: ../midori/midori-websettings.c:634 +#: ../midori/midori-websettings.c:572 msgid "Save downloaded files to:" msgstr "Αποθήκευση των αρχείων που κατέβηκαν στο:" -#: ../midori/midori-websettings.c:635 +#: ../midori/midori-websettings.c:573 msgid "The folder downloaded files are saved to" msgstr "Ο κατάλογος στον οποίο αποθηκεύονται τα αρχεία που κατεβαίνουν" -#: ../midori/midori-websettings.c:643 +#: ../midori/midori-websettings.c:581 msgid "Text Editor" msgstr "Κειμενογράφος" -#: ../midori/midori-websettings.c:644 +#: ../midori/midori-websettings.c:582 msgid "An external text editor" msgstr "Εξωτερικός κειμενογράφος" -#: ../midori/midori-websettings.c:659 +#: ../midori/midori-websettings.c:597 msgid "News Aggregator" msgstr "Διαχειριστής νέων" -#: ../midori/midori-websettings.c:660 +#: ../midori/midori-websettings.c:598 msgid "An external news aggregator" msgstr "Εξωτερικός διαχειριστής νέων" -#: ../midori/midori-websettings.c:668 +#: ../midori/midori-websettings.c:606 msgid "Location entry Search" msgstr "Διεύθυνση για αναζήτηση" -#: ../midori/midori-websettings.c:669 +#: ../midori/midori-websettings.c:607 msgid "The search to perform inside the location entry" msgstr "Η αναζήτηση να πραγματοποιηθεί εσωτερικά της τοποθεσίας εισαγωγής" -#: ../midori/midori-websettings.c:677 +#: ../midori/midori-websettings.c:615 msgid "Preferred Encoding" msgstr "Προτιμώμενη κωδικοποίηση" -#: ../midori/midori-websettings.c:678 +#: ../midori/midori-websettings.c:616 msgid "The preferred character encoding" msgstr "Η προτιμώμενη κωδικοποίηση χαρακτήρων" -#: ../midori/midori-websettings.c:688 +#: ../midori/midori-websettings.c:626 msgid "Always Show Tabbar" msgstr "Εμφάνιση πάντα της γραμμής καρτελών" -#: ../midori/midori-websettings.c:689 +#: ../midori/midori-websettings.c:627 msgid "Always show the tabbar" msgstr "Εμφάνιση πάντα της μπάρας με τις καρτέλες" -#: ../midori/midori-websettings.c:702 +#: ../midori/midori-websettings.c:635 msgid "Close Buttons on Tabs" msgstr "Κουμπιά κλεισίματος στις καρτέλες" -#: ../midori/midori-websettings.c:703 +#: ../midori/midori-websettings.c:636 msgid "Whether tabs have close buttons" msgstr "Εάν οι καρτέλες θα έχουν κουμπί κλεισίματος" -#: ../midori/midori-websettings.c:728 +#: ../midori/midori-websettings.c:661 msgid "Open new pages in:" msgstr "Άνοιγμα νέων σελίδων σε:" -#: ../midori/midori-websettings.c:729 +#: ../midori/midori-websettings.c:662 msgid "Where to open new pages" msgstr "Που να ανοίγουν οι νέες σελίδες" -#: ../midori/midori-websettings.c:738 +#: ../midori/midori-websettings.c:671 msgid "Middle click opens Selection" msgstr "Το μεσαίο κλικ ανοίγει την Επιλογή" -#: ../midori/midori-websettings.c:739 +#: ../midori/midori-websettings.c:672 msgid "Load an address from the selection via middle click" msgstr "Φόρτωση μίας διεύθυνσης από την επιλογή μέσω του μεσαίου κλικ" -#: ../midori/midori-websettings.c:747 +#: ../midori/midori-websettings.c:680 msgid "Open tabs in the background" msgstr "Άνοιγμα των καρτελών στο παρασκήνιο" -#: ../midori/midori-websettings.c:748 +#: ../midori/midori-websettings.c:681 msgid "Whether to open new tabs in the background" msgstr "Εάν θα ανοίγονται νέες καρτέλες στο παρασκήνιο" -#: ../midori/midori-websettings.c:756 +#: ../midori/midori-websettings.c:689 msgid "Open Tabs next to Current" msgstr "Άνοιγμα των καρτελών δίπλα στο τρέχων" -#: ../midori/midori-websettings.c:757 +#: ../midori/midori-websettings.c:690 msgid "Whether to open new tabs next to the current tab or after the last one" -msgstr "" -"Εάν θα ανοίγονται νέες καρτέλες δίπλα στην τρέχουσα καρτέλα ή μετά την " -"τελευταία" +msgstr "Εάν θα ανοίγονται νέες καρτέλες δίπλα στην τρέχουσα καρτέλα ή μετά την τελευταία" -#: ../midori/midori-websettings.c:765 +#: ../midori/midori-websettings.c:698 msgid "Open popups in tabs" msgstr "Άνοιγμα αναδυόμενων παραθύρων σε καρτέλες" -#: ../midori/midori-websettings.c:766 +#: ../midori/midori-websettings.c:699 msgid "Whether to open popup windows in tabs" msgstr "Εάν θα ανοίγονται τα αναδυόμενα παράθυρα σε καρτέλες" -#: ../midori/midori-websettings.c:776 ../extensions/statusbar-features.c:155 +#: ../midori/midori-websettings.c:709 +#: ../extensions/statusbar-features.c:131 msgid "Load images automatically" msgstr "Αυτόματη φόρτωση εικόνων" -#: ../midori/midori-websettings.c:777 +#: ../midori/midori-websettings.c:710 msgid "Load and display images automatically" msgstr "Αυτόματη φόρτωση και εμφάνιση εικόνων" -#: ../midori/midori-websettings.c:784 ../extensions/statusbar-features.c:165 +#: ../midori/midori-websettings.c:717 +#: ../extensions/statusbar-features.c:140 msgid "Enable scripts" msgstr "Ενεργοποίηση δεσμών εντολών" -#: ../midori/midori-websettings.c:785 +#: ../midori/midori-websettings.c:718 msgid "Enable embedded scripting languages" msgstr "Ενεργοποίηση ενσωματωμένων γλωσσών κειμένου" -#: ../midori/midori-websettings.c:792 ../extensions/statusbar-features.c:177 +#: ../midori/midori-websettings.c:725 +#: ../extensions/statusbar-features.c:149 msgid "Enable Netscape plugins" msgstr "Ενεργοποίηση αρθρωμάτων netscape" -#: ../midori/midori-websettings.c:793 +#: ../midori/midori-websettings.c:726 msgid "Enable embedded Netscape plugin objects" msgstr "Ενεργοποίηση ενσωματωμένων αρθρωμάτων netscape" -#: ../midori/midori-websettings.c:808 +#: ../midori/midori-websettings.c:746 msgid "Enable Spell Checking" msgstr "Ενεργοποίηση ορθογραφίας" -#: ../midori/midori-websettings.c:809 +#: ../midori/midori-websettings.c:747 msgid "Enable spell checking while typing" msgstr "Ενεργοποίηση ορθογραφίας κατά την πληκτρολόγηση" -#: ../midori/midori-websettings.c:815 +#: ../midori/midori-websettings.c:753 msgid "Enable HTML5 database support" msgstr "Ενεργοποίηση υποστήριξης βάσης δεδομένων HTML5" -#: ../midori/midori-websettings.c:816 +#: ../midori/midori-websettings.c:754 msgid "Whether to enable HTML5 database support" msgstr "Εάν θα ενεργοποιηθεί η τοπική υποστήριξη αποθήκευσης HTML5" -#: ../midori/midori-websettings.c:822 +#: ../midori/midori-websettings.c:760 msgid "Enable HTML5 local storage support" msgstr "Ενεργοποίηση τοπικής υποστήριξης αποθήκευσης HTML5" -#: ../midori/midori-websettings.c:823 +#: ../midori/midori-websettings.c:761 msgid "Whether to enable HTML5 local storage support" msgstr "Εάν θα ενεργοποιηθεί η τοπική υποστήριξη αποθήκευσης HTML5" -#: ../midori/midori-websettings.c:829 +#: ../midori/midori-websettings.c:767 msgid "Enable offline web application cache" msgstr "Ενεργοποίηση προσωρινής μνήμης δικτυακή εφαρμογής εκτός σύνδεσης" -#: ../midori/midori-websettings.c:830 +#: ../midori/midori-websettings.c:768 msgid "Whether to enable offline web application cache" msgstr "Εάν θα ενεργοποιηθεί η προσωρινή μνήμη της εφαρμογής εκτός σύνδεσης" -#: ../midori/midori-websettings.c:851 +#: ../midori/midori-websettings.c:784 msgid "Flash window on background tabs" msgstr "Αναβόσβησε το παράθυρο στις παρασκήνιες καρτέλες" -#: ../midori/midori-websettings.c:852 +#: ../midori/midori-websettings.c:785 msgid "Flash the browser window if a new tab was opened in the background" -msgstr "" -"Αναβόσβησε το παράθυρο του περιηγητή όταν μία καρτέλα ανοιχθεί στο παρασκήνιο" - -#: ../midori/midori-websettings.c:860 -msgid "Enable WebGL support" -msgstr "Ενεργοποίηση υποστήριξης WebGL" - -#: ../midori/midori-websettings.c:861 -msgid "Allow websites to use OpenGL rendering" -msgstr "Να επιτρέπεται στις ιστοσελίδες να χρησιμοποιούν αποτύπωση OpenGL" +msgstr "Αναβόσβησε το παράθυρο του περιηγητή όταν μία καρτέλα ανοιχθεί στο παρασκήνιο" -#: ../midori/midori-websettings.c:887 +#: ../midori/midori-websettings.c:800 msgid "Zoom Text and Images" msgstr "Εστίαση κειμένου και εικόνων" -#: ../midori/midori-websettings.c:888 +#: ../midori/midori-websettings.c:801 msgid "Whether to zoom text and images" msgstr "Εάν θα εστιάζεται το κείμενο και οι εικόνες" -#: ../midori/midori-websettings.c:903 +#: ../midori/midori-websettings.c:816 msgid "Find inline while typing" msgstr "Ενσωματωμένη εύρεση κατά την πληκτρολόγηση" -#: ../midori/midori-websettings.c:904 +#: ../midori/midori-websettings.c:817 msgid "Whether to automatically find inline while typing" msgstr "Εάν θα γίνεται αυτόματη ενσωματωμένη αναζήτηση κατά την πληκτρολόγηση" -#: ../midori/midori-websettings.c:919 +#: ../midori/midori-websettings.c:832 msgid "Kinetic scrolling" msgstr "Κινητική κύλιση" -#: ../midori/midori-websettings.c:920 +#: ../midori/midori-websettings.c:833 msgid "Whether scrolling should kinetically move according to speed" msgstr "Εάν η κύλιση θα κινείται ανάλογα με την ταχύτητα " -#: ../midori/midori-websettings.c:928 +#: ../midori/midori-websettings.c:841 msgid "Delete old Cookies after:" msgstr "Διαγραφή παλιών cookies μετά από:" -#: ../midori/midori-websettings.c:929 +#: ../midori/midori-websettings.c:842 msgid "The maximum number of days to save cookies for" msgstr "Ο μέγιστος χρόνος σε μέρες για την αποθήκευση των cookies" -#: ../midori/midori-websettings.c:945 +#: ../midori/midori-websettings.c:858 msgid "Only accept Cookies from sites you visit" msgstr "Αποδοχή Cookies μόνο από τα επισκεπτόμενους ιστότοπους" -#: ../midori/midori-websettings.c:946 +#: ../midori/midori-websettings.c:859 msgid "Block cookies sent by third-party websites" msgstr "Εμπόδισε cookies που στέλνονται από τρίτους ιστότοπους " -#: ../midori/midori-websettings.c:960 +#: ../midori/midori-websettings.c:873 msgid "Delete pages from history after:" msgstr "Διαγραφή σελίδων από το ιστορικό μετά από:" -#: ../midori/midori-websettings.c:961 +#: ../midori/midori-websettings.c:874 msgid "The maximum number of days to save the history for" msgstr "Ο μέγιστος χρόνος σε μέρες για την αποθήκευση του ιστορικού" -#: ../midori/midori-websettings.c:976 +#: ../midori/midori-websettings.c:889 msgid "Proxy server" msgstr "Διακομιστής μεσολάβησης" -#: ../midori/midori-websettings.c:977 +#: ../midori/midori-websettings.c:890 msgid "The type of proxy server to use" msgstr "Ο τύπος του διακομιστής προς χρήση" -#: ../midori/midori-websettings.c:986 +#: ../midori/midori-websettings.c:899 msgid "HTTP Proxy Server" msgstr "HTTP διακομιστής μεσολάβησης" -#: ../midori/midori-websettings.c:987 +#: ../midori/midori-websettings.c:900 msgid "The proxy server used for HTTP connections" msgstr "Ο μεσολαβητής χρησιμοποιείται για http συνδέσεις" -#: ../midori/midori-websettings.c:1002 +#: ../midori/midori-websettings.c:915 msgid "Port" msgstr "Πόρτα" -#: ../midori/midori-websettings.c:1003 +#: ../midori/midori-websettings.c:916 msgid "The proxy server port used for HTTP connections" msgstr "Η πόρτα του μεσολαβητή χρησιμοποιείται για HTTP συνδέσεις" -#: ../midori/midori-websettings.c:1021 +#: ../midori/midori-websettings.c:934 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:951 msgid "Identify as" msgstr "Αναγνώριση ως" -#: ../midori/midori-websettings.c:1039 +#: ../midori/midori-websettings.c:952 msgid "What to identify as to web pages" msgstr "Με τι να αναγνωρίζεται στις σελίδες ιστού" -#: ../midori/midori-websettings.c:1055 +#: ../midori/midori-websettings.c:968 msgid "Identification string" msgstr "Αλφαριθμητικό αναγνώρισης" -#: ../midori/midori-websettings.c:1056 +#: ../midori/midori-websettings.c:969 msgid "The application identification string" msgstr "Το αλφαριθμητικό αναγνώρισης της εφαρμογής" -#: ../midori/midori-websettings.c:1072 +#: ../midori/midori-websettings.c:985 msgid "Preferred languages" msgstr "Προτιμώμενες γλώσσες" -#: ../midori/midori-websettings.c:1073 -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:986 +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:1088 +#: ../midori/midori-websettings.c:1001 msgid "Clear private data" msgstr "Καθαρισμός προσωπικών δεδομένων" -#: ../midori/midori-websettings.c:1089 +#: ../midori/midori-websettings.c:1002 msgid "The private data selected for deletion" msgstr "Τα προσωπικά δεδομένα που επιλέχθηκαν για διαγραφή" -#: ../midori/midori-websettings.c:1104 +#: ../midori/midori-websettings.c:1017 msgid "Clear data" msgstr "Καθαρισμός δεδομένων" -#: ../midori/midori-websettings.c:1105 +#: ../midori/midori-websettings.c:1018 msgid "The data selected for deletion" msgstr "Τα δεδομένα που επιλέχθηκαν για διαγραφή" #. i18n: Reworded: Shorten details propagated when going to another page -#: ../midori/midori-websettings.c:1154 +#: ../midori/midori-websettings.c:1051 msgid "Strip referrer details sent to websites" msgstr "Αφαίρεση λεπτομερειών referrer που αποστέλλονται σε ιστοσελίδες" #. i18n: Referer here is not a typo but a technical term -#: ../midori/midori-websettings.c:1156 +#: ../midori/midori-websettings.c:1053 msgid "Whether the \"Referer\" header should be shortened to the hostname" msgstr "Εάν η κεφαλίδα \"Referer\" θα πρέπει να συντομεύσει στο hostname" -#: ../midori/midori-websettings.c:1170 +#: ../midori/midori-websettings.c:1067 msgid "Always use my font choices" msgstr "Πάντα χρήση των δικών μου επιλογών γραμματοσειράς" -#: ../midori/midori-websettings.c:1171 +#: ../midori/midori-websettings.c:1068 msgid "Override fonts picked by websites with user preferences" -msgstr "" -"Παράκαμψη της επιλογής των γραμματοσειρών των ιστότοπων με τις επιλογές του " -"χρήστη" - -#: ../midori/midori-view.c:1002 ../midori/midori-view.c:1140 -msgid "Trust this website" -msgstr "Έμπιστη ιστοσελίδα" - -#: ../midori/midori-view.c:1138 -msgid "Security unknown" -msgstr "Άγνωστη ασφάλεια" +msgstr "Παράκαμψη της επιλογής των γραμματοσειρών των ιστότοπων με τις επιλογές του χρήστη" -#: ../midori/midori-view.c:1436 +#: ../midori/midori-view.c:1343 #, c-format msgid "%s wants to save an HTML5 database." msgstr "%s θέλει να σώσει μια βάση δεδομένων HTML5." -#: ../midori/midori-view.c:1440 ../midori/midori-view.c:1474 +#: ../midori/midori-view.c:1347 +#: ../midori/midori-view.c:1376 msgid "_Deny" msgstr "_Άρνηση" -#: ../midori/midori-view.c:1440 ../midori/midori-view.c:1474 +#: ../midori/midori-view.c:1347 +#: ../midori/midori-view.c:1376 msgid "_Allow" msgstr "_Αποδοχή" -#: ../midori/midori-view.c:1469 +#: ../midori/midori-view.c:1372 #, c-format msgid "%s wants to know your location." msgstr "%s θέλει να ξέρει τη θέση σας." -#: ../midori/midori-view.c:1565 +#: ../midori/midori-view.c:1459 #, c-format msgid "Error - %s" msgstr "Σφάλμα- %s" -#: ../midori/midori-view.c:1566 +#: ../midori/midori-view.c:1460 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "Η σελίδα '%s' δεν μπορεί να φορτωθεί." -#: ../midori/midori-view.c:1568 +#: ../midori/midori-view.c:1462 msgid "Try again" msgstr "Δοκιμάστε ξανά" -#: ../midori/midori-view.c:1766 ../midori/midori-view.c:2879 +#: ../midori/midori-view.c:1624 +#: ../midori/midori-view.c:2469 #, c-format msgid "Send a message to %s" msgstr "Αποστολή μηνύματος στο: %s" -#: ../midori/midori-view.c:2665 -msgid "Add _search engine..." -msgstr "Προσθήκη _μηχανής αναζήτησης..." - -#: ../midori/midori-view.c:2709 ../midori/midori-view.c:3035 +#: ../midori/midori-view.c:2311 +#: ../midori/midori-view.c:2622 msgid "Inspect _Element" msgstr "Εξέταση _στοιχείου" -#: ../midori/midori-view.c:2761 +#: ../midori/midori-view.c:2361 msgid "Open Link in New _Tab" msgstr "Άνοιγμα συνδέσμου σε νέα κ_αρτέλα" -#: ../midori/midori-view.c:2765 +#: ../midori/midori-view.c:2365 msgid "Open Link in _Foreground Tab" msgstr "Άνοιγμα συνδέσμου σε νέα καρτέλα στο π_ροσκήνιο" -#: ../midori/midori-view.c:2766 +#: ../midori/midori-view.c:2366 msgid "Open Link in _Background Tab" msgstr "Άνοιγμα συνδέσμου σε καρτέλα στο _παρασκήνιο" -#: ../midori/midori-view.c:2769 +#: ../midori/midori-view.c:2369 msgid "Open Link in New _Window" msgstr "Άνοιγμα συνδέσμου σε νέο _παράθυρο" -#: ../midori/midori-view.c:2772 +#: ../midori/midori-view.c:2372 msgid "Open Link as Web A_pplication" msgstr "Άνοιγμα ως δικτυακή εφ_αρμογή" -#: ../midori/midori-view.c:2777 +#: ../midori/midori-view.c:2375 msgid "Copy Link de_stination" msgstr "Αντιγραφή συνδέσμου πρ_οορισμού" -#: ../midori/midori-view.c:2793 +#: ../midori/midori-view.c:2387 msgid "Open _Image in New Tab" msgstr "Άνοιγμα ει_κόνας σε νέα καρτέλα" -#: ../midori/midori-view.c:2796 +#: ../midori/midori-view.c:2390 msgid "Copy Image _Address" msgstr "Αντιγραφή _διεύθυνσης εικόνας" -#: ../midori/midori-view.c:2799 +#: ../midori/midori-view.c:2393 msgid "Save I_mage" msgstr "Αποθήκευση ει_κόνας" -#: ../midori/midori-view.c:2802 -msgid "Open in Image _Viewer" -msgstr "Άνοιγμα σε Πρόγραμμα _Προβολής Εικόνας" - -#: ../midori/midori-view.c:2809 +#: ../midori/midori-view.c:2400 msgid "Copy Video _Address" msgstr "Αντιγραφή _διεύθυνσης βίντεο" -#: ../midori/midori-view.c:2812 +#: ../midori/midori-view.c:2403 msgid "Save _Video" msgstr "Αποθήκευση _βίντεο" -#: ../midori/midori-view.c:2812 +#: ../midori/midori-view.c:2403 msgid "Download _Video" msgstr "Αποθήκευση _βίντεο" -#: ../midori/midori-view.c:2838 +#: ../midori/midori-view.c:2429 msgid "Search _with" msgstr "Αναζήτηση _με" -#: ../midori/midori-view.c:2870 +#: ../midori/midori-view.c:2461 msgid "_Search the Web" msgstr "_Αναζήτηση στον ιστό" -#: ../midori/midori-view.c:2887 +#: ../midori/midori-view.c:2477 msgid "Open Address in New _Tab" msgstr "Άνοιγμα διεύθυνσης σε νέα_καρτέλα" -#: ../midori/midori-view.c:2940 -msgid "Open _Frame in New Tab" -msgstr "Άνοιγμα _Πλαισίου σε Νέα Καρτέλα" +#: ../midori/midori-view.c:2773 +msgid "Open or download file" +msgstr "Άνοιγμα ή κατέβασμα αρχείου" -#: ../midori/midori-view.c:3201 -#, c-format -msgid "Open or download file from %s" -msgstr "Άνοιγμα ή λήψη αρχείου από %s" - -#: ../midori/midori-view.c:3225 -#, c-format -msgid "File Name: %s" -msgstr "Όνομα Αρχείου: %s" - -#: ../midori/midori-view.c:3230 +#: ../midori/midori-view.c:2792 #, c-format msgid "File Type: '%s'" msgstr "Τύπος αρχείου: '%s'" -#: ../midori/midori-view.c:3232 +#: ../midori/midori-view.c:2794 #, c-format msgid "File Type: %s ('%s')" msgstr "Τύπος αρχείου: %s ('%s')" -#: ../midori/midori-view.c:3267 -#, c-format -msgid "Size: %s" -msgstr "Μέγεθος: %s" - #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:3278 +#: ../midori/midori-view.c:2811 #, c-format msgid "Open %s" msgstr "Άνοιγμα %s" -#: ../midori/midori-view.c:3897 +#: ../midori/midori-view.c:3397 #, c-format msgid "Inspect page - %s" msgstr "Εξέταση σελίδα -%s" -#: ../midori/midori-view.c:4252 +#: ../midori/midori-view.c:3685 msgid "Speed Dial" msgstr "Γρήγορη σύνδεση" -#: ../midori/midori-view.c:4253 ../midori/midori-view.c:4359 +#: ../midori/midori-view.c:3686 +#: ../midori/midori-view.c:3778 msgid "Click to add a shortcut" msgstr "Κάντε click για προσθήκη συντόμευσης" -#: ../midori/midori-view.c:4254 +#: ../midori/midori-view.c:3687 msgid "Enter shortcut address" msgstr "Εισάγεται διεύθυνση συντόμευσης" -#: ../midori/midori-view.c:4255 +#: ../midori/midori-view.c:3688 msgid "Enter shortcut title" msgstr "Εισάγετε τίτλο συντόμευσης" -#: ../midori/midori-view.c:4256 +#: ../midori/midori-view.c:3689 msgid "Are you sure you want to delete this shortcut?" msgstr "Είστε σίγουροι ότι θέλετε να διαγράψετε αυτή την συντόμευση;" -#: ../midori/midori-view.c:4429 +#: ../midori/midori-view.c:3855 #, c-format msgid "No documentation installed" msgstr "Δεν έχει εγκατασταθεί τεκμηρίωση" -#: ../midori/midori-view.c:4506 -msgid "Midori doesn't store any personal data:" -msgstr "Ο Midori δεν αποθηκεύει προσωπικά δεδομένα:" - -#: ../midori/midori-view.c:4507 -msgid "No history or web cookies are being saved." -msgstr "Δεν αποθηκεύτηκαν ιστορικό ή cookies." - -#: ../midori/midori-view.c:4508 -msgid "Extensions are disabled." -msgstr "Τα πρόσθετα είναι απενεργοποιημένα." - -#: ../midori/midori-view.c:4509 -msgid "HTML5 storage, local database and application caches are disabled." -msgstr "" -"Απενεργοποιήθηκαν η αποθήκευση HTML5, η λανθάνουσα μνήμη της τοπική βάση " -"δεδομένων και εφαρμογών." - -#: ../midori/midori-view.c:4510 -msgid "Midori prevents websites from tracking the user:" -msgstr "Ο Midori αποτρέπει τις ιστοσελίδες να απομνημονεύσουν τον χρήστη:" - -#: ../midori/midori-view.c:4511 -msgid "Referrer URLs are stripped down to the hostname." -msgstr "" - -#: ../midori/midori-view.c:4512 -msgid "DNS prefetching is disabled." -msgstr "Απενεργοποίηση προανάκτησης DNS." - -#: ../midori/midori-view.c:4513 -msgid "The language and timezone are not revealed to websites." -msgstr "Η γλώσσα και η ζώνη ώρας δεν εμφανίζονται στις ιστοσελίδες." - -#: ../midori/midori-view.c:4514 -msgid "Flash and other Netscape plugins cannot be listed by websites." -msgstr "" -"Το Flash και άλλα πρόσθετα του Netscape δεν μπορούν να βρεθούν σε λίστα από " -"ιστοσελίδες." - -#: ../midori/midori-view.c:4603 +#: ../midori/midori-view.c:3905 msgid "Version numbers in brackets show the version used at runtime." -msgstr "" -"Οι αριθμοί έκδοσης στις παρενθέσεις δείχνουν την έκδοση που χρησιμοποιήθηκε " -"κατά την εκτέλεση." +msgstr "Οι αριθμοί έκδοσης στις παρενθέσεις δείχνουν την έκδοση που χρησιμοποιήθηκε κατά την εκτέλεση." -#: ../midori/midori-view.c:4653 +#: ../midori/midori-view.c:3950 msgid "Page loading delayed" msgstr "Καθυστέρηση φόρτωση σελίδας" -#: ../midori/midori-view.c:4654 +#: ../midori/midori-view.c:3951 msgid "Loading delayed either due to a recent crash or startup preferences." -msgstr "" -"Καθυστέρηση φόρτωσης είτε λόγω πρόσφατης κατάρρευσης ή εφαρμογής ρυθμίσεων " -"εκκίνησης." +msgstr "Καθυστέρηση φόρτωσης είτε λόγω πρόσφατης κατάρρευσης ή εφαρμογής ρυθμίσεων εκκίνησης." -#: ../midori/midori-view.c:4655 +#: ../midori/midori-view.c:3952 msgid "Load Page" msgstr "Φόρτωση σελίδας" -#: ../midori/midori-view.c:4822 +#: ../midori/midori-view.c:4092 msgid "Blank page" msgstr "Κενή σελίδα" -#: ../midori/midori-view.c:5086 +#: ../midori/midori-view.c:4356 msgid "_Duplicate Tab" msgstr "_Διπλότυπη καρτέλα" -#: ../midori/midori-view.c:5091 +#: ../midori/midori-view.c:4361 msgid "Show Tab _Label" msgstr "Εμφάνιση _ετικέτας καρτέλας" -#: ../midori/midori-view.c:5091 +#: ../midori/midori-view.c:4361 msgid "Show Tab _Icon Only" msgstr "Εμφάνιση μόνο των πλακ_ιδίων καρτέλας" -#: ../midori/midori-view.c:5098 -msgid "Close Ot_her Tab" -msgid_plural "Close Ot_her Tabs" -msgstr[0] "Κλείσιμο της άλλ_ης καρτέλας" -msgstr[1] "Κλείσιμο των άλλ_ων καρτελών" +#: ../midori/midori-view.c:4367 +msgid "Close ot_her Tabs" +msgstr "Κλείσιμο άλλ_ων καρτελών" #. i18n: word stem of "previous page" type links, case is not important -#: ../midori/midori-view.c:5934 +#: ../midori/midori-view.c:4984 msgid "previous" msgstr "προηγούμενο" #. i18n: word stem of "next page" type links, case is not important -#: ../midori/midori-view.c:5953 +#: ../midori/midori-view.c:5003 msgid "next" msgstr "επόμενο" -#: ../midori/midori-view.c:5966 +#: ../midori/midori-view.c:5016 msgid "Print background images" msgstr "Εκτύπωση εικόνων παρασκηνίου" -#: ../midori/midori-view.c:5967 +#: ../midori/midori-view.c:5017 msgid "Whether background images should be printed" msgstr "Εάν θα τυπώνονται οι εικόνες παρασκηνίου" -#: ../midori/midori-view.c:5999 +#: ../midori/midori-view.c:5049 msgid "Features" msgstr "Χαρακτηριστικά" -#: ../midori/midori-preferences.c:298 +#: ../midori/midori-preferences.c:297 msgid "Startup" msgstr "Εκκίνηση" -#: ../midori/midori-preferences.c:311 +#: ../midori/midori-preferences.c:310 msgid "Use _current page" msgstr "Χρήση _τρέχουσας σελίδας" -#: ../midori/midori-preferences.c:315 +#: ../midori/midori-preferences.c:314 msgid "Use current page as homepage" msgstr "Τρέχουσα σελίδα ως αρχική" #. Page "Appearance" -#: ../midori/midori-preferences.c:324 +#: ../midori/midori-preferences.c:323 msgid "Fonts" msgstr "Γραμματοσειρές" -#: ../midori/midori-preferences.c:327 +#: ../midori/midori-preferences.c:326 msgid "Proportional Font Family" msgstr "Αναλογική οικογένεια γραμματοσειράς" -#: ../midori/midori-preferences.c:331 +#: ../midori/midori-preferences.c:330 msgid "The default font family used to display text" -msgstr "" -"Η προκαθορισμένη οικογένεια γραμματοσειράς χρησιμοποιείται για την εμφάνιση " -"του κειμένου" +msgstr "Η προκαθορισμένη οικογένεια γραμματοσειράς χρησιμοποιείται για την εμφάνιση του κειμένου" -#: ../midori/midori-preferences.c:334 +#: ../midori/midori-preferences.c:333 msgid "The default font size used to display text" msgstr "Το προκαθορισμένο μέγεθος γραμματοσειράς για την εμφάνιση του κειμένου" -#: ../midori/midori-preferences.c:336 +#: ../midori/midori-preferences.c:335 msgid "Fixed-width Font Family" msgstr "Σταθερού-μεγέθους οικογένεια γραμματοσειράς" -#: ../midori/midori-preferences.c:340 +#: ../midori/midori-preferences.c:339 msgid "The font family used to display fixed-width text" -msgstr "" -"Η οικογένεια γραμματοσειράς χρησιμοποιείται για την εμφάνιση σταθερού " -"μεγέθους κειμένου" +msgstr "Η οικογένεια γραμματοσειράς χρησιμοποιείται για την εμφάνιση σταθερού μεγέθους κειμένου" -#: ../midori/midori-preferences.c:343 +#: ../midori/midori-preferences.c:342 msgid "The font size used to display fixed-width text" -msgstr "" -"Το μέγεθος της γραμματοσειράς που χρησιμοποιείται για την εμφάνιση κειμένου " -"σταθερού μεγέθους" +msgstr "Το μέγεθος της γραÎ¼Î¼Î±Ï„οσειράς που χρησιμοποιείται για την εμφάνιση κειμένου σταθερού μεγέθους" -#: ../midori/midori-preferences.c:345 +#: ../midori/midori-preferences.c:344 msgid "Minimum Font Size" msgstr "Ελάχιστο μέγεθος γραμματοσειράς" -#: ../midori/midori-preferences.c:349 +#: ../midori/midori-preferences.c:348 msgid "The minimum font size used to display text" msgstr "Το ελάχιστο μέγεθος γραμματοσειράς για την εμφάνιση του κειμένου" #. Page "Behavior" -#: ../midori/midori-preferences.c:360 +#: ../midori/midori-preferences.c:359 msgid "Behavior" msgstr "Συμπεριφορά" -#: ../midori/midori-preferences.c:386 +#: ../midori/midori-preferences.c:385 msgid "Allow scripts to open popups" msgstr "Να επιτρέπονται στις δέσμες εντολών να ανοίγουν αναδυόμενα παράθυρα." -#: ../midori/midori-preferences.c:387 +#: ../midori/midori-preferences.c:386 msgid "Whether scripts are allowed to open popup windows automatically" -msgstr "" -"Εάν θα επιτρέπονται στις δέσμες εντολών να ανοίγουν αυτόματα αναδυόμενα " -"παράθυρα" +msgstr "Εάν θα επιτρέπονται στις δέσμες εντολών να ανοίγουν αυτόματα αναδυόμενα παράθυρα" #. Page "Interface" -#: ../midori/midori-preferences.c:418 +#: ../midori/midori-preferences.c:409 msgid "Browsing" msgstr "Περιήγηση" #. Page "Network" -#: ../midori/midori-preferences.c:458 +#: ../midori/midori-preferences.c:447 msgid "Network" msgstr "Δίκτυο" -#: ../midori/midori-preferences.c:465 +#: ../midori/midori-preferences.c:454 msgid "Hostname" msgstr "Όνομα διακομιστή" -#: ../midori/midori-preferences.c:489 +#: ../midori/midori-preferences.c:478 msgid "MB" msgstr "ΜΒ" -#: ../midori/midori-searchaction.c:957 +#: ../midori/midori-searchaction.c:907 msgid "Add search engine" msgstr "Προσθήκη μηχανής αναζήτησης" -#: ../midori/midori-searchaction.c:957 +#: ../midori/midori-searchaction.c:907 msgid "Edit search engine" msgstr "Επεξεργασία μηχανής αναζήτησης" -#: ../midori/midori-searchaction.c:985 +#: ../midori/midori-searchaction.c:936 msgid "_Name:" msgstr "_Όνομα:" -#: ../midori/midori-searchaction.c:1000 +#: ../midori/midori-searchaction.c:952 msgid "_Description:" msgstr "_Περιγραφή:" -#: ../midori/midori-searchaction.c:1013 ../extensions/feed-panel/main.c:377 -msgid "_Address:" -msgstr "_Διεύθυνση:" +#: ../midori/midori-searchaction.c:985 +msgid "_Icon:" +msgstr "_Εικονίδιο:" -#: ../midori/midori-searchaction.c:1032 +#: ../midori/midori-searchaction.c:999 msgid "_Token:" msgstr "_Μορφότυπο:" -#: ../midori/midori-searchaction.c:1330 +#: ../midori/midori-searchaction.c:1299 msgid "Manage Search Engines" msgstr "Διαχείριση των μηχανών αναζήτησης" -#: ../midori/midori-searchaction.c:1432 +#: ../midori/midori-searchaction.c:1399 msgid "Use as _default" msgstr "Χρήση ως _προκαθορισμένο" -#: ../midori/sokoke.c:346 +#: ../midori/sokoke.c:406 msgid "Open with" msgstr "Άνοιγμα με" -#: ../midori/sokoke.c:354 +#: ../midori/sokoke.c:414 #, c-format msgid "Choose an application or command to open \"%s\":" msgstr "Επιλέξτε μια εφαρμογή ή εντολή για να ανοίξει το \"%s\":" -#: ../midori/sokoke.c:468 ../midori/sokoke.c:482 +#: ../midori/sokoke.c:455 +#: ../midori/sokoke.c:465 +#: ../midori/sokoke.c:493 +#: ../midori/sokoke.c:522 +#: ../midori/sokoke.c:536 msgid "Could not run external program." msgstr "Δεν μπορεί να εκτελεστεί το εξωτερικό πρόγραμμα." -#: ../midori/sokoke.c:1529 +#: ../midori/sokoke.c:1691 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d ώρα" msgstr[1] "%d ώρες" -#: ../midori/sokoke.c:1530 +#: ../midori/sokoke.c:1692 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d λεπτό" msgstr[1] "%d λεπτά" -#: ../midori/sokoke.c:1531 +#: ../midori/sokoke.c:1693 #, c-format msgid "%d second" msgid_plural "%d seconds" @@ -2164,180 +2001,163 @@ msgstr[0] "%d δευτερόλεπτο" msgstr[1] "%d δευτερόλεπτα" #. i18n: Download tooltip (size): 4KB of 43MB -#: ../midori/sokoke.c:1539 ../panels/midori-transfers.c:268 +#: ../midori/sokoke.c:1701 +#: ../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:1548 +#: ../midori/sokoke.c:1710 msgid "?B" msgstr "?B" #. i18n: Download tooltip (transfer rate): (130KB/s) -#: ../midori/sokoke.c:1551 +#: ../midori/sokoke.c:1713 #, c-format msgid " (%s/s)" msgstr " (%s/s)" #. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning -#: ../midori/sokoke.c:1568 +#: ../midori/sokoke.c:1730 #, c-format msgid " - %s remaining" msgstr " - %s απομένει" #. i18n: A panel at the bottom, to search text in pages -#: ../toolbars/midori-findbar.c:265 +#: ../toolbars/midori-findbar.c:264 msgid "_Inline Find:" msgstr "Ε_νσωματωμένη αναζήτηση:" -#: ../toolbars/midori-findbar.c:287 +#: ../toolbars/midori-findbar.c:291 msgid "Previous" msgstr "Προηγούμενο" -#: ../toolbars/midori-findbar.c:293 +#: ../toolbars/midori-findbar.c:297 msgid "Next" msgstr "Επόμενο" -#: ../toolbars/midori-findbar.c:297 +#: ../toolbars/midori-findbar.c:301 msgid "Match Case" msgstr "Ταίριασμα πεζών" -#: ../toolbars/midori-findbar.c:306 +#: ../toolbars/midori-findbar.c:310 msgid "Highlight Matches" msgstr "Τονισμός των ταιριασμάτων" -#: ../toolbars/midori-findbar.c:317 +#: ../toolbars/midori-findbar.c:321 msgid "Close Findbar" msgstr "Κλείσιμο μπάρας εύρεσης" -#: ../toolbars/midori-transferbar.c:124 +#: ../toolbars/midori-transferbar.c:122 #, c-format msgid "The file '%s' has been downloaded." msgstr "Το αρχείο '%s' έχει κατέβει." -#: ../toolbars/midori-transferbar.c:129 +#: ../toolbars/midori-transferbar.c:125 msgid "Transfer completed" msgstr "Η μεταφορά ολοκληρώθηκε" -#: ../toolbars/midori-transferbar.c:201 +#: ../toolbars/midori-transferbar.c:193 msgid "The downloaded file is erroneous." msgstr "Το αρχείο που κατέβηκε είναι εσφαλμένο." -#: ../toolbars/midori-transferbar.c:202 -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: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:345 ../panels/midori-transfers.c:142 +#: ../toolbars/midori-transferbar.c:331 +#: ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "Καθαρισμός όλων" -#: ../toolbars/midori-transferbar.c:382 ../toolbars/midori-transferbar.c:384 +#: ../toolbars/midori-transferbar.c:368 +#: ../toolbars/midori-transferbar.c:370 msgid "Some files are being downloaded" msgstr "Μερικά αρχεία κατεβαίνουν" -#: ../toolbars/midori-transferbar.c:388 +#: ../toolbars/midori-transferbar.c:374 msgid "_Quit Midori" msgstr "_Τερματισμός του Μιντόρι" -#: ../toolbars/midori-transferbar.c:390 +#: ../toolbars/midori-transferbar.c:376 msgid "The transfers will be cancelled if Midori quits." msgstr "Οι μεταφορές θα ακυρωθούν εάν τερματιστεί ο midori." -#: ../panels/midori-bookmarks.c:308 +#: ../panels/midori-bookmarks.c:113 +msgid "Bookmarks" +msgstr "Σελιδοδείκτες" + +#: ../panels/midori-bookmarks.c:291 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "Απέτυχε η προσθήκη σελιδοδείκτη: %s\n" -#: ../panels/midori-bookmarks.c:475 -#, c-format -msgid "Failed to update bookmark : %s\n" -msgstr "Αποτυχία ενημέρωσης σελιδοδείκτη: %s\n" - -#: ../panels/midori-bookmarks.c:535 +#: ../panels/midori-bookmarks.c:471 msgid "Edit the selected bookmark" msgstr "Επεξεργασία του επιλεγμένου σελιδοδείκτη" -#: ../panels/midori-bookmarks.c:543 +#: ../panels/midori-bookmarks.c:479 msgid "Delete the selected bookmark" msgstr "Διαγραφή του επιλεγμένου σελιδοδείκτη" -#: ../panels/midori-bookmarks.c:558 +#: ../panels/midori-bookmarks.c:494 msgid "Add a new folder" msgstr "Προσθήκη ενός νέου φακέλου" -#: ../panels/midori-bookmarks.c:697 ../panels/midori-history.c:638 +#: ../panels/midori-bookmarks.c:628 +#: ../panels/midori-history.c:579 msgid "Separator" msgstr "Διαχωριστικό" -#. Create the filter entry -#: ../panels/midori-bookmarks.c:1027 -msgid "Search Bookmarks" -msgstr "Αναζήτηση Σελιδοδεικτών" - -#: ../panels/midori-history.c:111 +#: ../panels/midori-history.c:110 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:142 +msgid "A week ago" +msgstr "Μια βδομάδα πριν" -#: ../panels/midori-history.c:162 ../panels/midori-history.c:186 +#: ../panels/midori-history.c:144 #, c-format msgid "%d day ago" msgid_plural "%d days ago" msgstr[0] "%d μέρα πριν" msgstr[1] "%d μέρες πριν" -#: ../panels/midori-history.c:165 ../panels/midori-history.c:184 -msgid "A week ago" -msgstr "Μια βδομάδα πριν" +#: ../panels/midori-history.c:147 +msgid "Today" +msgstr "Σήμερα" -#: ../panels/midori-history.c:232 -#, c-format -msgid "Failed to remove history item: %s\n" -msgstr "Αποτυχία στην διαγραφή του αντικειμένου από το ιστορικό: %s\n" +#: ../panels/midori-history.c:149 +msgid "Yesterday" +msgstr "Χθες" -#: ../panels/midori-history.c:360 +#: ../panels/midori-history.c:317 msgid "Are you sure you want to remove all history items?" -msgstr "" -"Είστε σίγουροι ότι θέλετε να διαγράψετε όλα τα αντικείμενα του ιστορικού;" +msgstr "Είστε σίγουροι ότι θέλετε να διαγράψετε όλα τα αντικείμενα του ιστορικού;" -#: ../panels/midori-history.c:407 +#: ../panels/midori-history.c:363 msgid "Bookmark the selected history item" msgstr "Σελιδοποίηση του επιλεγμένου αντικειμένου του ιστορικού" -#: ../panels/midori-history.c:416 +#: ../panels/midori-history.c:372 msgid "Delete the selected history item" msgstr "Διαγραφή του επιλεγμένου αντικειμένου από το ιστορικό" -#: ../panels/midori-history.c:424 +#: ../panels/midori-history.c:380 msgid "Clear the entire history" msgstr "Καθαρισμός ολόκληρου του ιστορικού" -#. Create the filter entry -#: ../panels/midori-history.c:997 -msgid "Search History" -msgstr "Αναζήτηση Ιστορικού" - -#: ../panels/midori-transfers.c:87 +#: ../panels/midori-transfers.c:86 msgid "Transfers" msgstr "Μεταφορές" -#: ../panels/midori-transfers.c:470 +#: ../panels/midori-transfers.c:467 msgid "Open Destination _Folder" msgstr "Άνοιγμα _φακέλου προορισμού" -#: ../panels/midori-transfers.c:473 +#: ../panels/midori-transfers.c:470 msgid "Copy Link Loc_ation" msgstr "Αντιγραφή τοποθεσίας σ_υνδέσμου" @@ -2365,107 +2185,103 @@ msgstr "Συνθηματικό" msgid "_Remember password" msgstr "Α_πομνημόνευση συνθηματικού" -#: ../katze/katze-throbber.c:949 +#: ../katze/katze-throbber.c:942 #, c-format msgid "Named icon '%s' couldn't be loaded" msgstr "Το εικονίδιο Named '%s' δεν μπορεί να φορτωθεί" -#: ../katze/katze-throbber.c:962 +#: ../katze/katze-throbber.c:955 #, c-format msgid "Stock icon '%s' couldn't be loaded" msgstr "Το εικονίδιο Stock '%s' δεν μπορεί να φορτωθεί" -#: ../katze/katze-throbber.c:1042 +#: ../katze/katze-throbber.c:1035 msgid "Animation frames are broken" msgstr "Τα κινούμενα γραφικά πλαίσια δεν λειτουργούν" -#: ../katze/katze-utils.c:443 ../katze/katze-utils.c:867 +#: ../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:489 ../katze/katze-utils.c:518 +#: ../katze/katze-utils.c:485 +#: ../katze/katze-utils.c:514 #: ../extensions/addons.c:308 msgid "Choose file" msgstr "Επιλογή αρχείου" -#: ../katze/katze-utils.c:504 +#: ../katze/katze-utils.c:500 msgid "Choose folder" msgstr "Επιλογή φακέλου" -#: ../katze/katze-utils.c:602 +#: ../katze/katze-utils.c:604 msgid "None" msgstr "Κανένα" -#: ../katze/katze-utils.c:717 +#: ../katze/katze-utils.c:719 msgid "1 hour" msgstr "1 ώρα" -#: ../katze/katze-utils.c:718 +#: ../katze/katze-utils.c:720 msgid "1 day" msgstr "1 ημέρα" -#: ../katze/katze-utils.c:719 +#: ../katze/katze-utils.c:721 msgid "1 week" msgstr "1 Εβδομάδα" -#: ../katze/katze-utils.c:720 +#: ../katze/katze-utils.c:722 msgid "1 month" msgstr "1 μήνας" -#: ../katze/katze-utils.c:721 +#: ../katze/katze-utils.c:723 msgid "1 year" msgstr "1 έτος" -#: ../katze/katze-preferences.c:98 ../extensions/history-list.vala:235 +#: ../katze/katze-preferences.c:91 +#: ../extensions/history-list.vala:235 #, c-format msgid "Preferences for %s" msgstr "Προτιμήσεις για %s" -#: ../extensions/adblock.c:470 +#: ../extensions/adblock.c:433 msgid "Configure Advertisement filters" msgstr "Ρύθμιση φίλτρων διαφημίσεων" -#: ../extensions/adblock.c:503 +#: ../extensions/adblock.c:464 #, 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:917 +#: ../extensions/adblock.c:828 msgid "Edit rule" msgstr "Επεξεργασία κανόνα" -#: ../extensions/adblock.c:931 +#: ../extensions/adblock.c:842 msgid "_Rule:" msgstr "_Κανόνας:" -#: ../extensions/adblock.c:985 +#: ../extensions/adblock.c:896 msgid "Bl_ock image" msgstr "Φρ_αγή εικόνας" -#: ../extensions/adblock.c:990 +#: ../extensions/adblock.c:901 msgid "Bl_ock link" msgstr "Φρ_αγή συνδέσμου" -#: ../extensions/adblock.c:1689 +#: ../extensions/adblock.c:1492 msgid "Advertisement blocker" msgstr "Εμποδιστής διαφημίσεων" -#: ../extensions/adblock.c:1690 +#: ../extensions/adblock.c:1493 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 "" -"Αυτή η σελίδα φαίνεται να περιλαμβάνει ένα σενάριο χρήστη. Θέλετε να το " -"εγκαταστήσετε;" +msgstr "Αυτή η σελίδα φαίνεται να περιλαμβάνει ένα σενάριο χρήστη. Θέλετε να το εγκαταστήσετε;" #: ../extensions/addons.c:222 msgid "_Install user script" @@ -2474,9 +2290,7 @@ 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 "" -"Αυτή η σελίδα φαίνεται να περιέχει ένα στυλ χρήστη. Θέλετε να το " -"εγκαταστήσετε;" +msgstr "Αυτή η σελίδα φαίνεται να περιέχει ένα στυλ χρήστη. Θέλετε να το εγκαταστήσετε;" #: ../extensions/addons.c:228 msgid "_Install user style" @@ -2486,116 +2300,118 @@ msgstr "_Εγκατάσταση στυλ χρήστη" msgid "Don't install" msgstr "Να μην εγκατασταθεί" -#: ../extensions/addons.c:319 ../extensions/addons.c:677 +#: ../extensions/addons.c:319 +#: ../extensions/addons.c:681 msgid "Userscripts" msgstr "Δέσμες εντολών χρηστών" -#: ../extensions/addons.c:324 ../extensions/addons.c:679 +#: ../extensions/addons.c:324 +#: ../extensions/addons.c:683 msgid "Userstyles" msgstr "Θέματα χρήστη" -#: ../extensions/addons.c:370 ../extensions/addons.c:449 +#: ../extensions/addons.c:380 +#: ../extensions/addons.c:459 #: ../extensions/feed-panel/main.c:129 msgid "Error" msgstr "Σφάλμα" -#: ../extensions/addons.c:411 +#: ../extensions/addons.c:421 #, c-format msgid "Do you want to delete '%s'?" msgstr "Θέλετε να διαγράψετε το '%s';" -#: ../extensions/addons.c:417 +#: ../extensions/addons.c:427 msgid "Delete user script" msgstr "Διαγραφή δέσμης εντολών χρήστη" -#: ../extensions/addons.c:418 +#: ../extensions/addons.c:428 msgid "Delete user style" msgstr "Διαγραφή θεμάτων χρήστη" -#: ../extensions/addons.c:421 +#: ../extensions/addons.c:431 #, c-format msgid "The file %s will be permanently deleted." msgstr "Το αρχείο %s θα διαγραφεί μόνιμα." -#: ../extensions/addons.c:566 ../extensions/addons.c:643 +#: ../extensions/addons.c:570 +#: ../extensions/addons.c:647 msgid "Open in Text Editor" msgstr "Άνοιγμα στον κειμενογράφο" -#: ../extensions/addons.c:568 ../extensions/addons.c:652 +#: ../extensions/addons.c:572 +#: ../extensions/addons.c:656 msgid "Open Target Folder" msgstr "Άνοιγμα φακέλου προορισμού" -#: ../extensions/addons.c:634 +#: ../extensions/addons.c:638 msgid "Add new addon" msgstr "Προσθήκη νέας επέκτασης" -#: ../extensions/addons.c:660 +#: ../extensions/addons.c:664 msgid "Remove selected addon" msgstr "Απομάκρυνση της επιλεγμένης επέκτασης" -#: ../extensions/addons.c:1689 ../extensions/addons.c:1907 +#: ../extensions/addons.c:1691 +#: ../extensions/addons.c:1868 msgid "User addons" msgstr "Προσθήκες χρήστη" -#: ../extensions/addons.c:1819 +#: ../extensions/addons.c:1821 #, c-format msgid "Can't monitor folder '%s': %s" msgstr "Αδυναμία παρακολούθησης του καταλόγου '%s': %s" -#: ../extensions/addons.c:1908 +#: ../extensions/addons.c:1869 msgid "Support for userscripts and userstyles" msgstr "Υποστήριξη για δέσμες εντολών χρήστη και στυλ χρήστη" -#: ../extensions/colorful-tabs.c:201 +#: ../extensions/colorful-tabs.c:202 msgid "Colorful Tabs" msgstr "Χρωματιστές καρτέλες" -#: ../extensions/colorful-tabs.c:202 +#: ../extensions/colorful-tabs.c:203 msgid "Tint each tab distinctly" msgstr "Ευκρινές αποχρώσεις σε κάθε καρτέλα" -#: ../extensions/cookie-manager/cookie-manager-page.c:73 +#: ../extensions/cookie-manager/cookie-manager-page.c:80 #: ../extensions/cookie-manager/main.c:35 msgid "Cookie Manager" msgstr "Διαχειριστής cookie" -#: ../extensions/cookie-manager/cookie-manager-page.c:103 +#: ../extensions/cookie-manager/cookie-manager-page.c:110 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 "" -"Διαγράφει όλα τα cookies που φαίνονται. Εάν ένα φίλτρο έχει δοθεί, μόνο τα " -"cookies που ταιριάζουν στο φίλτρο θα διαγραφούν." +#: ../extensions/cookie-manager/cookie-manager-page.c:112 +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:120 +#: ../extensions/cookie-manager/cookie-manager-page.c:127 msgid "Expand All" msgstr "Ανάπτυξη όλων" -#: ../extensions/cookie-manager/cookie-manager-page.c:127 +#: ../extensions/cookie-manager/cookie-manager-page.c:134 msgid "Collapse All" msgstr "Μάζεμα όλων" -#: ../extensions/cookie-manager/cookie-manager-page.c:572 +#: ../extensions/cookie-manager/cookie-manager-page.c:576 msgid "Do you really want to delete all cookies?" msgstr "Είστε σίγουροι ότι θέλετε να διαγράψετε όλα τα cookies;" -#: ../extensions/cookie-manager/cookie-manager-page.c:574 +#: ../extensions/cookie-manager/cookie-manager-page.c:578 msgid "Question" msgstr "Ερώτηση" -#: ../extensions/cookie-manager/cookie-manager-page.c:583 +#: ../extensions/cookie-manager/cookie-manager-page.c:587 msgid "Only cookies which match the filter will be deleted." msgstr "Μόνο τα cookies που ταιριάζουν στο φίλτρο θα διαγραφούν." -#: ../extensions/cookie-manager/cookie-manager-page.c:671 +#: ../extensions/cookie-manager/cookie-manager-page.c:675 msgid "At the end of the session" msgstr "Στο τέλος της συνεδρίας" -#: ../extensions/cookie-manager/cookie-manager-page.c:674 +#: ../extensions/cookie-manager/cookie-manager-page.c:678 #, c-format msgid "" "Host: %s\n" @@ -2612,15 +2428,15 @@ msgstr "" "Ασφάλεια: %s\n" "Λήγει: %s" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:684 msgid "Yes" msgstr "Ναι" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:684 msgid "No" msgstr "Όχι" -#: ../extensions/cookie-manager/cookie-manager-page.c:694 +#: ../extensions/cookie-manager/cookie-manager-page.c:698 #, c-format msgid "" "Domain: %s\n" @@ -2629,21 +2445,25 @@ msgstr "" "Τομέας: %s\n" "Cookies: %d" -#: ../extensions/cookie-manager/cookie-manager-page.c:1017 +#: ../extensions/cookie-manager/cookie-manager-page.c:1028 msgid "Name" msgstr "Όνομα" -#: ../extensions/cookie-manager/cookie-manager-page.c:1069 +#: ../extensions/cookie-manager/cookie-manager-page.c:1081 msgid "_Expand All" msgstr "_Ανάπτυξη όλων" -#: ../extensions/cookie-manager/cookie-manager-page.c:1077 +#: ../extensions/cookie-manager/cookie-manager-page.c:1089 msgid "_Collapse All" msgstr "_Μάζεμα όλων" -#: ../extensions/cookie-manager/cookie-manager-page.c:1129 -msgid "Search Cookies by Name or Domain" -msgstr "Αναζήτηση Cookies ανά Όνομα ή Τομέα" +#: ../extensions/cookie-manager/cookie-manager-page.c:1142 +msgid "Filter:" +msgstr "Φίλτρο:" + +#: ../extensions/cookie-manager/cookie-manager-page.c:1147 +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:36 msgid "List, view and delete cookies" @@ -2663,13 +2483,11 @@ msgstr "Αντιγραφή των διευθύνσεων όλων των καρ #: ../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:387 @@ -2723,8 +2541,7 @@ msgstr "Αποτυχία εύρεσης απαιτούμενου στοιχεί #: ../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 @@ -2744,73 +2561,45 @@ msgstr "Πλαίσιο ροής" msgid "Read Atom/ RSS feeds" msgstr "Ανάγνωση Atom / RSS ροών" -#: ../extensions/formhistory/formhistory.c:39 +#: ../extensions/formhistory.c:143 #, 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 +#: ../extensions/formhistory.c:295 msgid "Toggle form history state" msgstr "Φόρμα εναλλαγής από την κατάσταση ιστορικού" -#: ../extensions/formhistory/formhistory.c:438 +#: ../extensions/formhistory.c:296 msgid "Activate or deactivate form history for the current tab." -msgstr "" -"Ενεργοποίηση ή απενεργοποίηση ιστορικότητας φόρμας για την τελευταία " -"τρέχουσα καρτέλα." +msgstr "Ενεργοποίηση ή απενεργοποίηση ιστορικότητας φόρμας για την τελευταία τρέχουσα καρτέλα." -#: ../extensions/formhistory/formhistory.c:549 -#: ../extensions/formhistory/formhistory.c:553 +#: ../extensions/formhistory.c:430 +#: ../extensions/formhistory.c:434 #, 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.c:509 +msgid "only activate form history via hotkey (Ctrl+Shift+F) per tab" +msgstr "ενεργοποίηση ιστορικότητας φόρμας μόνο μέσω συντόμευσης(Ctrl+Shift+F) ανά καρτέλα" -#: ../extensions/formhistory/formhistory.c:669 +#: ../extensions/formhistory.c:568 msgid "Stores history of entered form data" msgstr "Αποθηκεύει το ιστορικό των δεδομένων που έχουν εισαχθεί σε φόρμες" -#: ../extensions/formhistory/formhistory-gdom-frontend.c:225 -#: ../extensions/formhistory/formhistory-js-frontend.c:106 +#: ../extensions/formhistory.c:572 #, c-format -msgid "Failed to select suggestions\n" -msgstr "Αποτυχία επιλογής υποδείξεων\n" +msgid "Not available: %s" +msgstr "Μη διαθέσιμα: %s" + +#: ../extensions/formhistory.c:573 +msgid "Resource files not installed" +msgstr "Τα αρχεία πόρων δεν έχουν εγκατασταθεί" + +#: ../extensions/formhistory.c:579 +msgid "Form history filler" +msgstr "Ιστορικό δεδομένων φόρμας" #: ../extensions/history-list.vala:197 msgid "There are no unvisited tabs" @@ -2867,9 +2656,7 @@ msgstr "Λίστα ιστορικού" #: ../extensions/history-list.vala:570 msgid "Move to the last used tab when switching or closing tabs" -msgstr "" -"Μετακίνηση στην τελευταία χρησιμοποιημένη καρτέλα όταν εναλλάσσονται ή " -"κλείνονται οι καρτέλες" +msgstr "Μετακίνηση στην τελευταία χρησιμοποιημένη καρτέλα όταν εναλλάσσονται ή κλείνονται οι καρτέλες" #: ../extensions/mouse-gestures.c:301 msgid "Mouse Gestures" @@ -2887,15 +2674,15 @@ msgstr "Ανανέωση σελίδας ή διακοπή φόρτωσης" msgid "Customize Keyboard shortcuts" msgstr "Προσαρμογή συντομεύσεων πληκτρολογίου" -#: ../extensions/shortcuts.c:283 +#: ../extensions/shortcuts.c:285 msgid "Customize Sh_ortcuts..." msgstr "Προσαρμογή σ_υντομεύσεων..." -#: ../extensions/shortcuts.c:320 +#: ../extensions/shortcuts.c:322 msgid "Shortcuts" msgstr "Συντομεύσεις" -#: ../extensions/shortcuts.c:321 +#: ../extensions/shortcuts.c:323 msgid "View and edit keyboard shortcuts" msgstr "Εμφάνιση και επεξεργασία συντομεύσεων πληκτρολογίου" @@ -2907,37 +2694,36 @@ msgstr "Ρολόι στην γραμμή κατάστασης" msgid "Display date and time in the statusbar" msgstr "Εμφάνιση ημερομηνίας και ώρας στην γραμμή κατάστασης" -#: ../extensions/statusbar-features.c:152 +#: ../extensions/statusbar-features.c:128 msgid "Images" msgstr "Εικόνες" -#: ../extensions/statusbar-features.c:162 +#: ../extensions/statusbar-features.c:137 msgid "Scripts" msgstr "Δέσμες εντολών" -#: ../extensions/statusbar-features.c:174 +#: ../extensions/statusbar-features.c:146 msgid "Netscape plugins" msgstr "Αρθρωμάτων netscape" -#: ../extensions/statusbar-features.c:259 +#: ../extensions/statusbar-features.c:192 msgid "Statusbar Features" msgstr "Γραμμή κατάστασης χαρακτηριστικών" -#: ../extensions/statusbar-features.c:260 +#: ../extensions/statusbar-features.c:193 msgid "Easily toggle features on web pages on and off" -msgstr "" -"Εύκολη εναλλαγή χαρακτηριστικών στις ιστοσελίδες ενεργοποίηση και " -"απενεργοποίηση" +msgstr "Εύκολη εναλλαγή χαρακτηριστικών στις ιστοσελίδες ενεργοποίηση και απενεργοποίηση" -#: ../extensions/tab-panel.c:589 ../extensions/tab-panel.c:676 +#: ../extensions/tab-panel.c:596 +#: ../extensions/tab-panel.c:683 msgid "Tab Panel" msgstr "Πλαίσιο καρτέλας" -#: ../extensions/tab-panel.c:659 +#: ../extensions/tab-panel.c:666 msgid "T_ab Panel" msgstr "Πλαίσιο κ_αρτέλας" -#: ../extensions/tab-panel.c:677 +#: ../extensions/tab-panel.c:684 msgid "Show tabs in a vertical panel" msgstr "Εμφάνιση καρτελών στο κάθετο πλαίσιο" @@ -2949,35 +2735,35 @@ msgstr "Μόνο εικονίδια στις καρτέλες εξ'ορισμο msgid "New tabs have no label by default" msgstr "Οι νέες καρτέλες δεν έχουν ετικέτα εξ'ορισμού" -#: ../extensions/toolbar-editor.c:395 +#: ../extensions/toolbar-editor.c:393 msgid "Customize Toolbar" msgstr "Προσαρμογή εργαλειοθήκης" -#: ../extensions/toolbar-editor.c:411 -msgid "" -"Select items to be displayed on the toolbar. Items can be reordered by drag " -"and drop." -msgstr "" -"Επιλέξτε τα αντικείμενα που θα εμφανίζονται στην εργαλειοθήκη. Τα " -"αντικείμενα μπορούνε να ταξινομηθούν κατά την μεταφορά." +#: ../extensions/toolbar-editor.c:413 +msgid "Select items to be displayed on the toolbar. Items can be reodered by drag and drop." +msgstr "Επιλέξτε τα αντικείμενα που θα εμφανίζονται στην εργαλειοθήκη. Τα αντικείμενα μπορούνε να ταξινομηθούν κατά την μεταφορά." -#: ../extensions/toolbar-editor.c:427 +#: ../extensions/toolbar-editor.c:429 msgid "Available Items" msgstr "Διαθέσιμα αντικείμενα" -#: ../extensions/toolbar-editor.c:448 +#: ../extensions/toolbar-editor.c:450 msgid "Displayed Items" msgstr "Εμφανίσιμα αντικείμενα" -#: ../extensions/toolbar-editor.c:588 -msgid "_Customize Toolbar…" -msgstr "_Προσαρμογή Εργαλειοθήκης..." +#: ../extensions/toolbar-editor.c:585 +msgid "Customize _Toolbar..." +msgstr "Προσαρμογή _εργαλειοθήκης..." + +#: ../extensions/toolbar-editor.c:601 +msgid "_Customize..." +msgstr "_Προσαρμογή..." -#: ../extensions/toolbar-editor.c:617 +#: ../extensions/toolbar-editor.c:631 msgid "Toolbar Editor" msgstr "Επεξεργασία εργαλειοθήκης" -#: ../extensions/toolbar-editor.c:618 +#: ../extensions/toolbar-editor.c:632 msgid "Easily edit the toolbar layout" msgstr "Εύκολη επεξεργασία της εμφάνισης της εργαλειοθήκης" @@ -2985,72 +2771,3 @@ msgstr "Εύκολη επεξεργασία της εμφάνισης της ε msgid "Cache HTTP communication on disk" msgstr "Προσωρινή μνήμη επικοινωνίας HTTP στο δίσκο" -#~ msgid "_Bookmark" -#~ msgstr "_Σελιδοδείκτης" - -#~ msgid "_Console" -#~ msgstr "_Τερματικό" - -#~ msgid "Toplevel folder" -#~ msgstr "Αρχικός φάκελος" - -#~ msgid "_Title:" -#~ msgstr "_Τίτλος:" - -#~ msgid "_Folder:" -#~ msgstr "_Φάκελος:" - -#~ msgid "Import bookmarks..." -#~ msgstr "Εισαγωγή συνδέσμων..." - -#~ msgid "Search with..." -#~ msgstr "Αναζήτηση με..." - -#~ msgid "Close ot_her Tabs" -#~ msgstr "Κλείσιμο άλλ_ων καρτελών" - -#~ msgid "_Icon:" -#~ msgstr "_Εικονίδιο:" - -#~ msgid "Filter:" -#~ msgstr "Φίλτρο:" - -#~ msgid "" -#~ "Enter a filter string to show only cookies whose name or domain field " -#~ "match the entered filter" -#~ msgstr "" -#~ "Εισαγωγή ενός αλφαριθμητικού φίλτρου για να φαίνονται μόνο τα cookies που " -#~ "το όνομα ή το πεδίο τομέα ταιριάζει με το φίλτρο που εισάγεται" - -#~ msgid "Customize _Toolbar..." -#~ msgstr "Προσαρμογή _εργαλειοθήκης..." - -#~ msgid "_Customize..." -#~ msgstr "_Προσαρμογή..." - -#~ msgid "The bookmarks couldn't be saved. %s" -#~ msgstr "Οι σελιδοδείκτες δεν μπόρεσαν να αποθηκευτούν. %s" - -#~ 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 --git a/po/en_GB.po b/po/en_GB.po index f7151ce4..6aee7484 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -8,2199 +8,2274 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.1.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-04-22 20:03+0000\n" +"POT-Creation-Date: 2010-12-16 05:13+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 "Browse the Web" -msgstr "Browse the Web" +msgid "Lightweight web browser" +msgstr "Lightweight web browser" -#: ../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 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1355 ../midori/main.c:1751 +#: ../midori/main.c:1759 ../midori/main.c:1775 +#: ../midori/midori-websettings.c:315 msgid "Midori" msgstr "Midori" -#: ../data/midori.desktop.in.h:4 +#: ../data/midori.desktop.in.h:3 msgid "Web Browser" msgstr "Web Browser" -#: ../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 +#: ../midori/main.c:94 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "The configuration couldn't be loaded: %s\n" -#: ../midori/main.c:150 +#: ../midori/main.c:142 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Value '%s' is invalid for %s" -#: ../midori/main.c:155 ../midori/main.c:259 +#: ../midori/main.c:147 ../midori/main.c:240 #, c-format msgid "Invalid configuration value '%s'" msgstr "Invalid configuration value '%s'" -#: ../midori/main.c:380 +#: ../midori/main.c:345 #, 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:434 +#: ../midori/main.c:399 #, c-format msgid "Failed to clear history: %s\n" msgstr "Failed to clear history: %s\n" -#: ../midori/main.c:454 ../midori/main.c:581 -#: ../extensions/formhistory/formhistory.c:531 +#: ../midori/main.c:421 ../midori/main.c:578 ../extensions/formhistory.c:443 #, c-format msgid "Failed to open database: %s\n" msgstr "Failed to open database: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:524 +#: ../midori/main.c:485 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Failed to remove old history items: %s\n" -#: ../midori/main.c:564 ../panels/midori-history.c:232 +#: ../midori/main.c:530 +#, c-format +msgid "Failed to add bookmark item: %s\n" +msgstr "Failed to add bookmark item: %s\n" + +#: ../midori/main.c:561 ../panels/midori-history.c:180 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Failed to remove history item: %s\n" -#: ../midori/main.c:611 +#: ../midori/main.c:608 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "The bookmarks couldn't be saved. %s" -#: ../midori/main.c:633 +#: ../midori/main.c:632 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "The configuration couldn't be saved. %s" -#: ../midori/main.c:668 +#: ../midori/main.c:667 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "The search engines couldn't be saved. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:705 +#: ../midori/main.c:684 ../midori/main.c:704 #, c-format msgid "The trash couldn't be saved. %s" msgstr "The wastebasket couldn't be saved. %s" -#: ../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 +#: ../midori/main.c:755 ../midori/main.c:992 #, c-format msgid "The session couldn't be saved. %s" msgstr "The session couldn't be saved. %s" -#: ../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:939 +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." -msgstr "" -"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:1027 +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 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:1134 +#: ../midori/main.c:1043 msgid "Modify _preferences" msgstr "Modify _preferences" -#: ../midori/main.c:1138 +#: ../midori/main.c:1047 +msgid "Reset the last _session" +msgstr "Reset the last _session" + +#: ../midori/main.c:1052 msgid "Disable all _extensions" msgstr "Disable all _extensions" -#: ../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 +#: ../midori/main.c:1235 ../midori/main.c:2039 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "The session couldn't be loaded: %s\n" -#: ../midori/main.c:1538 +#: ../midori/main.c:1355 +msgid "No filename specified" +msgstr "No filename specified" + +#: ../midori/main.c:1374 +msgid "An unknown error occured." +msgstr "An unknown error occured." + +#: ../midori/main.c:1405 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Snapshot saved to: %s\n" -#: ../midori/main.c:1951 +#: ../midori/main.c:1641 msgid "Run ADDRESS as a web application" msgstr "Run ADDRESS as a web application" -#: ../midori/main.c:1951 +#: ../midori/main.c:1641 msgid "ADDRESS" msgstr "ADDRESS" -#: ../midori/main.c:1954 +#: ../midori/main.c:1644 msgid "Use FOLDER as configuration folder" msgstr "Use FOLDER as configuration folder" -#: ../midori/main.c:1954 +#: ../midori/main.c:1644 msgid "FOLDER" msgstr "FOLDER" -#: ../midori/main.c:1957 -msgid "Private browsing, no changes are saved" -msgstr "Private browsing, no changes are saved" - -#: ../midori/main.c:1959 +#: ../midori/main.c:1647 msgid "Show a diagnostic dialog" msgstr "Show a diagnostic dialogue" -#: ../midori/main.c:1961 +#: ../midori/main.c:1649 msgid "Run the specified filename as javascript" msgstr "Run the specified filename as javascript" -#: ../midori/main.c:1963 +#: ../midori/main.c:1652 msgid "Take a snapshot of the specified URI" msgstr "Take a snapshot of the specified URI" -#: ../midori/main.c:1965 +#: ../midori/main.c:1655 msgid "Execute the specified command" msgstr "Execute the specified command" -#: ../midori/main.c:1967 +#: ../midori/main.c:1657 msgid "List available commands to execute with -e/ --execute" msgstr "List available commands to execute with -e/ --execute" -#: ../midori/main.c:1969 +#: ../midori/main.c:1659 msgid "Display program version" msgstr "Display program version" -#: ../midori/main.c:1971 +#: ../midori/main.c:1661 msgid "Addresses" msgstr "Addresses" -#: ../midori/main.c:1973 +#: ../midori/main.c:1663 msgid "Block URIs according to regular expression PATTERN" msgstr "Block URIs according to regular expression PATTERN" -#: ../midori/main.c:1973 +#: ../midori/main.c:1663 msgid "PATTERN" msgstr "PATTERN" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1977 +#: ../midori/main.c:1667 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "Reset Midori after SECONDS seconds of inactivity" -#: ../midori/main.c:1977 +#: ../midori/main.c:1667 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 +#: ../midori/main.c:1748 msgid "[Addresses]" msgstr "[Addresses]" -#: ../midori/main.c:2087 +#: ../midori/main.c:1776 msgid "Please report comments, suggestions and bugs to:" msgstr "Please report comments, suggestions and bugs to:" -#: ../midori/main.c:2089 +#: ../midori/main.c:1778 msgid "Check for new versions at:" msgstr "Check for new versions at:" -#. 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:1839 +msgid "Website icons" +msgstr "Website icons" -#: ../midori/main.c:2175 -msgid "Cookies and Website data" -msgstr "Cookies and Website data" +#: ../midori/main.c:1841 +msgid "Cookies" +msgstr "Cookies" -#. 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:1844 +msgid "'Flash' Cookies" +msgstr "'Flash' Cookies" -#: ../midori/main.c:2182 -msgid "Website icons" -msgstr "Website icons" +#: ../midori/main.c:1848 +msgid "HTML5 _Databases" +msgstr "HTML5 _Databases" -#: ../midori/main.c:2288 -msgid "An unknown error occured" -msgstr "An unknown error occured" +#: ../midori/main.c:1922 +msgid "The specified configuration folder is invalid." +msgstr "The specified configuration folder is invalid." -#: ../midori/main.c:2395 +#: ../midori/main.c:1970 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:2431 +#: ../midori/main.c:2007 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Bookmarks couldn't be loaded: %s\n" -#: ../midori/main.c:2479 +#: ../midori/main.c:2054 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "The wastebasket couldn't be loaded: %s\n" -#: ../midori/main.c:2492 +#: ../midori/main.c:2067 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "The history couldn't be loaded: %s\n" -#: ../midori/main.c:2508 +#: ../midori/main.c:2080 msgid "The following errors occured:" msgstr "The following errors occured:" -#: ../midori/main.c:2524 +#: ../midori/main.c:2096 msgid "_Ignore" msgstr "_Ignore" -#: ../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 +#: ../midori/midori-array.c:429 msgid "File not found." msgstr "File not found." -#: ../midori/midori-array.c:547 ../midori/midori-array.c:586 -#: ../midori/midori-array.c:609 ../midori/midori-array.c:619 +#: ../midori/midori-array.c:463 ../midori/midori-array.c:486 +#: ../midori/midori-array.c:496 msgid "Malformed document." msgstr "Malformed document." -#: ../midori/midori-array.c:628 +#: ../midori/midori-array.c:505 msgid "Unrecognized bookmark format." msgstr "Unrecognised bookmark format." -#: ../midori/midori-array.c:915 +#: ../midori/midori-array.c:716 msgid "Writing failed." msgstr "Writing failed." -#: ../midori/midori-browser.c:350 ../midori/midori-browser.c:5298 -#: ../midori/midori-browser.c:5307 +#: ../midori/midori-browser.c:331 ../midori/midori-browser.c:4882 +#: ../midori/midori-browser.c:4888 msgid "Reload the current page" msgstr "Reload the current page" -#: ../midori/midori-browser.c:359 ../midori/midori-browser.c:5304 +#: ../midori/midori-browser.c:341 ../midori/midori-browser.c:4885 msgid "Stop loading the current page" msgstr "Stop loading the current page" -#: ../midori/midori-browser.c:476 +#: ../midori/midori-browser.c:448 +#, c-format +msgid "%d%% loaded" +msgstr "%d%% loaded" + +#: ../midori/midori-browser.c:486 #, c-format msgid "Failed to update title: %s\n" msgstr "Failed to update title: %s\n" -#: ../midori/midori-browser.c:489 +#: ../midori/midori-browser.c:499 #, c-format msgid "Unexpected action '%s'." msgstr "Unexpected action '%s'." -#: ../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 +#: ../midori/midori-browser.c:724 msgid "New folder" msgstr "New folder" -#: ../midori/midori-browser.c:774 +#: ../midori/midori-browser.c:724 msgid "Edit folder" msgstr "Edit folder" -#: ../midori/midori-browser.c:776 +#: ../midori/midori-browser.c:726 msgid "New bookmark" msgstr "New bookmark" -#: ../midori/midori-browser.c:776 +#: ../midori/midori-browser.c:726 msgid "Edit bookmark" msgstr "Edit bookmark" -#: ../midori/midori-browser.c:818 +#: ../midori/midori-browser.c:757 msgid "_Title:" msgstr "_Title:" -#: ../midori/midori-browser.c:838 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:774 ../midori/midori-searchaction.c:960 +msgid "_Description:" +msgstr "_Description:" + +#: ../midori/midori-browser.c:793 ../midori/midori-searchaction.c:974 #: ../extensions/feed-panel/main.c:377 msgid "_Address:" msgstr "_Address:" -#: ../midori/midori-browser.c:861 ../midori/midori-browser.c:4326 +#: ../midori/midori-browser.c:825 ../midori/midori-browser.c:4063 msgid "_Folder:" msgstr "_Folder:" -#: ../midori/midori-browser.c:877 +#: ../midori/midori-browser.c:835 ../midori/midori-browser.c:926 +#: ../midori/midori-browser.c:4068 ../midori/midori-browser.c:4096 +msgid "Toplevel folder" +msgstr "Toplevel folder" + +#: ../midori/midori-browser.c:867 msgid "Add to _Speed Dial" msgstr "Add to _Speed Dial" -#: ../midori/midori-browser.c:890 +#: ../midori/midori-browser.c:880 msgid "Show in the tool_bar" msgstr "Show in the tool_bar" -#: ../midori/midori-browser.c:905 +#: ../midori/midori-browser.c:895 msgid "Run as _web application" msgstr "Run as _web application" -#: ../midori/midori-browser.c:976 +#: ../midori/midori-browser.c:971 #, 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 +#: ../midori/midori-browser.c:973 #, 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 +#: ../midori/midori-browser.c:980 #, 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 +#: ../midori/midori-browser.c:983 #, 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 +#: ../midori/midori-browser.c:1049 ../midori/midori-browser.c:4139 msgid "Save file as" msgstr "Save file as" -#: ../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 -msgid "Error downloading the image!" -msgstr "Error downloading the image!" - -#: ../midori/midori-browser.c:1366 -msgid "Can not download selected image." -msgstr "Can not download selected image." - -#: ../midori/midori-browser.c:1492 +#: ../midori/midori-browser.c:1447 msgid "Save file" msgstr "Save file" -#: ../midori/midori-browser.c:2367 +#: ../midori/midori-browser.c:2146 msgid "Open file" msgstr "Open file" -#: ../midori/midori-browser.c:2499 +#: ../midori/midori-browser.c:2256 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 "" -"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." -#: ../midori/midori-browser.c:2505 ../extensions/feed-panel/main.c:365 +#: ../midori/midori-browser.c:2262 ../extensions/feed-panel/main.c:365 msgid "New feed" msgstr "New feed" -#: ../midori/midori-browser.c:2548 ../midori/midori-browser.c:5367 -#: ../panels/midori-bookmarks.c:427 +#: ../midori/midori-browser.c:2305 ../midori/midori-browser.c:4947 +#: ../panels/midori-bookmarks.c:377 msgid "Add a new bookmark" msgstr "Add a new bookmark" -#: ../midori/midori-browser.c:3047 ../midori/midori-searchaction.c:488 +#: ../midori/midori-browser.c:2860 ../midori/midori-searchaction.c:481 msgid "Empty" msgstr "Empty" -#: ../midori/midori-browser.c:3467 -msgid "Toggle text cursor navigation" -msgstr "Toggle text cursor navigation" +#: ../midori/midori-browser.c:3327 ../midori/sokoke.c:435 +#: ../midori/sokoke.c:445 ../midori/sokoke.c:473 ../midori/sokoke.c:502 +#: ../midori/sokoke.c:516 +msgid "Could not run external program." +msgstr "Could not run external program." -#: ../midori/midori-browser.c:3782 ../midori/midori-browser.c:5753 +#: ../midori/midori-browser.c:3570 ../midori/midori-browser.c:5343 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Failed to insert new history item: %s\n" -#: ../midori/midori-browser.c:4114 ../panels/midori-bookmarks.c:743 -#: ../panels/midori-history.c:801 +#: ../midori/midori-browser.c:3897 ../panels/midori-bookmarks.c:690 +#: ../panels/midori-history.c:729 msgid "Open all in _Tabs" msgstr "Open all in _Tabs" -#: ../midori/midori-browser.c:4121 ../panels/midori-bookmarks.c:749 -#: ../panels/midori-history.c:807 ../extensions/feed-panel/feed-panel.c:528 +#: ../midori/midori-browser.c:3904 ../panels/midori-bookmarks.c:696 +#: ../panels/midori-history.c:735 ../extensions/feed-panel/feed-panel.c:536 msgid "Open in New _Tab" msgstr "Open in New _Tab" -#: ../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 +#: ../midori/midori-browser.c:3907 ../midori/midori-view.c:2625 +#: ../midori/midori-view.c:4331 ../panels/midori-bookmarks.c:698 +#: ../panels/midori-history.c:737 ../extensions/feed-panel/feed-panel.c:538 msgid "Open in New _Window" msgstr "Open in New _Window" -#: ../midori/midori-browser.c:4213 +#: ../midori/midori-browser.c:3986 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4214 +#: ../midori/midori-browser.c:3987 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4215 +#: ../midori/midori-browser.c:3988 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4216 +#: ../midori/midori-browser.c:3989 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4217 +#: ../midori/midori-browser.c:3990 msgid "Epiphany" msgstr "Epiphany" -#: ../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:4014 +msgid "Import bookmarks..." +msgstr "Import bookmarks..." -#: ../midori/midori-browser.c:4242 ../midori/midori-browser.c:5372 +#: ../midori/midori-browser.c:4017 ../midori/midori-browser.c:4952 msgid "_Import bookmarks" msgstr "_Import bookmarks" -#: ../midori/midori-browser.c:4253 +#: ../midori/midori-browser.c:4028 msgid "_Application:" msgstr "_Application:" -#: ../midori/midori-browser.c:4318 -msgid "Import from XBEL or HTML file" -msgstr "Import from XBEL or HTML file" - -#: ../midori/midori-browser.c:4353 +#: ../midori/midori-browser.c:4055 ../midori/midori-browser.c:4104 msgid "Import from a file" msgstr "Import from a file" -#: ../midori/midori-browser.c:4365 +#: ../midori/midori-browser.c:4115 msgid "Failed to import bookmarks" msgstr "Failed to import bookmarks" -#: ../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 +#: ../midori/midori-browser.c:4156 msgid "Failed to export bookmarks" msgstr "Failed to export bookmarks" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4556 +#: ../midori/midori-browser.c:4273 msgid "Clear Private Data" msgstr "Clear Private Data" -#: ../midori/midori-browser.c:4560 +#: ../midori/midori-browser.c:4277 msgid "_Clear private data" msgstr "_Clear private data" -#: ../midori/midori-browser.c:4573 +#: ../midori/midori-browser.c:4291 msgid "Clear the following data:" msgstr "Clear the following data:" -#: ../midori/midori-browser.c:4583 -msgid "Last open _tabs" -msgstr "Last open _tabs" +#. i18n: Browsing history, visited web pages +#: ../midori/midori-browser.c:4302 ../midori/sokoke.c:1397 +msgid "_History" +msgstr "_History" + +#: ../midori/midori-browser.c:4307 ../midori/sokoke.c:1403 +msgid "_Closed Tabs" +msgstr "_Closed Tabs" -#: ../midori/midori-browser.c:4609 +#: ../midori/midori-browser.c:4327 msgid "Clear private data when _quitting Midori" msgstr "Clear private data when _quitting Midori" -#: ../midori/midori-browser.c:4804 +#: ../midori/midori-browser.c:4467 msgid "A lightweight web browser." msgstr "A lightweight web browser." -#: ../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:4469 +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 +#: ../midori/midori-browser.c:4488 msgid "translator-credits" msgstr "" "Bastien Nocera \n" "Abigail Brady " -#: ../midori/midori-browser.c:5214 +#: ../midori/midori-browser.c:4795 msgid "_File" msgstr "_File" -#: ../midori/midori-browser.c:5217 +#: ../midori/midori-browser.c:4797 ../midori/sokoke.c:1404 +msgid "New _Window" +msgstr "New _Window" + +#: ../midori/midori-browser.c:4798 msgid "Open a new window" msgstr "Open a new window" -#: ../midori/midori-browser.c:5220 +#: ../midori/midori-browser.c:4801 msgid "Open a new tab" msgstr "Open a new tab" -#: ../midori/midori-browser.c:5222 -msgid "New P_rivate Browsing Window" -msgstr "New P_rivate Browsing Window" +#: ../midori/midori-browser.c:4803 +msgid "P_rivate Browsing" +msgstr "P_rivate Browsing" + +#: ../midori/midori-browser.c:4804 +msgid "Don't save any private data while browsing" +msgstr "Don't save any private data while browsing" -#: ../midori/midori-browser.c:5226 +#: ../midori/midori-browser.c:4808 msgid "Open a file" msgstr "Open a file" -#: ../midori/midori-browser.c:5228 -msgid "_Save Page As…" -msgstr "_Save Page As…" - -#: ../midori/midori-browser.c:5229 +#: ../midori/midori-browser.c:4811 msgid "Save to a file" msgstr "Save to a file" -#: ../midori/midori-browser.c:5231 +#: ../midori/midori-browser.c:4813 msgid "Add to Speed _dial" msgstr "Add to Speed _dial" -#: ../midori/midori-browser.c:5235 +#: ../midori/midori-browser.c:4814 +msgid "Add shortcut to speed dial" +msgstr "Add shortcut to speed dial" + +#: ../midori/midori-browser.c:4816 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:4817 +msgid "Add shortcut to the desktop" +msgstr "Add shortcut to the desktop" -#: ../midori/midori-browser.c:5241 +#: ../midori/midori-browser.c:4819 msgid "Subscribe to News _feed" msgstr "Subscribe to News _feed" -#: ../midori/midori-browser.c:5247 +#: ../midori/midori-browser.c:4820 +msgid "Subscribe to this news feed" +msgstr "Subscribe to this news feed" + +#: ../midori/midori-browser.c:4825 msgid "_Close Tab" msgstr "_Close Tab" -#: ../midori/midori-browser.c:5248 +#: ../midori/midori-browser.c:4826 msgid "Close the current tab" msgstr "Close the current tab" -#: ../midori/midori-browser.c:5250 +#: ../midori/midori-browser.c:4828 msgid "C_lose Window" msgstr "C_lose Window" -#: ../midori/midori-browser.c:5254 +#: ../midori/midori-browser.c:4829 +msgid "Close this window" +msgstr "Close this window" + +#: ../midori/midori-browser.c:4832 msgid "Print the current page" msgstr "Print the current page" -#: ../midori/midori-browser.c:5256 -msgid "Close a_ll Windows" -msgstr "Close a_ll Windows" +#: ../midori/midori-browser.c:4835 +msgid "Quit the application" +msgstr "Quit the application" -#: ../midori/midori-browser.c:5259 +#: ../midori/midori-browser.c:4837 msgid "_Edit" msgstr "_Edit" -#: ../midori/midori-browser.c:5282 -msgid "_Find…" -msgstr "_Find…" +#: ../midori/midori-browser.c:4841 +msgid "Undo the last modification" +msgstr "Undo the last modification" + +#: ../midori/midori-browser.c:4844 +msgid "Redo the last modification" +msgstr "Redo the last modification" + +#: ../midori/midori-browser.c:4848 +msgid "Cut the selected text" +msgstr "Cut the selected text" + +#: ../midori/midori-browser.c:4851 ../midori/midori-browser.c:4854 +msgid "Copy the selected text" +msgstr "Copy the selected text" + +#: ../midori/midori-browser.c:4857 +msgid "Paste text from the clipboard" +msgstr "Paste text from the clipboard" -#: ../midori/midori-browser.c:5283 +#: ../midori/midori-browser.c:4860 +msgid "Delete the selected text" +msgstr "Delete the selected text" + +#: ../midori/midori-browser.c:4863 +msgid "Select all text" +msgstr "Select all text" + +#: ../midori/midori-browser.c:4866 msgid "Find a word or phrase in the page" msgstr "Find a word or phrase in the page" -#: ../midori/midori-browser.c:5285 +#: ../midori/midori-browser.c:4868 msgid "Find _Next" msgstr "Find _Next" -#: ../midori/midori-browser.c:5288 +#: ../midori/midori-browser.c:4869 +msgid "Find the next occurrence of a word or phrase" +msgstr "Find the next occurrence of a word or phrase" + +#: ../midori/midori-browser.c:4871 msgid "Find _Previous" msgstr "Find _Previous" -#: ../midori/midori-browser.c:5292 +#: ../midori/midori-browser.c:4872 +msgid "Find the previous occurrence of a word or phrase" +msgstr "Find the previous occurrence of a word or phrase" + +#: ../midori/midori-browser.c:4876 msgid "Configure the application preferences" msgstr "Configure the application preferences" -#: ../midori/midori-browser.c:5294 +#: ../midori/midori-browser.c:4878 msgid "_View" msgstr "_View" -#: ../midori/midori-browser.c:5295 +#: ../midori/midori-browser.c:4879 msgid "_Toolbars" msgstr "_Toolbars" -#: ../midori/midori-browser.c:5300 -msgid "Reload page without caching" -msgstr "Reload page without caching" - -#: ../midori/midori-browser.c:5310 +#: ../midori/midori-browser.c:4891 msgid "Increase the zoom level" msgstr "Increase the zoom level" -#: ../midori/midori-browser.c:5313 +#: ../midori/midori-browser.c:4894 msgid "Decrease the zoom level" msgstr "Decrease the zoom level" -#: ../midori/midori-browser.c:5317 +#: ../midori/midori-browser.c:4897 +msgid "Reset the zoom level" +msgstr "Reset the zoom level" + +#: ../midori/midori-browser.c:4898 msgid "_Encoding" msgstr "_Encoding" -#: ../midori/midori-browser.c:5319 +#: ../midori/midori-browser.c:4900 msgid "View So_urce" msgstr "View So_urce" -#: ../midori/midori-browser.c:5322 -msgid "Ca_ret Browsing" -msgstr "Ca_ret Browsing" +#: ../midori/midori-browser.c:4901 +msgid "View the source code of the page" +msgstr "View the source code of the page" -#: ../midori/midori-browser.c:5326 +#: ../midori/midori-browser.c:4904 msgid "Toggle fullscreen view" msgstr "Toggle fullscreen view" -#: ../midori/midori-browser.c:5328 +#: ../midori/midori-browser.c:4907 msgid "Scroll _Left" msgstr "Scroll _Left" -#: ../midori/midori-browser.c:5331 +#: ../midori/midori-browser.c:4908 +msgid "Scroll to the left" +msgstr "Scroll to the left" + +#: ../midori/midori-browser.c:4910 msgid "Scroll _Down" msgstr "Scroll _Down" -#: ../midori/midori-browser.c:5334 +#: ../midori/midori-browser.c:4911 +msgid "Scroll down" +msgstr "Scroll down" + +#: ../midori/midori-browser.c:4913 msgid "Scroll _Up" msgstr "Scroll _Up" -#: ../midori/midori-browser.c:5337 +#: ../midori/midori-browser.c:4914 +msgid "Scroll up" +msgstr "Scroll up" + +#: ../midori/midori-browser.c:4916 msgid "Scroll _Right" msgstr "Scroll _Right" -#: ../midori/midori-browser.c:5340 +#: ../midori/midori-browser.c:4917 +msgid "Scroll to the right" +msgstr "Scroll to the right" + +#: ../midori/midori-browser.c:4920 msgid "_Go" msgstr "_Go" -#: ../midori/midori-browser.c:5343 +#: ../midori/midori-browser.c:4923 msgid "Go back to the previous page" msgstr "Go back to the previous page" -#: ../midori/midori-browser.c:5346 +#: ../midori/midori-browser.c:4926 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:5350 +#: ../midori/midori-browser.c:4930 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:5354 +#: ../midori/midori-browser.c:4934 msgid "Go to the next sub-page" msgstr "Go to the next sub-page" -#: ../midori/midori-browser.c:5357 +#: ../midori/midori-browser.c:4937 msgid "Go to your homepage" msgstr "Go to your homepage" -#: ../midori/midori-browser.c:5359 +#: ../midori/midori-browser.c:4939 msgid "Empty Trash" msgstr "Empty Wastebasket" -#: ../midori/midori-browser.c:5362 +#: ../midori/midori-browser.c:4940 +msgid "Delete the contents of the trash" +msgstr "Delete the contents of the wastebasket" + +#: ../midori/midori-browser.c:4942 msgid "Undo _Close Tab" msgstr "Undo _Close Tab" -#: ../midori/midori-browser.c:5369 +#: ../midori/midori-browser.c:4943 +msgid "Open the last closed tab" +msgstr "Open the last closed tab" + +#: ../midori/midori-browser.c:4949 msgid "Add a new _folder" msgstr "Add a new _folder" -#: ../midori/midori-browser.c:5375 +#: ../midori/midori-browser.c:4950 +msgid "Add a new bookmark folder" +msgstr "Add a new bookmark folder" + +#: ../midori/midori-browser.c:4955 msgid "_Export bookmarks" msgstr "_Export bookmarks" -#: ../midori/midori-browser.c:5378 ../midori/midori-searchaction.c:497 +#: ../midori/midori-browser.c:4958 ../midori/midori-searchaction.c:490 msgid "_Manage Search Engines" msgstr "_Manage Search Engines" -#: ../midori/midori-browser.c:5381 +#: ../midori/midori-browser.c:4959 +msgid "Add, edit and remove search engines..." +msgstr "Add, edit and remove search engines..." + +#: ../midori/midori-browser.c:4962 msgid "_Clear Private Data" msgstr "_Clear Private Data" -#: ../midori/midori-browser.c:5384 +#: ../midori/midori-browser.c:4963 +msgid "Clear private data..." +msgstr "Clear private data..." + +#: ../midori/midori-browser.c:4967 msgid "_Inspect Page" msgstr "_Inspect Page" -#: ../midori/midori-browser.c:5388 +#: ../midori/midori-browser.c:4968 +msgid "Inspect page details and access developer tools..." +msgstr "Inspect page details and access developer tools..." + +#: ../midori/midori-browser.c:4973 msgid "_Previous Tab" msgstr "_Previous Tab" -#: ../midori/midori-browser.c:5391 +#: ../midori/midori-browser.c:4974 +msgid "Switch to the previous tab" +msgstr "Switch to the previous tab" + +#: ../midori/midori-browser.c:4976 msgid "_Next Tab" msgstr "_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:4977 +msgid "Switch to the next tab" +msgstr "Switch to the next tab" -#: ../midori/midori-browser.c:5398 +#: ../midori/midori-browser.c:4979 msgid "Focus _Current Tab" msgstr "Focus _Current Tab" -#: ../midori/midori-browser.c:5401 -msgid "Focus _Next view" -msgstr "Focus _Next view" +#: ../midori/midori-browser.c:4980 +msgid "Focus the current tab" +msgstr "Focus the current tab" -#: ../midori/midori-browser.c:5404 +#: ../midori/midori-browser.c:4982 msgid "Only show the Icon of the _Current Tab" msgstr "Only show the Icon of the _Current Tab" -#: ../midori/midori-browser.c:5407 +#: ../midori/midori-browser.c:4983 +msgid "Only show the icon of the current tab" +msgstr "Only show the icon of the current tab" + +#: ../midori/midori-browser.c:4985 msgid "_Duplicate Current Tab" msgstr "_Duplicate Current Tab" -#: ../midori/midori-browser.c:5410 +#: ../midori/midori-browser.c:4986 +msgid "Duplicate the current tab" +msgstr "Duplicate the current tab" + +#: ../midori/midori-browser.c:4988 msgid "Close Ot_her Tabs" msgstr "Close Ot_her Tabs" -#: ../midori/midori-browser.c:5413 +#: ../midori/midori-browser.c:4989 +msgid "Close all tabs except the current tab" +msgstr "Close all tabs except the current tab" + +#: ../midori/midori-browser.c:4991 msgid "Open last _session" msgstr "Open last _session" -#: ../midori/midori-browser.c:5416 +#: ../midori/midori-browser.c:4992 +msgid "Open the tabs saved in the last session" +msgstr "Open the tabs saved in the last session" + +#: ../midori/midori-browser.c:4994 msgid "_Help" msgstr "_Help" -#: ../midori/midori-browser.c:5418 +#: ../midori/midori-browser.c:4996 +msgid "_Contents" +msgstr "_Contents" + +#: ../midori/midori-browser.c:4997 +msgid "Show the documentation" +msgstr "Show the documentation" + +#: ../midori/midori-browser.c:4999 msgid "_Frequent Questions" msgstr "_Frequent Questions" -#: ../midori/midori-browser.c:5421 -msgid "_Report a Problem…" -msgstr "_Report a Problem…" +#: ../midori/midori-browser.c:5000 +msgid "Show the Frequently Asked Questions" +msgstr "Show the Frequently Asked Questions" -#: ../midori/midori-browser.c:5433 +#: ../midori/midori-browser.c:5002 +msgid "_Report a Bug" +msgstr "_Report a Bug" + +#: ../midori/midori-browser.c:5003 +msgid "Open Midori's bug tracker" +msgstr "Open Midori's bug tracker" + +#: ../midori/midori-browser.c:5006 +msgid "Show information about the program" +msgstr "Show information about the program" + +#: ../midori/midori-browser.c:5014 msgid "_Menubar" msgstr "_Menubar" -#: ../midori/midori-browser.c:5437 +#: ../midori/midori-browser.c:5015 +msgid "Show menubar" +msgstr "Show menubar" + +#: ../midori/midori-browser.c:5018 msgid "_Navigationbar" msgstr "_Navigationbar" -#: ../midori/midori-browser.c:5441 +#: ../midori/midori-browser.c:5019 +msgid "Show navigationbar" +msgstr "Show navigationbar" + +#: ../midori/midori-browser.c:5022 msgid "Side_panel" msgstr "Side_panel" -#: ../midori/midori-browser.c:5442 -msgid "Sidepanel" -msgstr "Sidepanel" +#: ../midori/midori-browser.c:5023 +msgid "Show sidepanel" +msgstr "Show sidepanel" -#: ../midori/midori-browser.c:5445 +#: ../midori/midori-browser.c:5026 msgid "_Bookmarkbar" msgstr "_Bookmarkbar" -#: ../midori/midori-browser.c:5449 +#: ../midori/midori-browser.c:5027 +msgid "Show bookmarkbar" +msgstr "Show bookmarkbar" + +#: ../midori/midori-browser.c:5030 +msgid "_Transferbar" +msgstr "_Transferbar" + +#: ../midori/midori-browser.c:5031 +msgid "Show transferbar" +msgstr "Show transferbar" + +#: ../midori/midori-browser.c:5034 msgid "_Statusbar" msgstr "_Statusbar" -#: ../midori/midori-browser.c:5458 ../midori/midori-websettings.c:311 +#: ../midori/midori-browser.c:5035 +msgid "Show statusbar" +msgstr "Show statusbar" + +#: ../midori/midori-browser.c:5043 msgid "_Automatic" msgstr "_Automatic" -#: ../midori/midori-browser.c:5461 ../midori/midori-websettings.c:236 +#: ../midori/midori-browser.c:5046 ../midori/midori-websettings.c:223 msgid "Chinese (BIG5)" msgstr "Chinese (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5465 +#: ../midori/midori-browser.c:5050 msgid "Japanese (SHIFT__JIS)" msgstr "Japanese (SHIFT__JIS)" -#: ../midori/midori-browser.c:5468 ../midori/midori-websettings.c:238 +#: ../midori/midori-browser.c:5053 ../midori/midori-websettings.c:225 msgid "Korean (EUC-KR)" msgstr "Korean (EUC-KR)" -#: ../midori/midori-browser.c:5471 ../midori/midori-websettings.c:239 +#: ../midori/midori-browser.c:5056 ../midori/midori-websettings.c:226 msgid "Russian (KOI8-R)" msgstr "Russian (KOI8-R)" -#: ../midori/midori-browser.c:5474 ../midori/midori-websettings.c:240 +#: ../midori/midori-browser.c:5059 ../midori/midori-websettings.c:227 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5477 ../midori/midori-websettings.c:241 +#: ../midori/midori-browser.c:5062 ../midori/midori-websettings.c:228 msgid "Western (ISO-8859-1)" msgstr "Western (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 "Custom…" +#: ../midori/midori-browser.c:5065 ../midori/midori-websettings.c:229 +#: ../midori/midori-websettings.c:320 ../katze/katze-utils.c:706 +msgid "Custom..." +msgstr "Custom..." -#: ../midori/midori-browser.c:5985 +#: ../midori/midori-browser.c:5585 msgid "_Separator" msgstr "_Separator" -#: ../midori/midori-browser.c:5992 -msgid "_Location…" -msgstr "_Location…" +#: ../midori/midori-browser.c:5592 +msgid "_Location..." +msgstr "_Location..." -#: ../midori/midori-browser.c:5994 +#: ../midori/midori-browser.c:5594 msgid "Open a particular location" msgstr "Open a particular location" -#: ../midori/midori-browser.c:6016 -msgid "_Web Search…" -msgstr "_Web Search…" +#: ../midori/midori-browser.c:5618 +msgid "_Web Search..." +msgstr "_Web Search..." -#: ../midori/midori-browser.c:6018 +#: ../midori/midori-browser.c:5620 msgid "Run a web search" msgstr "Run a web search" -#: ../midori/midori-browser.c:6045 +#: ../midori/midori-browser.c:5641 msgid "Reopen a previously closed tab or window" msgstr "Reopen a previously closed tab or window" -#: ../midori/midori-browser.c:6062 +#: ../midori/midori-browser.c:5654 ../midori/sokoke.c:1393 +msgid "_Bookmarks" +msgstr "_Bookmarks" + +#: ../midori/midori-browser.c:5656 msgid "Show the saved bookmarks" msgstr "Show the saved bookmarks" -#: ../midori/midori-browser.c:6079 +#: ../midori/midori-browser.c:5670 msgid "_Tools" msgstr "_Tools" -#: ../midori/midori-browser.c:6095 +#: ../midori/midori-browser.c:5685 msgid "_Window" msgstr "_Window" -#: ../midori/midori-browser.c:6097 +#: ../midori/midori-browser.c:5687 msgid "Show a list of all open tabs" msgstr "Show a list of all open tabs" -#: ../midori/midori-browser.c:6111 +#: ../midori/midori-browser.c:5701 msgid "_Menu" msgstr "_Menu" -#: ../midori/midori-browser.c:6113 +#: ../midori/midori-browser.c:5703 msgid "Menu" msgstr "Menu" -#: ../midori/midori-browser.c:6927 +#: ../midori/midori-browser.c:6283 #, c-format msgid "Unexpected setting '%s'" msgstr "Unexpected setting '%s'" -#: ../midori/midori-extension.c:329 +#: ../midori/midori-extension.c:286 #, 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-extension.c:747 ../midori/midori-extension.c:844 -#: ../midori/midori-extension.c:941 ../midori/midori-extension.c:1053 -#: ../extensions/addons.c:1695 +#: ../midori/midori-extension.c:667 ../midori/midori-extension.c:764 +#: ../midori/midori-extension.c:861 ../midori/midori-extension.c:973 +#: ../extensions/addons.c:1637 #, 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-locationaction.c:394 -#, c-format -msgid "Search with %s" -msgstr "Search with %s" - -#: ../midori/midori-locationaction.c:412 -msgid "Search with…" -msgstr "Search with…" - -#: ../midori/midori-locationaction.c:537 +#: ../midori/midori-locationaction.c:393 #, c-format msgid "Failed to select from history\n" msgstr "Failed to select from history\n" -#: ../midori/midori-locationaction.c:624 +#: ../midori/midori-locationaction.c:477 #, c-format msgid "Search for %s" msgstr "Search for %s" +#: ../midori/midori-locationaction.c:500 +#, c-format +msgid "Search with %s" +msgstr "Search with %s" + +#: ../midori/midori-locationaction.c:1311 +#, c-format +msgid "Failed to execute database statement\n" +msgstr "Failed to execute database statement\n" + #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1398 +#: ../midori/midori-locationaction.c:1367 msgid "Paste and p_roceed" msgstr "Paste and p_roceed" -#: ../midori/midori-locationaction.c:1739 +#: ../midori/midori-locationaction.c:1819 msgid "Not verified" msgstr "Not verified" -#: ../midori/midori-locationaction.c:1759 +#: ../midori/midori-locationaction.c:1830 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: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:409 ../midori/midori-panel.c:410 +#: ../midori/midori-panel.c:390 ../midori/midori-panel.c:391 msgid "Close panel" msgstr "Close panel" -#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566 -msgid "Align sidepanel to the left" -msgstr "Align sidepanel to the left" - -#: ../midori/midori-websettings.c:218 -msgid "Show Speed Dial" -msgstr "Show Speed Dial" +#: ../midori/midori-websettings.c:203 +msgid "Show Blank page" +msgstr "Show Blank page" -#: ../midori/midori-websettings.c:219 +#: ../midori/midori-websettings.c:204 msgid "Show Homepage" msgstr "Show Homepage" -#: ../midori/midori-websettings.c:237 +#: ../midori/midori-websettings.c:205 +msgid "Show last open tabs" +msgstr "Show last open tabs" + +#: ../midori/midori-websettings.c:207 +msgid "Show last tabs without loading" +msgstr "Show last tabs without loading" + +#: ../midori/midori-websettings.c:224 msgid "Japanese (SHIFT_JIS)" msgstr "Japanese (SHIFT_JIS)" -#: ../midori/midori-websettings.c:257 +#: ../midori/midori-websettings.c:244 msgid "New tab" msgstr "New tab" -#: ../midori/midori-websettings.c:258 +#: ../midori/midori-websettings.c:245 msgid "New window" msgstr "New window" -#: ../midori/midori-websettings.c:259 +#: ../midori/midori-websettings.c:246 msgid "Current tab" msgstr "Current tab" -#: ../midori/midori-websettings.c:274 +#: ../midori/midori-websettings.c:261 msgid "Default" msgstr "Default" -#: ../midori/midori-websettings.c:275 +#: ../midori/midori-websettings.c:262 msgid "Icons" msgstr "Icons" -#: ../midori/midori-websettings.c:276 +#: ../midori/midori-websettings.c:263 msgid "Small icons" msgstr "Small icons" -#: ../midori/midori-websettings.c:277 +#: ../midori/midori-websettings.c:264 msgid "Text" msgstr "Text" -#: ../midori/midori-websettings.c:278 +#: ../midori/midori-websettings.c:265 msgid "Icons and text" msgstr "Icons and text" -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-websettings.c:266 msgid "Text beside icons" msgstr "Text beside icons" -#: ../midori/midori-websettings.c:294 +#: ../midori/midori-websettings.c:281 msgid "Automatic (GNOME or environment)" msgstr "Automatic (GNOME or environment)" -#: ../midori/midori-websettings.c:295 +#: ../midori/midori-websettings.c:282 msgid "HTTP proxy server" msgstr "HTTP proxy server" -#: ../midori/midori-websettings.c:296 +#: ../midori/midori-websettings.c:283 msgid "No proxy server" msgstr "No proxy server" -#: ../midori/midori-websettings.c:313 +#: ../midori/midori-websettings.c:298 +msgid "All cookies" +msgstr "All cookies" + +#: ../midori/midori-websettings.c:299 +msgid "Session cookies" +msgstr "Session cookies" + +#: ../midori/midori-websettings.c:300 ../katze/katze-utils.c:675 +msgid "None" +msgstr "None" + +#: ../midori/midori-websettings.c:316 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:314 +#: ../midori/midori-websettings.c:317 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:315 +#: ../midori/midori-websettings.c:318 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:316 +#: ../midori/midori-websettings.c:319 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:400 +#: ../midori/midori-websettings.c:372 msgid "Remember last window size" msgstr "Remember last window size" -#: ../midori/midori-websettings.c:401 +#: ../midori/midori-websettings.c:373 msgid "Whether to save the last window size" msgstr "Whether to save the last window size" -#: ../midori/midori-websettings.c:409 +#: ../midori/midori-websettings.c:381 msgid "Last window width" msgstr "Last window width" -#: ../midori/midori-websettings.c:410 +#: ../midori/midori-websettings.c:382 msgid "The last saved window width" msgstr "The last saved window width" -#: ../midori/midori-websettings.c:418 +#: ../midori/midori-websettings.c:390 msgid "Last window height" msgstr "Last window height" -#: ../midori/midori-websettings.c:419 +#: ../midori/midori-websettings.c:391 msgid "The last saved window height" msgstr "The last saved window height" -#: ../midori/midori-websettings.c:444 +#: ../midori/midori-websettings.c:416 msgid "Last panel position" msgstr "Last panel position" -#: ../midori/midori-websettings.c:445 +#: ../midori/midori-websettings.c:417 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:454 +#: ../midori/midori-websettings.c:426 msgid "Last panel page" msgstr "Last panel page" -#: ../midori/midori-websettings.c:455 +#: ../midori/midori-websettings.c:427 msgid "The last saved panel page" msgstr "The last saved panel page" -#: ../midori/midori-websettings.c:463 +#: ../midori/midori-websettings.c:435 msgid "Last Web search" msgstr "Last Web search" -#: ../midori/midori-websettings.c:464 +#: ../midori/midori-websettings.c:436 msgid "The last saved Web search" msgstr "The last saved Web search" -#: ../midori/midori-websettings.c:473 +#: ../midori/midori-websettings.c:445 msgid "Show Menubar" msgstr "Show Menubar" -#: ../midori/midori-websettings.c:474 +#: ../midori/midori-websettings.c:446 msgid "Whether to show the menubar" msgstr "Whether to show the menubar" -#: ../midori/midori-websettings.c:482 +#: ../midori/midori-websettings.c:454 msgid "Show Navigationbar" msgstr "Show Navigationbar" -#: ../midori/midori-websettings.c:483 +#: ../midori/midori-websettings.c:455 msgid "Whether to show the navigationbar" msgstr "Whether to show the navigationbar" -#: ../midori/midori-websettings.c:491 +#: ../midori/midori-websettings.c:463 msgid "Show Bookmarkbar" msgstr "Show Bookmarkbar" -#: ../midori/midori-websettings.c:492 +#: ../midori/midori-websettings.c:464 msgid "Whether to show the bookmarkbar" msgstr "Whether to show the bookmarkbar" -#: ../midori/midori-websettings.c:500 +#: ../midori/midori-websettings.c:472 msgid "Show Panel" msgstr "Show Panel" -#: ../midori/midori-websettings.c:501 +#: ../midori/midori-websettings.c:473 msgid "Whether to show the panel" msgstr "Whether to show the panel" -#: ../midori/midori-websettings.c:509 +#: ../midori/midori-websettings.c:488 +msgid "Show Transferbar" +msgstr "Show Transferbar" + +#: ../midori/midori-websettings.c:489 +msgid "Whether to show the transferbar" +msgstr "Whether to show the transferbar" + +#: ../midori/midori-websettings.c:497 msgid "Show Statusbar" msgstr "Show Statusbar" -#: ../midori/midori-websettings.c:510 +#: ../midori/midori-websettings.c:498 msgid "Whether to show the statusbar" msgstr "Whether to show the statusbar" -#: ../midori/midori-websettings.c:519 +#: ../midori/midori-websettings.c:507 msgid "Toolbar Style:" msgstr "Toolbar Style:" -#: ../midori/midori-websettings.c:520 +#: ../midori/midori-websettings.c:508 msgid "The style of the toolbar" msgstr "The style of the toolbar" -#: ../midori/midori-websettings.c:529 +#: ../midori/midori-websettings.c:524 +msgid "Show progress in location entry" +msgstr "Show progress in location entry" + +#: ../midori/midori-websettings.c:525 +msgid "Whether to show loading progress in the location entry" +msgstr "Whether to show loading progress in the location entry" + +#: ../midori/midori-websettings.c:540 +msgid "Search engines in location completion" +msgstr "Search engines in location completion" + +#: ../midori/midori-websettings.c:541 +msgid "Whether to show search engines in the location completion" +msgstr "Whether to show search engines in the location completion" + +#: ../midori/midori-websettings.c:549 msgid "Toolbar Items" msgstr "Toolbar Items" -#: ../midori/midori-websettings.c:530 +#: ../midori/midori-websettings.c:550 msgid "The items to show on the toolbar" msgstr "The items to show on the toolbar" -#: ../midori/midori-websettings.c:538 +#: ../midori/midori-websettings.c:558 msgid "Compact Sidepanel" msgstr "Compact Sidepanel" -#: ../midori/midori-websettings.c:539 +#: ../midori/midori-websettings.c:559 msgid "Whether to make the sidepanel compact" msgstr "Whether to make the sidepanel compact" -#: ../midori/midori-websettings.c:554 +#: ../midori/midori-websettings.c:576 +msgid "Show operating controls of the panel" +msgstr "Show operating controls of the panel" + +#: ../midori/midori-websettings.c:577 +msgid "Whether to show the operating controls of the panel" +msgstr "Whether to show the operating controls of the panel" + +#: ../midori/midori-websettings.c:592 msgid "Align sidepanel on the right" msgstr "Align sidepanel on the right" -#: ../midori/midori-websettings.c:555 +#: ../midori/midori-websettings.c:593 msgid "Whether to align the sidepanel on the right" msgstr "Whether to align the sidepanel on the right" -#: ../midori/midori-websettings.c:570 +#: ../midori/midori-websettings.c:608 msgid "Open panels in separate windows" msgstr "Open panels in separate windows" -#: ../midori/midori-websettings.c:571 +#: ../midori/midori-websettings.c:609 msgid "Whether to always open panels in separate windows" msgstr "Whether to always open panels in separate windows" -#: ../midori/midori-websettings.c:580 +#: ../midori/midori-websettings.c:618 msgid "When Midori starts:" msgstr "When Midori starts:" -#: ../midori/midori-websettings.c:581 +#: ../midori/midori-websettings.c:619 msgid "What to do when Midori starts" msgstr "What to do when Midori starts" -#: ../midori/midori-websettings.c:590 +#: ../midori/midori-websettings.c:628 msgid "Homepage:" msgstr "Homepage:" -#: ../midori/midori-websettings.c:591 +#: ../midori/midori-websettings.c:629 msgid "The homepage" msgstr "The homepage" -#: ../midori/midori-websettings.c:606 +#: ../midori/midori-websettings.c:644 msgid "Show crash dialog" msgstr "Show crash dialogue" -#: ../midori/midori-websettings.c:607 +#: ../midori/midori-websettings.c:645 msgid "Show a dialog after Midori crashed" msgstr "Show a dialogue after Midori crashed" -#: ../midori/midori-websettings.c:615 +#. i18n: Speed dial, webpage shortcuts, named for the phone function +#: ../midori/midori-websettings.c:661 +msgid "Show speed dial in new tabs" +msgstr "Show speed dial in new tabs" + +#: ../midori/midori-websettings.c:662 +msgid "Show speed dial in newly opened tabs" +msgstr "Show speed dial in newly opened tabs" + +#: ../midori/midori-websettings.c:670 msgid "Save downloaded files to:" msgstr "Save downloaded files to:" -#: ../midori/midori-websettings.c:616 +#: ../midori/midori-websettings.c:671 msgid "The folder downloaded files are saved to" msgstr "The folder downloaded files are saved to" -#: ../midori/midori-websettings.c:624 +#: ../midori/midori-websettings.c:694 +msgid "Ask for the destination folder" +msgstr "Ask for the destination folder" + +#: ../midori/midori-websettings.c:695 +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:716 +msgid "Notify when a transfer has been completed" +msgstr "Notify when a transfer has been completed" + +#: ../midori/midori-websettings.c:717 +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:729 +msgid "Download Manager" +msgstr "Download Manager" + +#: ../midori/midori-websettings.c:730 +msgid "An external download manager" +msgstr "An external download manager" + +#: ../midori/midori-websettings.c:738 msgid "Text Editor" msgstr "Text Editor" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:739 msgid "An external text editor" msgstr "An external text editor" -#: ../midori/midori-websettings.c:640 +#: ../midori/midori-websettings.c:754 msgid "News Aggregator" msgstr "News Aggregator" -#: ../midori/midori-websettings.c:641 +#: ../midori/midori-websettings.c:755 msgid "An external news aggregator" msgstr "An external news aggregator" -#: ../midori/midori-websettings.c:649 +#: ../midori/midori-websettings.c:763 msgid "Location entry Search" msgstr "Location entry Search" -#: ../midori/midori-websettings.c:650 +#: ../midori/midori-websettings.c:764 msgid "The search to perform inside the location entry" msgstr "The search to perform inside the location entry" -#: ../midori/midori-websettings.c:658 +#: ../midori/midori-websettings.c:772 msgid "Preferred Encoding" msgstr "Preferred Encoding" -#: ../midori/midori-websettings.c:659 +#: ../midori/midori-websettings.c:773 msgid "The preferred character encoding" msgstr "The preferred character encoding" -#: ../midori/midori-websettings.c:669 +#: ../midori/midori-websettings.c:783 msgid "Always Show Tabbar" msgstr "Always Show Tabbar" -#: ../midori/midori-websettings.c:670 +#: ../midori/midori-websettings.c:784 msgid "Always show the tabbar" msgstr "Always show the tabbar" -#: ../midori/midori-websettings.c:683 +#: ../midori/midori-websettings.c:792 msgid "Close Buttons on Tabs" msgstr "Close Buttons on Tabs" -#: ../midori/midori-websettings.c:684 +#: ../midori/midori-websettings.c:793 msgid "Whether tabs have close buttons" msgstr "Whether tabs have close buttons" -#: ../midori/midori-websettings.c:709 +#: ../midori/midori-websettings.c:801 msgid "Open new pages in:" msgstr "Open new pages in:" -#: ../midori/midori-websettings.c:710 +#: ../midori/midori-websettings.c:802 msgid "Where to open new pages" msgstr "Where to open new pages" -#: ../midori/midori-websettings.c:719 +#: ../midori/midori-websettings.c:811 +msgid "Open external pages in:" +msgstr "Open external pages in:" + +#: ../midori/midori-websettings.c:812 +msgid "Where to open externally opened pages" +msgstr "Where to open externally opened pages" + +#: ../midori/midori-websettings.c:821 msgid "Middle click opens Selection" msgstr "Middle click opens Selection" -#: ../midori/midori-websettings.c:720 +#: ../midori/midori-websettings.c:822 msgid "Load an address from the selection via middle click" msgstr "Load an address from the selection via middle click" -#: ../midori/midori-websettings.c:728 +#: ../midori/midori-websettings.c:830 msgid "Open tabs in the background" msgstr "Open tabs in the background" -#: ../midori/midori-websettings.c:729 +#: ../midori/midori-websettings.c:831 msgid "Whether to open new tabs in the background" msgstr "Whether to open new tabs in the background" -#: ../midori/midori-websettings.c:737 +#: ../midori/midori-websettings.c:839 msgid "Open Tabs next to Current" msgstr "Open Tabs next to Current" -#: ../midori/midori-websettings.c:738 +#: ../midori/midori-websettings.c:840 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:746 +#: ../midori/midori-websettings.c:848 msgid "Open popups in tabs" msgstr "Open popups in tabs" -#: ../midori/midori-websettings.c:747 +#: ../midori/midori-websettings.c:849 msgid "Whether to open popup windows in tabs" msgstr "Whether to open popup windows in tabs" -#: ../midori/midori-websettings.c:757 ../extensions/statusbar-features.c:134 +#: ../midori/midori-websettings.c:859 ../extensions/statusbar-features.c:88 msgid "Load images automatically" msgstr "Load images automatically" -#: ../midori/midori-websettings.c:758 +#: ../midori/midori-websettings.c:860 msgid "Load and display images automatically" msgstr "Load and display images automatically" -#: ../midori/midori-websettings.c:765 ../extensions/statusbar-features.c:143 +#: ../midori/midori-websettings.c:867 ../extensions/statusbar-features.c:97 msgid "Enable scripts" msgstr "Enable scripts" -#: ../midori/midori-websettings.c:766 +#: ../midori/midori-websettings.c:868 msgid "Enable embedded scripting languages" msgstr "Enable embedded scripting languages" -#: ../midori/midori-websettings.c:773 ../extensions/statusbar-features.c:154 +#: ../midori/midori-websettings.c:875 ../extensions/statusbar-features.c:106 msgid "Enable Netscape plugins" msgstr "Enable Netscape plugins" -#: ../midori/midori-websettings.c:774 +#: ../midori/midori-websettings.c:876 msgid "Enable embedded Netscape plugin objects" msgstr "Enable embedded Netscape plugin objects" -#: ../midori/midori-websettings.c:789 +#: ../midori/midori-websettings.c:892 msgid "Enable Spell Checking" msgstr "Enable Spell Checking" -#: ../midori/midori-websettings.c:790 +#: ../midori/midori-websettings.c:893 msgid "Enable spell checking while typing" msgstr "Enable spell checking while typing" -#: ../midori/midori-websettings.c:796 +#: ../midori/midori-websettings.c:901 msgid "Enable HTML5 database support" msgstr "Enable HTML5 database support" -#: ../midori/midori-websettings.c:797 +#: ../midori/midori-websettings.c:902 msgid "Whether to enable HTML5 database support" msgstr "Whether to enable HTML5 database support" -#: ../midori/midori-websettings.c:803 +#: ../midori/midori-websettings.c:908 msgid "Enable HTML5 local storage support" msgstr "Enable HTML5 local storage support" -#: ../midori/midori-websettings.c:804 +#: ../midori/midori-websettings.c:909 msgid "Whether to enable HTML5 local storage support" msgstr "Whether to enable HTML5 local storage support" -#: ../midori/midori-websettings.c:810 +#: ../midori/midori-websettings.c:917 msgid "Enable offline web application cache" msgstr "Enable offline web application cache" -#: ../midori/midori-websettings.c:811 +#: ../midori/midori-websettings.c:918 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 +#: ../midori/midori-websettings.c:943 msgid "Zoom Text and Images" msgstr "Zoom Text and Images" -#: ../midori/midori-websettings.c:864 +#: ../midori/midori-websettings.c:944 msgid "Whether to zoom text and images" msgstr "Whether to zoom text and images" -#: ../midori/midori-websettings.c:879 +#: ../midori/midori-websettings.c:959 msgid "Find inline while typing" msgstr "Find inline while typing" -#: ../midori/midori-websettings.c:880 +#: ../midori/midori-websettings.c:960 msgid "Whether to automatically find inline while typing" msgstr "Whether to automatically find inline while typing" -#: ../midori/midori-websettings.c:895 +#: ../midori/midori-websettings.c:975 msgid "Kinetic scrolling" msgstr "Kinetic scrolling" -#: ../midori/midori-websettings.c:896 +#: ../midori/midori-websettings.c:976 msgid "Whether scrolling should kinetically move according to speed" msgstr "Whether scrolling should kinetically move according to speed" -#: ../midori/midori-websettings.c:904 -msgid "Delete old Cookies after:" -msgstr "Delete old Cookies after:" +#: ../midori/midori-websettings.c:984 +msgid "Accept cookies" +msgstr "Accept cookies" -#: ../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:985 +msgid "What type of cookies to accept" +msgstr "What type of cookies to accept" -#: ../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:994 +msgid "Maximum cookie age" +msgstr "Maximum cookie age" -#: ../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:995 +msgid "The maximum number of days to save cookies for" +msgstr "The maximum number of days to save cookies for" -#: ../midori/midori-websettings.c:936 -msgid "Delete pages from history after:" -msgstr "Delete pages from history after:" +#: ../midori/midori-websettings.c:1004 +msgid "Maximum history age" +msgstr "Maximum history age" -#: ../midori/midori-websettings.c:937 +#: ../midori/midori-websettings.c:1005 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:952 +#: ../midori/midori-websettings.c:1020 +msgid "Remember last downloaded files" +msgstr "Remember last downloaded files" + +#: ../midori/midori-websettings.c:1021 +msgid "Whether the last downloaded files are saved" +msgstr "Whether the last downloaded files are saved" + +#: ../midori/midori-websettings.c:1038 msgid "Proxy server" msgstr "Proxy server" -#: ../midori/midori-websettings.c:953 +#: ../midori/midori-websettings.c:1039 msgid "The type of proxy server to use" msgstr "The type of proxy server to use" -#: ../midori/midori-websettings.c:962 +#: ../midori/midori-websettings.c:1048 msgid "HTTP Proxy Server" msgstr "HTTP Proxy Server" -#: ../midori/midori-websettings.c:963 +#: ../midori/midori-websettings.c:1049 msgid "The proxy server used for HTTP connections" msgstr "The proxy server used for HTTP connections" -#: ../midori/midori-websettings.c:978 -msgid "Port" -msgstr "Port" - -#: ../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:1014 +#: ../midori/midori-websettings.c:1065 msgid "Identify as" msgstr "Identify as" -#: ../midori/midori-websettings.c:1015 +#: ../midori/midori-websettings.c:1066 msgid "What to identify as to web pages" msgstr "What to identify as to web pages" -#: ../midori/midori-websettings.c:1031 +#: ../midori/midori-websettings.c:1082 msgid "Identification string" msgstr "Identification string" -#: ../midori/midori-websettings.c:1032 +#: ../midori/midori-websettings.c:1083 msgid "The application identification string" msgstr "The application identification string" -#: ../midori/midori-websettings.c:1048 +#: ../midori/midori-websettings.c:1099 msgid "Preferred languages" msgstr "Preferred languages" -#: ../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 "" -"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: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\"" +msgstr "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:1064 +#: ../midori/midori-websettings.c:1115 msgid "Clear private data" msgstr "Clear private data" -#: ../midori/midori-websettings.c:1065 +#: ../midori/midori-websettings.c:1116 msgid "The private data selected for deletion" msgstr "The private data selected for deletion" -#: ../midori/midori-websettings.c:1080 +#: ../midori/midori-websettings.c:1131 msgid "Clear data" msgstr "Clear data" -#: ../midori/midori-websettings.c:1081 +#: ../midori/midori-websettings.c:1132 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 +#: ../midori/midori-view.c:1264 #, 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 +#: ../midori/midori-view.c:1268 ../midori/midori-view.c:1298 msgid "_Deny" msgstr "_Deny" -#: ../midori/midori-view.c:1364 ../midori/midori-view.c:1396 +#: ../midori/midori-view.c:1268 ../midori/midori-view.c:1298 msgid "_Allow" msgstr "_Allow" -#: ../midori/midori-view.c:1392 +#: ../midori/midori-view.c:1294 #, c-format msgid "%s wants to know your location." msgstr "%s wants to know your location." -#: ../midori/midori-view.c:1485 +#. 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:1395 ../midori/midori-view.c:4759 +#: ../midori/midori-view.c:4763 #, c-format msgid "Error - %s" msgstr "Error - %s" -#: ../midori/midori-view.c:1486 +#: ../midori/midori-view.c:1396 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "The page '%s' couldn't be loaded." -#: ../midori/midori-view.c:1488 +#: ../midori/midori-view.c:1398 msgid "Try again" msgstr "Try again" -#: ../midori/midori-view.c:1685 ../midori/midori-view.c:2598 +#. i18n: The title of the 404 - Not found error page +#: ../midori/midori-view.c:1417 +#, c-format +msgid "Not found - %s" +msgstr "Not found - %s" + +#: ../midori/midori-view.c:1603 ../midori/midori-view.c:2566 #, c-format msgid "Send a message to %s" msgstr "Send a message to %s" -#: ../midori/midori-view.c:2428 ../midori/midori-view.c:2747 +#: ../midori/midori-view.c:2345 ../midori/midori-view.c:2733 msgid "Inspect _Element" msgstr "Inspect _Element" -#: ../midori/midori-view.c:2480 +#: ../midori/midori-view.c:2397 ../midori/midori-view.c:2467 msgid "Open Link in New _Tab" msgstr "Open Link in New _Tab" -#: ../midori/midori-view.c:2484 +#: ../midori/midori-view.c:2401 msgid "Open Link in _Foreground Tab" msgstr "Open Link in _Foreground Tab" -#: ../midori/midori-view.c:2485 +#: ../midori/midori-view.c:2402 msgid "Open Link in _Background Tab" msgstr "Open Link in _Background Tab" -#: ../midori/midori-view.c:2488 +#: ../midori/midori-view.c:2405 ../midori/midori-view.c:2474 msgid "Open Link in New _Window" msgstr "Open Link in New _Window" -#: ../midori/midori-view.c:2491 +#: ../midori/midori-view.c:2408 msgid "Open Link as Web A_pplication" msgstr "Open Link as Web A_pplication" -#: ../midori/midori-view.c:2496 +#: ../midori/midori-view.c:2411 msgid "Copy Link de_stination" msgstr "Copy Link de_stination" -#: ../midori/midori-view.c:2512 +#: ../midori/midori-view.c:2414 ../midori/midori-view.c:2486 +msgid "_Save Link destination" +msgstr "_Save Link destination" + +#: ../midori/midori-view.c:2415 ../midori/midori-view.c:2480 +msgid "_Download Link destination" +msgstr "_Download Link destination" + +#: ../midori/midori-view.c:2419 ../midori/midori-view.c:2449 +#: ../midori/midori-view.c:2491 +msgid "Download with Download _Manager" +msgstr "Download with Download _Manager" + +#: ../midori/midori-view.c:2428 msgid "Open _Image in New Tab" msgstr "Open _Image in New Tab" -#: ../midori/midori-view.c:2515 +#: ../midori/midori-view.c:2431 msgid "Copy Image _Address" msgstr "Copy Image _Address" -#: ../midori/midori-view.c:2518 +#: ../midori/midori-view.c:2434 msgid "Save I_mage" msgstr "Save I_mage" -#: ../midori/midori-view.c:2521 -msgid "Open in Image _Viewer" -msgstr "Open in Image _Viewer" +#: ../midori/midori-view.c:2435 +msgid "Download I_mage" +msgstr "Download I_mage" -#: ../midori/midori-view.c:2528 +#: ../midori/midori-view.c:2442 msgid "Copy Video _Address" msgstr "Copy Video _Address" -#: ../midori/midori-view.c:2531 +#: ../midori/midori-view.c:2445 msgid "Save _Video" msgstr "Save _Video" -#: ../midori/midori-view.c:2531 +#: ../midori/midori-view.c:2445 msgid "Download _Video" msgstr "Download _Video" -#: ../midori/midori-view.c:2557 +#: ../midori/midori-view.c:2511 msgid "Search _with" msgstr "Search _with" -#: ../midori/midori-view.c:2589 +#: ../midori/midori-view.c:2546 ../midori/midori-view.c:2553 msgid "_Search the Web" msgstr "_Search the Web" -#: ../midori/midori-view.c:2606 +#: ../midori/midori-view.c:2574 msgid "Open Address in New _Tab" msgstr "Open Address in New _Tab" -#: ../midori/midori-view.c:2909 +#: ../midori/midori-view.c:2876 msgid "Open or download file" msgstr "Open or download file" -#: ../midori/midori-view.c:2929 +#: ../midori/midori-view.c:2895 #, c-format msgid "File Type: '%s'" msgstr "File Type: '%s'" -#: ../midori/midori-view.c:2931 +#: ../midori/midori-view.c:2898 #, c-format msgid "File Type: %s ('%s')" msgstr "File Type: %s ('%s')" -#: ../midori/midori-view.c:2935 -#, c-format -msgid "File Name: %s" -msgstr "File Name: %s" - -#: ../midori/midori-view.c:2955 +#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" +#: ../midori/midori-view.c:2902 #, c-format msgid "Open %s" msgstr "Open %s" -#: ../midori/midori-view.c:3576 +#: ../midori/midori-view.c:3478 #, c-format msgid "Inspect page - %s" msgstr "Inspect page - %s" -#: ../midori/midori-view.c:3923 +#: ../midori/midori-view.c:3762 msgid "Speed Dial" msgstr "Speed Dial" -#: ../midori/midori-view.c:3924 ../midori/midori-view.c:4020 +#: ../midori/midori-view.c:3763 msgid "Click to add a shortcut" msgstr "Click to add a shortcut" -#: ../midori/midori-view.c:3925 +#: ../midori/midori-view.c:3764 msgid "Enter shortcut address" msgstr "Enter shortcut address" -#: ../midori/midori-view.c:3926 +#: ../midori/midori-view.c:3765 msgid "Enter shortcut title" msgstr "Enter shortcut title" -#: ../midori/midori-view.c:3927 +#: ../midori/midori-view.c:3766 msgid "Are you sure you want to delete this shortcut?" msgstr "Are you sure you want to delete this shortcut?" -#: ../midori/midori-view.c:4089 -#, c-format -msgid "No documentation installed" -msgstr "No documentation installed" - -#: ../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:3767 +msgid "Set number of columns and rows" +msgstr "Set number of columns and rows" -#: ../midori/midori-view.c:4167 -msgid "Extensions are disabled." -msgstr "Extensions are disabled." +#: ../midori/midori-view.c:3768 +msgid "Enter number of columns and rows:" +msgstr "Enter number of columns and rows:" -#: ../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:3769 +msgid "Invalid input for the size of the speed dial" +msgstr "Invalid input for the size of the speed dial" -#: ../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:3770 +msgid "Thumb size:" +msgstr "Thumb size:" -#: ../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:3771 +msgid "Small" +msgstr "Small" -#: ../midori/midori-view.c:4171 -msgid "DNS prefetching is disabled." -msgstr "DNS prefetching is disabled." +#: ../midori/midori-view.c:3772 +msgid "Medium" +msgstr "Medium" -#: ../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:3773 +msgid "Big" +msgstr "Big" -#: ../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:3798 +#, c-format +msgid "Document cannot be displayed" +msgstr "Document cannot be displayed" -#: ../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:3821 +#, c-format +msgid "No documentation installed" +msgstr "No documentation installed" -#: ../midori/midori-view.c:4278 +#: ../midori/midori-view.c:3941 msgid "Page loading delayed" msgstr "Page loading delayed" -#: ../midori/midori-view.c:4279 +#: ../midori/midori-view.c:3942 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 +#: ../midori/midori-view.c:3943 msgid "Load Page" msgstr "Load Page" -#: ../midori/midori-view.c:4446 +#: ../midori/midori-view.c:4084 msgid "Blank page" msgstr "Blank page" -#: ../midori/midori-view.c:4708 +#: ../midori/midori-view.c:4335 msgid "_Duplicate Tab" msgstr "_Duplicate Tab" -#: ../midori/midori-view.c:4713 +#: ../midori/midori-view.c:4340 msgid "Show Tab _Label" msgstr "Show Tab _Label" -#: ../midori/midori-view.c:4713 +#: ../midori/midori-view.c:4340 msgid "Show Tab _Icon Only" msgstr "Show Tab _Icon Only" -#: ../midori/midori-view.c:4719 +#: ../midori/midori-view.c:4346 msgid "Close ot_her Tabs" msgstr "Close ot_her Tabs" -#. 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 +#: ../midori/midori-view.c:4937 msgid "Print background images" msgstr "Print background images" -#: ../midori/midori-view.c:5565 +#: ../midori/midori-view.c:4938 msgid "Whether background images should be printed" msgstr "Whether background images should be printed" -#: ../midori/midori-view.c:5597 +#: ../midori/midori-view.c:4974 ../midori/midori-preferences.c:412 msgid "Features" msgstr "Features" -#: ../midori/midori-preferences.c:297 +#. Page "General" +#: ../midori/midori-preferences.c:329 +msgid "General" +msgstr "General" + +#: ../midori/midori-preferences.c:330 msgid "Startup" msgstr "Startup" -#: ../midori/midori-preferences.c:310 -msgid "Use _current page" -msgstr "Use _current page" - -#: ../midori/midori-preferences.c:314 +#: ../midori/midori-preferences.c:345 ../midori/midori-preferences.c:352 msgid "Use current page as homepage" msgstr "Use current page as homepage" +#: ../midori/midori-preferences.c:362 ../panels/midori-transfers.c:87 +msgid "Transfers" +msgstr "Transfers" + #. Page "Appearance" -#: ../midori/midori-preferences.c:323 -msgid "Fonts" -msgstr "Fonts" +#: ../midori/midori-preferences.c:380 +msgid "Appearance" +msgstr "Appearance" -#: ../midori/midori-preferences.c:326 -msgid "Proportional Font Family" -msgstr "Proportional Font Family" +#: ../midori/midori-preferences.c:381 +msgid "Font settings" +msgstr "Font settings" -#: ../midori/midori-preferences.c:330 +#: ../midori/midori-preferences.c:383 +msgid "Default Font Family" +msgstr "Default Font Family" + +#: ../midori/midori-preferences.c:386 msgid "The default font family used to display text" msgstr "The default font family used to display text" -#: ../midori/midori-preferences.c:333 +#: ../midori/midori-preferences.c:389 msgid "The default font size used to display text" msgstr "The default font size used to display text" -#: ../midori/midori-preferences.c:335 +#: ../midori/midori-preferences.c:391 msgid "Fixed-width Font Family" msgstr "Fixed-width Font Family" -#: ../midori/midori-preferences.c:339 +#: ../midori/midori-preferences.c:394 msgid "The font family used to display fixed-width text" msgstr "The font family used to display fixed-width text" -#: ../midori/midori-preferences.c:342 +#: ../midori/midori-preferences.c:397 msgid "The font size used to display fixed-width text" msgstr "The font size used to display fixed-width text" -#: ../midori/midori-preferences.c:344 +#: ../midori/midori-preferences.c:399 msgid "Minimum Font Size" msgstr "Minimum Font Size" -#: ../midori/midori-preferences.c:348 +#: ../midori/midori-preferences.c:402 msgid "The minimum font size used to display text" msgstr "The minimum font size used to display text" #. Page "Behavior" -#: ../midori/midori-preferences.c:359 +#: ../midori/midori-preferences.c:411 msgid "Behavior" msgstr "Behaviour" -#: ../midori/midori-preferences.c:385 +#: ../midori/midori-preferences.c:420 +msgid "Enforce 96 dots per inch" +msgstr "Enforce 96 dots per inch" + +#: ../midori/midori-preferences.c:421 +msgid "Enforce a video dot density of 96 DPI" +msgstr "Enforce a video dot density of 96 DPI" + +#: ../midori/midori-preferences.c:433 msgid "Allow scripts to open popups" msgstr "Allow scripts to open popups" -#: ../midori/midori-preferences.c:386 +#: ../midori/midori-preferences.c:434 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:416 +#: ../midori/midori-preferences.c:453 +msgid "Interface" +msgstr "Interface" + +#: ../midori/midori-preferences.c:454 +msgid "Navigationbar" +msgstr "Navigationbar" + +#: ../midori/midori-preferences.c:464 msgid "Browsing" msgstr "Browsing" +#. Page "Applications" +#: ../midori/midori-preferences.c:482 +msgid "Applications" +msgstr "Applications" + +#: ../midori/midori-preferences.c:483 +msgid "External applications" +msgstr "External applications" + #. Page "Network" -#: ../midori/midori-preferences.c:456 +#: ../midori/midori-preferences.c:499 ../midori/midori-preferences.c:500 msgid "Network" msgstr "Network" -#: ../midori/midori-preferences.c:463 +#: ../midori/midori-preferences.c:506 msgid "Hostname" msgstr "Hostname" -#: ../midori/midori-preferences.c:487 -msgid "MB" -msgstr "MB" +#. Page "Privacy" +#: ../midori/midori-preferences.c:520 +msgid "Privacy" +msgstr "Privacy" + +#: ../midori/midori-preferences.c:521 +msgid "Web Cookies" +msgstr "Web Cookies" + +#: ../midori/midori-preferences.c:522 +msgid "Delete cookies when quitting Midori" +msgstr "Delete cookies when quitting Midori" + +#: ../midori/midori-preferences.c:529 +msgid "Delete old cookies after 1 hour" +msgstr "Delete old cookies after 1 hour" + +#: ../midori/midori-preferences.c:530 +msgid "Delete old cookies after 1 day" +msgstr "Delete old cookies after 1 day" + +#: ../midori/midori-preferences.c:531 +msgid "Delete old cookies after 1 week" +msgstr "Delete old cookies after 1 week" + +#: ../midori/midori-preferences.c:532 +msgid "Delete old cookies after 1 month" +msgstr "Delete old cookies after 1 month" + +#: ../midori/midori-preferences.c:533 +msgid "Delete old cookies after 1 year" +msgstr "Delete old cookies after 1 year" + +#: ../midori/midori-preferences.c:554 +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/midori-preferences.c:570 ../panels/midori-history.c:114 +msgid "History" +msgstr "History" + +#: ../midori/midori-preferences.c:575 +msgid "days" +msgstr "days" -#: ../midori/midori-searchaction.c:902 +#: ../midori/midori-searchaction.c:915 msgid "Add search engine" msgstr "Add search engine" -#: ../midori/midori-searchaction.c:902 +#: ../midori/midori-searchaction.c:915 msgid "Edit search engine" msgstr "Edit search engine" -#: ../midori/midori-searchaction.c:931 +#: ../midori/midori-searchaction.c:944 msgid "_Name:" msgstr "_Name:" -#: ../midori/midori-searchaction.c:947 -msgid "_Description:" -msgstr "_Description:" - -#: ../midori/midori-searchaction.c:981 +#: ../midori/midori-searchaction.c:988 msgid "_Icon:" msgstr "_Icon:" -#: ../midori/midori-searchaction.c:995 +#: ../midori/midori-searchaction.c:1002 msgid "_Token:" msgstr "_Token:" -#: ../midori/midori-searchaction.c:1295 +#: ../midori/midori-searchaction.c:1234 msgid "Manage Search Engines" msgstr "Manage Search Engines" -#: ../midori/midori-searchaction.c:1395 +#: ../midori/midori-searchaction.c:1334 msgid "Use as _default" msgstr "Use as _default" -#: ../midori/sokoke.c:354 +#: ../midori/sokoke.c:390 msgid "Open with" msgstr "Open with" -#: ../midori/sokoke.c:362 +#: ../midori/sokoke.c:395 #, c-format msgid "Choose an application or command to open \"%s\":" msgstr "Choose an application or command to open \"%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 "Could not run external program." +#: ../midori/sokoke.c:1392 +msgid "_Bookmark" +msgstr "_Bookmark" -#: ../midori/sokoke.c:1595 -#, c-format -msgid "%d hour" -msgid_plural "%d hours" -msgstr[0] "%d hour" -msgstr[1] "%d hours" +#: ../midori/sokoke.c:1394 +msgid "Add Boo_kmark" +msgstr "Add Boo_kmark" -#: ../midori/sokoke.c:1596 -#, c-format -msgid "%d minute" -msgid_plural "%d minutes" -msgstr[0] "%d minute" -msgstr[1] "%d minutes" +#: ../midori/sokoke.c:1395 +msgid "_Console" +msgstr "_Console" -#: ../midori/sokoke.c:1597 -#, c-format -msgid "%d second" -msgid_plural "%d seconds" -msgstr[0] "%d second" -msgstr[1] "%d seconds" +#: ../midori/sokoke.c:1396 +msgid "_Extensions" +msgstr "_Extensions" -#. 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:1398 +msgid "_Homepage" +msgstr "_Homepage" -#. i18n: Unknown number of bytes, used for transfer rate like ?B/s -#: ../midori/sokoke.c:1614 -msgid "?B" -msgstr "?B" +#: ../midori/sokoke.c:1399 +msgid "_Userscripts" +msgstr "_Userscripts" -#. i18n: Download tooltip (transfer rate): (130KB/s) -#: ../midori/sokoke.c:1617 -#, c-format -msgid " (%s/s)" -msgstr " (%s/s)" +#: ../midori/sokoke.c:1400 +msgid "New _Tab" +msgstr "New _Tab" -#. 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:1401 +msgid "_Transfers" +msgstr "_Transfers" + +#: ../midori/sokoke.c:1402 +msgid "Netscape p_lugins" +msgstr "Netscape p_lugins" + +#: ../midori/sokoke.c:1405 +msgid "New _Folder" +msgstr "New _Folder" #. i18n: A panel at the bottom, to search text in pages -#: ../toolbars/midori-findbar.c:291 +#: ../toolbars/midori-findbar.c:228 msgid "_Inline Find:" msgstr "_Inline Find:" -#: ../toolbars/midori-findbar.c:317 +#: ../toolbars/midori-findbar.c:262 msgid "Previous" msgstr "Previous" -#: ../toolbars/midori-findbar.c:323 +#: ../toolbars/midori-findbar.c:268 msgid "Next" msgstr "Next" -#: ../toolbars/midori-findbar.c:327 +#: ../toolbars/midori-findbar.c:272 msgid "Match Case" msgstr "Match Case" -#: ../toolbars/midori-findbar.c:336 +#: ../toolbars/midori-findbar.c:281 msgid "Highlight Matches" msgstr "Highlight Matches" -#: ../toolbars/midori-findbar.c:347 +#: ../toolbars/midori-findbar.c:292 msgid "Close Findbar" msgstr "Close Findbar" -#: ../toolbars/midori-transferbar.c:122 +#: ../toolbars/midori-transferbar.c:88 ../panels/midori-transfers.c:273 +#, c-format +msgid "%s of %s" +msgstr "%s of %s" + +#: ../toolbars/midori-transferbar.c:123 #, c-format msgid "The file '%s' has been downloaded." msgstr "The file '%s' has been downloaded." -#: ../toolbars/midori-transferbar.c:125 +#: ../toolbars/midori-transferbar.c:126 msgid "Transfer completed" msgstr "Transfer completed" -#: ../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 +#: ../toolbars/midori-transferbar.c:257 ../panels/midori-transfers.c:144 msgid "Clear All" msgstr "Clear All" -#: ../toolbars/midori-transferbar.c:371 ../toolbars/midori-transferbar.c:373 +#: ../toolbars/midori-transferbar.c:300 ../toolbars/midori-transferbar.c:302 msgid "Some files are being downloaded" msgstr "Some files are being downloaded" -#: ../toolbars/midori-transferbar.c:377 +#: ../toolbars/midori-transferbar.c:306 msgid "_Quit Midori" msgstr "_Quit Midori" -#: ../toolbars/midori-transferbar.c:379 +#: ../toolbars/midori-transferbar.c:308 msgid "The transfers will be cancelled if Midori quits." msgstr "The transfers will be cancelled if Midori quits." -#: ../panels/midori-bookmarks.c:114 +#: ../panels/midori-bookmarks.c:116 msgid "Bookmarks" msgstr "Bookmarks" -#: ../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 +#: ../panels/midori-bookmarks.c:385 msgid "Edit the selected bookmark" msgstr "Edit the selected bookmark" -#: ../panels/midori-bookmarks.c:443 +#: ../panels/midori-bookmarks.c:393 msgid "Delete the selected bookmark" msgstr "Delete the selected bookmark" -#: ../panels/midori-bookmarks.c:458 +#: ../panels/midori-bookmarks.c:407 msgid "Add a new folder" msgstr "Add a new folder" -#: ../panels/midori-bookmarks.c:592 ../panels/midori-history.c:633 +#: ../panels/midori-bookmarks.c:539 ../panels/midori-history.c:565 msgid "Separator" msgstr "Separator" -#: ../panels/midori-history.c:111 -msgid "History" -msgstr "History" - -#: ../panels/midori-history.c:158 ../panels/midori-history.c:189 -msgid "Today" -msgstr "Today" +#: ../panels/midori-extensions.c:91 +msgid "Extensions" +msgstr "Extensions" -#: ../panels/midori-history.c:160 ../panels/midori-history.c:191 -msgid "Yesterday" -msgstr "Yesterday" +#: ../panels/midori-history.c:146 +msgid "A week ago" +msgstr "A week ago" -#: ../panels/midori-history.c:162 ../panels/midori-history.c:186 +#: ../panels/midori-history.c:148 #, 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:151 +msgid "Today" +msgstr "Today" + +#: ../panels/midori-history.c:153 +msgid "Yesterday" +msgstr "Yesterday" -#: ../panels/midori-history.c:360 +#: ../panels/midori-history.c:305 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:407 +#: ../panels/midori-history.c:350 msgid "Bookmark the selected history item" msgstr "Bookmark the selected history item" -#: ../panels/midori-history.c:416 +#: ../panels/midori-history.c:359 msgid "Delete the selected history item" msgstr "Delete the selected history item" -#: ../panels/midori-history.c:424 +#: ../panels/midori-history.c:367 msgid "Clear the entire history" msgstr "Clear the entire history" -#: ../panels/midori-transfers.c:86 -msgid "Transfers" -msgstr "Transfers" - -#: ../panels/midori-transfers.c:469 +#: ../panels/midori-transfers.c:481 msgid "Open Destination _Folder" msgstr "Open Destination _Folder" -#: ../panels/midori-transfers.c:472 +#: ../panels/midori-transfers.c:484 msgid "Copy Link Loc_ation" msgstr "Copy Link Loc_ation" -#: ../katze/katze-http-auth.c:210 +#: ../katze/katze-http-auth.c:213 msgid "Authentication Required" msgstr "Authentication Required" -#: ../katze/katze-http-auth.c:226 +#: ../katze/katze-http-auth.c:229 msgid "" "A username and a password are required\n" "to open this location:" @@ -2208,244 +2283,220 @@ msgstr "" "A username and a password are required\n" "to open this location:" -#: ../katze/katze-http-auth.c:240 +#: ../katze/katze-http-auth.c:243 msgid "Username" msgstr "Username" -#: ../katze/katze-http-auth.c:253 +#: ../katze/katze-http-auth.c:256 msgid "Password" msgstr "Password" -#: ../katze/katze-http-auth.c:267 +#: ../katze/katze-http-auth.c:270 msgid "_Remember password" msgstr "_Remember password" -#: ../katze/katze-throbber.c:949 +#: ../katze/katze-throbber.c:879 #, c-format msgid "Named icon '%s' couldn't be loaded" msgstr "Named icon '%s' couldn't be loaded" -#: ../katze/katze-throbber.c:962 +#: ../katze/katze-throbber.c:892 #, c-format msgid "Stock icon '%s' couldn't be loaded" msgstr "Stock icon '%s' couldn't be loaded" -#: ../katze/katze-throbber.c:1042 +#: ../katze/katze-throbber.c:964 msgid "Animation frames are broken" msgstr "Animation frames are broken" -#: ../katze/katze-utils.c:445 ../katze/katze-utils.c:879 +#: ../katze/katze-utils.c:510 ../katze/katze-utils.c:918 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Property '%s' is invalid for %s" -#: ../katze/katze-utils.c:491 ../katze/katze-utils.c:520 -#: ../extensions/addons.c:308 +#: ../katze/katze-utils.c:556 ../katze/katze-utils.c:585 +#: ../extensions/addons.c:313 msgid "Choose file" msgstr "Choose file" -#: ../katze/katze-utils.c:506 +#: ../katze/katze-utils.c:571 msgid "Choose folder" msgstr "Choose folder" -#: ../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 +#: ../katze/katze-preferences.c:95 #, c-format msgid "Preferences for %s" msgstr "Preferences for %s" -#: ../extensions/adblock.c:473 +#: ../extensions/adblock.c:415 msgid "Configure Advertisement filters" msgstr "Configure Advertisement filters" -#: ../extensions/adblock.c:504 +#: ../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 "" -"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 "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:882 +#: ../extensions/adblock.c:587 +msgid "Configure _Advertisement filters..." +msgstr "Configure _Advertisement filters..." + +#: ../extensions/adblock.c:841 msgid "Edit rule" msgstr "Edit rule" -#: ../extensions/adblock.c:896 +#: ../extensions/adblock.c:854 msgid "_Rule:" msgstr "_Rule:" -#: ../extensions/adblock.c:950 +#: ../extensions/adblock.c:908 msgid "Bl_ock image" msgstr "Bl_ock image" -#: ../extensions/adblock.c:955 +#: ../extensions/adblock.c:913 msgid "Bl_ock link" msgstr "Bl_ock link" -#: ../extensions/adblock.c:1670 +#: ../extensions/adblock.c:1492 msgid "Advertisement blocker" msgstr "Advertisement blocker" -#: ../extensions/adblock.c:1671 +#: ../extensions/adblock.c:1493 msgid "Block advertisements according to a filter list" msgstr "Block advertisements according to a filter list" #. i18n: An infobar shows up when viewing a script on userscripts.org -#: ../extensions/addons.c:221 +#: ../extensions/addons.c:223 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 +#: ../extensions/addons.c:224 msgid "_Install user script" msgstr "_Install user script" #. i18n: An infobar shows up when viewing a style on userstyles.org -#: ../extensions/addons.c:227 +#: ../extensions/addons.c:229 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 +#: ../extensions/addons.c:230 msgid "_Install user style" msgstr "_Install user style" -#: ../extensions/addons.c:236 +#: ../extensions/addons.c:238 msgid "Don't install" msgstr "Don't install" -#: ../extensions/addons.c:319 ../extensions/addons.c:681 +#: ../extensions/addons.c:324 ../extensions/addons.c:685 msgid "Userscripts" msgstr "Userscripts" -#: ../extensions/addons.c:324 ../extensions/addons.c:683 +#: ../extensions/addons.c:329 ../extensions/addons.c:687 msgid "Userstyles" msgstr "Userstyles" -#: ../extensions/addons.c:380 ../extensions/addons.c:459 +#: ../extensions/addons.c:385 ../extensions/addons.c:461 #: ../extensions/feed-panel/main.c:129 msgid "Error" msgstr "Error" -#: ../extensions/addons.c:421 +#: ../extensions/addons.c:425 #, c-format msgid "Do you want to delete '%s'?" msgstr "Do you want to delete '%s'?" -#: ../extensions/addons.c:427 +#: ../extensions/addons.c:431 msgid "Delete user script" msgstr "Delete user script" -#: ../extensions/addons.c:428 +#: ../extensions/addons.c:432 msgid "Delete user style" msgstr "Delete user style" -#: ../extensions/addons.c:431 +#: ../extensions/addons.c:436 #, 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 +#: ../extensions/addons.c:572 ../extensions/addons.c:649 msgid "Open in Text Editor" msgstr "Open in Text Editor" -#: ../extensions/addons.c:572 ../extensions/addons.c:656 +#: ../extensions/addons.c:574 ../extensions/addons.c:658 msgid "Open Target Folder" msgstr "Open Target Folder" -#: ../extensions/addons.c:638 +#: ../extensions/addons.c:640 msgid "Add new addon" msgstr "Add new addon" -#: ../extensions/addons.c:664 +#: ../extensions/addons.c:667 +msgid "Open target folder for selected addon" +msgstr "Open target folder for selected addon" + +#: ../extensions/addons.c:668 msgid "Remove selected addon" msgstr "Remove selected addon" -#: ../extensions/addons.c:1696 ../extensions/addons.c:1914 +#: ../extensions/addons.c:1638 ../extensions/addons.c:1800 msgid "User addons" msgstr "User addons" -#: ../extensions/addons.c:1826 +#: ../extensions/addons.c:1759 #, c-format msgid "Can't monitor folder '%s': %s" msgstr "Can't monitor folder '%s': %s" -#: ../extensions/addons.c:1915 +#: ../extensions/addons.c:1801 msgid "Support for userscripts and userstyles" msgstr "Support for userscripts and userstyles" -#: ../extensions/colorful-tabs.c:201 +#: ../extensions/colorful-tabs.c:202 msgid "Colorful Tabs" msgstr "Colourful Tabs" -#: ../extensions/colorful-tabs.c:202 +#: ../extensions/colorful-tabs.c:203 msgid "Tint each tab distinctly" msgstr "Tint each tab distinctly" -#: ../extensions/cookie-manager/cookie-manager-page.c:73 +#: ../extensions/cookie-manager/cookie-manager-page.c:82 #: ../extensions/cookie-manager/main.c:35 msgid "Cookie Manager" msgstr "Cookie Manager" -#: ../extensions/cookie-manager/cookie-manager-page.c:103 +#: ../extensions/cookie-manager/cookie-manager-page.c:112 msgid "Delete All" msgstr "Delete All" -#: ../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 "" -"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:114 +msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter." +msgstr "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:120 +#: ../extensions/cookie-manager/cookie-manager-page.c:129 msgid "Expand All" msgstr "Expand All" -#: ../extensions/cookie-manager/cookie-manager-page.c:127 +#: ../extensions/cookie-manager/cookie-manager-page.c:136 msgid "Collapse All" msgstr "Collapse All" -#: ../extensions/cookie-manager/cookie-manager-page.c:572 +#: ../extensions/cookie-manager/cookie-manager-page.c:578 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:574 +#: ../extensions/cookie-manager/cookie-manager-page.c:580 msgid "Question" msgstr "Question" -#: ../extensions/cookie-manager/cookie-manager-page.c:583 +#: ../extensions/cookie-manager/cookie-manager-page.c:589 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:671 +#: ../extensions/cookie-manager/cookie-manager-page.c:677 msgid "At the end of the session" msgstr "At the end of the session" -#: ../extensions/cookie-manager/cookie-manager-page.c:674 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 #, c-format msgid "" "Host: %s\n" @@ -2462,15 +2513,15 @@ msgstr "" "Secure: %s\n" "Expires: %s" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:686 msgid "Yes" msgstr "Yes" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:686 msgid "No" msgstr "No" -#: ../extensions/cookie-manager/cookie-manager-page.c:694 +#: ../extensions/cookie-manager/cookie-manager-page.c:700 #, c-format msgid "" "Domain: %s\n" @@ -2479,43 +2530,39 @@ msgstr "" "Domain: %s\n" "Cookies: %d" -#: ../extensions/cookie-manager/cookie-manager-page.c:1024 +#: ../extensions/cookie-manager/cookie-manager-page.c:1030 msgid "Name" msgstr "Name" -#: ../extensions/cookie-manager/cookie-manager-page.c:1077 +#: ../extensions/cookie-manager/cookie-manager-page.c:1083 msgid "_Expand All" msgstr "_Expand All" -#: ../extensions/cookie-manager/cookie-manager-page.c:1085 +#: ../extensions/cookie-manager/cookie-manager-page.c:1091 msgid "_Collapse All" msgstr "_Collapse All" -#: ../extensions/cookie-manager/cookie-manager-page.c:1139 +#: ../extensions/cookie-manager/cookie-manager-page.c:1144 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 "" -"Enter a filter string to show only cookies whose name or domain field match " -"the entered 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 "Enter a filter string to show only cookies whose name or domain field match the entered filter" #: ../extensions/cookie-manager/main.c:36 msgid "List, view and delete cookies" msgstr "List, view and delete cookies" -#: ../extensions/copy-tabs.c:38 +#: ../extensions/copy-tabs.c:39 msgid "Copy Tab _Addresses" msgstr "Copy Tab _Addresses" -#: ../extensions/copy-tabs.c:95 +#: ../extensions/copy-tabs.c:96 msgid "Copy Addresses of Tabs" msgstr "Copy Addresses of Tabs" -#: ../extensions/copy-tabs.c:96 +#: ../extensions/copy-tabs.c:97 msgid "Copy the addresses of all tabs to the clipboard" msgstr "Copy the addresses of all tabs to the clipboard" @@ -2528,25 +2575,25 @@ 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:387 +#: ../extensions/feed-panel/feed-panel.c:392 #, c-format msgctxt "Feed" msgid "Last updated: %s." msgstr "Last updated: %s." -#: ../extensions/feed-panel/feed-panel.c:653 +#: ../extensions/feed-panel/feed-panel.c:661 msgid "Feeds" msgstr "Feeds" -#: ../extensions/feed-panel/feed-panel.c:706 +#: ../extensions/feed-panel/feed-panel.c:714 msgid "Add new feed" msgstr "Add new feed" -#: ../extensions/feed-panel/feed-panel.c:713 +#: ../extensions/feed-panel/feed-panel.c:721 msgid "Delete feed" msgstr "Delete feed" -#: ../extensions/feed-panel/feed-panel.c:795 +#: ../extensions/feed-panel/feed-panel.c:803 msgid "_Feeds" msgstr "_Feeds" @@ -2599,127 +2646,81 @@ msgstr "Feed Panel" msgid "Read Atom/ RSS feeds" msgstr "Read Atom/ RSS feeds" -#: ../extensions/formhistory/formhistory.c:39 +#: ../extensions/formhistory.c:146 #, c-format msgid "Failed to add form value: %s\n" msgstr "Failed to add form value: %s\n" -#: ../extensions/formhistory/formhistory.c:95 -msgid "Form history" -msgstr "Form history" - -#: ../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 +#: ../extensions/formhistory.c:458 ../extensions/formhistory.c:462 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Failed to execute database statement: %s\n" -#: ../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/formhistory.c:668 -msgid "Form history filler" -msgstr "Form history filler" - -#: ../extensions/formhistory/formhistory.c:669 +#: ../extensions/formhistory.c:520 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 +#: ../extensions/formhistory.c:524 #, c-format -msgid "Failed to select suggestions\n" -msgstr "Failed to select suggestions\n" +msgid "Not available: %s" +msgstr "Not available: %s" + +#: ../extensions/formhistory.c:525 +msgid "Resource files not installed" +msgstr "Resource files not installed" -#: ../extensions/history-list.vala:197 +#: ../extensions/formhistory.c:531 +msgid "Form history filler" +msgstr "Form history filler" + +#. i18n: Data entered into web forms by the user +#: ../extensions/formhistory.c:543 +msgid "_Form History" +msgstr "_Form History" + +#: ../extensions/history-list.vala:149 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:231 +msgid "Next Tab (History List)" +msgstr "Next Tab (History List)" -#: ../extensions/history-list.vala:275 -msgid "Tab closing behavior" -msgstr "Tab closing behaviour" +#: ../extensions/history-list.vala:232 +msgid "Next tab from history" +msgstr "Next tab from history" -#: ../extensions/history-list.vala:283 -msgid "Do nothing" -msgstr "Do nothing" +#: ../extensions/history-list.vala:241 +msgid "Previous Tab (History List)" +msgstr "Previous Tab (History List)" -#: ../extensions/history-list.vala:289 -msgid "Switch to last viewed tab" -msgstr "Switch to last viewed tab" +#: ../extensions/history-list.vala:242 +msgid "Previous tab from history" +msgstr "Previous tab from history" -#: ../extensions/history-list.vala:295 -msgid "Switch to newest tab" -msgstr "Switch to newest tab" - -#: ../extensions/history-list.vala:423 +#: ../extensions/history-list.vala:251 msgid "Next new Tab (History List)" msgstr "Next new Tab (History List)" -#: ../extensions/history-list.vala:424 +#: ../extensions/history-list.vala:252 msgid "Next new tab from history" msgstr "Next new tab from history" -#: ../extensions/history-list.vala:433 +#: ../extensions/history-list.vala:261 msgid "Previous new Tab (History List)" msgstr "Previous new Tab (History List)" -#: ../extensions/history-list.vala:434 +#: ../extensions/history-list.vala:262 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 +#: ../extensions/history-list.vala:347 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/history-list.vala:348 +msgid "Switch tabs with Ctrl+Tab sorted by last usage" +msgstr "Switch tabs with Ctrl+Tab sorted by last usage" #: ../extensions/mouse-gestures.c:301 msgid "Mouse Gestures" @@ -2729,23 +2730,32 @@ msgstr "Mouse Gestures" msgid "Control Midori by moving the mouse" msgstr "Control Midori by moving the mouse" -#: ../extensions/shortcuts.c:109 -msgid "Reload page or stop loading" -msgstr "Reload page or stop loading" +#. i18n: A panel showing a user specified web page +#: ../extensions/page-holder.c:128 ../extensions/page-holder.c:174 +msgid "Pageholder" +msgstr "Pageholder" + +#: ../extensions/page-holder.c:158 +msgid "_Pageholder" +msgstr "_Pageholder" + +#: ../extensions/page-holder.c:175 +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:176 +#: ../extensions/shortcuts.c:170 msgid "Customize Keyboard shortcuts" msgstr "Customise Keyboard shortcuts" -#: ../extensions/shortcuts.c:283 -msgid "Customize Sh_ortcuts…" -msgstr "Customise Sh_ortcuts…" +#: ../extensions/shortcuts.c:276 +msgid "Customize Sh_ortcuts..." +msgstr "Customise Sh_ortcuts..." -#: ../extensions/shortcuts.c:320 +#: ../extensions/shortcuts.c:313 msgid "Shortcuts" msgstr "Shortcuts" -#: ../extensions/shortcuts.c:321 +#: ../extensions/shortcuts.c:314 msgid "View and edit keyboard shortcuts" msgstr "View and edit keyboard shortcuts" @@ -2757,446 +2767,82 @@ msgstr "Statusbar Clock" msgid "Display date and time in the statusbar" msgstr "Display date and time in the statusbar" -#: ../extensions/statusbar-features.c:131 +#: ../extensions/statusbar-features.c:85 msgid "Images" msgstr "Images" -#: ../extensions/statusbar-features.c:140 +#: ../extensions/statusbar-features.c:94 msgid "Scripts" msgstr "Scripts" -#: ../extensions/statusbar-features.c:151 +#: ../extensions/statusbar-features.c:103 msgid "Netscape plugins" msgstr "Netscape plugins" -#: ../extensions/statusbar-features.c:199 +#: ../extensions/statusbar-features.c:140 msgid "Statusbar Features" msgstr "Statusbar Features" -#: ../extensions/statusbar-features.c:200 +#: ../extensions/statusbar-features.c:141 msgid "Easily toggle features on web pages on and off" msgstr "Easily toggle features on web pages on and off" -#: ../extensions/tab-panel.c:593 ../extensions/tab-panel.c:680 +#: ../extensions/tab-panel.c:585 ../extensions/tab-panel.c:643 msgid "Tab Panel" msgstr "Tab Panel" -#: ../extensions/tab-panel.c:663 +#: ../extensions/tab-panel.c:626 msgid "T_ab Panel" msgstr "T_ab Panel" -#: ../extensions/tab-panel.c:681 +#: ../extensions/tab-panel.c:644 msgid "Show tabs in a vertical panel" msgstr "Show tabs in a vertical panel" -#: ../extensions/tabs-minimized.c:76 +#: ../extensions/tabs-minimized.c:77 msgid "Only Icons on Tabs by default" msgstr "Only Icons on Tabs by default" -#: ../extensions/tabs-minimized.c:77 +#: ../extensions/tabs-minimized.c:78 msgid "New tabs have no label by default" msgstr "New tabs have no label by default" -#: ../extensions/toolbar-editor.c:393 +#: ../extensions/toolbar-editor.c:387 msgid "Customize Toolbar" msgstr "Customise Toolbar" -#: ../extensions/toolbar-editor.c:409 -msgid "" -"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 reordered by drag " -"and drop." +#: ../extensions/toolbar-editor.c:403 +msgid "Select items to be displayed on the toolbar. Items can be reodered by drag and drop." +msgstr "Select items to be displayed on the toolbar. Items can be reodered by drag and drop." -#: ../extensions/toolbar-editor.c:425 +#: ../extensions/toolbar-editor.c:419 msgid "Available Items" msgstr "Available Items" -#: ../extensions/toolbar-editor.c:446 +#: ../extensions/toolbar-editor.c:440 msgid "Displayed Items" msgstr "Displayed Items" -#: ../extensions/toolbar-editor.c:581 -msgid "Customize _Toolbar…" -msgstr "Customise _Toolbar…" - -#: ../extensions/toolbar-editor.c:597 -msgid "_Customize…" -msgstr "_Customise…" +#: ../extensions/toolbar-editor.c:575 +msgid "Customize _Toolbar..." +msgstr "Customise _Toolbar..." -#: ../extensions/toolbar-editor.c:627 +#: ../extensions/toolbar-editor.c:604 msgid "Toolbar Editor" msgstr "Toolbar Editor" -#: ../extensions/toolbar-editor.c:628 +#: ../extensions/toolbar-editor.c:605 msgid "Easily edit the toolbar layout" msgstr "Easily edit the toolbar layout" -#: ../extensions/web-cache.c:463 +#: ../extensions/web-cache.c:472 ../extensions/web-cache.c:481 +msgid "Web Cache" +msgstr "Web Cache" + +#: ../extensions/web-cache.c:473 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" @@ -3215,6 +2861,9 @@ msgstr "Cache HTTP communication on disk" #~ msgid "Original cookies only" #~ msgstr "Original cookies only" +#~ msgid "Accept cookies from the original website only" +#~ msgstr "Accept cookies from the original website only" + #~ msgid "Remember last visited pages" #~ msgstr "Remember last visited pages" @@ -3224,10 +2873,8 @@ msgstr "Cache HTTP communication on disk" #~ 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 "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" @@ -3247,17 +2894,11 @@ msgstr "Cache HTTP communication on disk" #~ 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 "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 "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" @@ -3265,10 +2906,8 @@ msgstr "Cache HTTP communication on disk" #~ 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 "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" diff --git a/po/eo.po b/po/eo.po deleted file mode 100644 index 3df22e17..00000000 --- a/po/eo.po +++ /dev/null @@ -1,2793 +0,0 @@ -# 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 --git a/po/es.po b/po/es.po index 2d1dcac7..3a35fbed 100644 --- a/po/es.po +++ b/po/es.po @@ -12,140 +12,101 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.1.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-09 16:21+0000\n" -"PO-Revision-Date: 2012-05-13 11:54-0600\n" -"Last-Translator: Sergio García \n" -"Language-Team: Spanish/es \n" +"POT-Creation-Date: 2011-10-30 11:11+0000\n" +"PO-Revision-Date: 2011-03-17 19:23-0400\n" +"Last-Translator: \n" +"Language-Team: Spanish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Poedit-Language: Spanish\n" "X-Generator: Lokalize 1.2\n" #: ../data/midori.desktop.in.h:1 -msgid "Browse the Web" -msgstr "Navegue por la web" +msgid "Lightweight web browser" +msgstr "Navegador web ligero" -#: ../data/midori.desktop.in.h:2 -msgid "Internet;WWW;Explorer" -msgstr "Internet;WWW;Explorer" - -#: ../data/midori.desktop.in.h:3 ../midori/main.c:1926 ../midori/main.c:1950 -#: ../midori/main.c:1964 ../midori/midori-websettings.c:199 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:2009 ../midori/main.c:2029 +#: ../midori/main.c:2045 ../midori/midori-websettings.c:301 msgid "Midori" msgstr "Midori" -#: ../data/midori.desktop.in.h:4 -msgid "Midori Web Browser" -msgstr "Navegador web Midori" - -#: ../data/midori.desktop.in.h:5 -msgid "New Private Browsing Window" -msgstr "Nueva ventana de navegación privada" - -#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1314 -msgid "New Tab" -msgstr "Nueva pestaña" - -#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1311 -msgid "New Window" -msgstr "Nueva ventana" - -#: ../data/midori.desktop.in.h:8 +#: ../data/midori.desktop.in.h:3 msgid "Web Browser" msgstr "Navegador web" -#: ../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:4351 -msgid "Private Browsing" -msgstr "Navegación Privada" - -#: ../midori/main.c:91 ../midori/main.c:97 +#: ../midori/main.c:102 ../midori/main.c:108 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "No se pudo cargar la configuración: %s\n" -#: ../midori/main.c:145 +#: ../midori/main.c:156 #, c-format msgid "Value '%s' is invalid for %s" msgstr "El valor «%s» no es válido para %s" -#: ../midori/main.c:150 ../midori/main.c:254 +#: ../midori/main.c:161 ../midori/main.c:254 #, c-format msgid "Invalid configuration value '%s'" msgstr "Valor de configuración no válido «%s»" -#: ../midori/main.c:365 +#: ../midori/main.c:359 #, 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:419 +#: ../midori/main.c:413 #, c-format msgid "Failed to clear history: %s\n" msgstr "No se pudo vaciar el historial: %s\n" -#: ../midori/main.c:441 ../extensions/formhistory/formhistory.c:531 +#: ../midori/main.c:433 ../midori/main.c:554 ../extensions/formhistory.c:417 #, c-format msgid "Failed to open database: %s\n" msgstr "No se pudo abrir la base de datos: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:513 +#: ../midori/main.c:497 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "No se pudieron quitar elementos antiguos del historial: %s\n" -#: ../midori/main.c:535 +#: ../midori/main.c:537 ../panels/midori-history.c:194 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "No se pudo quitar el elemento del historial: %s\n" + +#: ../midori/main.c:584 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "No se pudieron guardar los marcadores. %s" + +#: ../midori/main.c:618 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "No se pudo guardar la configuración. %s" -#: ../midori/main.c:561 +#: ../midori/main.c:653 #, 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:598 +#: ../midori/main.c:679 ../midori/main.c:699 #, c-format msgid "The trash couldn't be saved. %s" msgstr "No se pudo guardar la papelera. %s" -#: ../midori/main.c:671 ../panels/midori-extensions.c:90 +#: ../midori/main.c:733 ../panels/midori-extensions.c:92 msgid "Extensions" msgstr "Extensiones" -#: ../midori/main.c:685 +#: ../midori/main.c:747 msgid "Privacy" msgstr "Privacidad" -#: ../midori/main.c:687 -msgid "Delete old Cookies after:" -msgstr "Eliminar cookies antiguas después de:" - -#: ../midori/main.c:689 ../midori/main.c:692 -msgid "The maximum number of days to save cookies for" -msgstr "Número máximo de días para conservar las cookies" - -#: ../midori/main.c:696 -msgid "Only accept Cookies from sites you visit" -msgstr "Solo aceptar cookies de los sitios que visite" - -#: ../midori/main.c:697 -msgid "Block cookies sent by third-party websites" -msgstr "Bloquear cookies enviadas por sitios de terceros" - -#: ../midori/main.c:702 +#: ../midori/main.c:759 msgid "" "Cookies store login data, saved games, or user profiles for advertisement " "purposes." @@ -153,45 +114,19 @@ msgstr "" "Las cookies almacenan datos de inicio de sesión, juegos guardados o perfiles " "de usuario para fines publicitarios." -#: ../midori/main.c:709 -msgid "Enable offline web application cache" -msgstr "Activar caché local de aplicación web" - -#: ../midori/main.c:712 -msgid "Enable HTML5 local storage support" -msgstr "Activar soporte de almacenamiento local HTML5" - -#. i18n: Reworded: Shorten details propagated when going to another page -#: ../midori/main.c:716 -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/main.c:718 -msgid "Whether the \"Referer\" header should be shortened to the hostname" -msgstr "Si se debe acortar la cabecera del \\ \"Referer\\ \"" - -#: ../midori/main.c:721 -msgid "Delete pages from history after:" -msgstr "Eliminar páginas del historial después de:" - -#: ../midori/main.c:723 ../midori/main.c:726 -msgid "The maximum number of days to save the history for" -msgstr "Número máximo de días para conservar el historial" - -#: ../midori/main.c:767 +#: ../midori/main.c:821 #, c-format msgid "The session couldn't be saved. %s" msgstr "No se pudo guardar la sesión. %s" -#: ../midori/main.c:993 +#: ../midori/main.c:1031 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:1088 +#: ../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." @@ -200,240 +135,244 @@ msgstr "" "repetidamente, pruebe una de las siguientes opciones para resolver el " "problema." -#: ../midori/main.c:1107 +#: ../midori/main.c:1118 msgid "Modify _preferences" msgstr "Modificar _preferencias" -#: ../midori/main.c:1111 +#: ../midori/main.c:1122 msgid "Disable all _extensions" msgstr "Desactivar todas las _extensiones" -#: ../midori/main.c:1120 -msgid "Show a dialog after Midori crashed" -msgstr "Mostrar un dialogo después de que Midori se cuelgue" - -#: ../midori/main.c:1125 +#: ../midori/main.c:1135 msgid "Discard old tabs" msgstr "Descartar las pestañas viejas" -#: ../midori/main.c:1126 ../midori/midori-websettings.c:107 +#: ../midori/main.c:1136 ../midori/midori-websettings.c:210 msgid "Show last tabs without loading" msgstr "Mostrar las últimas etiquetas sin cargar" -#: ../midori/main.c:1127 ../midori/midori-websettings.c:106 +#: ../midori/main.c:1137 ../midori/midori-websettings.c:209 msgid "Show last open tabs" msgstr "Mostrar las últimas pestañas abiertas" -#: ../midori/main.c:1374 ../midori/main.c:2378 +#: ../midori/main.c:1347 ../midori/main.c:2428 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "No se pudo cargar la sesión: %s\n" -#: ../midori/main.c:1512 +#: ../midori/main.c:1488 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Captura guardada en: %s\n" -#: ../midori/main.c:1841 +#: ../midori/main.c:1912 msgid "Run ADDRESS as a web application" msgstr "Ejecutar DIRECCIÓN como una aplicación web" -#: ../midori/main.c:1841 +#: ../midori/main.c:1912 msgid "ADDRESS" msgstr "DIRECCIÓN" -#: ../midori/main.c:1844 +#: ../midori/main.c:1915 msgid "Use FOLDER as configuration folder" msgstr "Utilizar CARPETA como carpeta de configuración" -#: ../midori/main.c:1844 +#: ../midori/main.c:1915 msgid "FOLDER" msgstr "CARPETA" -#: ../midori/main.c:1847 +#: ../midori/main.c:1918 msgid "Private browsing, no changes are saved" msgstr "Navegación privada, no se guardan los cambios" -#: ../midori/main.c:1850 -msgid "Portable mode, all runtime files are stored in one place" -msgstr "" -"Modo portable, Todas los archivos de tiempo de ejecución son guardados en un " -"mismo lugar" - -#: ../midori/main.c:1853 -msgid "Plain GTK+ window with WebKit, akin to GtkLauncher" -msgstr "Ventana plana GTK+ con WebKit, similar a GtkLauncher" - -#: ../midori/main.c:1855 +#: ../midori/main.c:1920 msgid "Show a diagnostic dialog" msgstr "Mostrar diálogo de diagnóstico" -#: ../midori/main.c:1857 +#: ../midori/main.c:1922 msgid "Run the specified filename as javascript" msgstr "Ejecutar el nombre de archivo especificado como JavaScript" -#: ../midori/main.c:1859 +#: ../midori/main.c:1924 msgid "Take a snapshot of the specified URI" msgstr "Tomar una captura de la URI especificada" -#: ../midori/main.c:1861 +#: ../midori/main.c:1926 msgid "Execute the specified command" msgstr "Ejecutar el comando especificado" -#: ../midori/main.c:1863 +#: ../midori/main.c:1928 msgid "List available commands to execute with -e/ --execute" msgstr "Mostrar los comandos disponibles para ejecutar con -e/ --execute" -#: ../midori/main.c:1865 +#: ../midori/main.c:1930 msgid "Display program version" msgstr "Mostrar la versión del programa" -#: ../midori/main.c:1867 +#: ../midori/main.c:1932 msgid "Addresses" msgstr "Direcciones" -#: ../midori/main.c:1869 +#: ../midori/main.c:1934 msgid "Block URIs according to regular expression PATTERN" msgstr "Bloquear URI según PATRÓN de expresión regular" -#: ../midori/main.c:1869 +#: ../midori/main.c:1934 msgid "PATTERN" msgstr "PATRÓN" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1873 +#: ../midori/main.c:1938 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "Restablecer Midori después de SEGUNDOS segundos de inactividad" -#: ../midori/main.c:1873 +#: ../midori/main.c:1938 msgid "SECONDS" msgstr "SEGUNDOS" -#: ../midori/main.c:1876 +#: ../midori/main.c:1941 msgid "Redirects console warnings to the specified FILENAME" msgstr "" "Redirecciona las advertencias de la consola en el FILENAME especificado" -#: ../midori/main.c:1876 +#: ../midori/main.c:1941 msgid "FILENAME" msgstr "NOMBRE DE ARCHIVO" -#: ../midori/main.c:1965 +#: ../midori/main.c:2006 +msgid "[Addresses]" +msgstr "[Direcciones]" + +#: ../midori/main.c:2016 +msgid "The specified configuration folder is invalid." +msgstr "La carpeta de configuración especificada no es válida." + +#: ../midori/main.c:2046 msgid "Please report comments, suggestions and bugs to:" msgstr "Por favor envíe comentarios, sugerencias y errores a:" -#: ../midori/main.c:1967 +#: ../midori/main.c:2048 msgid "Check for new versions at:" msgstr "Buscar nuevas versiones en:" +#: ../midori/main.c:2131 +msgid "Website icons" +msgstr "Iconos de sitios web" + #. i18n: Logins and passwords in websites and web forms -#: ../midori/main.c:2098 +#: ../midori/main.c:2134 msgid "Saved logins and _passwords" msgstr "Inicios de sesión y _contraseñas guardadas" -#: ../midori/main.c:2100 -msgid "Cookies and Website data" -msgstr "Cookies y datos de sitios web" +#: ../midori/main.c:2136 +msgid "Cookies" +msgstr "Cookies" + +#: ../midori/main.c:2139 +msgid "'Flash' Cookies" +msgstr "Cookies 'Flash'" -#. TODO: Preserve page icons of search engines and merge privacy items -#: ../midori/main.c:2104 ../midori/midori-preferences.c:505 -#: ../extensions/web-cache.c:461 ../extensions/web-cache.c:470 +#: ../midori/main.c:2142 +msgid "HTML5 _Databases" +msgstr "Activar soporte de base de _datos HTML5" + +#: ../midori/main.c:2145 ../midori/midori-websettings.c:934 +#: ../extensions/web-cache.c:464 ../extensions/web-cache.c:473 msgid "Web Cache" msgstr "Caché web" -#: ../midori/main.c:2107 -msgid "Website icons" -msgstr "Iconos de sitios web" +#: ../midori/main.c:2147 +msgid "Offline Application Cache" +msgstr "Activar caché local para aplicaciones web" -#: ../midori/main.c:2211 +#: ../midori/main.c:2250 msgid "An unknown error occured" msgstr "Se produjo un error desconocido" -#: ../midori/main.c:2326 +#: ../midori/main.c:2359 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:2360 +#: ../midori/main.c:2395 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "No se pudieron cargar los marcadores: %s\n" -#: ../midori/main.c:2393 +#: ../midori/main.c:2443 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "No se pudo cargar la papelera: %s\n" -#: ../midori/main.c:2406 +#: ../midori/main.c:2456 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "No se pudo cargar el historial: %s\n" -#: ../midori/main.c:2421 +#: ../midori/main.c:2472 msgid "The following errors occured:" msgstr "Se produjeron los siguientes errores:" -#: ../midori/main.c:2437 +#: ../midori/main.c:2488 msgid "_Ignore" msgstr "_Ignorar" -#: ../midori/midori-app.c:1156 ../midori/midori-browser.c:533 -#, c-format -msgid "Unexpected action '%s'." -msgstr "Acción inesperada «%s»." +#: ../midori/midori-app.c:1321 +msgid "_Bookmark" +msgstr "_Marcador" -#: ../midori/midori-app.c:1372 ../midori/midori-browser.c:6212 +#: ../midori/midori-app.c:1322 ../midori/midori-browser.c:6069 msgid "_Bookmarks" msgstr "_Marcadores" -#: ../midori/midori-app.c:1373 +#: ../midori/midori-app.c:1323 msgid "Add Boo_kmark" msgstr "Añadir _marcador" -#: ../midori/midori-app.c:1374 +#: ../midori/midori-app.c:1324 +msgid "_Console" +msgstr "_Consola" + +#: ../midori/midori-app.c:1325 msgid "_Extensions" msgstr "_Extensiones" #. i18n: Browsing history, visited web pages, closed tabs -#: ../midori/midori-app.c:1375 ../midori/midori-browser.c:4665 +#: ../midori/midori-app.c:1326 ../midori/midori-browser.c:4614 msgid "_History" msgstr "_Historial" -#: ../midori/midori-app.c:1376 +#: ../midori/midori-app.c:1327 +msgid "_Homepage" +msgstr "_Página de inicio" + +#: ../midori/midori-app.c:1328 msgid "_Userscripts" msgstr "_Scripts de usuario" -#: ../midori/midori-app.c:1377 -msgid "User_styles" -msgstr "_Estilos de usuario" - -#: ../midori/midori-app.c:1378 +#: ../midori/midori-app.c:1329 msgid "New _Tab" msgstr "Nueva _pestaña" -#: ../midori/midori-app.c:1379 +#: ../midori/midori-app.c:1330 msgid "_Transfers" msgstr "_Transferencias" -#: ../midori/midori-app.c:1380 +#: ../midori/midori-app.c:1331 msgid "Netscape p_lugins" msgstr "C_omplementos de Netscape" -#: ../midori/midori-app.c:1381 +#: ../midori/midori-app.c:1332 msgid "_Closed Tabs" msgstr "_Pestañas cerradas" -#: ../midori/midori-app.c:1382 ../midori/midori-browser.c:5348 +#: ../midori/midori-app.c:1333 ../midori/midori-browser.c:5202 msgid "New _Window" msgstr "Nueva _ventana" -#: ../midori/midori-app.c:1383 +#: ../midori/midori-app.c:1334 msgid "New _Folder" msgstr "Nueva _carpeta" -#: ../midori/midori-app.c:1437 -msgid "[Addresses]" -msgstr "[Direcciones]" - #: ../midori/midori-array.c:522 msgid "File not found." msgstr "Archivo no encontrado." @@ -447,117 +386,128 @@ msgstr "Documento defectuoso." msgid "Unrecognized bookmark format." msgstr "Formato de marcador no reconocido." -#: ../midori/midori-array.c:915 +#: ../midori/midori-array.c:916 msgid "Writing failed." msgstr "Falló la escritura." -#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:5487 -msgid "Go forward to the next page" -msgstr "Avanza una página" - -#. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:353 ../midori/midori-browser.c:5495 -#: ../midori/midori-browser.c:5498 -msgid "Go to the next sub-page" -msgstr "Ir a la subpágina siguiente" - -#: ../midori/midori-browser.c:440 ../midori/midori-browser.c:5436 -#: ../midori/midori-browser.c:5445 +#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:5287 +#: ../midori/midori-browser.c:5296 msgid "Reload the current page" msgstr "Recargar la página actual" -#: ../midori/midori-browser.c:448 ../midori/midori-browser.c:5442 +#: ../midori/midori-browser.c:347 ../midori/midori-browser.c:5293 msgid "Stop loading the current page" msgstr "Detener la carga de la página actual" -#: ../midori/midori-browser.c:518 +#: ../midori/midori-browser.c:474 #, c-format msgid "Failed to update title: %s\n" msgstr "No se pudo actualizar el título: %s\n" -#: ../midori/midori-browser.c:613 +#: ../midori/midori-browser.c:487 +#, c-format +msgid "Unexpected action '%s'." +msgstr "Acción inesperada «%s»." + +#: ../midori/midori-browser.c:588 #, c-format msgid "%s (Private Browsing)" msgstr "%s (navegación privada)" -#: ../midori/midori-browser.c:723 ../midori/midori-browser.c:765 -#: ../panels/midori-bookmarks.c:114 -msgid "Bookmarks" -msgstr "Marcadores" +#: ../midori/midori-browser.c:699 ../midori/midori-browser.c:732 +msgid "Toplevel folder" +msgstr "Carpeta de nivel superior" -#: ../midori/midori-browser.c:825 +#: ../midori/midori-browser.c:789 msgid "New folder" msgstr "Nueva carpeta" -#: ../midori/midori-browser.c:825 +#: ../midori/midori-browser.c:789 msgid "Edit folder" msgstr "Editar carpeta" -#: ../midori/midori-browser.c:827 +#: ../midori/midori-browser.c:791 msgid "New bookmark" msgstr "Nuevo marcador" -#: ../midori/midori-browser.c:827 +#: ../midori/midori-browser.c:791 msgid "Edit bookmark" msgstr "Editar marcador" -#: ../midori/midori-browser.c:861 -msgid "Type a name for this bookmark and choose where to keep it." -msgstr "Elija un nombre para el marcador y elija donde guardarlo." +#: ../midori/midori-browser.c:822 +msgid "_Title:" +msgstr "_Título:" + +#: ../midori/midori-browser.c:842 ../midori/midori-searchaction.c:970 +#: ../extensions/feed-panel/main.c:377 +msgid "_Address:" +msgstr "_Dirección:" + +#: ../midori/midori-browser.c:865 ../midori/midori-browser.c:4349 +msgid "_Folder:" +msgstr "_Carpeta:" -#: ../midori/midori-browser.c:922 +#: ../midori/midori-browser.c:881 msgid "Add to _Speed Dial" msgstr "Añadir a marcado _rápido" -#: ../midori/midori-browser.c:928 +#: ../midori/midori-browser.c:894 msgid "Show in the tool_bar" msgstr "Mostrar en la _barra de herramientas" -#: ../midori/midori-browser.c:936 +#: ../midori/midori-browser.c:909 msgid "Run as _web application" msgstr "Ejecutar como aplicación _web" -#: ../midori/midori-browser.c:1054 ../midori/midori-browser.c:4469 +#: ../midori/midori-browser.c:980 +#, 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:982 +#, 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:989 +#, c-format +msgid "There is not enough free space to download \"%s\"." +msgstr "No hay suficiente espacio para descargar «%s»." + +#: ../midori/midori-browser.c:992 +#, 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:1036 ../midori/midori-browser.c:4419 msgid "Save file as" msgstr "Guardar archivo como" -#: ../midori/midori-browser.c:1064 -msgid "Save associated _resources" -msgstr "Salvar _asociacion de recursos" +#: ../midori/midori-browser.c:1352 +msgid "New Window" +msgstr "Nueva ventana" -#: ../midori/midori-browser.c:1311 +#: ../midori/midori-browser.c:1352 msgid "A new window has been opened" msgstr "Se ha abierto una ventana nueva" -#: ../midori/midori-browser.c:1314 +#: ../midori/midori-browser.c:1355 +msgid "New Tab" +msgstr "Nueva pestaña" + +#: ../midori/midori-browser.c:1355 msgid "A new tab has been opened" msgstr "Se ha abierto una pestaña nueva" -#: ../midori/midori-browser.c:1331 -msgid "Error opening the image!" -msgstr "Error abriendo la imagen:" - -#: ../midori/midori-browser.c:1332 -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:1338 -msgid "Error downloading the image!" -msgstr "Error al cargar el canal '%s'" - -#: ../midori/midori-browser.c:1339 -msgid "Can not download selected image." -msgstr "No se puede descargar la imágen seleccionada." - -#: ../midori/midori-browser.c:1396 +#: ../midori/midori-browser.c:1392 msgid "Save file" msgstr "Guardar archivo" -#: ../midori/midori-browser.c:2300 +#: ../midori/midori-browser.c:2282 msgid "Open file" msgstr "Abrir archivo" -#: ../midori/midori-browser.c:2432 +#: ../midori/midori-browser.c:2412 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" @@ -571,156 +521,136 @@ msgstr "" "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:2438 ../extensions/feed-panel/main.c:365 +#: ../midori/midori-browser.c:2418 ../extensions/feed-panel/main.c:365 msgid "New feed" msgstr "Nuevo canal" -#: ../midori/midori-browser.c:2481 ../midori/midori-browser.c:5511 -#: ../panels/midori-bookmarks.c:527 +#: ../midori/midori-browser.c:2461 ../midori/midori-browser.c:5356 +#: ../panels/midori-bookmarks.c:467 msgid "Add a new bookmark" msgstr "Añadir un nuevo marcador" -#: ../midori/midori-browser.c:3025 ../midori/midori-searchaction.c:487 +#: ../midori/midori-browser.c:3024 ../midori/midori-searchaction.c:491 msgid "Empty" msgstr "Vacío" -#: ../midori/midori-browser.c:3471 ../midori/midori-browser.c:3472 -msgid "Toggle text cursor navigation" -msgstr "Activar o desactivar la navegación con el cursor del texto" - -#: ../midori/midori-browser.c:3474 -msgid "" -"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in " -"all websites." -msgstr "" -"Presione y mantenga F7 para alternar a la navegación intercalada. Cuando se " -"active, El cursor de texto aparecerá en todas las páginas." - -#: ../midori/midori-browser.c:3477 -msgid "_Enable Caret Browsing" -msgstr "_Activar navegación intercalada" - -#: ../midori/midori-browser.c:3869 ../midori/midori-browser.c:5905 +#: ../midori/midori-browser.c:3815 ../midori/midori-browser.c:5766 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "No se pudo insertar un nuevo elemento en el historial: %s\n" -#: ../midori/midori-browser.c:4195 ../panels/midori-bookmarks.c:850 -#: ../panels/midori-history.c:806 +#: ../midori/midori-browser.c:4146 ../panels/midori-bookmarks.c:783 +#: ../panels/midori-history.c:752 msgid "Open all in _Tabs" msgstr "Abrir todo en _pestañas" -#: ../midori/midori-browser.c:4202 ../panels/midori-bookmarks.c:856 -#: ../panels/midori-history.c:812 ../extensions/feed-panel/feed-panel.c:528 +#: ../midori/midori-browser.c:4153 ../panels/midori-bookmarks.c:789 +#: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:533 msgid "Open in New _Tab" msgstr "Abrir en una nueva _pestaña " -#: ../midori/midori-browser.c:4205 ../midori/midori-view.c:2952 -#: ../midori/midori-view.c:4924 ../panels/midori-bookmarks.c:858 -#: ../panels/midori-history.c:814 ../extensions/feed-panel/feed-panel.c:530 +#: ../midori/midori-browser.c:4156 ../midori/midori-view.c:2555 +#: ../midori/midori-view.c:4383 ../panels/midori-bookmarks.c:791 +#: ../panels/midori-history.c:760 ../extensions/feed-panel/feed-panel.c:535 msgid "Open in New _Window" msgstr "Abrir en una nueva _ventana" -#: ../midori/midori-browser.c:4294 +#: ../midori/midori-browser.c:4236 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4295 +#: ../midori/midori-browser.c:4237 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4296 +#: ../midori/midori-browser.c:4238 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4297 +#: ../midori/midori-browser.c:4239 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4298 +#: ../midori/midori-browser.c:4240 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4299 +#: ../midori/midori-browser.c:4241 #, c-format msgid "Firefox (%s)" msgstr "Firefox (%s)" -#: ../midori/midori-browser.c:4300 -msgid "Midori 0.2.6" -msgstr "Midori" - -#: ../midori/midori-browser.c:4321 -msgid "Import bookmarks…" -msgstr "Importar marcadores…" +#: ../midori/midori-browser.c:4262 +msgid "Import bookmarks..." +msgstr "Importar marcadores..." -#: ../midori/midori-browser.c:4324 ../midori/midori-browser.c:5516 +#: ../midori/midori-browser.c:4265 ../midori/midori-browser.c:5361 msgid "_Import bookmarks" msgstr "_Importar marcadores" -#: ../midori/midori-browser.c:4335 +#: ../midori/midori-browser.c:4276 msgid "_Application:" msgstr "_Aplicación:" -#: ../midori/midori-browser.c:4400 +#: ../midori/midori-browser.c:4341 msgid "Import from XBEL or HTML file" msgstr "Importar desde archivo XBEL o HTML" -#: ../midori/midori-browser.c:4428 +#: ../midori/midori-browser.c:4376 msgid "Import from a file" msgstr "Importar desde un archivo" -#: ../midori/midori-browser.c:4440 +#: ../midori/midori-browser.c:4388 msgid "Failed to import bookmarks" msgstr "No se pudieron importar los marcadores" -#: ../midori/midori-browser.c:4474 +#: ../midori/midori-browser.c:4424 msgid "XBEL Bookmarks" msgstr "Marcadores XBEL" -#: ../midori/midori-browser.c:4479 +#: ../midori/midori-browser.c:4429 msgid "Netscape Bookmarks" msgstr "Marcadores Netscape " -#: ../midori/midori-browser.c:4493 +#: ../midori/midori-browser.c:4443 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:4508 +#: ../midori/midori-browser.c:4459 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:4630 +#: ../midori/midori-browser.c:4581 msgid "Clear Private Data" msgstr "Borrar datos privados" -#: ../midori/midori-browser.c:4634 +#: ../midori/midori-browser.c:4585 msgid "_Clear private data" msgstr "_Borrar datos privados" -#: ../midori/midori-browser.c:4649 +#: ../midori/midori-browser.c:4598 msgid "Clear the following data:" msgstr "Borrar los siguientes datos:" -#: ../midori/midori-browser.c:4659 +#: ../midori/midori-browser.c:4608 msgid "Last open _tabs" msgstr "Últimas _pestañas abiertas" -#: ../midori/midori-browser.c:4685 +#: ../midori/midori-browser.c:4634 msgid "Clear private data when _quitting Midori" msgstr "Borrar datos privados al _salir de Midori" -#: ../midori/midori-browser.c:4900 +#: ../midori/midori-browser.c:4810 msgid "A lightweight web browser." msgstr "Un navegador web ligero." -#: ../midori/midori-browser.c:4901 +#: ../midori/midori-browser.c:4811 msgid "See about:version for version info." msgstr "Escriba about:version para conocer más detalles de la versión." -#: ../midori/midori-browser.c:4903 +#: ../midori/midori-browser.c:4813 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 " @@ -732,7 +662,7 @@ msgstr "" "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:4933 +#: ../midori/midori-browser.c:4834 msgid "translator-credits" msgstr "" "Miguel Anxo Bouzada \n" @@ -742,599 +672,1094 @@ msgstr "" "Guillermo Iguarán \n" "Abel Martín " -#: ../midori/midori-browser.c:5346 +#: ../midori/midori-browser.c:5200 msgid "_File" msgstr "_Archivo" -#: ../midori/midori-browser.c:5349 +#: ../midori/midori-browser.c:5203 msgid "Open a new window" msgstr "Abrir una ventana nueva" -#: ../midori/midori-browser.c:5352 +#: ../midori/midori-browser.c:5206 msgid "Open a new tab" msgstr "Abrir una pestaña nueva" -#: ../midori/midori-browser.c:5354 +#: ../midori/midori-browser.c:5208 msgid "New P_rivate Browsing Window" msgstr "Nueva ventana de navegación p_rivada" -#: ../midori/midori-browser.c:5358 +#: ../midori/midori-browser.c:5209 +msgid "Don't save any private data while browsing" +msgstr "No guardar datos privados durante la navegación" + +#: ../midori/midori-browser.c:5213 msgid "Open a file" msgstr "Abrir un archivo" -#: ../midori/midori-browser.c:5360 -msgid "_Save Page As…" -msgstr "_Guardar página como…" +#: ../midori/midori-browser.c:5215 +msgid "_Save Page As..." +msgstr "_Guardar página como..." -#: ../midori/midori-browser.c:5361 +#: ../midori/midori-browser.c:5216 msgid "Save to a file" msgstr "Guardar en un archivo" -#: ../midori/midori-browser.c:5363 +#: ../midori/midori-browser.c:5218 msgid "Add to Speed _dial" msgstr "Añadir a _marcado rápido" -#: ../midori/midori-browser.c:5367 +#: ../midori/midori-browser.c:5219 +msgid "Add shortcut to speed dial" +msgstr "Añadir acceso directo a marcado rápido" + +#: ../midori/midori-browser.c:5222 msgid "Add Shortcut to the _desktop" msgstr "Añadir acceso directo en el _escritorio" -#: ../midori/midori-browser.c:5369 +#: ../midori/midori-browser.c:5223 +msgid "Add shortcut to the desktop" +msgstr "Añadir acceso directo en el escritorio" + +#: ../midori/midori-browser.c:5225 msgid "Create _Launcher" msgstr "Crear _lanzador" -#: ../midori/midori-browser.c:5373 +#: ../midori/midori-browser.c:5226 +msgid "Create a launcher" +msgstr "Crear un lanzador" + +#: ../midori/midori-browser.c:5229 msgid "Subscribe to News _feed" msgstr "Suscribirse al _canal de noticias" -#: ../midori/midori-browser.c:5379 +#: ../midori/midori-browser.c:5230 +msgid "Subscribe to this news feed" +msgstr "Suscribirse a este canal de noticias" + +#: ../midori/midori-browser.c:5235 msgid "_Close Tab" msgstr "_Cerrar pestaña" -#: ../midori/midori-browser.c:5380 +#: ../midori/midori-browser.c:5236 msgid "Close the current tab" msgstr "Cerrar la pestaña actual" -#: ../midori/midori-browser.c:5382 +#: ../midori/midori-browser.c:5238 msgid "C_lose Window" msgstr "_Cerrar ventana" -#: ../midori/midori-browser.c:5386 -msgid "_Share" -msgstr "_Compartir" +#: ../midori/midori-browser.c:5239 +msgid "Close this window" +msgstr "Cerrar esta ventana" -#: ../midori/midori-browser.c:5391 +#: ../midori/midori-browser.c:5242 msgid "Print the current page" msgstr "Imprimir la página actual" -#: ../midori/midori-browser.c:5394 +#: ../midori/midori-browser.c:5244 msgid "Close a_ll Windows" msgstr "Cerrar _todas las ventanas" -#: ../midori/midori-browser.c:5397 +#: ../midori/midori-browser.c:5245 +msgid "Close all open windows" +msgstr "Cerrar todas las ventanas abiertas" + +#: ../midori/midori-browser.c:5247 msgid "_Edit" msgstr "_Editar" -#: ../midori/midori-browser.c:5420 -msgid "_Find…" -msgstr "_Buscar…" +#: ../midori/midori-browser.c:5250 +msgid "Undo the last modification" +msgstr "Deshacer la última modificación" + +#: ../midori/midori-browser.c:5253 +msgid "Redo the last modification" +msgstr "Rehacer la última modificación" + +#: ../midori/midori-browser.c:5256 +msgid "Cut the selected text" +msgstr "Cortar el texto seleccionado" + +#: ../midori/midori-browser.c:5259 +msgid "Copy the selected text" +msgstr "Copiar el texto seleccionado" + +#: ../midori/midori-browser.c:5262 +msgid "Paste text from the clipboard" +msgstr "Pegar texto del portapapeles" + +#: ../midori/midori-browser.c:5265 +msgid "Delete the selected text" +msgstr "Borrar el texto seleccionado" + +#: ../midori/midori-browser.c:5268 +msgid "Select all text" +msgstr "Seleccionar todo el texto" -#: ../midori/midori-browser.c:5421 +#: ../midori/midori-browser.c:5270 +msgid "_Find..." +msgstr "_Buscar..." + +#: ../midori/midori-browser.c:5271 msgid "Find a word or phrase in the page" msgstr "Buscar una palabra o frase en la página" -#: ../midori/midori-browser.c:5423 +#: ../midori/midori-browser.c:5273 msgid "Find _Next" msgstr "Buscar _siguiente" -#: ../midori/midori-browser.c:5426 +#: ../midori/midori-browser.c:5274 +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:5276 msgid "Find _Previous" msgstr "Buscar _anterior" -#: ../midori/midori-browser.c:5430 +#: ../midori/midori-browser.c:5277 +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:5281 msgid "Configure the application preferences" msgstr "Configurar las preferencias de la aplicación" -#: ../midori/midori-browser.c:5432 +#: ../midori/midori-browser.c:5283 msgid "_View" msgstr "_Ver" -#: ../midori/midori-browser.c:5433 +#: ../midori/midori-browser.c:5284 msgid "_Toolbars" msgstr "_Barra de herramientas" -#: ../midori/midori-browser.c:5438 +#: ../midori/midori-browser.c:5289 ../midori/midori-browser.c:5290 msgid "Reload page without caching" msgstr "Recargar página sin caché" -#: ../midori/midori-browser.c:5448 +#: ../midori/midori-browser.c:5299 msgid "Increase the zoom level" msgstr "Aumentar el nivel de zoom" -#: ../midori/midori-browser.c:5451 +#: ../midori/midori-browser.c:5302 msgid "Decrease the zoom level" msgstr "Disminuir el nivel de zoom" -#: ../midori/midori-browser.c:5455 +#: ../midori/midori-browser.c:5305 +msgid "Reset the zoom level" +msgstr "Restablecer el nivel de zoom" + +#: ../midori/midori-browser.c:5306 msgid "_Encoding" msgstr "_Codificación" -#: ../midori/midori-browser.c:5457 +#: ../midori/midori-browser.c:5308 msgid "View So_urce" msgstr "Ver _código fuente" -#: ../midori/midori-browser.c:5460 +#: ../midori/midori-browser.c:5309 +msgid "View the source code of the page" +msgstr "Ver el código fuente de la página" + +#: ../midori/midori-browser.c:5311 msgid "Ca_ret Browsing" msgstr "Navegación inter_calada" -#: ../midori/midori-browser.c:5464 +#: ../midori/midori-browser.c:5312 +msgid "Toggle text cursor navigation" +msgstr "Activar o desactivar la navegación con el cursor del texto" + +#: ../midori/midori-browser.c:5315 msgid "Toggle fullscreen view" msgstr "Activar o desactivar pantalla completa" -#: ../midori/midori-browser.c:5466 +#: ../midori/midori-browser.c:5317 msgid "Scroll _Left" msgstr "Desplazar hacia la _izquierda" -#: ../midori/midori-browser.c:5469 +#: ../midori/midori-browser.c:5318 +msgid "Scroll to the left" +msgstr "Desplazar hacia la izquierda" + +#: ../midori/midori-browser.c:5320 msgid "Scroll _Down" msgstr "Desplazar hacia a_bajo" -#: ../midori/midori-browser.c:5472 +#: ../midori/midori-browser.c:5321 +msgid "Scroll down" +msgstr "Desplazar hacia abajo" + +#: ../midori/midori-browser.c:5323 msgid "Scroll _Up" msgstr "Desplazar hacia a_rriba" -#: ../midori/midori-browser.c:5475 +#: ../midori/midori-browser.c:5324 +msgid "Scroll up" +msgstr "Desplazar hacia arriba" + +#: ../midori/midori-browser.c:5326 msgid "Scroll _Right" msgstr "Desplazar hacia la _derecha" -#: ../midori/midori-browser.c:5478 -msgid "_Readable" -msgstr "_Leible" +#: ../midori/midori-browser.c:5327 +msgid "Scroll to the right" +msgstr "Desplazar hacia la derecha" -#: ../midori/midori-browser.c:5481 +#: ../midori/midori-browser.c:5329 msgid "_Go" msgstr "_Ir" -#: ../midori/midori-browser.c:5484 +#: ../midori/midori-browser.c:5332 msgid "Go back to the previous page" -msgstr "Retrocede una página" +msgstr "Retroceder una página" + +#: ../midori/midori-browser.c:5335 +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:5491 +#: ../midori/midori-browser.c:5339 msgid "Go to the previous sub-page" msgstr "Ir a la subpágina anterior" -#: ../midori/midori-browser.c:5500 -msgid "_Homepage" -msgstr "_Página de inicio" +#. i18n: Visit the following logical page, ie. in a forum or blog +#: ../midori/midori-browser.c:5343 +msgid "Go to the next sub-page" +msgstr "Ir a la subpágina siguiente" -#: ../midori/midori-browser.c:5501 +#: ../midori/midori-browser.c:5346 msgid "Go to your homepage" msgstr "Abrir la página de inicio" -#: ../midori/midori-browser.c:5503 +#: ../midori/midori-browser.c:5348 msgid "Empty Trash" msgstr "Vaciar la papelera" -#: ../midori/midori-browser.c:5506 +#: ../midori/midori-browser.c:5349 +msgid "Delete the contents of the trash" +msgstr "Eliminar el contenido de la papelera" + +#: ../midori/midori-browser.c:5351 msgid "Undo _Close Tab" msgstr "Deshacer el _cierre de pestaña" -#: ../midori/midori-browser.c:5513 +#: ../midori/midori-browser.c:5352 +msgid "Open the last closed tab" +msgstr "Abrir la última pestaña cerrada" + +#: ../midori/midori-browser.c:5358 msgid "Add a new _folder" msgstr "Añadir una _carpeta nueva" -#: ../midori/midori-browser.c:5519 +#: ../midori/midori-browser.c:5359 +msgid "Add a new bookmark folder" +msgstr "Añadir un marcador nuevo" + +#: ../midori/midori-browser.c:5364 msgid "_Export bookmarks" msgstr "_Exportar marcadores" -#: ../midori/midori-browser.c:5522 ../midori/midori-searchaction.c:496 +#: ../midori/midori-browser.c:5367 ../midori/midori-searchaction.c:500 msgid "_Manage Search Engines" msgstr "_Gestionar motores de búsqueda" -#: ../midori/midori-browser.c:5525 +#: ../midori/midori-browser.c:5368 +msgid "Add, edit and remove search engines..." +msgstr "Añadir, editar y quitar motores de búsqueda..." + +#: ../midori/midori-browser.c:5371 msgid "_Clear Private Data" msgstr "_Borrar datos privados" -#: ../midori/midori-browser.c:5528 +#: ../midori/midori-browser.c:5372 +msgid "Clear private data..." +msgstr "Borrar datos privados" + +#: ../midori/midori-browser.c:5375 msgid "_Inspect Page" msgstr "_Inspeccionar página" -#: ../midori/midori-browser.c:5532 +#: ../midori/midori-browser.c:5376 +msgid "Inspect page details and access developer tools..." +msgstr "" +"Inspeccionar detalles de página y acceder a herramientas de desarrollo..." + +#: ../midori/midori-browser.c:5380 msgid "_Previous Tab" msgstr "Pestaña _anterior" -#: ../midori/midori-browser.c:5535 +#: ../midori/midori-browser.c:5381 +msgid "Switch to the previous tab" +msgstr "Cambiar a la pestaña anterior" + +#: ../midori/midori-browser.c:5383 msgid "_Next Tab" msgstr "Pestaña _siguiente" -#: ../midori/midori-browser.c:5537 +#: ../midori/midori-browser.c:5384 +msgid "Switch to the next tab" +msgstr "Cambiar a la pestaña siguiente" + +#: ../midori/midori-browser.c:5385 msgid "Move Tab _Backward" msgstr "Mover pestaña hacia _atrás" -#: ../midori/midori-browser.c:5539 +#: ../midori/midori-browser.c:5386 +msgid "Move tab behind the previous tab" +msgstr "Mover pestaña detrás de la pestaña anterior" + +#: ../midori/midori-browser.c:5387 msgid "_Move Tab Forward" msgstr "_Mover pestaña hacia adelante" -#: ../midori/midori-browser.c:5542 +#: ../midori/midori-browser.c:5388 +msgid "Move tab in front of the next tab" +msgstr "Mover pestaña en frente de la siguiente pestaña" + +#: ../midori/midori-browser.c:5390 msgid "Focus _Current Tab" msgstr "Foco en la pestaña a_ctual" -#: ../midori/midori-browser.c:5545 +#: ../midori/midori-browser.c:5391 +msgid "Focus the current tab" +msgstr "Foco en la pestaña actual" + +#: ../midori/midori-browser.c:5393 msgid "Focus _Next view" msgstr "Enfocar _siguiente vista" -#: ../midori/midori-browser.c:5548 +#: ../midori/midori-browser.c:5394 +msgid "Cycle focus between views" +msgstr "Ciclo de enfoque entre las vistas" + +#: ../midori/midori-browser.c:5396 msgid "Only show the Icon of the _Current Tab" msgstr "Solo mostrar el icono de la pestaña actual" -#: ../midori/midori-browser.c:5551 +#: ../midori/midori-browser.c:5397 +msgid "Only show the icon of the current tab" +msgstr "Solo mostrar el icono de la pestaña actual" + +#: ../midori/midori-browser.c:5399 msgid "_Duplicate Current Tab" msgstr "_Duplicar pestaña actual" -#: ../midori/midori-browser.c:5554 +#: ../midori/midori-browser.c:5400 +msgid "Duplicate the current tab" +msgstr "Duplicar la pestaña actual" + +#: ../midori/midori-browser.c:5402 msgid "Close Ot_her Tabs" msgstr "Cerrar las o_tras pestañas" -#: ../midori/midori-browser.c:5557 +#: ../midori/midori-browser.c:5403 +msgid "Close all tabs except the current tab" +msgstr "Cerrar todas las pestañas excepto la actual" + +#: ../midori/midori-browser.c:5405 msgid "Open last _session" msgstr "Abrir la última _sesión" -#: ../midori/midori-browser.c:5560 +#: ../midori/midori-browser.c:5406 +msgid "Open the tabs saved in the last session" +msgstr "Abrir las pestañas guardadas en la última sesión" + +#: ../midori/midori-browser.c:5408 msgid "_Help" msgstr "Ay_uda" -#: ../midori/midori-browser.c:5562 +#: ../midori/midori-browser.c:5410 msgid "_Frequent Questions" msgstr "_Preguntas frecuentes" -#: ../midori/midori-browser.c:5565 -msgid "_Report a Problem…" -msgstr "_Informar de un problema…" +#: ../midori/midori-browser.c:5411 +msgid "Show the Frequently Asked Questions" +msgstr "Mostrar las preguntas más frecuentes" -#: ../midori/midori-browser.c:5570 ../midori/midori-browser.c:6231 -msgid "_Tools" -msgstr "_Herramientas" +#: ../midori/midori-browser.c:5413 +msgid "_Report a Problem..." +msgstr "_Informar de un problema..." + +#: ../midori/midori-browser.c:5414 +msgid "Open Midori's bug tracker" +msgstr "Abrir el sistema de seguimiento de errores de Midori" -#: ../midori/midori-browser.c:5577 +#: ../midori/midori-browser.c:5417 +msgid "Show information about the program" +msgstr "Mostrar información sobre el programa" + +#: ../midori/midori-browser.c:5425 msgid "_Menubar" msgstr "Barra de _menús" -#: ../midori/midori-browser.c:5581 +#: ../midori/midori-browser.c:5426 +msgid "Show menubar" +msgstr "Mostrar la barra de menús" + +#: ../midori/midori-browser.c:5429 msgid "_Navigationbar" msgstr "Barra de _navegación" -#: ../midori/midori-browser.c:5585 +#: ../midori/midori-browser.c:5430 +msgid "Show navigationbar" +msgstr "Mostrar la barra de navegación" + +#: ../midori/midori-browser.c:5433 msgid "Side_panel" msgstr "_Panel lateral" -#: ../midori/midori-browser.c:5586 -msgid "Sidepanel" -msgstr "Panel Lateral" +#: ../midori/midori-browser.c:5434 +msgid "Show sidepanel" +msgstr "Mostrar el panel lateral" -#: ../midori/midori-browser.c:5589 +#: ../midori/midori-browser.c:5437 msgid "_Bookmarkbar" msgstr "Barra de _marcadores" -#: ../midori/midori-browser.c:5593 +#: ../midori/midori-browser.c:5438 +msgid "Show bookmarkbar" +msgstr "Mostrar la barra de marcadores" + +#: ../midori/midori-browser.c:5441 msgid "_Statusbar" msgstr "_Barra de estado" -#: ../midori/midori-browser.c:5602 ../midori/midori-websettings.c:198 +#: ../midori/midori-browser.c:5442 +msgid "Show statusbar" +msgstr "Mostrar la barra de estado" + +#: ../midori/midori-browser.c:5450 ../midori/midori-websettings.c:300 msgid "_Automatic" msgstr "_Automático" -#: ../midori/midori-browser.c:5605 ../midori/midori-websettings.c:122 -msgid "Chinese Traditional (BIG5)" -msgstr "Chino tradicional (BIG5)" - -#: ../midori/midori-browser.c:5608 ../midori/midori-websettings.c:123 -msgid "Chinese Simplified (GB18030)" -msgstr "Chino simplificado (GB18030)" +#: ../midori/midori-browser.c:5453 ../midori/midori-websettings.c:225 +msgid "Chinese (BIG5)" +msgstr "Chino (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5612 +#: ../midori/midori-browser.c:5457 msgid "Japanese (SHIFT__JIS)" msgstr "Japonés (SHIFT__JIS)" -#: ../midori/midori-browser.c:5615 ../midori/midori-websettings.c:125 +#: ../midori/midori-browser.c:5460 ../midori/midori-websettings.c:227 msgid "Korean (EUC-KR)" msgstr "Koreano (EUC-KR)" -#: ../midori/midori-browser.c:5618 ../midori/midori-websettings.c:126 +#: ../midori/midori-browser.c:5463 ../midori/midori-websettings.c:228 msgid "Russian (KOI8-R)" msgstr "Ruso (KOI8-R)" -#: ../midori/midori-browser.c:5621 ../midori/midori-websettings.c:127 +#: ../midori/midori-browser.c:5466 ../midori/midori-websettings.c:229 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5624 ../midori/midori-websettings.c:128 +#: ../midori/midori-browser.c:5469 ../midori/midori-websettings.c:230 msgid "Western (ISO-8859-1)" msgstr "Occidental (ISO-8859-1)" -#: ../midori/midori-browser.c:5627 -msgid "Custom…" -msgstr "Personalizado…" +#: ../midori/midori-browser.c:5472 ../midori/midori-websettings.c:231 +#: ../midori/midori-websettings.c:306 ../katze/katze-utils.c:635 +msgid "Custom..." +msgstr "Personalizado..." -#: ../midori/midori-browser.c:6137 +#: ../midori/midori-browser.c:6002 msgid "_Separator" msgstr "_Separador" -#: ../midori/midori-browser.c:6144 -msgid "_Location…" -msgstr "_Ubicación…" +#: ../midori/midori-browser.c:6009 +msgid "_Location..." +msgstr "_Ubicación..." -#: ../midori/midori-browser.c:6146 +#: ../midori/midori-browser.c:6011 msgid "Open a particular location" msgstr "Abrir una dirección en particular" -#: ../midori/midori-browser.c:6168 -msgid "_Web Search…" -msgstr "_Buscar en la web…" +#: ../midori/midori-browser.c:6033 +msgid "_Web Search..." +msgstr "_Buscar en la web..." -#: ../midori/midori-browser.c:6170 +#: ../midori/midori-browser.c:6035 msgid "Run a web search" msgstr "Realizar una búsqueda en la web" -#: ../midori/midori-browser.c:6197 +#: ../midori/midori-browser.c:6056 msgid "Reopen a previously closed tab or window" msgstr "Abrir ventanas o pestañas cerradas" -#: ../midori/midori-browser.c:6214 +#: ../midori/midori-browser.c:6071 msgid "Show the saved bookmarks" msgstr "Mostrar los marcadores guardados." -#: ../midori/midori-browser.c:6247 +#: ../midori/midori-browser.c:6085 +msgid "_Tools" +msgstr "_Herramientas" + +#: ../midori/midori-browser.c:6100 msgid "_Window" msgstr "_Ventanas" -#: ../midori/midori-browser.c:6249 +#: ../midori/midori-browser.c:6102 msgid "Show a list of all open tabs" msgstr "Mostrar una lista de todas las pestañas abiertas" -#: ../midori/midori-browser.c:6263 +#: ../midori/midori-browser.c:6116 msgid "_Menu" msgstr "_Menú" -#: ../midori/midori-browser.c:6265 +#: ../midori/midori-browser.c:6118 msgid "Menu" msgstr "Menú" -#: ../midori/midori-browser.c:7090 +#: ../midori/midori-browser.c:6685 #, c-format msgid "Unexpected setting '%s'" msgstr "Configuración no esperada «%s»" -#: ../midori/midori-extension.c:330 +#: ../midori/midori-extension.c:314 #, c-format 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-extension.c:749 ../midori/midori-extension.c:846 -#: ../midori/midori-extension.c:943 ../midori/midori-extension.c:1055 -#: ../extensions/addons.c:1685 +#: ../midori/midori-extension.c:712 ../midori/midori-extension.c:809 +#: ../midori/midori-extension.c:906 ../midori/midori-extension.c:1018 +#: ../extensions/addons.c:1714 #, 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" -#: ../midori/midori-locationaction.c:398 -#, c-format -msgid "Search with %s" -msgstr "Buscar con %s" - -#: ../midori/midori-locationaction.c:418 -msgid "Search with…" -msgstr "Buscar con…" - -#: ../midori/midori-locationaction.c:545 +#: ../midori/midori-locationaction.c:426 #, c-format msgid "Failed to select from history\n" msgstr "No se pudo seleccionar del historial\n" -#: ../midori/midori-locationaction.c:632 +#: ../midori/midori-locationaction.c:510 #, c-format msgid "Search for %s" msgstr "Buscar %s" -#: ../midori/midori-locationaction.c:1227 -msgid "Export certificate" -msgstr "Exportar certificado" - -#: ../midori/midori-locationaction.c:1259 -msgid "The signing certificate authority is not known." -msgstr "El sertificado de autoridad no es conocido" - -#: ../midori/midori-locationaction.c:1261 -msgid "" -"The certificate does not match the expected identity of the site that it was " -"retrieved from." -msgstr "El certificado no calza con la identidad esperada del sitio" - -#: ../midori/midori-locationaction.c:1263 -msgid "The certificate's activation time is still in the future." -msgstr "El tiempo de activación del certificado está en el futuro" - -#: ../midori/midori-locationaction.c:1265 -msgid "The certificate has expired" -msgstr "El certificado expiró" - -#: ../midori/midori-locationaction.c:1267 -msgid "" -"The certificate has been revoked according to the GTlsConnection's " -"certificate revocation list." -msgstr "" -"El certificado ha sido revocade deacuerdo a la lista de revocación de " -"GTlsConnection" - -#: ../midori/midori-locationaction.c:1269 -msgid "The certificate's algorithm is considered insecure." -msgstr "El algoritmo del certificado es conciderado inseguro" - -#: ../midori/midori-locationaction.c:1271 -msgid "Some other error occurred validating the certificate." -msgstr "Ocurrieron errores durante la validación del certificado" - -#: ../midori/midori-locationaction.c:1318 -msgid "_Export certificate" -msgstr "_Exportar certificado" - -#: ../midori/midori-locationaction.c:1333 -msgid "Self-signed" -msgstr "Autofirmado" - -#: ../midori/midori-locationaction.c:1367 -msgid "Security details" -msgstr "Detalles de seguridad" +#: ../midori/midori-locationaction.c:536 +#, c-format +msgid "Search with %s" +msgstr "Buscar con %s" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1650 +#: ../midori/midori-locationaction.c:1286 msgid "Paste and p_roceed" msgstr "Pegar y c_ontinuar" -#: ../midori/midori-locationaction.c:1974 +#: ../midori/midori-locationaction.c:1681 msgid "Not verified" msgstr "No verificada" -#: ../midori/midori-locationaction.c:1982 +#: ../midori/midori-locationaction.c:1696 msgid "Verified and encrypted connection" msgstr "Conexión verificada y cifrada" -#: ../midori/midori-locationaction.c:1989 -msgid "Open, unencrypted connection" -msgstr "Conexión abierta y desencriptada" - -#: ../midori/midori-panel.c:317 ../midori/midori-panel.c:319 -#: ../midori/midori-panel.c:483 ../midori/midori-panel.c:486 +#: ../midori/midori-panel.c:399 ../midori/midori-panel.c:401 +#: ../midori/midori-panel.c:564 ../midori/midori-panel.c:567 msgid "Align sidepanel to the right" msgstr "Alinear el panel a la derecha" -#: ../midori/midori-panel.c:329 ../midori/midori-panel.c:330 +#: ../midori/midori-panel.c:411 ../midori/midori-panel.c:412 msgid "Close panel" msgstr "Cerrar panel" -#: ../midori/midori-panel.c:484 ../midori/midori-panel.c:487 +#: ../midori/midori-panel.c:565 ../midori/midori-panel.c:568 msgid "Align sidepanel to the left" msgstr "Alinear el panel a la izquierda" -#: ../midori/midori-websettings.c:104 +#: ../midori/midori-websettings.c:207 msgid "Show Speed Dial" msgstr "Mostrar marcado rápido" -#: ../midori/midori-websettings.c:105 +#: ../midori/midori-websettings.c:208 msgid "Show Homepage" msgstr "Mostrar página de inicio" -#: ../midori/midori-websettings.c:124 +#: ../midori/midori-websettings.c:226 msgid "Japanese (SHIFT_JIS)" msgstr "Japonés (SHIFT_JIS)" -#: ../midori/midori-websettings.c:129 ../midori/midori-websettings.c:205 -#: ../katze/katze-utils.c:633 -msgid "Custom..." -msgstr "Personalizar…" - -#: ../midori/midori-websettings.c:144 +#: ../midori/midori-websettings.c:246 msgid "New tab" msgstr "Nueva pestaña" -#: ../midori/midori-websettings.c:145 +#: ../midori/midori-websettings.c:247 msgid "New window" msgstr "Nueva ventana" -#: ../midori/midori-websettings.c:146 +#: ../midori/midori-websettings.c:248 msgid "Current tab" msgstr "Pestaña actual" -#: ../midori/midori-websettings.c:161 +#: ../midori/midori-websettings.c:263 msgid "Default" msgstr "Predeterminado" -#: ../midori/midori-websettings.c:162 +#: ../midori/midori-websettings.c:264 msgid "Icons" msgstr "Iconos" -#: ../midori/midori-websettings.c:163 +#: ../midori/midori-websettings.c:265 msgid "Small icons" msgstr "Iconos pequeños" -#: ../midori/midori-websettings.c:164 +#: ../midori/midori-websettings.c:266 msgid "Text" msgstr "Texto" -#: ../midori/midori-websettings.c:165 +#: ../midori/midori-websettings.c:267 msgid "Icons and text" msgstr "Iconos y texto" -#: ../midori/midori-websettings.c:166 +#: ../midori/midori-websettings.c:268 msgid "Text beside icons" msgstr "Texto al lado de los iconos" -#: ../midori/midori-websettings.c:181 +#: ../midori/midori-websettings.c:283 msgid "Automatic (GNOME or environment)" msgstr "Automático (GNOME o entorno)" -#: ../midori/midori-websettings.c:182 +#: ../midori/midori-websettings.c:284 msgid "HTTP proxy server" msgstr "Servidor proxy HTTP" -#: ../midori/midori-websettings.c:183 +#: ../midori/midori-websettings.c:285 msgid "No proxy server" msgstr "Sin servidor proxy" -#: ../midori/midori-websettings.c:200 -msgid "Chrome" -msgstr "Chrome" - -#: ../midori/midori-websettings.c:201 +#: ../midori/midori-websettings.c:302 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:202 +#: ../midori/midori-websettings.c:303 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:203 +#: ../midori/midori-websettings.c:304 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:305 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:277 -msgid "Toolbar Style:" -msgstr "Estilo de la barra de herramientas:" +#: ../midori/midori-websettings.c:358 +msgid "Remember last window size" +msgstr "Recordar el tamaño de la última ventana" -#: ../midori/midori-websettings.c:278 -msgid "The style of the toolbar" -msgstr "El estilo de la barra de herramientas" +#: ../midori/midori-websettings.c:359 +msgid "Whether to save the last window size" +msgstr "Si se desea recordar el tamaño de la última ventana" -#: ../midori/midori-websettings.c:287 -msgid "When Midori starts:" -msgstr "Cuando Midori inicie:" +#: ../midori/midori-websettings.c:367 +msgid "Last window width" +msgstr "Última anchura de la ventana" -#: ../midori/midori-websettings.c:297 -msgid "Preferred Encoding" -msgstr "Codificación preferida" +#: ../midori/midori-websettings.c:368 +msgid "The last saved window width" +msgstr "Última anchura de la ventana guardada" -#: ../midori/midori-websettings.c:324 -msgid "Open new pages in:" -msgstr "Abrir las páginas nuevas en:" +#: ../midori/midori-websettings.c:376 +msgid "Last window height" +msgstr "Última altura de la ventana" -#. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:387 +#: ../midori/midori-websettings.c:377 +msgid "The last saved window height" +msgstr "Última altura guardada de la ventana " + +#: ../midori/midori-websettings.c:402 +msgid "Last panel position" +msgstr "Última posición del panel" + +#: ../midori/midori-websettings.c:403 +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:412 +msgid "Last panel page" +msgstr "Última página del panel" + +#: ../midori/midori-websettings.c:413 +msgid "The last saved panel page" +msgstr "Última página guardada del panel" + +#: ../midori/midori-websettings.c:421 +msgid "Last Web search" +msgstr "Última búsqueda web" + +#: ../midori/midori-websettings.c:422 +msgid "The last saved Web search" +msgstr "Última búsqueda web guardada" + +#: ../midori/midori-websettings.c:431 +msgid "Show Menubar" +msgstr "Mostrar barra de menú" + +#: ../midori/midori-websettings.c:432 +msgid "Whether to show the menubar" +msgstr "Mostrar u ocultar la barra de menú" + +#: ../midori/midori-websettings.c:440 +msgid "Show Navigationbar" +msgstr "Mostrar la barra de navegación" + +#: ../midori/midori-websettings.c:441 +msgid "Whether to show the navigationbar" +msgstr "Mostrar u ocultar la barra de navegación" + +#: ../midori/midori-websettings.c:449 +msgid "Show Bookmarkbar" +msgstr "Mostrar la barra de marcadores" + +#: ../midori/midori-websettings.c:450 +msgid "Whether to show the bookmarkbar" +msgstr "Mostrar u ocultar la barra de marcadores" + +#: ../midori/midori-websettings.c:458 +msgid "Show Panel" +msgstr "Mostrar el panel" + +#: ../midori/midori-websettings.c:459 +msgid "Whether to show the panel" +msgstr "Mostrar u ocultar el panel" + +#: ../midori/midori-websettings.c:467 +msgid "Show Statusbar" +msgstr "Mostrar la barra de estado" + +#: ../midori/midori-websettings.c:468 +msgid "Whether to show the statusbar" +msgstr "Mostrar u ocultar la barra de estado" + +#: ../midori/midori-websettings.c:477 +msgid "Toolbar Style:" +msgstr "Estilo de la barra de herramientas:" + +#: ../midori/midori-websettings.c:478 +msgid "The style of the toolbar" +msgstr "El estilo de la barra de herramientas" + +#: ../midori/midori-websettings.c:487 +msgid "Toolbar Items" +msgstr "Elementos de la barra de herramientas" + +#: ../midori/midori-websettings.c:488 +msgid "The items to show on the toolbar" +msgstr "Los elementos a mostrar en la barra de herramientas" + +#: ../midori/midori-websettings.c:496 +msgid "Compact Sidepanel" +msgstr "Panel lateral compacto" + +#: ../midori/midori-websettings.c:497 +msgid "Whether to make the sidepanel compact" +msgstr "Si se desea hacer compacto el panel lateral" + +#: ../midori/midori-websettings.c:512 +msgid "Align sidepanel on the right" +msgstr "Alinear el panel a la derecha" + +#: ../midori/midori-websettings.c:513 +msgid "Whether to align the sidepanel on the right" +msgstr "Alinear el panel lateral a la derecha" + +#: ../midori/midori-websettings.c:528 +msgid "Open panels in separate windows" +msgstr "Abrir paneles en ventanas separadas" + +#: ../midori/midori-websettings.c:529 +msgid "Whether to always open panels in separate windows" +msgstr "Configura si los paneles se abren en ventanas separadas" + +#: ../midori/midori-websettings.c:538 +msgid "When Midori starts:" +msgstr "Cuando se inicie Midori:" + +#: ../midori/midori-websettings.c:539 +msgid "What to do when Midori starts" +msgstr "Qué hacer al inicio de Midori" + +#: ../midori/midori-websettings.c:548 +msgid "Homepage:" +msgstr "Página de inicio:" + +#: ../midori/midori-websettings.c:549 +msgid "The homepage" +msgstr "La página de inicio" + +#: ../midori/midori-websettings.c:564 +msgid "Show crash dialog" +msgstr "Mostrar diálogo de cuelgue" + +#: ../midori/midori-websettings.c:565 +msgid "Show a dialog after Midori crashed" +msgstr "Mostrar un dialogo después de que Midori se cuelgue" + +#: ../midori/midori-websettings.c:573 +msgid "Save downloaded files to:" +msgstr "Guardar los archivos descargados en:" + +#: ../midori/midori-websettings.c:574 +msgid "The folder downloaded files are saved to" +msgstr "Carpeta donde se guardan los archivos descargados" + +#: ../midori/midori-websettings.c:582 +msgid "Text Editor" +msgstr "Editor de texto" + +#: ../midori/midori-websettings.c:583 +msgid "An external text editor" +msgstr "Editor de textos externo" + +#: ../midori/midori-websettings.c:598 +msgid "News Aggregator" +msgstr "Agregador de noticias" + +#: ../midori/midori-websettings.c:599 +msgid "An external news aggregator" +msgstr "Un agregador de noticias externo" + +#: ../midori/midori-websettings.c:607 +msgid "Location entry Search" +msgstr "Búsqueda en la barra" + +#: ../midori/midori-websettings.c:608 +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:616 +msgid "Preferred Encoding" +msgstr "Codificación preferida" + +#: ../midori/midori-websettings.c:617 +msgid "The preferred character encoding" +msgstr "Codificación de caracteres preferida" + +#: ../midori/midori-websettings.c:627 +msgid "Always Show Tabbar" +msgstr "Siempre mostrar la barra de pestañas" + +#: ../midori/midori-websettings.c:628 +msgid "Always show the tabbar" +msgstr "Siempre mostrar la barra de pestañas" + +#: ../midori/midori-websettings.c:636 +msgid "Close Buttons on Tabs" +msgstr "Botón de cerrar en las pestañas" + +#: ../midori/midori-websettings.c:637 +msgid "Whether tabs have close buttons" +msgstr "Si se desea que las pestañas tengan el botón de cerrar" + +#: ../midori/midori-websettings.c:662 +msgid "Open new pages in:" +msgstr "Abrir las páginas nuevas en:" + +#: ../midori/midori-websettings.c:663 +msgid "Where to open new pages" +msgstr "Dónde abrir las páginas nuevas" + +#: ../midori/midori-websettings.c:672 +msgid "Middle click opens Selection" +msgstr "Abrir la selección con pulsación central" + +#: ../midori/midori-websettings.c:673 +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:681 +msgid "Open tabs in the background" +msgstr "Abrir pestañas en segundo plano" + +#: ../midori/midori-websettings.c:682 +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:690 +msgid "Open Tabs next to Current" +msgstr "Abrir pestañas junto a la actual" + +#: ../midori/midori-websettings.c:691 +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:699 +msgid "Open popups in tabs" +msgstr "Abrir ventanas emergentes en pestañas" + +#: ../midori/midori-websettings.c:700 +msgid "Whether to open popup windows in tabs" +msgstr "Si se desea abrir las ventanas emergentes en pestañas" + +#: ../midori/midori-websettings.c:710 ../extensions/statusbar-features.c:132 +msgid "Load images automatically" +msgstr "Cargar imágenes automáticamente" + +#: ../midori/midori-websettings.c:711 +msgid "Load and display images automatically" +msgstr "Cargar y mostrar imágenes automáticamente" + +#: ../midori/midori-websettings.c:718 ../extensions/statusbar-features.c:141 +msgid "Enable scripts" +msgstr "Activar scripts" + +#: ../midori/midori-websettings.c:719 +msgid "Enable embedded scripting languages" +msgstr "Activar idiomas de escrituras incrustadas" + +#: ../midori/midori-websettings.c:726 ../extensions/statusbar-features.c:150 +msgid "Enable Netscape plugins" +msgstr "Activar complementos de Netscape" + +#: ../midori/midori-websettings.c:727 +msgid "Enable embedded Netscape plugin objects" +msgstr "Activar el complemento de objetos incrustados Netscape" + +#: ../midori/midori-websettings.c:747 +msgid "Enable Spell Checking" +msgstr "Activar corrección ortográfica" + +#: ../midori/midori-websettings.c:748 +msgid "Enable spell checking while typing" +msgstr "Activar corrección ortográfica mientras se escribe" + +#: ../midori/midori-websettings.c:754 +msgid "Enable HTML5 database support" +msgstr "Activar soporte de base de datos HTML5" + +#: ../midori/midori-websettings.c:755 +msgid "Whether to enable HTML5 database support" +msgstr "Configura si se activa el soporte de base de datos de HTML5" + +#: ../midori/midori-websettings.c:761 +msgid "Enable HTML5 local storage support" +msgstr "Activar soporte de almacenamiento local HTML5" + +#: ../midori/midori-websettings.c:762 +msgid "Whether to enable HTML5 local storage support" +msgstr "Configura si se activa el soporte de almacenamiento local de HTML5" + +#: ../midori/midori-websettings.c:768 +msgid "Enable offline web application cache" +msgstr "Activar caché local de aplicación web" + +#: ../midori/midori-websettings.c:769 +msgid "Whether to enable offline web application cache" +msgstr "Configura si se activa el caché local de aplicación web" + +#: ../midori/midori-websettings.c:785 +msgid "Flash window on background tabs" +msgstr "Destellar ventana en pestañas en segundo plano" + +#: ../midori/midori-websettings.c:786 +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:801 +msgid "Zoom Text and Images" +msgstr "Ampliar textos e imágenes" + +#: ../midori/midori-websettings.c:802 +msgid "Whether to zoom text and images" +msgstr "Si se desea ampliar texto e imágenes" + +#: ../midori/midori-websettings.c:817 +msgid "Find inline while typing" +msgstr "Buscar en el texto al escribir" + +#: ../midori/midori-websettings.c:818 +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:833 +msgid "Kinetic scrolling" +msgstr "Desplazamiento dinámico" + +#: ../midori/midori-websettings.c:834 +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:842 +msgid "Delete old Cookies after:" +msgstr "Eliminar cookies antiguas después de:" + +#: ../midori/midori-websettings.c:843 +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:859 +msgid "Only accept Cookies from sites you visit" +msgstr "Solo aceptar cookies de los sitios que visite" + +#: ../midori/midori-websettings.c:860 +msgid "Block cookies sent by third-party websites" +msgstr "Bloquear cookies enviadas por sitios de terceros" + +#: ../midori/midori-websettings.c:874 +msgid "Delete pages from history after:" +msgstr "Eliminar páginas del historial después de:" + +#: ../midori/midori-websettings.c:875 +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:890 +msgid "Proxy server" +msgstr "Servidor proxy" + +#: ../midori/midori-websettings.c:891 +msgid "The type of proxy server to use" +msgstr "El tipo de servidor a usar" + +#: ../midori/midori-websettings.c:900 +msgid "HTTP Proxy Server" +msgstr "Servidor proxy HTTP" + +#: ../midori/midori-websettings.c:901 +msgid "The proxy server used for HTTP connections" +msgstr "Servidor proxy utilizado para conexiones HTTP" + +#: ../midori/midori-websettings.c:916 +msgid "Port" +msgstr "Puerto" + +#: ../midori/midori-websettings.c:917 +msgid "The proxy server port used for HTTP connections" +msgstr "El puerto del servidor proxy usado para conexiones HTTP" + +#: ../midori/midori-websettings.c:935 +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:952 msgid "Identify as" msgstr "Identificar como:" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:953 msgid "What to identify as to web pages" msgstr "Identificar como páginas web" -#: ../midori/midori-websettings.c:421 +#: ../midori/midori-websettings.c:969 +msgid "Identification string" +msgstr "Cadena de identificación" + +#: ../midori/midori-websettings.c:970 +msgid "The application identification string" +msgstr "Aplicación de identificación de cadenas" + +#: ../midori/midori-websettings.c:986 msgid "Preferred languages" msgstr "Idiomas preferidos" -#: ../midori/midori-websettings.c:422 +#: ../midori/midori-websettings.c:987 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\"" @@ -1343,740 +1768,568 @@ msgstr "" "multi-idiomas, como por ejemplo \"de\", \"ru,nl\" o \"en-us;q=1.0, fr-fr;" "q=0.667\"" -#: ../midori/midori-websettings.c:471 +#: ../midori/midori-websettings.c:1002 +msgid "Clear private data" +msgstr "Borrar datos privados" + +#: ../midori/midori-websettings.c:1003 +msgid "The private data selected for deletion" +msgstr "Los datos privados seleccionados para su eliminación" + +#: ../midori/midori-websettings.c:1018 +msgid "Clear data" +msgstr "Borrar datos privados" + +#: ../midori/midori-websettings.c:1019 +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:1052 +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:1054 +msgid "Whether the \"Referer\" header should be shortened to the hostname" +msgstr "Si se debe acortar la cabecera del \\ \"Referer\\ \"" + +#: ../midori/midori-websettings.c:1068 msgid "Always use my font choices" msgstr "Siempre usar las tipografías que elija" -#: ../midori/midori-websettings.c:472 +#: ../midori/midori-websettings.c:1069 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" +msgstr "Usar las tipografías elegidas por el usuario en vez de las elegidas por los sitios web" -#: ../midori/midori-view.c:1012 ../midori/midori-view.c:1151 -msgid "Trust this website" -msgstr "Confiar en el sitio" - -#: ../midori/midori-view.c:1149 -msgid "Security unknown" -msgstr "Seguridad desconocida" - -#: ../midori/midori-view.c:1447 +#: ../midori/midori-view.c:1368 #, c-format msgid "%s wants to save an HTML5 database." msgstr "%s desea grabar una base de datos HTML5" -#: ../midori/midori-view.c:1451 ../midori/midori-view.c:1485 +#: ../midori/midori-view.c:1372 ../midori/midori-view.c:1401 msgid "_Deny" msgstr "_Denegar " -#: ../midori/midori-view.c:1451 ../midori/midori-view.c:1485 +#: ../midori/midori-view.c:1372 ../midori/midori-view.c:1401 msgid "_Allow" msgstr "_Permitir" -#: ../midori/midori-view.c:1480 +#: ../midori/midori-view.c:1397 #, c-format msgid "%s wants to know your location." msgstr "%s desea conocer su ubicación actual." -#: ../midori/midori-view.c:1576 +#: ../midori/midori-view.c:1484 #, c-format msgid "Error - %s" msgstr "Error - %s" -#: ../midori/midori-view.c:1577 +#: ../midori/midori-view.c:1485 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "No se pudo cargar la página '%s'." -#: ../midori/midori-view.c:1579 +#: ../midori/midori-view.c:1487 msgid "Try again" msgstr "Inténtelo de nuevo" -#: ../midori/midori-view.c:1775 ../midori/midori-view.c:2887 +#: ../midori/midori-view.c:1649 ../midori/midori-view.c:2496 #, c-format msgid "Send a message to %s" msgstr "Enviar un mensaje a %s" -#: ../midori/midori-view.c:2673 -msgid "Add _search engine..." -msgstr "Añadir motor de _búsqueda" - -#: ../midori/midori-view.c:2717 ../midori/midori-view.c:3043 +#: ../midori/midori-view.c:2336 ../midori/midori-view.c:2649 msgid "Inspect _Element" msgstr "Inspeccionar _elemento" -#: ../midori/midori-view.c:2769 +#: ../midori/midori-view.c:2386 msgid "Open Link in New _Tab" msgstr "Abrir enlace en nueva _pestaña" -#: ../midori/midori-view.c:2773 +#: ../midori/midori-view.c:2390 msgid "Open Link in _Foreground Tab" msgstr "Abrir enlace en pestaña en _primer plano" -#: ../midori/midori-view.c:2774 +#: ../midori/midori-view.c:2391 msgid "Open Link in _Background Tab" msgstr "Abrir enlace en pestaña en _segundo plano" -#: ../midori/midori-view.c:2777 +#: ../midori/midori-view.c:2394 msgid "Open Link in New _Window" msgstr "Abrir enlace en nueva _ventana" -#: ../midori/midori-view.c:2780 +#: ../midori/midori-view.c:2397 msgid "Open Link as Web A_pplication" msgstr "Abrir enlace como a_plicación web" -#: ../midori/midori-view.c:2785 +#: ../midori/midori-view.c:2400 msgid "Copy Link de_stination" msgstr "Copiar de_stino del enlace" -#: ../midori/midori-view.c:2801 +#: ../midori/midori-view.c:2412 msgid "Open _Image in New Tab" msgstr "Abrir _imagen en nueva pestaña" -#: ../midori/midori-view.c:2804 +#: ../midori/midori-view.c:2415 msgid "Copy Image _Address" msgstr "Copiar _dirección de imagen" -#: ../midori/midori-view.c:2807 +#: ../midori/midori-view.c:2418 msgid "Save I_mage" msgstr "Guardar i_magen" -#: ../midori/midori-view.c:2810 -msgid "Open in Image _Viewer" -msgstr "Abrir en _Visor de Imagenes" - -#: ../midori/midori-view.c:2817 +#: ../midori/midori-view.c:2425 msgid "Copy Video _Address" msgstr "Copiar _dirección de vídeo" -#: ../midori/midori-view.c:2820 +#: ../midori/midori-view.c:2428 msgid "Save _Video" msgstr "Guardar _vídeo" -#: ../midori/midori-view.c:2820 +#: ../midori/midori-view.c:2428 msgid "Download _Video" msgstr "Descargar _vídeo" -#: ../midori/midori-view.c:2846 +#: ../midori/midori-view.c:2454 msgid "Search _with" msgstr "Buscar _con" -#: ../midori/midori-view.c:2878 +#: ../midori/midori-view.c:2488 msgid "_Search the Web" msgstr "_Buscar en la web" -#: ../midori/midori-view.c:2895 +#: ../midori/midori-view.c:2504 msgid "Open Address in New _Tab" msgstr "Abrir dirección en una nueva _pestaña " -#: ../midori/midori-view.c:2948 -msgid "Open _Frame in New Tab" -msgstr "Abrir _marco en nueva pestaña" - -#: ../midori/midori-view.c:3203 -#, c-format -msgid "Open or download file from %s" -msgstr "Abre o descarga el archivo desde %s" - -#: ../midori/midori-view.c:3216 -#, c-format -msgid "File Name: %s" -msgstr "Nombre de archivo: %s" +#: ../midori/midori-view.c:2788 +msgid "Open or download file" +msgstr "Abrir o descargar archivo" -#: ../midori/midori-view.c:3221 +#: ../midori/midori-view.c:2807 #, c-format msgid "File Type: '%s'" msgstr "Tipo de archivo: '%s'" -#: ../midori/midori-view.c:3223 +#: ../midori/midori-view.c:2809 #, c-format msgid "File Type: %s ('%s')" msgstr "Tipo de archivo: %s ('%s')" -#: ../midori/midori-view.c:3260 -#, c-format -msgid "Size: %s" -msgstr "Tamaño: %s" +#: ../midori/midori-view.c:2820 +msgid "MD5-Checksum:" +msgstr "MD5-Checksum:" + +#: ../midori/midori-view.c:2827 +msgid "SHA1-Checksum:" +msgstr "SHA1-Checksum:" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:3271 +#: ../midori/midori-view.c:2837 #, c-format msgid "Open %s" msgstr "Abrir %s" -#: ../midori/midori-view.c:3876 +#: ../midori/midori-view.c:3422 #, c-format msgid "Inspect page - %s" msgstr "Inspeccionar la página - %s" -#: ../midori/midori-view.c:4275 -#, c-format -msgid "No documentation installed" -msgstr "No hay documentación instalada" - -#: ../midori/midori-view.c:4352 -msgid "Midori doesn't store any personal data:" -msgstr "Midori no almacena información personal:" - -#: ../midori/midori-view.c:4353 -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:4354 -msgid "Extensions are disabled." -msgstr "Las extensiones están deshabilitadas." - -#: ../midori/midori-view.c:4355 -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:3709 +msgid "Speed Dial" +msgstr "Marcación rápida" -#: ../midori/midori-view.c:4356 -msgid "Midori prevents websites from tracking the user:" -msgstr "Midori evita que los sitios web rastreen al usuario:" +#: ../midori/midori-view.c:3710 ../midori/midori-view.c:3795 +msgid "Click to add a shortcut" +msgstr "Haga clic aquí para añadir un acceso directo" -#: ../midori/midori-view.c:4357 -msgid "Referrer URLs are stripped down to the hostname." -msgstr "Las URLs de referencia estan reducidas al hostname." +#: ../midori/midori-view.c:3711 +msgid "Enter shortcut address" +msgstr "Introduzca la dirección del acceso directo" -#: ../midori/midori-view.c:4358 -msgid "DNS prefetching is disabled." -msgstr "La prelectura de DNS esta desactivada." +#: ../midori/midori-view.c:3712 +msgid "Enter shortcut title" +msgstr "Introduzca el título del acceso directo" -#: ../midori/midori-view.c:4359 -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:3713 +msgid "Are you sure you want to delete this shortcut?" +msgstr "¿Está seguro que desea eliminar este acceso directo?" -#: ../midori/midori-view.c:4360 -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:3872 +#, c-format +msgid "No documentation installed" +msgstr "No hay documentación instalada" -#: ../midori/midori-view.c:4446 +#: ../midori/midori-view.c:3933 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:4495 +#: ../midori/midori-view.c:3981 msgid "Page loading delayed" msgstr "Carga de página retrasada" -#: ../midori/midori-view.c:4496 +#: ../midori/midori-view.c:3982 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:4497 +#: ../midori/midori-view.c:3983 msgid "Load Page" msgstr "Cargar página" -#: ../midori/midori-view.c:4664 +#: ../midori/midori-view.c:4123 msgid "Blank page" msgstr "Página en blanco" -#: ../midori/midori-view.c:4928 +#: ../midori/midori-view.c:4387 msgid "_Duplicate Tab" msgstr "_Duplicar pestaña" -#: ../midori/midori-view.c:4933 +#: ../midori/midori-view.c:4392 msgid "Show Tab _Label" msgstr "Mostrar título de la pestaña" -#: ../midori/midori-view.c:4933 +#: ../midori/midori-view.c:4392 msgid "Show Tab _Icon Only" msgstr "Mostrar sólo el _icono del panel" -#: ../midori/midori-view.c:4940 -msgid "Close Ot_her Tab" -msgid_plural "Close Ot_her Tabs" -msgstr[0] "Cerrar la o_tra pestaña" -msgstr[1] "Cerrar las o_tras pestañas" +#: ../midori/midori-view.c:4398 +msgid "Close ot_her Tabs" +msgstr "Cerrar las o_tras pestañas" #. i18n: word stem of "previous page" type links, case is not important -#: ../midori/midori-view.c:5697 +#: ../midori/midori-view.c:5015 msgid "previous" msgstr "anterior" #. i18n: word stem of "next page" type links, case is not important -#: ../midori/midori-view.c:5716 +#: ../midori/midori-view.c:5034 msgid "next" msgstr "siguiente" -#: ../midori/midori-view.c:5729 +#: ../midori/midori-view.c:5047 msgid "Print background images" msgstr "Imprimir imágenes de fondo" -#: ../midori/midori-view.c:5730 +#: ../midori/midori-view.c:5048 msgid "Whether background images should be printed" msgstr "Si se deberían imprimir las imágenes de fondo" -#: ../midori/midori-view.c:5762 +#: ../midori/midori-view.c:5080 msgid "Features" msgstr "Características" -#. i18n: Download tooltip (size): 4KB of 43MB -#: ../midori/midori-download.vala:48 -#, c-format -msgid "%s of %s" -msgstr "%s de %s" - -#: ../midori/midori-download.vala:60 -#, c-format -msgid "%d hour" -msgid_plural "%d hours" -msgstr[0] "%d hora" -msgstr[1] "%d horas" - -#: ../midori/midori-download.vala:61 -#, c-format -msgid "%d minute" -msgid_plural "%d minutes" -msgstr[0] "%d minuto" -msgstr[1] "%d minutos" - -#: ../midori/midori-download.vala:62 -#, c-format -msgid "%d second" -msgid_plural "%d seconds" -msgstr[0] "%d segundo" -msgstr[1] "%d segundo" - -#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning -#: ../midori/midori-download.vala:78 -#, c-format -msgid " - %s remaining" -msgstr " - %s restantes" - -#. i18n: Unknown number of bytes, used for transfer rate like ?B/s -#: ../midori/midori-download.vala:86 -msgid "?B" -msgstr "?B" - -#. i18n: Download tooltip (transfer rate): (130KB/s) -#: ../midori/midori-download.vala:88 -#, c-format -msgid " (%s/s)" -msgstr " (%s/s)" - -#: ../midori/midori-download.vala:182 -msgid "The downloaded file is erroneous." -msgstr "El archivo descargado es inválido." - -#: ../midori/midori-download.vala:183 -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." - -#: ../midori/midori-download.vala:292 -#, 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-download.vala:294 -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-download.vala:297 -#, c-format -msgid "There is not enough free space to download \"%s\"." -msgstr "No hay suficiente espacio para descargar «%s»." - -#: ../midori/midori-download.vala:299 -#, c-format -msgid "The file needs %s but only %s are left." -msgstr "El archivo necesita %s pero solo quedan %s libres." - -#: ../midori/midori-speeddial.vala:160 -msgid "Speed Dial" -msgstr "Marcación rápida" - -#: ../midori/midori-speeddial.vala:161 ../midori/midori-speeddial.vala:246 -msgid "Click to add a shortcut" -msgstr "Haga clic aquí para añadir un acceso directo" - -#: ../midori/midori-speeddial.vala:162 -msgid "Enter shortcut address" -msgstr "Introduzca la dirección del acceso directo" - -#: ../midori/midori-speeddial.vala:163 -msgid "Enter shortcut title" -msgstr "Introduzca el título del acceso directo" - -#: ../midori/midori-speeddial.vala:164 -msgid "Are you sure you want to delete this shortcut?" -msgstr "¿Está seguro que desea eliminar este acceso directo?" - -#: ../midori/midori-preferences.c:299 +#: ../midori/midori-preferences.c:301 msgid "Startup" msgstr "Inicio" -#: ../midori/midori-preferences.c:305 -msgid "Homepage:" -msgstr "Página de inicio:" - -#: ../midori/midori-preferences.c:313 +#: ../midori/midori-preferences.c:314 msgid "Use _current page" msgstr "Usar _página actual" -#: ../midori/midori-preferences.c:317 +#: ../midori/midori-preferences.c:318 msgid "Use current page as homepage" msgstr "Usar la página actual como página de inicio" #. Page "Appearance" -#: ../midori/midori-preferences.c:326 +#: ../midori/midori-preferences.c:327 msgid "Fonts" msgstr "Fuentes" -#: ../midori/midori-preferences.c:329 +#: ../midori/midori-preferences.c:330 msgid "Proportional Font Family" msgstr "Familia de Fuente Proporcional" -#: ../midori/midori-preferences.c:333 +#: ../midori/midori-preferences.c:334 msgid "The default font family used to display text" msgstr "Tamaño de letra predeterminado utilizado para mostrar texto" -#: ../midori/midori-preferences.c:336 +#: ../midori/midori-preferences.c:337 msgid "The default font size used to display text" msgstr "Tamaño de letra predeterminado utilizado para mostrar texto" -#: ../midori/midori-preferences.c:338 +#: ../midori/midori-preferences.c:339 msgid "Fixed-width Font Family" msgstr "Tipo de letra de ancho fijo" -#: ../midori/midori-preferences.c:342 +#: ../midori/midori-preferences.c:343 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:345 +#: ../midori/midori-preferences.c:346 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:347 +#: ../midori/midori-preferences.c:348 msgid "Minimum Font Size" msgstr "Tamaño mínimo de fuente" -#: ../midori/midori-preferences.c:351 +#: ../midori/midori-preferences.c:352 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:362 +#: ../midori/midori-preferences.c:363 msgid "Behavior" msgstr "Comportamiento" -#: ../midori/midori-preferences.c:366 ../extensions/statusbar-features.c:155 -msgid "Load images automatically" -msgstr "Cargar imágenes automáticamente" - -#: ../midori/midori-preferences.c:369 -msgid "Enable Spell Checking" -msgstr "Activar corrección ortográfica" - -#: ../midori/midori-preferences.c:383 ../extensions/statusbar-features.c:165 -msgid "Enable scripts" -msgstr "Activar scripts" - -#: ../midori/midori-preferences.c:386 ../extensions/statusbar-features.c:177 -msgid "Enable Netscape plugins" -msgstr "Activar complementos de Netscape" - -#: ../midori/midori-preferences.c:391 -msgid "Zoom Text and Images" -msgstr "Ampliar textos e imágenes" - -#: ../midori/midori-preferences.c:394 +#: ../midori/midori-preferences.c:389 msgid "Allow scripts to open popups" msgstr "Permitir ventanas emergentes de scripts" -#: ../midori/midori-preferences.c:395 +#: ../midori/midori-preferences.c:390 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:401 -msgid "Kinetic scrolling" -msgstr "Desplazamiento dinámico" - -#: ../midori/midori-preferences.c:402 -msgid "Whether scrolling should kinetically move according to speed" -msgstr "" -"Configura si el desplazamiento debe realizarse de forma acorde a la velocidad" - -#: ../midori/midori-preferences.c:407 -msgid "Middle click opens Selection" -msgstr "Abrir la selección con pulsación central" - -#: ../midori/midori-preferences.c:408 -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-preferences.c:414 -msgid "Enable WebGL support" -msgstr "Habilitar soporte WebGL" - -#: ../midori/midori-preferences.c:419 -msgid "Flash window on background tabs" -msgstr "Destellar ventana en pestañas en segundo plano" - -#: ../midori/midori-preferences.c:428 -msgid "Save downloaded files to:" -msgstr "Guardar los archivos descargados en:" - #. Page "Interface" -#: ../midori/midori-preferences.c:435 +#: ../midori/midori-preferences.c:413 msgid "Browsing" msgstr "Navegación" -#: ../midori/midori-preferences.c:451 -msgid "Close Buttons on Tabs" -msgstr "Botón de cerrar en las pestañas" - -#: ../midori/midori-preferences.c:455 -msgid "Always Show Tabbar" -msgstr "Siempre mostrar la barra de pestañas" - -#: ../midori/midori-preferences.c:459 -msgid "Open Tabs next to Current" -msgstr "Abrir pestañas junto a la actual" - -#: ../midori/midori-preferences.c:460 -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-preferences.c:463 -msgid "Open tabs in the background" -msgstr "Abrir pestañas en segundo plano" - -#: ../midori/midori-preferences.c:467 -msgid "Text Editor" -msgstr "Editor de texto" - -#: ../midori/midori-preferences.c:472 -msgid "News Aggregator" -msgstr "Agregador de noticias" - #. Page "Network" -#: ../midori/midori-preferences.c:479 +#: ../midori/midori-preferences.c:451 msgid "Network" msgstr "Red" -#: ../midori/midori-preferences.c:481 -msgid "Proxy server" -msgstr "Servidor proxy" - -#: ../midori/midori-preferences.c:486 +#: ../midori/midori-preferences.c:458 msgid "Hostname" msgstr "Nombre de host" -#: ../midori/midori-preferences.c:494 -msgid "Port" -msgstr "Puerto" - -#: ../midori/midori-preferences.c:506 ../midori/midori-preferences.c:509 -msgid "The maximum size of cached pages on disk" -msgstr "El tamaño máximo de páginas de caché en el disco" - -#: ../midori/midori-preferences.c:511 +#: ../midori/midori-preferences.c:482 msgid "MB" msgstr "MB" -#: ../midori/midori-searchaction.c:957 +#: ../midori/midori-searchaction.c:911 msgid "Add search engine" msgstr "Añadir motor de búsqueda" -#: ../midori/midori-searchaction.c:957 +#: ../midori/midori-searchaction.c:911 msgid "Edit search engine" msgstr "Editar motor de búsqueda" -#: ../midori/midori-searchaction.c:985 +#: ../midori/midori-searchaction.c:940 msgid "_Name:" msgstr "_Nombre:" -#: ../midori/midori-searchaction.c:1000 +#: ../midori/midori-searchaction.c:956 msgid "_Description:" msgstr "_Descripción:" -#: ../midori/midori-searchaction.c:1013 ../extensions/feed-panel/main.c:377 -msgid "_Address:" -msgstr "_Dirección:" +#: ../midori/midori-searchaction.c:989 +msgid "_Icon:" +msgstr "_Icono" -#: ../midori/midori-searchaction.c:1032 +#: ../midori/midori-searchaction.c:1003 msgid "_Token:" msgstr "_Abreviatura:" -#: ../midori/midori-searchaction.c:1330 -msgid "Manage Search Engines" -msgstr "Administrar los motores de búsqueda" +#: ../midori/midori-searchaction.c:1303 +msgid "Manage Search Engines" +msgstr "Administrar los motores de búsqueda" + +#: ../midori/midori-searchaction.c:1403 +msgid "Use as _default" +msgstr "_Predeterminado" + +#: ../midori/sokoke.c:409 +msgid "Open with" +msgstr "Abrir con" + +#: ../midori/sokoke.c:417 +#, c-format +msgid "Choose an application or command to open \"%s\":" +msgstr "Eliga una aplicación o comando para abir \"%s\":" + +#: ../midori/sokoke.c:458 ../midori/sokoke.c:468 ../midori/sokoke.c:496 +#: ../midori/sokoke.c:525 ../midori/sokoke.c:539 +msgid "Could not run external program." +msgstr "No se pudo ejecutar la aplicación externa." + +#: ../midori/sokoke.c:1795 +#, c-format +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "%d hora" +msgstr[1] "%d horas" + +#: ../midori/sokoke.c:1796 +#, c-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "%d minuto" +msgstr[1] "%d minutos" -#: ../midori/midori-searchaction.c:1432 -msgid "Use as _default" -msgstr "_Predeterminado" +#: ../midori/sokoke.c:1797 +#, c-format +msgid "%d second" +msgid_plural "%d seconds" +msgstr[0] "%d segundo" +msgstr[1] "%d segundo" -#: ../midori/sokoke.c:353 -msgid "Open with" -msgstr "Abrir con" +#. i18n: Download tooltip (size): 4KB of 43MB +#: ../midori/sokoke.c:1805 ../panels/midori-transfers.c:268 +#, c-format +msgid "%s of %s" +msgstr "%s de %s" + +#. i18n: Unknown number of bytes, used for transfer rate like ?B/s +#: ../midori/sokoke.c:1814 +msgid "?B" +msgstr "?B" -#: ../midori/sokoke.c:361 +#. i18n: Download tooltip (transfer rate): (130KB/s) +#: ../midori/sokoke.c:1817 #, c-format -msgid "Choose an application or command to open \"%s\":" -msgstr "Eliga una aplicación o comando para abir \"%s\":" +msgid " (%s/s)" +msgstr " (%s/s)" -#: ../midori/sokoke.c:475 ../midori/sokoke.c:489 -msgid "Could not run external program." -msgstr "No se pudo ejecutar la aplicación externa." +#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning +#: ../midori/sokoke.c:1834 +#, c-format +msgid " - %s remaining" +msgstr " - %s restantes" #. i18n: A panel at the bottom, to search text in pages -#: ../toolbars/midori-findbar.c:265 +#: ../toolbars/midori-findbar.c:264 msgid "_Inline Find:" msgstr "_Buscar:" -#: ../toolbars/midori-findbar.c:287 +#: ../toolbars/midori-findbar.c:291 msgid "Previous" msgstr "Anterior" -#: ../toolbars/midori-findbar.c:293 +#: ../toolbars/midori-findbar.c:297 msgid "Next" msgstr "Siguiente" -#: ../toolbars/midori-findbar.c:297 +#: ../toolbars/midori-findbar.c:301 msgid "Match Case" msgstr "Coincidir mayúsculas " -#: ../toolbars/midori-findbar.c:306 +#: ../toolbars/midori-findbar.c:310 msgid "Highlight Matches" msgstr "Destacar coincidencias" -#: ../toolbars/midori-findbar.c:317 +#: ../toolbars/midori-findbar.c:321 msgid "Close Findbar" msgstr "Cerrar la barra de búsqueda" -#: ../toolbars/midori-transferbar.c:109 +#: ../toolbars/midori-transferbar.c:120 #, c-format msgid "The file '%s' has been downloaded." msgstr "El archivo '%s' ha sido descargado." -#: ../toolbars/midori-transferbar.c:114 +#: ../toolbars/midori-transferbar.c:123 msgid "Transfer completed" msgstr "Transferencia completa" -#: ../toolbars/midori-transferbar.c:241 ../panels/midori-transfers.c:139 +#: ../toolbars/midori-transferbar.c:212 +msgid "The downloaded file is erroneous." +msgstr "El archivo descargado es inválido." + +#: ../toolbars/midori-transferbar.c:213 +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:350 ../panels/midori-transfers.c:142 msgid "Clear All" msgstr "Limpiar todo" -#: ../toolbars/midori-transferbar.c:274 ../toolbars/midori-transferbar.c:276 +#: ../toolbars/midori-transferbar.c:387 ../toolbars/midori-transferbar.c:389 msgid "Some files are being downloaded" msgstr "Se está descargando algunos archivos" -#: ../toolbars/midori-transferbar.c:280 +#: ../toolbars/midori-transferbar.c:393 msgid "_Quit Midori" msgstr "_Cerrar Midori" -#: ../toolbars/midori-transferbar.c:282 +#: ../toolbars/midori-transferbar.c:395 msgid "The transfers will be cancelled if Midori quits." msgstr "Se cancelarán las descargas si Midori se cierra." -#: ../panels/midori-bookmarks.c:308 +#: ../panels/midori-bookmarks.c:117 +msgid "Bookmarks" +msgstr "Marcadores" + +#: ../panels/midori-bookmarks.c:295 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "Error al añadir marcador: %s\n" #: ../panels/midori-bookmarks.c:475 -#, c-format -msgid "Failed to update bookmark : %s\n" -msgstr "Error al actualizar marcador: %s\n" - -#: ../panels/midori-bookmarks.c:535 msgid "Edit the selected bookmark" msgstr "Editar el marcador seleccionado" -#: ../panels/midori-bookmarks.c:543 +#: ../panels/midori-bookmarks.c:483 msgid "Delete the selected bookmark" msgstr "Borrar el marcador seleccionado" -#: ../panels/midori-bookmarks.c:558 +#: ../panels/midori-bookmarks.c:498 msgid "Add a new folder" msgstr "Añadir una nueva carpeta" -#: ../panels/midori-bookmarks.c:697 ../panels/midori-history.c:638 +#: ../panels/midori-bookmarks.c:632 ../panels/midori-history.c:584 msgid "Separator" msgstr "Separador" -#. Create the filter entry -#: ../panels/midori-bookmarks.c:1027 -msgid "Search Bookmarks" -msgstr "Buscar marcadores" - -#: ../panels/midori-history.c:111 +#: ../panels/midori-history.c:115 msgid "History" msgstr "Historial" -#: ../panels/midori-history.c:158 ../panels/midori-history.c:189 -msgid "Today" -msgstr "Hoy" - -#: ../panels/midori-history.c:160 ../panels/midori-history.c:191 -msgid "Yesterday" -msgstr "Ayer" +#: ../panels/midori-history.c:147 +msgid "A week ago" +msgstr "Hace una semana" -#: ../panels/midori-history.c:162 ../panels/midori-history.c:186 +#: ../panels/midori-history.c:149 #, 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:165 ../panels/midori-history.c:184 -msgid "A week ago" -msgstr "Hace una semana" +#: ../panels/midori-history.c:152 +msgid "Today" +msgstr "Hoy" -#: ../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:154 +msgid "Yesterday" +msgstr "Ayer" -#: ../panels/midori-history.c:360 +#: ../panels/midori-history.c:322 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:407 +#: ../panels/midori-history.c:368 msgid "Bookmark the selected history item" msgstr "Añadir a marcadores el elemento seleccionado del historial" -#: ../panels/midori-history.c:416 +#: ../panels/midori-history.c:377 msgid "Delete the selected history item" msgstr "Borrar el elemento seleccionado del historial" -#: ../panels/midori-history.c:424 +#: ../panels/midori-history.c:385 msgid "Clear the entire history" msgstr "Vaciar todo el historial" -#. Create the filter entry -#: ../panels/midori-history.c:997 -msgid "Search History" -msgstr "Buscar historial" - #: ../panels/midori-transfers.c:87 msgid "Transfers" msgstr "Transferencias" -#: ../panels/midori-transfers.c:435 +#: ../panels/midori-transfers.c:468 msgid "Open Destination _Folder" msgstr "Abrir la _carpeta de destino" -#: ../panels/midori-transfers.c:438 +#: ../panels/midori-transfers.c:471 msgid "Copy Link Loc_ation" msgstr "Copiar destino del _enlace" @@ -2104,76 +2357,68 @@ msgstr "Contraseña" msgid "_Remember password" msgstr "_Recordar contraseña" -#: ../katze/katze-throbber.c:949 +#: ../katze/katze-throbber.c:942 #, c-format msgid "Named icon '%s' couldn't be loaded" msgstr "No se pudo cargar el ícono llamado «%s»" -#: ../katze/katze-throbber.c:962 +#: ../katze/katze-throbber.c:955 #, c-format msgid "Stock icon '%s' couldn't be loaded" msgstr "No se pudo cargar el ícono stock «%s»" -#: ../katze/katze-throbber.c:1042 +#: ../katze/katze-throbber.c:1035 msgid "Animation frames are broken" msgstr "Los cuadros de animación están rotos" -#: ../katze/katze-utils.c:443 ../katze/katze-utils.c:866 +#: ../katze/katze-utils.c:439 ../katze/katze-utils.c:873 #, c-format msgid "Property '%s' is invalid for %s" msgstr "La propiedad «%s» no es válida para %s" -#: ../katze/katze-utils.c:489 ../katze/katze-utils.c:518 -#: ../extensions/addons.c:309 +#: ../katze/katze-utils.c:485 ../katze/katze-utils.c:514 +#: ../extensions/addons.c:310 msgid "Choose file" msgstr "Elegir archivo" -#: ../katze/katze-utils.c:504 +#: ../katze/katze-utils.c:500 msgid "Choose folder" msgstr "Elegir carpeta" -#: ../katze/katze-utils.c:602 +#: ../katze/katze-utils.c:604 msgid "None" msgstr "Ninguna" -#: ../katze/katze-utils.c:717 +#: ../katze/katze-utils.c:719 msgid "1 hour" msgstr "1 hora" -#: ../katze/katze-utils.c:718 +#: ../katze/katze-utils.c:720 msgid "1 day" msgstr "1 día" -#: ../katze/katze-utils.c:719 +#: ../katze/katze-utils.c:721 msgid "1 week" msgstr "1 semana" -#: ../katze/katze-utils.c:720 +#: ../katze/katze-utils.c:722 msgid "1 month" msgstr "1 mes" -#: ../katze/katze-utils.c:721 +#: ../katze/katze-utils.c:723 msgid "1 year" msgstr "1 año" -#: ../katze/katze-preferences.c:98 ../extensions/history-list.vala:235 +#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235 #, c-format msgid "Preferences for %s" msgstr "Preferencias de %s" -#: ../katze/midori-uri.vala:173 -msgid "MD5-Checksum:" -msgstr "MD5-Checksum:" - -#: ../katze/midori-uri.vala:180 -msgid "SHA1-Checksum:" -msgstr "SHA1-Checksum:" - -#: ../extensions/adblock.c:475 +#: ../extensions/adblock.c:419 msgid "Configure Advertisement filters" msgstr "Configurar los filtros de publicidad" -#: ../extensions/adblock.c:508 +#: ../extensions/adblock.c:450 #, c-format msgid "" "Type the address of a preconfigured filter list in the text entry and click " @@ -2183,132 +2428,132 @@ msgstr "" "texto y haga clic en \"Añadir\" para añadirlo a la lista. Puede encontrar " "más listas en %s." -#: ../extensions/adblock.c:922 +#: ../extensions/adblock.c:814 msgid "Edit rule" msgstr "Editar regla" -#: ../extensions/adblock.c:936 +#: ../extensions/adblock.c:828 msgid "_Rule:" msgstr "_Regla:" -#: ../extensions/adblock.c:990 +#: ../extensions/adblock.c:882 msgid "Bl_ock image" msgstr "Bl_oquear imagen" -#: ../extensions/adblock.c:995 +#: ../extensions/adblock.c:887 msgid "Bl_ock link" msgstr "Bl_oquear enlace" -#: ../extensions/adblock.c:1799 +#: ../extensions/adblock.c:1474 msgid "Advertisement blocker" msgstr "Bloqueador de publicidad" -#: ../extensions/adblock.c:1800 +#: ../extensions/adblock.c:1475 msgid "Block advertisements according to a filter list" msgstr "Bloquear publicidad de acuerdo a una lista de filtros" #. i18n: An infobar shows up when viewing a script on userscripts.org -#: ../extensions/addons.c:222 +#: ../extensions/addons.c:223 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:223 +#: ../extensions/addons.c:224 msgid "_Install user script" msgstr "_Instalar script de usuario" #. i18n: An infobar shows up when viewing a style on userstyles.org -#: ../extensions/addons.c:228 +#: ../extensions/addons.c:229 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:229 +#: ../extensions/addons.c:230 msgid "_Install user style" msgstr "_Instalar estilo de usuario" -#: ../extensions/addons.c:237 +#: ../extensions/addons.c:238 msgid "Don't install" msgstr "No instalar" -#: ../extensions/addons.c:320 ../extensions/addons.c:675 +#: ../extensions/addons.c:321 ../extensions/addons.c:683 msgid "Userscripts" msgstr "Scripts de usuario" -#: ../extensions/addons.c:325 ../extensions/addons.c:677 +#: ../extensions/addons.c:326 ../extensions/addons.c:685 msgid "Userstyles" msgstr "Estilos de usuario" -#: ../extensions/addons.c:371 ../extensions/addons.c:450 +#: ../extensions/addons.c:382 ../extensions/addons.c:461 #: ../extensions/feed-panel/main.c:129 msgid "Error" msgstr "Error" -#: ../extensions/addons.c:412 +#: ../extensions/addons.c:423 #, c-format msgid "Do you want to delete '%s'?" msgstr "¿Está seguro que desea borrar \"%s\"?" -#: ../extensions/addons.c:418 +#: ../extensions/addons.c:429 msgid "Delete user script" msgstr "Eliminar script de usuario" -#: ../extensions/addons.c:419 +#: ../extensions/addons.c:430 msgid "Delete user style" msgstr "Eliminar estilo de usuario" -#: ../extensions/addons.c:422 +#: ../extensions/addons.c:433 #, c-format msgid "The file %s will be permanently deleted." msgstr "El archivo %s será eliminado definitivamente." -#: ../extensions/addons.c:564 ../extensions/addons.c:641 +#: ../extensions/addons.c:572 ../extensions/addons.c:649 msgid "Open in Text Editor" msgstr "Abrir en editor de texto" -#: ../extensions/addons.c:566 ../extensions/addons.c:650 +#: ../extensions/addons.c:574 ../extensions/addons.c:658 msgid "Open Target Folder" msgstr "Abrir carpeta de destino" -#: ../extensions/addons.c:632 +#: ../extensions/addons.c:640 msgid "Add new addon" msgstr "Añadir nuevo complemento" -#: ../extensions/addons.c:658 +#: ../extensions/addons.c:666 msgid "Remove selected addon" msgstr "Eliminar complemento seleccionado" -#: ../extensions/addons.c:1686 ../extensions/addons.c:1904 +#: ../extensions/addons.c:1715 ../extensions/addons.c:1886 msgid "User addons" msgstr "Complementos de usuario" -#: ../extensions/addons.c:1816 +#: ../extensions/addons.c:1839 #, c-format msgid "Can't monitor folder '%s': %s" msgstr "No se puede monitorizar el directorio '%s': %s" -#: ../extensions/addons.c:1905 +#: ../extensions/addons.c:1887 msgid "Support for userscripts and userstyles" msgstr "Soporte para scripts y estilos de usuario" -#: ../extensions/colorful-tabs.c:201 +#: ../extensions/colorful-tabs.c:202 msgid "Colorful Tabs" msgstr "Pestañas de colores" -#: ../extensions/colorful-tabs.c:202 +#: ../extensions/colorful-tabs.c:203 msgid "Tint each tab distinctly" msgstr "Colorear pestañas de distintos colores" -#: ../extensions/cookie-manager/cookie-manager-page.c:73 +#: ../extensions/cookie-manager/cookie-manager-page.c:83 #: ../extensions/cookie-manager/main.c:35 msgid "Cookie Manager" msgstr "Gestor de cookies" -#: ../extensions/cookie-manager/cookie-manager-page.c:103 +#: ../extensions/cookie-manager/cookie-manager-page.c:113 msgid "Delete All" msgstr "Eliminar todo" -#: ../extensions/cookie-manager/cookie-manager-page.c:105 +#: ../extensions/cookie-manager/cookie-manager-page.c:115 msgid "" "Deletes all shown cookies. If a filter is set, only those cookies are " "deleted which match the filter." @@ -2316,31 +2561,31 @@ 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:120 +#: ../extensions/cookie-manager/cookie-manager-page.c:130 msgid "Expand All" msgstr "Expandir todo" -#: ../extensions/cookie-manager/cookie-manager-page.c:127 +#: ../extensions/cookie-manager/cookie-manager-page.c:137 msgid "Collapse All" msgstr "Contraer todo" -#: ../extensions/cookie-manager/cookie-manager-page.c:572 +#: ../extensions/cookie-manager/cookie-manager-page.c:579 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:574 +#: ../extensions/cookie-manager/cookie-manager-page.c:581 msgid "Question" msgstr "Pregunta" -#: ../extensions/cookie-manager/cookie-manager-page.c:583 +#: ../extensions/cookie-manager/cookie-manager-page.c:590 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:671 +#: ../extensions/cookie-manager/cookie-manager-page.c:678 msgid "At the end of the session" msgstr "Al final de la sesión" -#: ../extensions/cookie-manager/cookie-manager-page.c:674 +#: ../extensions/cookie-manager/cookie-manager-page.c:681 #, c-format msgid "" "Host: %s\n" @@ -2357,15 +2602,15 @@ msgstr "" "Seguro: %s\n" "Expira: %s" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:687 msgid "Yes" msgstr "Si" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:687 msgid "No" msgstr "No" -#: ../extensions/cookie-manager/cookie-manager-page.c:694 +#: ../extensions/cookie-manager/cookie-manager-page.c:701 #, c-format msgid "" "Domain: %s\n" @@ -2374,35 +2619,43 @@ msgstr "" "Dominio: %s\n" "Cookies: %d" -#: ../extensions/cookie-manager/cookie-manager-page.c:1017 +#: ../extensions/cookie-manager/cookie-manager-page.c:1031 msgid "Name" msgstr "Nombre" -#: ../extensions/cookie-manager/cookie-manager-page.c:1069 +#: ../extensions/cookie-manager/cookie-manager-page.c:1084 msgid "_Expand All" msgstr "_Expandir todo" -#: ../extensions/cookie-manager/cookie-manager-page.c:1077 +#: ../extensions/cookie-manager/cookie-manager-page.c:1092 msgid "_Collapse All" msgstr "_Contraer todo" -#: ../extensions/cookie-manager/cookie-manager-page.c:1129 -msgid "Search Cookies by Name or Domain" -msgstr "Buscar cookies por nombre de dominio" +#: ../extensions/cookie-manager/cookie-manager-page.c:1145 +msgid "Filter:" +msgstr "Filtro:" + +#: ../extensions/cookie-manager/cookie-manager-page.c:1150 +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:36 msgid "List, view and delete cookies" msgstr "Listar, ver y eliminar cookies" -#: ../extensions/copy-tabs.c:38 +#: ../extensions/copy-tabs.c:39 msgid "Copy Tab _Addresses" msgstr "Copiar _direcciones de las pestañas" -#: ../extensions/copy-tabs.c:95 +#: ../extensions/copy-tabs.c:96 msgid "Copy Addresses of Tabs" msgstr "Copiar direcciones de las pestañas" -#: ../extensions/copy-tabs.c:96 +#: ../extensions/copy-tabs.c:97 msgid "Copy the addresses of all tabs to the clipboard" msgstr "Copiar las direcciones de todas las pestañas al portapapeles" @@ -2419,25 +2672,25 @@ msgstr "" "los datos XML." #. i18n: The local date a feed was last updated -#: ../extensions/feed-panel/feed-panel.c:387 +#: ../extensions/feed-panel/feed-panel.c:392 #, c-format msgctxt "Feed" msgid "Last updated: %s." msgstr "Última actualización: %s." -#: ../extensions/feed-panel/feed-panel.c:653 +#: ../extensions/feed-panel/feed-panel.c:658 msgid "Feeds" msgstr "Canales" -#: ../extensions/feed-panel/feed-panel.c:706 +#: ../extensions/feed-panel/feed-panel.c:711 msgid "Add new feed" msgstr "Añadir nuevo canal" -#: ../extensions/feed-panel/feed-panel.c:713 +#: ../extensions/feed-panel/feed-panel.c:718 msgid "Delete feed" msgstr "Eliminar canal" -#: ../extensions/feed-panel/feed-panel.c:795 +#: ../extensions/feed-panel/feed-panel.c:800 msgid "_Feeds" msgstr "_Canales" @@ -2497,73 +2750,47 @@ msgstr "Panel de canales" msgid "Read Atom/ RSS feeds" msgstr "Lector de canales Atom/RSS" -#: ../extensions/formhistory/formhistory.c:39 +#: ../extensions/formhistory.c:145 #, c-format msgid "Failed to add form value: %s\n" msgstr "Fallo al añadir valor de formulario: %s\n" -#: ../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 +#: ../extensions/formhistory.c:297 msgid "Toggle form history state" msgstr "Alternar estado del formulario de historial" -#: ../extensions/formhistory/formhistory.c:438 +#: ../extensions/formhistory.c:298 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 +#: ../extensions/formhistory.c:432 ../extensions/formhistory.c:436 #, 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/formhistory.c:629 -msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab" +#: ../extensions/formhistory.c:511 +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" +"solo se activan a través de la historia de forma tecla (Ctrl + Shift + F) " +"por la ficha" -#: ../extensions/formhistory/formhistory.c:669 +#: ../extensions/formhistory.c:570 msgid "Stores history of entered form data" msgstr "Almacena el historial de datos introducidos en formularios" -#: ../extensions/formhistory/formhistory-gdom-frontend.c:225 -#: ../extensions/formhistory/formhistory-js-frontend.c:106 +#: ../extensions/formhistory.c:574 #, c-format -msgid "Failed to select suggestions\n" -msgstr "No se pudo seleccionar del historial\n" +msgid "Not available: %s" +msgstr "No disponible: %s" + +#: ../extensions/formhistory.c:575 +msgid "Resource files not installed" +msgstr "Archivos de recursos no instalados" + +#: ../extensions/formhistory.c:581 +msgid "Form history filler" +msgstr "Completador de historial de formularios" #: ../extensions/history-list.vala:197 msgid "There are no unvisited tabs" @@ -2631,23 +2858,23 @@ msgstr "Gestos de ratón" msgid "Control Midori by moving the mouse" msgstr "Controlar Midori moviendo el ratón" -#: ../extensions/shortcuts.c:109 +#: ../extensions/shortcuts.c:110 msgid "Reload page or stop loading" msgstr "Recarga la página o detiene el proceso de carga" -#: ../extensions/shortcuts.c:176 +#: ../extensions/shortcuts.c:177 msgid "Customize Keyboard shortcuts" msgstr "Personalizar los atajos del teclado" -#: ../extensions/shortcuts.c:283 +#: ../extensions/shortcuts.c:286 msgid "Customize Sh_ortcuts..." -msgstr "Personalizar los a_ccesos directos…" +msgstr "Personalizar los ac_cesos directos..." -#: ../extensions/shortcuts.c:320 +#: ../extensions/shortcuts.c:323 msgid "Shortcuts" msgstr "Accesos directos" -#: ../extensions/shortcuts.c:321 +#: ../extensions/shortcuts.c:324 msgid "View and edit keyboard shortcuts" msgstr "Ver y editar los atajos de teclado" @@ -2659,490 +2886,86 @@ msgstr "Reloj de barra de estado" msgid "Display date and time in the statusbar" msgstr "Mostrar fecha y hora en la barra de estado" -#: ../extensions/statusbar-features.c:152 +#: ../extensions/statusbar-features.c:129 msgid "Images" msgstr "Imágenes" -#: ../extensions/statusbar-features.c:162 +#: ../extensions/statusbar-features.c:138 msgid "Scripts" msgstr "Scripts" -#: ../extensions/statusbar-features.c:174 +#: ../extensions/statusbar-features.c:147 msgid "Netscape plugins" msgstr "Complementos de Netscape" -#: ../extensions/statusbar-features.c:259 +#: ../extensions/statusbar-features.c:193 msgid "Statusbar Features" msgstr "Barra de funcionalidades" -#: ../extensions/statusbar-features.c:260 +#: ../extensions/statusbar-features.c:194 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:589 ../extensions/tab-panel.c:676 +#: ../extensions/tab-panel.c:597 ../extensions/tab-panel.c:684 msgid "Tab Panel" msgstr "Panel de pestañas" -#: ../extensions/tab-panel.c:659 +#: ../extensions/tab-panel.c:667 msgid "T_ab Panel" msgstr "Panel de p_estañas" -#: ../extensions/tab-panel.c:677 +#: ../extensions/tab-panel.c:685 msgid "Show tabs in a vertical panel" msgstr "Mostrar las pestañas en un panel vertical" -#: ../extensions/tabs-minimized.c:76 +#: ../extensions/tabs-minimized.c:77 msgid "Only Icons on Tabs by default" msgstr "Sólo iconos en las pestañas por defecto" -#: ../extensions/tabs-minimized.c:77 +#: ../extensions/tabs-minimized.c:78 msgid "New tabs have no label by default" msgstr "Nuevas pestañas sin etiqueta por defecto" -#: ../extensions/toolbar-editor.c:395 +#: ../extensions/toolbar-editor.c:393 msgid "Customize Toolbar" msgstr "Personalizar la barra de tareas" -#: ../extensions/toolbar-editor.c:411 +#: ../extensions/toolbar-editor.c:413 msgid "" -"Select items to be displayed on the toolbar. Items can be reordered by drag " +"Select items to be displayed on the toolbar. Items can be reodered 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:427 +#: ../extensions/toolbar-editor.c:429 msgid "Available Items" msgstr "Elementos disponibles" -#: ../extensions/toolbar-editor.c:448 +#: ../extensions/toolbar-editor.c:450 msgid "Displayed Items" msgstr "Elementos utilizados" -#: ../extensions/toolbar-editor.c:588 -msgid "_Customize Toolbar…" -msgstr "_Personalizar la barra de tareas…" +#: ../extensions/toolbar-editor.c:585 +msgid "Customize _Toolbar..." +msgstr "Personalizar la barra de _tareas..." -#: ../extensions/toolbar-editor.c:617 +#: ../extensions/toolbar-editor.c:601 +msgid "_Customize..." +msgstr "_Personalizar..." + +#: ../extensions/toolbar-editor.c:631 msgid "Toolbar Editor" msgstr "Editor de la barra de herramientas" -#: ../extensions/toolbar-editor.c:618 +#: ../extensions/toolbar-editor.c:632 msgid "Easily edit the toolbar layout" msgstr "Editar fácilmente el diseño de la barra de herramienta" -#: ../extensions/web-cache.c:462 +#: ../extensions/web-cache.c:465 msgid "Cache HTTP communication on disk" msgstr "Cachear tráfico HTTP en disco" -#~ msgid "Remember last window size" -#~ msgstr "Recordar el tamaño de la última ventana" - -#~ msgid "Whether to save the last window size" -#~ msgstr "Si se desea recordar el tamaño de la última ventana" - -#~ msgid "Last window width" -#~ msgstr "Última anchura de la ventana" - -#~ msgid "The last saved window width" -#~ msgstr "Última anchura de la ventana guardada" - -#~ msgid "Last window height" -#~ msgstr "Última altura de la ventana" - -#~ msgid "The last saved window height" -#~ msgstr "Última altura guardada de la ventana " - -#~ msgid "Last panel position" -#~ msgstr "Última posición del panel" - -#~ msgid "The last saved panel position" -#~ msgstr "Ultima posición guardada del panel" - -#~ msgid "Last panel page" -#~ msgstr "Última página del panel" - -#~ msgid "The last saved panel page" -#~ msgstr "Última página guardada del panel" - -#~ msgid "Last Web search" -#~ msgstr "Última búsqueda web" - -#~ msgid "The last saved Web search" -#~ msgstr "Última búsqueda web guardada" - -#~ msgid "Show Menubar" -#~ msgstr "Mostrar barra de menú" - -#~ msgid "Whether to show the menubar" -#~ msgstr "Mostrar u ocultar la barra de menú" - -#~ msgid "Show Navigationbar" -#~ msgstr "Mostrar la barra de navegación" - -#~ msgid "Whether to show the navigationbar" -#~ msgstr "Mostrar u ocultar la barra de navegación" - -#~ msgid "Show Bookmarkbar" -#~ msgstr "Mostrar la barra de marcadores" - -#~ msgid "Whether to show the bookmarkbar" -#~ msgstr "Mostrar u ocultar la barra de marcadores" - -#~ msgid "Show Panel" -#~ msgstr "Mostrar el panel" - -#~ msgid "Whether to show the panel" -#~ msgstr "Mostrar u ocultar el panel" - -#~ msgid "Show Statusbar" -#~ msgstr "Mostrar la barra de estado" - -#~ msgid "Whether to show the statusbar" -#~ msgstr "Mostrar u ocultar la barra de estado" - -#~ msgid "Toolbar Items" -#~ msgstr "Elementos de la barra de herramientas" - -#~ msgid "The items to show on the toolbar" -#~ msgstr "Los elementos a mostrar en la barra de herramientas" - -#~ msgid "Compact Sidepanel" -#~ msgstr "Panel lateral compacto" - -#~ msgid "Whether to make the sidepanel compact" -#~ msgstr "Si se desea hacer compacto el panel lateral" - -#~ msgid "Align sidepanel on the right" -#~ msgstr "Alinear el panel a la derecha" - -#~ msgid "Whether to align the sidepanel on the right" -#~ msgstr "Alinear el panel lateral a la derecha" - -#~ msgid "Open panels in separate windows" -#~ msgstr "Abrir paneles en ventanas separadas" - -#~ msgid "Whether to always open panels in separate windows" -#~ msgstr "Configura si los paneles se abren en ventanas separadas" - -#~ msgid "What to do when Midori starts" -#~ msgstr "Qué hacer al inicio de Midori" - -#~ msgid "The homepage" -#~ msgstr "La página de inicio" - -#~ msgid "Show crash dialog" -#~ msgstr "Mostrar diálogo de cuelgue" - -#~ msgid "The folder downloaded files are saved to" -#~ msgstr "Carpeta donde se guardan los archivos descargados" - -#~ msgid "An external text editor" -#~ msgstr "Editor de textos externo" - -#~ msgid "An external news aggregator" -#~ msgstr "Un agregador de noticias externo" - -#~ msgid "Location entry Search" -#~ msgstr "Búsqueda en la barra" - -#~ msgid "The search to perform inside the location entry" -#~ msgstr "" -#~ "Hacer una búsqueda a partir del contenido de la barra de direcciones" - -#~ msgid "The preferred character encoding" -#~ msgstr "Codificación de caracteres preferida" - -#~ msgid "Always show the tabbar" -#~ msgstr "Siempre mostrar la barra de pestañas" - -#~ msgid "Whether tabs have close buttons" -#~ msgstr "Si se desea que las pestañas tengan el botón de cerrar" - -#~ msgid "Where to open new pages" -#~ msgstr "Dónde abrir las páginas nuevas" - -#~ msgid "Whether to open new tabs in the background" -#~ msgstr "Si se desea que las nuevas pestañas se abran en segundo plano" - -#~ msgid "Open popups in tabs" -#~ msgstr "Abrir ventanas emergentes en pestañas" - -#~ msgid "Whether to open popup windows in tabs" -#~ msgstr "Si se desea abrir las ventanas emergentes en pestañas" - -#~ msgid "Load and display images automatically" -#~ msgstr "Cargar y mostrar imágenes automáticamente" - -#~ msgid "Enable embedded scripting languages" -#~ msgstr "Activar idiomas de escrituras incrustadas" - -#~ msgid "Enable embedded Netscape plugin objects" -#~ msgstr "Activar el complemento de objetos incrustados Netscape" - -#~ msgid "Enable spell checking while typing" -#~ msgstr "Activar corrección ortográfica mientras se escribe" - -#~ msgid "Enable HTML5 database support" -#~ msgstr "Activar soporte de base de datos HTML5" - -#~ msgid "Whether to enable HTML5 database support" -#~ msgstr "Configura si se activa el soporte de base de datos de HTML5" - -#~ msgid "Whether to enable HTML5 local storage support" -#~ msgstr "Configura si se activa el soporte de almacenamiento local de HTML5" - -#~ msgid "Whether to enable offline web application cache" -#~ msgstr "Configura si se activa el caché local de aplicación web" - -#~ 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" - -#~ msgid "Allow websites to use OpenGL rendering" -#~ msgstr "Permitir a los sitios web utilizar renderizado OpenGL" - -#~ msgid "Whether to zoom text and images" -#~ msgstr "Si se desea ampliar texto e imágenes" - -#~ msgid "Find inline while typing" -#~ msgstr "Buscar en el texto al escribir" - -#~ msgid "Whether to automatically find inline while typing" -#~ msgstr "" -#~ "Si se desea buscar automáticamente en el texto al comenzar a escribir" - -#~ msgid "The type of proxy server to use" -#~ msgstr "El tipo de servidor a usar" - -#~ msgid "HTTP Proxy Server" -#~ msgstr "Servidor proxy HTTP" - -#~ msgid "The proxy server used for HTTP connections" -#~ msgstr "Servidor proxy utilizado para conexiones HTTP" - -#~ msgid "The proxy server port used for HTTP connections" -#~ msgstr "El puerto del servidor proxy usado para conexiones HTTP" - -#~ msgid "Identification string" -#~ msgstr "Cadena de identificación" - -#~ msgid "The application identification string" -#~ msgstr "Aplicación de identificación de cadenas" - -#~ msgid "Clear private data" -#~ msgstr "Borrar datos privados" - -#~ msgid "The private data selected for deletion" -#~ msgstr "Los datos privados seleccionados para su eliminación" - -#~ msgid "Clear data" -#~ msgstr "Borrar datos privados" - -#~ msgid "The data selected for deletion" -#~ msgstr "Los datos seleccionados para eliminarse" - -#~ msgid "Filter:" -#~ msgstr "Filtro:" - -#~ 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" - -#~ msgid "Close ot_her Tabs" -#~ msgstr "Cerrar las o_tras pestañas" - -#~ msgid "_Icon:" -#~ msgstr "_Icono" - -#~ msgid "_Bookmark" -#~ msgstr "_Marcador" - -#~ msgid "_Console" -#~ msgstr "_Consola" - -#~ msgid "Toplevel folder" -#~ msgstr "Carpeta de nivel superior" - -#~ msgid "_Title:" -#~ msgstr "_Título:" - -#~ msgid "_Folder:" -#~ msgstr "_Carpeta:" - -#~ msgid "_Customize…" -#~ msgstr "_Personalizar…" - -#~ 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 "No filename specified" #~ msgstr "No se especificó el nombre del archivo" @@ -3170,6 +2993,9 @@ msgstr "Cachear tráfico HTTP en disco" #~ msgid "Reset the last _session" #~ msgstr "Restaurar la última _sesión" +#~ msgid "Midori (Private Browsing)" +#~ msgstr "Midori (Navegación privada)" + #~ msgid "Quit the application" #~ msgstr "Salir de la aplicación" @@ -3297,12 +3123,15 @@ msgstr "Cachear tráfico HTTP en disco" #~ msgid "%s of %s, %s/s" #~ msgstr "%s de %s, a %s/s" -#~ msgid "Configure _Advertisement filters…" -#~ msgstr "Configurar filtros de p_ublicidad…" +#~ 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 "_Form History" +#~ msgstr "_Historial" + #~ msgid "Next Tab (History List)" #~ msgstr "Pestaña siguiente (historial de pestañas)" @@ -3513,6 +3342,9 @@ msgstr "Cachear tráfico HTTP en disco" #~ msgid "Enable special extensions for developers" #~ msgstr "Habilitar extensiones especiales para desarrolladores" +#~ msgid "User_styles" +#~ msgstr "_Estilos de usuario" + #~ msgid "Tint tabs distinctly" #~ msgstr "Pestañas de distintos colores" @@ -3525,7 +3357,7 @@ msgstr "Cachear tráfico HTTP en disco" #~ msgid "Load on Startup" #~ msgstr "Al iniciar Midori cargar:" -#~ msgid "Configure _Toolbar…" +#~ msgid "Configure _Toolbar..." #~ msgstr "Configurar la _Barra de tareas" #~ msgid "_Quick Find" @@ -3540,6 +3372,9 @@ msgstr "Cachear tráfico HTTP en disco" #~ msgid "Warning: You are using a superuser account!" #~ msgstr "Advertencia: Usted está utilizando una cuenta de superusuario!" +#~ msgid "_Enable" +#~ msgstr "_Activar" + #~ msgid "Enable" #~ msgstr "Activar" diff --git a/po/et.po b/po/et.po index acb3da87..577cde2d 100644 --- a/po/et.po +++ b/po/et.po @@ -532,7 +532,7 @@ msgid "_Manage Search Engines" msgstr "_Halda otsingumootoreid" #: ../midori/midori-browser.c:3196 -msgid "Add, edit and remove search engines…" +msgid "Add, edit and remove search engines..." msgstr "Lisa, muuda ja eemalda otsingumootoreid" #: ../midori/midori-browser.c:3200 @@ -642,16 +642,16 @@ msgid "Show statusbar" msgstr "Näita olekuriba" #: ../midori/midori-browser.c:3669 -msgid "_Location…" -msgstr "_Asukoht…" +msgid "_Location..." +msgstr "_Asukoht..." #: ../midori/midori-browser.c:3671 msgid "Open a particular location" msgstr "Ava kindel asukoht" #: ../midori/midori-browser.c:3695 -msgid "_Web Search…" -msgstr "_Veebiotsing…" +msgid "_Web Search..." +msgstr "_Veebiotsing..." #: ../midori/midori-browser.c:3697 msgid "Run a web search" @@ -751,8 +751,8 @@ msgid "Western (ISO-8859-1)" msgstr "Lääne (ISO-8859-1)" #: ../midori/midori-websettings.c:153 -msgid "Custom…" -msgstr "Kohandatud…" +msgid "Custom..." +msgstr "Kohandatud..." #: ../midori/midori-websettings.c:168 msgid "New tab" @@ -1478,8 +1478,8 @@ msgstr "" #~ msgid "Redo the last modification" #~ msgstr "Tee viimane muudatus uuesti" -#~ msgid "Open in Page_holder…" -#~ msgstr "Ava lehe_hoidjas…" +#~ msgid "Open in Page_holder..." +#~ msgstr "Ava lehe_hoidjas..." #~ msgid "Open the current page in the pageholder" #~ msgstr "Ava käesolev lehekülg lehehoidjas" @@ -1487,8 +1487,8 @@ msgstr "" #~ msgid "_Manage Bookmarks" #~ msgstr "_Halda järjehoidjaid" -#~ msgid "Add, edit and remove bookmarks…" -#~ msgstr "Lisa, muuda ja eemalda järjehoidjaid…" +#~ msgid "Add, edit and remove bookmarks..." +#~ msgstr "Lisa, muuda ja eemalda järjehoidjaid..." #~ msgid "Open the selected bookmark in a new tab" #~ msgstr "Ava valitud järjehoidja uuel kaardil" diff --git a/po/eu.po b/po/eu.po deleted file mode 100644 index 98201579..00000000 --- a/po/eu.po +++ /dev/null @@ -1,2958 +0,0 @@ -# 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-08-05 21:45+0000\n" -"PO-Revision-Date: 2012-05-03 13:11+0000\n" -"Last-Translator: Asier Iturralde Sarasola \n" -"Language-Team: Librezale \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: Basque\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:2028 ../midori/main.c:2052 -#: ../midori/main.c:2066 ../midori/midori-websettings.c:315 -msgid "Midori" -msgstr "Midori" - -#: ../data/midori.desktop.in.h:4 -#, fuzzy -msgid "Midori Web Browser" -msgstr "Web-arakatzailea" - -#: ../data/midori.desktop.in.h:5 -#, fuzzy -msgid "New Private Browsing Window" -msgstr "Nabigatze _pribatuko leiho berria" - -#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1434 -msgid "New Tab" -msgstr "Fitxa berria" - -#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1431 -msgid "New Window" -msgstr "Leiho berria" - -#: ../data/midori.desktop.in.h:8 -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:4492 -msgid "Private Browsing" -msgstr "Nabigatze pribatua" - -#: ../midori/main.c:91 ../midori/main.c:97 -#, c-format -msgid "The configuration couldn't be loaded: %s\n" -msgstr "Ezin izan da konfigurazioa kargatu: %s\n" - -#: ../midori/main.c:145 -#, c-format -msgid "Value '%s' is invalid for %s" -msgstr "'%s' balioa baliogabea da %s-(r)entzat" - -#: ../midori/main.c:150 ../midori/main.c:254 -#, c-format -msgid "Invalid configuration value '%s'" -msgstr "Baliogabeko '%s' konfigurazio balioa" - -#: ../midori/main.c:375 -#, c-format -msgid "The search engines couldn't be loaded. %s\n" -msgstr "Ezin izan dira bilaketa-tresnak kargatu. %s\n" - -#: ../midori/main.c:429 -#, c-format -msgid "Failed to clear history: %s\n" -msgstr "Huts egin du historia garbitzean: %s\n" - -#: ../midori/main.c:451 ../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:523 -#, c-format -msgid "Failed to remove old history items: %s\n" -msgstr "Huts egin du historiako elementu zaharrak kentzean: %s\n" - -#: ../midori/main.c:545 -#, c-format -msgid "The configuration couldn't be saved. %s" -msgstr "Ezin izan da konfigurazioa gorde. %s" - -#: ../midori/main.c:571 -#, 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:608 -#, c-format -msgid "The trash couldn't be saved. %s" -msgstr "Ezin izan da zakarrontzia gorde. %s" - -#: ../midori/main.c:681 ../panels/midori-extensions.c:90 -msgid "Extensions" -msgstr "Hedapenak" - -#: ../midori/main.c:695 -msgid "Privacy" -msgstr "Pribatutasuna" - -#: ../midori/main.c:707 -msgid "" -"Cookies store login data, saved games, or user profiles for advertisement " -"purposes." -msgstr "" - -#: ../midori/main.c:763 -#, c-format -msgid "The session couldn't be saved. %s" -msgstr "Ezin izan da saioa gorde. %s" - -#: ../midori/main.c:1001 -msgid "" -"No root certificate file is available. SSL certificates cannot be verified." -msgstr "" -"Ez dago erro ziurtagiri fitxategi eskuragarririk. SSL ziurtagiriak ezin dira " -"egiaztatu." - -#: ../midori/main.c:1093 -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 "" -"Dirudienez Midori kraskatu egin zen ireki zen azkenengo aldian. Behin baino " -"gehiago pasa bada saiatu hauetako irteera bat arazoa konpontzeko." - -#: ../midori/main.c:1112 -msgid "Modify _preferences" -msgstr "Aldatu _hobespenak" - -#: ../midori/main.c:1116 -msgid "Disable all _extensions" -msgstr "Desgaitu _hedapen guztiak" - -#: ../midori/main.c:1129 -msgid "Discard old tabs" -msgstr "Baztertu fitxa zaharrak" - -#: ../midori/main.c:1130 ../midori/midori-websettings.c:223 -msgid "Show last tabs without loading" -msgstr "Erakutsi azken fitxak kargatu gabe" - -#: ../midori/main.c:1131 ../midori/midori-websettings.c:222 -msgid "Show last open tabs" -msgstr "Ikusi azken irekitako fitxak" - -#: ../midori/main.c:1379 ../midori/main.c:2436 -#, c-format -msgid "The session couldn't be loaded: %s\n" -msgstr "Ezin izan da saioa kargatu: %s\n" - -#: ../midori/main.c:1517 -#, c-format -msgid "Snapshot saved to: %s\n" -msgstr "Argazkia hona gorde da: %s\n" - -#: ../midori/main.c:1933 -msgid "Run ADDRESS as a web application" -msgstr "Exekutatu HELBIDEA web aplikazio bezala" - -#: ../midori/main.c:1933 -msgid "ADDRESS" -msgstr "HELBIDEA" - -#: ../midori/main.c:1936 -msgid "Use FOLDER as configuration folder" -msgstr "Erabili KARPETA konfigurazio karpeta bezala" - -#: ../midori/main.c:1936 -msgid "FOLDER" -msgstr "KARPETA" - -#: ../midori/main.c:1939 -msgid "Private browsing, no changes are saved" -msgstr "Nabigatze pribatua, aldaketak ez dira gordeko" - -#: ../midori/main.c:1941 -msgid "Show a diagnostic dialog" -msgstr "Erakutsi diagnostiko elkarrizketa-koadroa" - -#: ../midori/main.c:1943 -msgid "Run the specified filename as javascript" -msgstr "Exekutatu zehazturiko fitxategi-izena javascript bezala" - -#: ../midori/main.c:1945 -msgid "Take a snapshot of the specified URI" -msgstr "Hartu zehazturiko URI-aren argazki bat" - -#: ../midori/main.c:1947 -msgid "Execute the specified command" -msgstr "Exekutatu zehazturiko komandoa" - -#: ../midori/main.c:1949 -msgid "List available commands to execute with -e/ --execute" -msgstr "Zerrendatu exekuta daitezkeen komandoak honela: -e/ --execute" - -#: ../midori/main.c:1951 -msgid "Display program version" -msgstr "Bistaratu programaren bertsioa" - -#: ../midori/main.c:1953 -msgid "Addresses" -msgstr "Helbideak" - -#: ../midori/main.c:1955 -msgid "Block URIs according to regular expression PATTERN" -msgstr "Iragazi URIak espresio erregular PATROIArekin " - -#: ../midori/main.c:1955 -msgid "PATTERN" -msgstr "PATROIA" - -#. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1959 -msgid "Reset Midori after SECONDS seconds of inactivity" -msgstr "" - -#: ../midori/main.c:1959 -msgid "SECONDS" -msgstr "SEGUNDU" - -#: ../midori/main.c:1962 -msgid "Redirects console warnings to the specified FILENAME" -msgstr "" - -#: ../midori/main.c:1962 -msgid "FILENAME" -msgstr "FITXATEGI-IZENA" - -#: ../midori/main.c:2025 -msgid "[Addresses]" -msgstr "[Helbideak]" - -#: ../midori/main.c:2067 -msgid "Please report comments, suggestions and bugs to:" -msgstr "" - -#: ../midori/main.c:2069 -msgid "Check for new versions at:" -msgstr "" - -#. i18n: Logins and passwords in websites and web forms -#: ../midori/main.c:2164 -msgid "Saved logins and _passwords" -msgstr "" - -#: ../midori/main.c:2166 -msgid "Cookies and Website data" -msgstr "Cookie eta Webgune datuak" - -#. TODO: Preserve page icons of search engines and merge privacy items -#: ../midori/main.c:2170 ../midori/midori-websettings.c:1020 -#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471 -msgid "Web Cache" -msgstr "Web cache-a" - -#: ../midori/main.c:2173 -msgid "Website icons" -msgstr "Webguneen ikonoak" - -#: ../midori/main.c:2277 -msgid "An unknown error occured" -msgstr "Errore ezezagun bat gertatu da" - -#: ../midori/main.c:2384 -msgid "An instance of Midori is already running but not responding.\n" -msgstr "" - -#: ../midori/main.c:2418 -#, c-format -msgid "Bookmarks couldn't be loaded: %s\n" -msgstr "Ezin izan dira laster-markak kargatu: %s\n" - -#: ../midori/main.c:2451 -#, c-format -msgid "The trash couldn't be loaded: %s\n" -msgstr "Ezin izan da zakarrontzia kargatu: %s\n" - -#: ../midori/main.c:2464 -#, c-format -msgid "The history couldn't be loaded: %s\n" -msgstr "Ezin izan da historia kargatu: %s\n" - -#: ../midori/main.c:2479 -msgid "The following errors occured:" -msgstr "Ondorengo erroreak gertatu dira:" - -#: ../midori/main.c:2495 -msgid "_Ignore" -msgstr "Ez _ikusia egin" - -#: ../midori/midori-app.c:1155 ../midori/midori-browser.c:499 -#, c-format -msgid "Unexpected action '%s'." -msgstr "Ezusteko ekintza '%s'." - -#: ../midori/midori-app.c:1453 ../midori/midori-browser.c:6380 -msgid "_Bookmarks" -msgstr "_Laster-markak" - -#: ../midori/midori-app.c:1454 -msgid "Add Boo_kmark" -msgstr "Gehitu _laster-marka" - -#: ../midori/midori-app.c:1455 -msgid "_Extensions" -msgstr "_Hedapenak" - -#. i18n: Browsing history, visited web pages, closed tabs -#: ../midori/midori-app.c:1456 ../midori/midori-browser.c:4836 -msgid "_History" -msgstr "_Historia" - -#: ../midori/midori-app.c:1457 -msgid "_Userscripts" -msgstr "_Erabiltzailearen script-ak" - -#: ../midori/midori-app.c:1458 -#, fuzzy -msgid "User_styles" -msgstr "Erabiltzaile-estiloak" - -#: ../midori/midori-app.c:1459 -msgid "New _Tab" -msgstr "_Fitxa berria" - -#: ../midori/midori-app.c:1460 -msgid "_Transfers" -msgstr "_Transferentziak" - -#: ../midori/midori-app.c:1461 -msgid "Netscape p_lugins" -msgstr "Netscape-en pluginak" - -#: ../midori/midori-app.c:1462 -msgid "_Closed Tabs" -msgstr "_Itxitako fitxak" - -#: ../midori/midori-app.c:1463 ../midori/midori-browser.c:5519 -msgid "New _Window" -msgstr "_Leiho berria" - -#: ../midori/midori-app.c:1464 -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:360 ../midori/midori-browser.c:5607 -#: ../midori/midori-browser.c:5616 -msgid "Reload the current page" -msgstr "Birkargatu uneko orria" - -#: ../midori/midori-browser.c:369 ../midori/midori-browser.c:5613 -msgid "Stop loading the current page" -msgstr "Gelditu uneko orrialdea kargatzeaz" - -#: ../midori/midori-browser.c:486 -#, c-format -msgid "Failed to update title: %s\n" -msgstr "Huts egin du izenburua eguneratzean: %s\n" - -#: ../midori/midori-browser.c:579 -#, c-format -msgid "%s (Private Browsing)" -msgstr "%s (Nabigatze pribatua)" - -#: ../midori/midori-browser.c:692 ../midori/midori-browser.c:734 -#: ../panels/midori-bookmarks.c:114 -msgid "Bookmarks" -msgstr "Laster-markak" - -#: ../midori/midori-browser.c:794 -msgid "New folder" -msgstr "Karpeta berria" - -#: ../midori/midori-browser.c:794 -msgid "Edit folder" -msgstr "Editatu karpeta" - -#: ../midori/midori-browser.c:796 -msgid "New bookmark" -msgstr "Laster-marka berria" - -#: ../midori/midori-browser.c:796 -msgid "Edit bookmark" -msgstr "Editatu laster-marka" - -#: ../midori/midori-browser.c:830 -msgid "Type a name for this bookmark and choose where to keep it." -msgstr "Idatzi laster-marka honentzat izen bat eta hautatu non gorde nahi duzun." - -#: ../midori/midori-browser.c:891 -msgid "Add to _Speed Dial" -msgstr "" - -#: ../midori/midori-browser.c:897 -msgid "Show in the tool_bar" -msgstr "Erakutsi _tresna-barran" - -#: ../midori/midori-browser.c:905 -msgid "Run as _web application" -msgstr "Exekutatu _web aplikazio bezala" - -#: ../midori/midori-browser.c:975 -#, 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:977 -#, c-format -msgid "You don't have permission to write in this location." -msgstr "Ez daukazu kokaleku honetan idazteko baimenik." - -#: ../midori/midori-browser.c:984 -#, c-format -msgid "There is not enough free space to download \"%s\"." -msgstr "Ez dago \"%s\" deskargatzeko adina leku libre." - -#: ../midori/midori-browser.c:987 -#, 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:1123 ../midori/midori-browser.c:4640 -msgid "Save file as" -msgstr "Gorde fitxategia honela" - -#: ../midori/midori-browser.c:1129 -msgid "Save associated _resources" -msgstr "" - -#: ../midori/midori-browser.c:1431 -msgid "A new window has been opened" -msgstr "Leiho berri bat ireki da" - -#: ../midori/midori-browser.c:1434 -msgid "A new tab has been opened" -msgstr "Fitxa berri bat ireki da" - -#: ../midori/midori-browser.c:1451 -msgid "Error opening the image!" -msgstr "Errorea irudia irekitzean!" - -#: ../midori/midori-browser.c:1452 -msgid "Can not open selected image in a default viewer." -msgstr "Ezin da hautatutako irudia ireki ikustaile lehenetsian." - -#: ../midori/midori-browser.c:1458 -msgid "Error downloading the image!" -msgstr "Errorea irudia deskargatzean!" - -#: ../midori/midori-browser.c:1459 -msgid "Can not download selected image." -msgstr "Ezin da hautatutako irudia deskargatu." - -#: ../midori/midori-browser.c:1580 -msgid "Save file" -msgstr "Gorde fitxategia" - -#: ../midori/midori-browser.c:2476 -msgid "Open file" -msgstr "Ireki fitxategia" - -#: ../midori/midori-browser.c:2608 -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:2614 ../extensions/feed-panel/main.c:365 -msgid "New feed" -msgstr "Jario berria" - -#: ../midori/midori-browser.c:2657 ../midori/midori-browser.c:5679 -#: ../panels/midori-bookmarks.c:527 -msgid "Add a new bookmark" -msgstr "Gehitu laster-marka berri bat" - -#: ../midori/midori-browser.c:3201 ../midori/midori-searchaction.c:488 -msgid "Empty" -msgstr "Hutsik" - -#: ../midori/midori-browser.c:3644 ../midori/midori-browser.c:3645 -msgid "Toggle text cursor navigation" -msgstr "" - -#: ../midori/midori-browser.c:3647 -msgid "" -"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in " -"all websites." -msgstr "" - -#: ../midori/midori-browser.c:3650 -msgid "_Enable Caret Browsing" -msgstr "" - -#: ../midori/midori-browser.c:4040 ../midori/midori-browser.c:6073 -#, 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:4366 ../panels/midori-bookmarks.c:850 -#: ../panels/midori-history.c:806 -msgid "Open all in _Tabs" -msgstr "Ireki guztia _fitxetan" - -#: ../midori/midori-browser.c:4373 ../panels/midori-bookmarks.c:856 -#: ../panels/midori-history.c:812 ../extensions/feed-panel/feed-panel.c:528 -msgid "Open in New _Tab" -msgstr "Ireki _fitxa berrian" - -#: ../midori/midori-browser.c:4376 ../midori/midori-view.c:2940 -#: ../midori/midori-view.c:5069 ../panels/midori-bookmarks.c:858 -#: ../panels/midori-history.c:814 ../extensions/feed-panel/feed-panel.c:530 -msgid "Open in New _Window" -msgstr "Ireki leiho _berrian" - -#: ../midori/midori-browser.c:4465 -msgid "Arora" -msgstr "Arora" - -#: ../midori/midori-browser.c:4466 -msgid "Kazehakase" -msgstr "Kazehakase" - -#: ../midori/midori-browser.c:4467 -msgid "Opera" -msgstr "Opera" - -#: ../midori/midori-browser.c:4468 -msgid "Konqueror" -msgstr "Konqueror" - -#: ../midori/midori-browser.c:4469 -msgid "Epiphany" -msgstr "Epiphany" - -#: ../midori/midori-browser.c:4470 -#, c-format -msgid "Firefox (%s)" -msgstr "Firefox (%s)" - -#: ../midori/midori-browser.c:4471 -msgid "Midori 0.2.6" -msgstr "Midori 0.2.6" - -#: ../midori/midori-browser.c:4492 -msgid "Import bookmarks…" -msgstr "Inportatu laster-markak…" - -#: ../midori/midori-browser.c:4495 ../midori/midori-browser.c:5684 -msgid "_Import bookmarks" -msgstr "_Inportatu laster-markak" - -#: ../midori/midori-browser.c:4506 -msgid "_Application:" -msgstr "_Aplikazioa:" - -#: ../midori/midori-browser.c:4571 -msgid "Import from XBEL or HTML file" -msgstr "Inportatu XBEL edo HTML fitxategitik" - -#: ../midori/midori-browser.c:4599 -msgid "Import from a file" -msgstr "Inportatu fitxategi batetik" - -#: ../midori/midori-browser.c:4611 -msgid "Failed to import bookmarks" -msgstr "Huts egin du laster-markak inportatzean" - -#: ../midori/midori-browser.c:4645 -msgid "XBEL Bookmarks" -msgstr "XBEL laster-markak" - -#: ../midori/midori-browser.c:4650 -msgid "Netscape Bookmarks" -msgstr "Netscape-ren laster-markak" - -#: ../midori/midori-browser.c:4664 -msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)" -msgstr "" - -#: ../midori/midori-browser.c:4679 -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:4801 -msgid "Clear Private Data" -msgstr "Garbitu datu pribatuak" - -#: ../midori/midori-browser.c:4805 -msgid "_Clear private data" -msgstr "_Garbitu datu pribatuak" - -#: ../midori/midori-browser.c:4820 -msgid "Clear the following data:" -msgstr "Garbitu ondorengo datuak:" - -#: ../midori/midori-browser.c:4830 -msgid "Last open _tabs" -msgstr "" - -#: ../midori/midori-browser.c:4856 -msgid "Clear private data when _quitting Midori" -msgstr "" - -#: ../midori/midori-browser.c:5071 -msgid "A lightweight web browser." -msgstr "Web-arakatzaile arin bat" - -#: ../midori/midori-browser.c:5072 -msgid "See about:version for version info." -msgstr "" - -#: ../midori/midori-browser.c:5074 -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:5104 -msgid "translator-credits" -msgstr "" -"Launchpad Contributions:\n" -" Asier Iturralde Sarasola https://launchpad.net/~asier-iturralde" - -#: ../midori/midori-browser.c:5517 -msgid "_File" -msgstr "_Fitxategia" - -#: ../midori/midori-browser.c:5520 -msgid "Open a new window" -msgstr "Ireki leiho berri bat" - -#: ../midori/midori-browser.c:5523 -msgid "Open a new tab" -msgstr "Ireki fitxa berri bat" - -#: ../midori/midori-browser.c:5525 -msgid "New P_rivate Browsing Window" -msgstr "Nabigatze _pribatuko leiho berria" - -#: ../midori/midori-browser.c:5529 -msgid "Open a file" -msgstr "Ireki fitxategi bat" - -#: ../midori/midori-browser.c:5531 -msgid "_Save Page As…" -msgstr "_Gorde orria honela…" - -#: ../midori/midori-browser.c:5532 -msgid "Save to a file" -msgstr "Gorde fitxategi batera" - -#: ../midori/midori-browser.c:5534 -msgid "Add to Speed _dial" -msgstr "" - -#: ../midori/midori-browser.c:5538 -msgid "Add Shortcut to the _desktop" -msgstr "" - -#: ../midori/midori-browser.c:5540 -msgid "Create _Launcher" -msgstr "Sortu _abiarazlea" - -#: ../midori/midori-browser.c:5544 -msgid "Subscribe to News _feed" -msgstr "Harpidetu berrien _jariora" - -#: ../midori/midori-browser.c:5550 -msgid "_Close Tab" -msgstr "_Itxi fitxa" - -#: ../midori/midori-browser.c:5551 -msgid "Close the current tab" -msgstr "Itxi uneko fitxa" - -#: ../midori/midori-browser.c:5553 -msgid "C_lose Window" -msgstr "Itxi _leihoa" - -#: ../midori/midori-browser.c:5557 -msgid "_Share" -msgstr "" - -#: ../midori/midori-browser.c:5562 -msgid "Print the current page" -msgstr "Inprimatu uneko orria" - -#: ../midori/midori-browser.c:5565 -msgid "Close a_ll Windows" -msgstr "Itxi leiho _guztiak" - -#: ../midori/midori-browser.c:5568 -msgid "_Edit" -msgstr "_Editatu" - -#: ../midori/midori-browser.c:5591 -msgid "_Find…" -msgstr "_Bilatu…" - -#: ../midori/midori-browser.c:5592 -msgid "Find a word or phrase in the page" -msgstr "Bilatu hitz edo esaldi bat orrian" - -#: ../midori/midori-browser.c:5594 -msgid "Find _Next" -msgstr "Bilatu _hurrengoa" - -#: ../midori/midori-browser.c:5597 -msgid "Find _Previous" -msgstr "Bilatu _aurrekoa" - -#: ../midori/midori-browser.c:5601 -msgid "Configure the application preferences" -msgstr "Konfiguratu aplikazioaren hobespenak" - -#: ../midori/midori-browser.c:5603 -msgid "_View" -msgstr "_Ikusi" - -#: ../midori/midori-browser.c:5604 -msgid "_Toolbars" -msgstr "_Tresna-barrak" - -#: ../midori/midori-browser.c:5609 -msgid "Reload page without caching" -msgstr "" - -#: ../midori/midori-browser.c:5619 -msgid "Increase the zoom level" -msgstr "" - -#: ../midori/midori-browser.c:5622 -msgid "Decrease the zoom level" -msgstr "" - -#: ../midori/midori-browser.c:5626 -msgid "_Encoding" -msgstr "_Kodeketa" - -#: ../midori/midori-browser.c:5628 -msgid "View So_urce" -msgstr "Ikusi _iturburua" - -#: ../midori/midori-browser.c:5631 -msgid "Ca_ret Browsing" -msgstr "" - -#: ../midori/midori-browser.c:5635 -msgid "Toggle fullscreen view" -msgstr "Txandakatu pantaila osoko ikuspegia" - -#: ../midori/midori-browser.c:5637 -msgid "Scroll _Left" -msgstr "" - -#: ../midori/midori-browser.c:5640 -msgid "Scroll _Down" -msgstr "" - -#: ../midori/midori-browser.c:5643 -msgid "Scroll _Up" -msgstr "" - -#: ../midori/midori-browser.c:5646 -msgid "Scroll _Right" -msgstr "" - -#: ../midori/midori-browser.c:5649 -msgid "_Readable" -msgstr "" - -#: ../midori/midori-browser.c:5652 -msgid "_Go" -msgstr "_Joan" - -#: ../midori/midori-browser.c:5655 -msgid "Go back to the previous page" -msgstr "Joan aurreko orrira" - -#: ../midori/midori-browser.c:5658 -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:5662 -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:5666 -msgid "Go to the next sub-page" -msgstr "Joan hurrengo azpi-orrira" - -#: ../midori/midori-browser.c:5668 -msgid "_Homepage" -msgstr "_Hasiera-orria" - -#: ../midori/midori-browser.c:5669 -msgid "Go to your homepage" -msgstr "Joan zure hasiera-orrira" - -#: ../midori/midori-browser.c:5671 -msgid "Empty Trash" -msgstr "Hustu zakarrontzia" - -#: ../midori/midori-browser.c:5674 -msgid "Undo _Close Tab" -msgstr "Desegin fitxa _ixtea" - -#: ../midori/midori-browser.c:5681 -msgid "Add a new _folder" -msgstr "Gehitu _karpeta berri bat" - -#: ../midori/midori-browser.c:5687 -msgid "_Export bookmarks" -msgstr "_Esportatu laster-markak" - -#: ../midori/midori-browser.c:5690 ../midori/midori-searchaction.c:497 -msgid "_Manage Search Engines" -msgstr "_Kudeatu bilaketa-tresnak" - -#: ../midori/midori-browser.c:5693 -msgid "_Clear Private Data" -msgstr "_Garbitu datu pribatuak" - -#: ../midori/midori-browser.c:5696 -msgid "_Inspect Page" -msgstr "" - -#: ../midori/midori-browser.c:5700 -msgid "_Previous Tab" -msgstr "_Aurreko fitxa" - -#: ../midori/midori-browser.c:5703 -msgid "_Next Tab" -msgstr "_Hurrengo fitxa" - -#: ../midori/midori-browser.c:5705 -msgid "Move Tab _Backward" -msgstr "Mugitu fitxa _atzera" - -#: ../midori/midori-browser.c:5707 -msgid "_Move Tab Forward" -msgstr "_Mugitu fitxa aurrera" - -#: ../midori/midori-browser.c:5710 -msgid "Focus _Current Tab" -msgstr "" - -#: ../midori/midori-browser.c:5713 -msgid "Focus _Next view" -msgstr "" - -#: ../midori/midori-browser.c:5716 -msgid "Only show the Icon of the _Current Tab" -msgstr "" - -#: ../midori/midori-browser.c:5719 -msgid "_Duplicate Current Tab" -msgstr "_Bikoiztu uneko fitxa" - -#: ../midori/midori-browser.c:5722 -msgid "Close Ot_her Tabs" -msgstr "Itxi _beste fitxak" - -#: ../midori/midori-browser.c:5725 -msgid "Open last _session" -msgstr "Ireki azken _saioa" - -#: ../midori/midori-browser.c:5728 -msgid "_Help" -msgstr "_Laguntza" - -#: ../midori/midori-browser.c:5730 -msgid "_Frequent Questions" -msgstr "_Ohiko galderak" - -#: ../midori/midori-browser.c:5733 -msgid "_Report a Problem…" -msgstr "_Eman arazo baten berri…" - -#: ../midori/midori-browser.c:5738 ../midori/midori-browser.c:6399 -msgid "_Tools" -msgstr "_Tresnak" - -#: ../midori/midori-browser.c:5745 -msgid "_Menubar" -msgstr "_Menu-barra" - -#: ../midori/midori-browser.c:5749 -msgid "_Navigationbar" -msgstr "_Nabigazio-barra" - -#: ../midori/midori-browser.c:5753 -msgid "Side_panel" -msgstr "Alboko _panela" - -#: ../midori/midori-browser.c:5754 -msgid "Sidepanel" -msgstr "Alboko panela" - -#: ../midori/midori-browser.c:5757 -msgid "_Bookmarkbar" -msgstr "_Laster-marka-barra" - -#: ../midori/midori-browser.c:5761 -msgid "_Statusbar" -msgstr "_Egoera-barra" - -#: ../midori/midori-browser.c:5770 ../midori/midori-websettings.c:314 -msgid "_Automatic" -msgstr "_Automatikoa" - -#: ../midori/midori-browser.c:5773 ../midori/midori-websettings.c:238 -#, fuzzy -msgid "Chinese Traditional (BIG5)" -msgstr "Txinera (BIG5)" - -#: ../midori/midori-browser.c:5776 ../midori/midori-websettings.c:239 -msgid "Chinese Simplified (GB18030)" -msgstr "" - -#. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5780 -msgid "Japanese (SHIFT__JIS)" -msgstr "Japoniera (SHIFT__JIS)" - -#: ../midori/midori-browser.c:5783 ../midori/midori-websettings.c:241 -msgid "Korean (EUC-KR)" -msgstr "Koreera (EUC-KR)" - -#: ../midori/midori-browser.c:5786 ../midori/midori-websettings.c:242 -msgid "Russian (KOI8-R)" -msgstr "Errusiera (KOI8-R)" - -#: ../midori/midori-browser.c:5789 ../midori/midori-websettings.c:243 -msgid "Unicode (UTF-8)" -msgstr "Unicode (UTF-8)" - -#: ../midori/midori-browser.c:5792 ../midori/midori-websettings.c:244 -msgid "Western (ISO-8859-1)" -msgstr "Mendebaldekoa (ISO-8859-1)" - -#: ../midori/midori-browser.c:5795 -msgid "Custom…" -msgstr "Pertsonalizatua…" - -#: ../midori/midori-browser.c:6305 -msgid "_Separator" -msgstr "_Banatzailea" - -#: ../midori/midori-browser.c:6312 -msgid "_Location…" -msgstr "_Kokalekua" - -#: ../midori/midori-browser.c:6314 -msgid "Open a particular location" -msgstr "Ireki kokaleku jakin bat" - -#: ../midori/midori-browser.c:6336 -msgid "_Web Search…" -msgstr "_Web bilaketa" - -#: ../midori/midori-browser.c:6338 -msgid "Run a web search" -msgstr "Exekutatu web bilaketa bat" - -#: ../midori/midori-browser.c:6365 -msgid "Reopen a previously closed tab or window" -msgstr "" - -#: ../midori/midori-browser.c:6382 -msgid "Show the saved bookmarks" -msgstr "Erakutsi gordetako laster-markak" - -#: ../midori/midori-browser.c:6415 -msgid "_Window" -msgstr "_Leihoa" - -#: ../midori/midori-browser.c:6417 -msgid "Show a list of all open tabs" -msgstr "Erakutsi irekitako fitxa guztien zerrenda" - -#: ../midori/midori-browser.c:6431 -msgid "_Menu" -msgstr "_Menua" - -#: ../midori/midori-browser.c:6433 -msgid "Menu" -msgstr "Menua" - -#: ../midori/midori-browser.c:7258 -#, c-format -msgid "Unexpected setting '%s'" -msgstr "Ustekabeko ezarpena '%s'" - -#: ../midori/midori-extension.c:329 -#, 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:747 ../midori/midori-extension.c:844 -#: ../midori/midori-extension.c:941 ../midori/midori-extension.c:1053 -#: ../extensions/addons.c:1688 -#, 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:394 -#, c-format -msgid "Search with %s" -msgstr "" - -#: ../midori/midori-locationaction.c:414 -#, fuzzy -msgid "Search with…" -msgstr "Bilatu _honekin" - -#: ../midori/midori-locationaction.c:541 -#, c-format -msgid "Failed to select from history\n" -msgstr "Huts egin du historiatik hautatzean\n" - -#: ../midori/midori-locationaction.c:628 -#, c-format -msgid "Search for %s" -msgstr "" - -#: ../midori/midori-locationaction.c:1195 -msgid "Export certificate" -msgstr "" - -#: ../midori/midori-locationaction.c:1227 -msgid "The signing certificate authority is not known." -msgstr "" - -#: ../midori/midori-locationaction.c:1229 -msgid "" -"The certificate does not match the expected identity of the site that it was " -"retrieved from." -msgstr "" - -#: ../midori/midori-locationaction.c:1231 -msgid "The certificate's activation time is still in the future." -msgstr "" - -#: ../midori/midori-locationaction.c:1233 -msgid "The certificate has expired" -msgstr "" - -#: ../midori/midori-locationaction.c:1235 -msgid "" -"The certificate has been revoked according to the GTlsConnection's " -"certificate revocation list." -msgstr "" - -#: ../midori/midori-locationaction.c:1237 -msgid "The certificate's algorithm is considered insecure." -msgstr "Ziurtagiri algoritmoa ez-ziurtzat ematen da." - -#: ../midori/midori-locationaction.c:1239 -msgid "Some other error occurred validating the certificate." -msgstr "Beste errore bat gertatu da ziurtagiria egiaztatzean." - -#: ../midori/midori-locationaction.c:1286 -msgid "_Export certificate" -msgstr "_Esportatu ziurtagiria" - -#: ../midori/midori-locationaction.c:1301 -msgid "Self-signed" -msgstr "" - -#: ../midori/midori-locationaction.c:1335 -msgid "Security details" -msgstr "Segurtasun xehetasunak" - -#. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1618 -msgid "Paste and p_roceed" -msgstr "Itsatsi eta _jarraitu" - -#: ../midori/midori-locationaction.c:1942 -msgid "Not verified" -msgstr "Egiaztatu gabea" - -#: ../midori/midori-locationaction.c:1950 -msgid "Verified and encrypted connection" -msgstr "Egiaztatu eta zifratutako konexioa" - -#: ../midori/midori-locationaction.c:1957 -msgid "Open, unencrypted connection" -msgstr "Irekia, zifratu gabeko konexioa" - -#: ../midori/midori-panel.c:317 ../midori/midori-panel.c:319 -#: ../midori/midori-panel.c:483 ../midori/midori-panel.c:486 -msgid "Align sidepanel to the right" -msgstr "Lerrokatu alboko panela eskuinean" - -#: ../midori/midori-panel.c:329 ../midori/midori-panel.c:330 -msgid "Close panel" -msgstr "Itxi panela" - -#: ../midori/midori-panel.c:484 ../midori/midori-panel.c:487 -msgid "Align sidepanel to the left" -msgstr "Lerrokatu alboko panela ezkerrean" - -#: ../midori/midori-websettings.c:220 -msgid "Show Speed Dial" -msgstr "" - -#: ../midori/midori-websettings.c:221 -msgid "Show Homepage" -msgstr "Erakutsi hasiera-orria" - -#: ../midori/midori-websettings.c:240 -msgid "Japanese (SHIFT_JIS)" -msgstr "Japoniera (SHIFT_JIS)" - -#: ../midori/midori-websettings.c:245 ../midori/midori-websettings.c:321 -#: ../katze/katze-utils.c:633 -msgid "Custom..." -msgstr "Pertsonalizatua…" - -#: ../midori/midori-websettings.c:260 -msgid "New tab" -msgstr "Fitxa berria" - -#: ../midori/midori-websettings.c:261 -msgid "New window" -msgstr "Leiho berria" - -#: ../midori/midori-websettings.c:262 -msgid "Current tab" -msgstr "Uneko fitxa" - -#: ../midori/midori-websettings.c:277 -msgid "Default" -msgstr "Lehenetsia" - -#: ../midori/midori-websettings.c:278 -msgid "Icons" -msgstr "Ikonoak" - -#: ../midori/midori-websettings.c:279 -msgid "Small icons" -msgstr "Ikono txikiak" - -#: ../midori/midori-websettings.c:280 -msgid "Text" -msgstr "Testua" - -#: ../midori/midori-websettings.c:281 -msgid "Icons and text" -msgstr "Ikonoak eta testua" - -#: ../midori/midori-websettings.c:282 -msgid "Text beside icons" -msgstr "Testua ikonoen ondoan" - -#: ../midori/midori-websettings.c:297 -msgid "Automatic (GNOME or environment)" -msgstr "Automatikoa (GNOME edo ingurunea)" - -#: ../midori/midori-websettings.c:298 -msgid "HTTP proxy server" -msgstr "HTTP proxy zerbitzaria" - -#: ../midori/midori-websettings.c:299 -msgid "No proxy server" -msgstr "Proxy zerbitzaririk ez" - -#: ../midori/midori-websettings.c:316 -msgid "Chrome" -msgstr "" - -#: ../midori/midori-websettings.c:317 -msgid "Safari" -msgstr "Safari" - -#: ../midori/midori-websettings.c:318 -msgid "iPhone" -msgstr "iPhone" - -#: ../midori/midori-websettings.c:319 -msgid "Firefox" -msgstr "Firefox" - -#: ../midori/midori-websettings.c:320 -msgid "Internet Explorer" -msgstr "Internet Explorer" - -#: ../midori/midori-websettings.c:404 -msgid "Remember last window size" -msgstr "Gogoratu azken leiho-tamaina" - -#: ../midori/midori-websettings.c:405 -msgid "Whether to save the last window size" -msgstr "Azken leiho-tamaina gordeko den ala ez" - -#: ../midori/midori-websettings.c:413 -msgid "Last window width" -msgstr "Azken leiho-zabalera" - -#: ../midori/midori-websettings.c:414 -msgid "The last saved window width" -msgstr "Gordetako azken leiho-zabalera" - -#: ../midori/midori-websettings.c:422 -msgid "Last window height" -msgstr "Azken leiho-altuera" - -#: ../midori/midori-websettings.c:423 -msgid "The last saved window height" -msgstr "Gordetako azken leiho-altuera" - -#: ../midori/midori-websettings.c:448 -msgid "Last panel position" -msgstr "Azken panel-posizioa" - -#: ../midori/midori-websettings.c:449 -msgid "The last saved panel position" -msgstr "Gordetako azken panel-posizioa" - -#. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:458 -msgid "Last panel page" -msgstr "Azken panel-orria" - -#: ../midori/midori-websettings.c:459 -msgid "The last saved panel page" -msgstr "Gordetako azken panel-orria" - -#: ../midori/midori-websettings.c:467 -msgid "Last Web search" -msgstr "Azken web bilaketa" - -#: ../midori/midori-websettings.c:468 -msgid "The last saved Web search" -msgstr "Gordetako azken web bilaketa" - -#: ../midori/midori-websettings.c:492 -msgid "Show Menubar" -msgstr "Erakutsi menu-barra" - -#: ../midori/midori-websettings.c:493 -msgid "Whether to show the menubar" -msgstr "Menu-barra erakutsiko den ala ez" - -#: ../midori/midori-websettings.c:501 -msgid "Show Navigationbar" -msgstr "Erakutsi nabigazio-barra" - -#: ../midori/midori-websettings.c:502 -msgid "Whether to show the navigationbar" -msgstr "Nabigazio-barra erakutsiko den ala ez" - -#: ../midori/midori-websettings.c:510 -msgid "Show Bookmarkbar" -msgstr "Erakutsi laster-marka-barra" - -#: ../midori/midori-websettings.c:511 -msgid "Whether to show the bookmarkbar" -msgstr "Laster-marka-barra erakutsiko den ala ez" - -#: ../midori/midori-websettings.c:519 -msgid "Show Panel" -msgstr "Erakutsi panela" - -#: ../midori/midori-websettings.c:520 -msgid "Whether to show the panel" -msgstr "Panela erakutsiko den ala ez" - -#: ../midori/midori-websettings.c:528 -msgid "Show Statusbar" -msgstr "Erakutsi egoera-barra" - -#: ../midori/midori-websettings.c:529 -msgid "Whether to show the statusbar" -msgstr "Egoera-barra erakutsiko den ala ez" - -#: ../midori/midori-websettings.c:538 -msgid "Toolbar Style:" -msgstr "Tresna-barraren estiloa:" - -#: ../midori/midori-websettings.c:539 -msgid "The style of the toolbar" -msgstr "Tresna-barraren estiloa" - -#: ../midori/midori-websettings.c:548 -msgid "Toolbar Items" -msgstr "Tresna-barraren elementuak" - -#: ../midori/midori-websettings.c:549 -msgid "The items to show on the toolbar" -msgstr "Tresna-barran erakutsiko diren elementuak" - -#: ../midori/midori-websettings.c:557 -msgid "Compact Sidepanel" -msgstr "Alboko panel trinkoa" - -#: ../midori/midori-websettings.c:558 -msgid "Whether to make the sidepanel compact" -msgstr "Alboko panela trinkotuko den ala ez" - -#: ../midori/midori-websettings.c:573 -msgid "Align sidepanel on the right" -msgstr "Lerrokatu alboko panela eskuinean" - -#: ../midori/midori-websettings.c:574 -msgid "Whether to align the sidepanel on the right" -msgstr "Alboko panela eskuinean lerrokatuko den ala ez" - -#: ../midori/midori-websettings.c:589 -msgid "Open panels in separate windows" -msgstr "Ireki panela leiho bereizietan" - -#: ../midori/midori-websettings.c:590 -msgid "Whether to always open panels in separate windows" -msgstr "Panelak beti leiho bereizietan irekiko diren ala ez" - -#: ../midori/midori-websettings.c:599 -msgid "When Midori starts:" -msgstr "Midori abiatzean:" - -#: ../midori/midori-websettings.c:600 -msgid "What to do when Midori starts" -msgstr "Zer egin Midori abiatzean" - -#: ../midori/midori-websettings.c:609 -msgid "Homepage:" -msgstr "Hasiera-orria" - -#: ../midori/midori-websettings.c:610 -msgid "The homepage" -msgstr "Hasiera-orria" - -#: ../midori/midori-websettings.c:625 -msgid "Show crash dialog" -msgstr "Erakutsi kraskatze elkarrizketa-koadroa" - -#: ../midori/midori-websettings.c:626 -msgid "Show a dialog after Midori crashed" -msgstr "Erakutsi elkarrizketa-koadro bat Midorik kraskatzean" - -#: ../midori/midori-websettings.c:634 -msgid "Save downloaded files to:" -msgstr "Gorde deskargatutako fitxategiak hona:" - -#: ../midori/midori-websettings.c:635 -msgid "The folder downloaded files are saved to" -msgstr "Deskargatutako fitxategiak gordeko diren karpeta" - -#: ../midori/midori-websettings.c:643 -msgid "Text Editor" -msgstr "Testu-editorea" - -#: ../midori/midori-websettings.c:644 -msgid "An external text editor" -msgstr "Kanpoko testu-editore bat" - -#: ../midori/midori-websettings.c:659 -msgid "News Aggregator" -msgstr "" - -#: ../midori/midori-websettings.c:660 -msgid "An external news aggregator" -msgstr "" - -#: ../midori/midori-websettings.c:668 -msgid "Location entry Search" -msgstr "" - -#: ../midori/midori-websettings.c:669 -msgid "The search to perform inside the location entry" -msgstr "" - -#: ../midori/midori-websettings.c:677 -msgid "Preferred Encoding" -msgstr "Hobetsitako kodeketa" - -#: ../midori/midori-websettings.c:678 -msgid "The preferred character encoding" -msgstr "Hobetsitako karaktere-kodeketa" - -#: ../midori/midori-websettings.c:688 -msgid "Always Show Tabbar" -msgstr "Beti erakutsi fitxa-barra" - -#: ../midori/midori-websettings.c:689 -msgid "Always show the tabbar" -msgstr "Beti erakutsi fitxa-barra" - -#: ../midori/midori-websettings.c:702 -msgid "Close Buttons on Tabs" -msgstr "Ixteko botoiak fitxetan" - -#: ../midori/midori-websettings.c:703 -msgid "Whether tabs have close buttons" -msgstr "Fitxek ixteko botoiak dituzten ala ez" - -#: ../midori/midori-websettings.c:728 -msgid "Open new pages in:" -msgstr "Ireki orri berriak hemen:" - -#: ../midori/midori-websettings.c:729 -msgid "Where to open new pages" -msgstr "Non ireki behar diren orri berriak" - -#: ../midori/midori-websettings.c:738 -msgid "Middle click opens Selection" -msgstr "" - -#: ../midori/midori-websettings.c:739 -msgid "Load an address from the selection via middle click" -msgstr "" - -#: ../midori/midori-websettings.c:747 -msgid "Open tabs in the background" -msgstr "Ireki fitxak atzeko planoan" - -#: ../midori/midori-websettings.c:748 -msgid "Whether to open new tabs in the background" -msgstr "Atzeko planoan fitxak irekiko diren ala ez" - -#: ../midori/midori-websettings.c:756 -msgid "Open Tabs next to Current" -msgstr "Ireki fitxak unekoaren ondoren" - -#: ../midori/midori-websettings.c:757 -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:765 -msgid "Open popups in tabs" -msgstr "" - -#: ../midori/midori-websettings.c:766 -msgid "Whether to open popup windows in tabs" -msgstr "" - -#: ../midori/midori-websettings.c:776 ../extensions/statusbar-features.c:155 -msgid "Load images automatically" -msgstr "Kargatu irudiak automatikoki" - -#: ../midori/midori-websettings.c:777 -msgid "Load and display images automatically" -msgstr "Kargatu eta bistaratu irudiak automatikoki" - -#: ../midori/midori-websettings.c:784 ../extensions/statusbar-features.c:165 -msgid "Enable scripts" -msgstr "Gaitu script-ak" - -#: ../midori/midori-websettings.c:785 -msgid "Enable embedded scripting languages" -msgstr "" - -#: ../midori/midori-websettings.c:792 ../extensions/statusbar-features.c:177 -msgid "Enable Netscape plugins" -msgstr "Gaitu Netscape pluginak" - -#: ../midori/midori-websettings.c:793 -msgid "Enable embedded Netscape plugin objects" -msgstr "" - -#: ../midori/midori-websettings.c:808 -msgid "Enable Spell Checking" -msgstr "Gaitu ortografia egiaztaketa" - -#: ../midori/midori-websettings.c:809 -msgid "Enable spell checking while typing" -msgstr "Gaitu idatzi ahalako ortografia egiaztaketa" - -#: ../midori/midori-websettings.c:815 -msgid "Enable HTML5 database support" -msgstr "Gaitu HTML5 datu-baseen euskarria" - -#: ../midori/midori-websettings.c:816 -msgid "Whether to enable HTML5 database support" -msgstr "HTML5 datu-baseen euskarria gaituko den ala ez" - -#: ../midori/midori-websettings.c:822 -msgid "Enable HTML5 local storage support" -msgstr "Gaitu HTML5 biltegiratze lokalaren euskarria" - -#: ../midori/midori-websettings.c:823 -msgid "Whether to enable HTML5 local storage support" -msgstr "HTML5 biltegiratze lokalaren euskarria gaituko den ala ez" - -#: ../midori/midori-websettings.c:829 -msgid "Enable offline web application cache" -msgstr "Gaitu lineaz kanpoko web aplikazioen cachea" - -#: ../midori/midori-websettings.c:830 -msgid "Whether to enable offline web application cache" -msgstr "Lineaz kanpoko web aplikazioen cachea gaituko den ala ez" - -#: ../midori/midori-websettings.c:851 -msgid "Flash window on background tabs" -msgstr "" - -#: ../midori/midori-websettings.c:852 -msgid "Flash the browser window if a new tab was opened in the background" -msgstr "" - -#: ../midori/midori-websettings.c:860 -msgid "Enable WebGL support" -msgstr "Gaitu WebGL euskarria" - -#: ../midori/midori-websettings.c:861 -msgid "Allow websites to use OpenGL rendering" -msgstr "Baimendu webguneek OpenGL errendatzea erabiltzea" - -#: ../midori/midori-websettings.c:887 -msgid "Zoom Text and Images" -msgstr "" - -#: ../midori/midori-websettings.c:888 -msgid "Whether to zoom text and images" -msgstr "" - -#: ../midori/midori-websettings.c:903 -msgid "Find inline while typing" -msgstr "" - -#: ../midori/midori-websettings.c:904 -msgid "Whether to automatically find inline while typing" -msgstr "" - -#: ../midori/midori-websettings.c:919 -msgid "Kinetic scrolling" -msgstr "" - -#: ../midori/midori-websettings.c:920 -msgid "Whether scrolling should kinetically move according to speed" -msgstr "" - -#: ../midori/midori-websettings.c:928 -msgid "Delete old Cookies after:" -msgstr "" - -#: ../midori/midori-websettings.c:929 -msgid "The maximum number of days to save cookies for" -msgstr "" - -#: ../midori/midori-websettings.c:945 -msgid "Only accept Cookies from sites you visit" -msgstr "Bisitatutako guneetako cookie-ak soilik onartu" - -#: ../midori/midori-websettings.c:946 -msgid "Block cookies sent by third-party websites" -msgstr "Blokeatu hirugarrengo webguneek bidalitako cookie-ak" - -#: ../midori/midori-websettings.c:960 -msgid "Delete pages from history after:" -msgstr "" - -#: ../midori/midori-websettings.c:961 -msgid "The maximum number of days to save the history for" -msgstr "" - -#: ../midori/midori-websettings.c:976 -msgid "Proxy server" -msgstr "Proxy zerbitzaria" - -#: ../midori/midori-websettings.c:977 -msgid "The type of proxy server to use" -msgstr "Erabiliko den proxy zerbitzari mota" - -#: ../midori/midori-websettings.c:986 -msgid "HTTP Proxy Server" -msgstr "HTTP proxy zerbitzaria" - -#: ../midori/midori-websettings.c:987 -msgid "The proxy server used for HTTP connections" -msgstr "HTTP konexioetarako erabilitako proxy zerbitzaria" - -#: ../midori/midori-websettings.c:1002 -msgid "Port" -msgstr "Ataka" - -#: ../midori/midori-websettings.c:1003 -msgid "The proxy server port used for HTTP connections" -msgstr "HTTP konexioetarako erabilitako proxy zerbitzariaren ataka" - -#: ../midori/midori-websettings.c:1021 -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 -msgid "Identify as" -msgstr "" - -#: ../midori/midori-websettings.c:1039 -msgid "What to identify as to web pages" -msgstr "" - -#: ../midori/midori-websettings.c:1055 -msgid "Identification string" -msgstr "" - -#: ../midori/midori-websettings.c:1056 -msgid "The application identification string" -msgstr "" - -#: ../midori/midori-websettings.c:1072 -msgid "Preferred languages" -msgstr "Hobetsitako hizkuntzak" - -#: ../midori/midori-websettings.c:1073 -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:1088 -msgid "Clear private data" -msgstr "Garbitu datu pribatuak" - -#: ../midori/midori-websettings.c:1089 -msgid "The private data selected for deletion" -msgstr "Ezabatzeko hautatutako datu pribatuak" - -#: ../midori/midori-websettings.c:1104 -msgid "Clear data" -msgstr "Garbitu datuak" - -#: ../midori/midori-websettings.c:1105 -msgid "The data selected for deletion" -msgstr "Ezabatzeko hautatutako datuak" - -#. i18n: Reworded: Shorten details propagated when going to another page -#: ../midori/midori-websettings.c:1154 -msgid "Strip referrer details sent to websites" -msgstr "" - -#. i18n: Referer here is not a typo but a technical term -#: ../midori/midori-websettings.c:1156 -msgid "Whether the \"Referer\" header should be shortened to the hostname" -msgstr "" - -#: ../midori/midori-websettings.c:1170 -msgid "Always use my font choices" -msgstr "Beti erabili nire letra-tipo aukerak" - -#: ../midori/midori-websettings.c:1171 -msgid "Override fonts picked by websites with user preferences" -msgstr "" - -#: ../midori/midori-view.c:1002 ../midori/midori-view.c:1140 -msgid "Trust this website" -msgstr "" - -#: ../midori/midori-view.c:1138 -msgid "Security unknown" -msgstr "" - -#: ../midori/midori-view.c:1436 -#, 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:1440 ../midori/midori-view.c:1474 -msgid "_Deny" -msgstr "_Ukatu" - -#: ../midori/midori-view.c:1440 ../midori/midori-view.c:1474 -msgid "_Allow" -msgstr "_Baimendu" - -#: ../midori/midori-view.c:1469 -#, c-format -msgid "%s wants to know your location." -msgstr "%s-(e)k zure kokapena ezagutu nahi du." - -#: ../midori/midori-view.c:1565 -#, c-format -msgid "Error - %s" -msgstr "Errorea - %s" - -#: ../midori/midori-view.c:1566 -#, c-format -msgid "The page '%s' couldn't be loaded." -msgstr "Ezin izan da '%s' orria kargatu." - -#: ../midori/midori-view.c:1568 -msgid "Try again" -msgstr "Saiatu berriro" - -#: ../midori/midori-view.c:1766 ../midori/midori-view.c:2875 -#, c-format -msgid "Send a message to %s" -msgstr "Mezu bat bidali %s-(r)i" - -#: ../midori/midori-view.c:2661 -#, fuzzy -msgid "Add _search engine..." -msgstr "Gehitu bilaketa-tresna" - -#: ../midori/midori-view.c:2705 ../midori/midori-view.c:3031 -msgid "Inspect _Element" -msgstr "" - -#: ../midori/midori-view.c:2757 -msgid "Open Link in New _Tab" -msgstr "Ireki esteka _fitxa berrian" - -#: ../midori/midori-view.c:2761 -msgid "Open Link in _Foreground Tab" -msgstr "Ireki esteka _aurreko planoko fitxan" - -#: ../midori/midori-view.c:2762 -msgid "Open Link in _Background Tab" -msgstr "Ireki esteka a_tzeko planoko fitxan" - -#: ../midori/midori-view.c:2765 -msgid "Open Link in New _Window" -msgstr "Ireki esteka _leiho berrian" - -#: ../midori/midori-view.c:2768 -msgid "Open Link as Web A_pplication" -msgstr "Ireki esteka web _aplikazio bezala" - -#: ../midori/midori-view.c:2773 -msgid "Copy Link de_stination" -msgstr "Kopiatu estekaren helburua" - -#: ../midori/midori-view.c:2789 -msgid "Open _Image in New Tab" -msgstr "Ireki _irudia fitxa berrian" - -#: ../midori/midori-view.c:2792 -msgid "Copy Image _Address" -msgstr "Kopiatu irudiaren _helbidea" - -#: ../midori/midori-view.c:2795 -msgid "Save I_mage" -msgstr "Gorde i_rudia" - -#: ../midori/midori-view.c:2798 -msgid "Open in Image _Viewer" -msgstr "Ireki irudi-i_kustailean" - -#: ../midori/midori-view.c:2805 -msgid "Copy Video _Address" -msgstr "Kopiatu bideoaren _helbidea" - -#: ../midori/midori-view.c:2808 -msgid "Save _Video" -msgstr "Gorde _bideoa" - -#: ../midori/midori-view.c:2808 -msgid "Download _Video" -msgstr "Deskargatu _bideoa" - -#: ../midori/midori-view.c:2834 -msgid "Search _with" -msgstr "Bilatu _honekin" - -#: ../midori/midori-view.c:2866 -msgid "_Search the Web" -msgstr "_Bilatu sarean" - -#: ../midori/midori-view.c:2883 -msgid "Open Address in New _Tab" -msgstr "Ireki helbidea _fitxa berrian" - -#: ../midori/midori-view.c:2936 -#, fuzzy -msgid "Open _Frame in New Tab" -msgstr "Ireki _irudia fitxa berrian" - -#: ../midori/midori-view.c:3189 -msgid "Open or download file" -msgstr "Ireki edo deskargatu fitxategia" - -#: ../midori/midori-view.c:3213 -#, c-format -msgid "File Name: %s" -msgstr "Fitxategi-izena: %s" - -#: ../midori/midori-view.c:3218 -#, c-format -msgid "File Type: '%s'" -msgstr "Fitxategi-mota: '%s'" - -#: ../midori/midori-view.c:3220 -#, c-format -msgid "File Type: %s ('%s')" -msgstr "Fitxategi-mota: %s ('%s')" - -#: ../midori/midori-view.c:3255 -#, c-format -msgid "Size: %s" -msgstr "" - -#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:3266 -#, c-format -msgid "Open %s" -msgstr "Ireki %s" - -#: ../midori/midori-view.c:3885 -#, c-format -msgid "Inspect page - %s" -msgstr "" - -#: ../midori/midori-view.c:4240 -msgid "Speed Dial" -msgstr "" - -#: ../midori/midori-view.c:4241 ../midori/midori-view.c:4347 -msgid "Click to add a shortcut" -msgstr "Klikatu lasterbide bat gehitzeko" - -#: ../midori/midori-view.c:4242 -msgid "Enter shortcut address" -msgstr "Sartu lasterbidearen helbidea" - -#: ../midori/midori-view.c:4243 -msgid "Enter shortcut title" -msgstr "Sartu lasterbidearen izenburua" - -#: ../midori/midori-view.c:4244 -msgid "Are you sure you want to delete this shortcut?" -msgstr "Ziur zaude lasterbide hau ezabatu nahi duzula?" - -#: ../midori/midori-view.c:4416 -#, c-format -msgid "No documentation installed" -msgstr "" - -#: ../midori/midori-view.c:4493 -msgid "Midori doesn't store any personal data:" -msgstr "Midori-k ez du datu pertsonalik gordetzen:" - -#: ../midori/midori-view.c:4494 -msgid "No history or web cookies are being saved." -msgstr "Ez da gordetzen ez historiarik ez web cookie-rik." - -#: ../midori/midori-view.c:4495 -msgid "Extensions are disabled." -msgstr "Hedapenak desgaituta daude." - -#: ../midori/midori-view.c:4496 -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:4497 -msgid "Midori prevents websites from tracking the user:" -msgstr "" - -#: ../midori/midori-view.c:4498 -msgid "Referrer URLs are stripped down to the hostname." -msgstr "" - -#: ../midori/midori-view.c:4499 -msgid "DNS prefetching is disabled." -msgstr "" - -#: ../midori/midori-view.c:4500 -msgid "The language and timezone are not revealed to websites." -msgstr "" - -#: ../midori/midori-view.c:4501 -msgid "Flash and other Netscape plugins cannot be listed by websites." -msgstr "" - -#: ../midori/midori-view.c:4590 -msgid "Version numbers in brackets show the version used at runtime." -msgstr "" - -#: ../midori/midori-view.c:4640 -msgid "Page loading delayed" -msgstr "Orria kargatzea atzeratuta" - -#: ../midori/midori-view.c:4641 -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:4642 -msgid "Load Page" -msgstr "Kargatu orria" - -#: ../midori/midori-view.c:4809 -msgid "Blank page" -msgstr "Orri hutsa" - -#: ../midori/midori-view.c:5073 -msgid "_Duplicate Tab" -msgstr "_Bikoiztu fitxa" - -#: ../midori/midori-view.c:5078 -msgid "Show Tab _Label" -msgstr "Erakutsi fitxaren _etiketa" - -#: ../midori/midori-view.c:5078 -msgid "Show Tab _Icon Only" -msgstr "Erakutsi fitxaren _ikonoa soilik" - -#: ../midori/midori-view.c:5085 -#, fuzzy -msgid "Close Ot_her Tab" -msgid_plural "Close Ot_her Tabs" -msgstr[0] "Itxi _beste fitxak" -msgstr[1] "Itxi _beste fitxak" - -#. i18n: word stem of "previous page" type links, case is not important -#: ../midori/midori-view.c:5921 -msgid "previous" -msgstr "aurrekoa" - -#. i18n: word stem of "next page" type links, case is not important -#: ../midori/midori-view.c:5940 -msgid "next" -msgstr "hurrengoa" - -#: ../midori/midori-view.c:5953 -msgid "Print background images" -msgstr "Inprimatu atzeko planoko irudiak" - -#: ../midori/midori-view.c:5954 -msgid "Whether background images should be printed" -msgstr "Atzeko planoko irudiak inprimatu behar diren ala ez" - -#: ../midori/midori-view.c:5986 -msgid "Features" -msgstr "Ezaugarriak" - -#: ../midori/midori-preferences.c:298 -msgid "Startup" -msgstr "Abioa" - -#: ../midori/midori-preferences.c:311 -msgid "Use _current page" -msgstr "Erabili _uneko orria" - -#: ../midori/midori-preferences.c:315 -msgid "Use current page as homepage" -msgstr "Erabili uneko orria hasiera-orria bezala" - -#. Page "Appearance" -#: ../midori/midori-preferences.c:324 -msgid "Fonts" -msgstr "Letra-tipoak" - -#: ../midori/midori-preferences.c:327 -msgid "Proportional Font Family" -msgstr "" - -#: ../midori/midori-preferences.c:331 -msgid "The default font family used to display text" -msgstr "" - -#: ../midori/midori-preferences.c:334 -msgid "The default font size used to display text" -msgstr "" - -#: ../midori/midori-preferences.c:336 -msgid "Fixed-width Font Family" -msgstr "" - -#: ../midori/midori-preferences.c:340 -msgid "The font family used to display fixed-width text" -msgstr "" - -#: ../midori/midori-preferences.c:343 -msgid "The font size used to display fixed-width text" -msgstr "" - -#: ../midori/midori-preferences.c:345 -msgid "Minimum Font Size" -msgstr "Gutxieneko letra-tipoaren tamaina" - -#: ../midori/midori-preferences.c:349 -msgid "The minimum font size used to display text" -msgstr "Testua bistaratzeko erabilitako gutxieneko letra-tipoaren tamaina" - -#. Page "Behavior" -#: ../midori/midori-preferences.c:360 -msgid "Behavior" -msgstr "Portaera" - -#: ../midori/midori-preferences.c:386 -msgid "Allow scripts to open popups" -msgstr "" - -#: ../midori/midori-preferences.c:387 -msgid "Whether scripts are allowed to open popup windows automatically" -msgstr "" - -#. Page "Interface" -#: ../midori/midori-preferences.c:418 -msgid "Browsing" -msgstr "Arakatzen" - -#. Page "Network" -#: ../midori/midori-preferences.c:458 -msgid "Network" -msgstr "Sarea" - -#: ../midori/midori-preferences.c:465 -msgid "Hostname" -msgstr "Ostalari-izena" - -#: ../midori/midori-preferences.c:489 -msgid "MB" -msgstr "MB" - -#: ../midori/midori-searchaction.c:958 -msgid "Add search engine" -msgstr "Gehitu bilaketa-tresna" - -#: ../midori/midori-searchaction.c:958 -msgid "Edit search engine" -msgstr "Editatu bilaketa-tresna" - -#: ../midori/midori-searchaction.c:986 -msgid "_Name:" -msgstr "_Izena:" - -#: ../midori/midori-searchaction.c:1001 -msgid "_Description:" -msgstr "Deskribapena:" - -#: ../midori/midori-searchaction.c:1014 ../extensions/feed-panel/main.c:377 -msgid "_Address:" -msgstr "_Helbidea:" - -#: ../midori/midori-searchaction.c:1033 -msgid "_Token:" -msgstr "" - -#: ../midori/midori-searchaction.c:1331 -msgid "Manage Search Engines" -msgstr "Kudeatu bilaketa-tresnak" - -#: ../midori/midori-searchaction.c:1433 -msgid "Use as _default" -msgstr "Erabili _lehenetsi bezala" - -#: ../midori/sokoke.c:346 -msgid "Open with" -msgstr "Ireki honekin" - -#: ../midori/sokoke.c:354 -#, c-format -msgid "Choose an application or command to open \"%s\":" -msgstr "Aukeratu aplikazio edo komando bat \"%s\" irekitzeko:" - -#: ../midori/sokoke.c:468 ../midori/sokoke.c:482 -msgid "Could not run external program." -msgstr "Ezin izan da kanpoko programa exekutatu." - -#: ../midori/sokoke.c:1529 -#, c-format -msgid "%d hour" -msgid_plural "%d hours" -msgstr[0] "ordu %d" -msgstr[1] "%d ordu" - -#: ../midori/sokoke.c:1530 -#, c-format -msgid "%d minute" -msgid_plural "%d minutes" -msgstr[0] "minutu %d" -msgstr[1] "%d minutu" - -#: ../midori/sokoke.c:1531 -#, 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:1539 ../panels/midori-transfers.c:269 -#, c-format -msgid "%s of %s" -msgstr "%s / %s" - -#. i18n: Unknown number of bytes, used for transfer rate like ?B/s -#: ../midori/sokoke.c:1548 -msgid "?B" -msgstr "?B" - -#. i18n: Download tooltip (transfer rate): (130KB/s) -#: ../midori/sokoke.c:1551 -#, c-format -msgid " (%s/s)" -msgstr " (%s/s)" - -#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning -#: ../midori/sokoke.c:1568 -#, c-format -msgid " - %s remaining" -msgstr " - %s falta dira" - -#. i18n: A panel at the bottom, to search text in pages -#: ../toolbars/midori-findbar.c:277 -msgid "_Inline Find:" -msgstr "" - -#: ../toolbars/midori-findbar.c:303 -msgid "Previous" -msgstr "Aurrekoa" - -#: ../toolbars/midori-findbar.c:309 -msgid "Next" -msgstr "Hurrengoa" - -#: ../toolbars/midori-findbar.c:313 -msgid "Match Case" -msgstr "" - -#: ../toolbars/midori-findbar.c:322 -msgid "Highlight Matches" -msgstr "" - -#: ../toolbars/midori-findbar.c:333 -msgid "Close Findbar" -msgstr "Itxi bilaketa-barra" - -#: ../toolbars/midori-transferbar.c:124 -#, c-format -msgid "The file '%s' has been downloaded." -msgstr "'%s' fitxategia deskargatu da." - -#: ../toolbars/midori-transferbar.c:127 -msgid "Transfer completed" -msgstr "Transferentzia burututa" - -#: ../toolbars/midori-transferbar.c:195 -msgid "The downloaded file is erroneous." -msgstr "" - -#: ../toolbars/midori-transferbar.c:196 -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:339 ../panels/midori-transfers.c:142 -msgid "Clear All" -msgstr "Garbitu guztia" - -#: ../toolbars/midori-transferbar.c:376 ../toolbars/midori-transferbar.c:378 -msgid "Some files are being downloaded" -msgstr "Zenbait fitxategi deskargatzen ari dira" - -#: ../toolbars/midori-transferbar.c:382 -msgid "_Quit Midori" -msgstr "_Irten Midori-tik" - -#: ../toolbars/midori-transferbar.c:384 -msgid "The transfers will be cancelled if Midori quits." -msgstr "" - -#: ../panels/midori-bookmarks.c:308 -#, c-format -msgid "Failed to add bookmark item: %s\n" -msgstr "Huts egin du laster-marka elementua gehitzean: %s\n" - -#: ../panels/midori-bookmarks.c:475 -#, fuzzy, c-format -msgid "Failed to update bookmark : %s\n" -msgstr "Huts egin du laster-marka elementua gehitzean: %s\n" - -#: ../panels/midori-bookmarks.c:535 -msgid "Edit the selected bookmark" -msgstr "Editatu hautatutako laster-marka" - -#: ../panels/midori-bookmarks.c:543 -msgid "Delete the selected bookmark" -msgstr "Ezabatu hautatutako laster-marka" - -#: ../panels/midori-bookmarks.c:558 -msgid "Add a new folder" -msgstr "Gehitu karpeta berri bat" - -#: ../panels/midori-bookmarks.c:697 ../panels/midori-history.c:638 -msgid "Separator" -msgstr "Banatzailea" - -#: ../panels/midori-bookmarks.c:1038 -#, fuzzy -msgid "Search Bookmarks" -msgstr "Laster-markak" - -#: ../panels/midori-history.c:111 -msgid "History" -msgstr "Historia" - -#: ../panels/midori-history.c:158 ../panels/midori-history.c:189 -msgid "Today" -msgstr "Gaur" - -#: ../panels/midori-history.c:160 ../panels/midori-history.c:191 -msgid "Yesterday" -msgstr "Atzo" - -#: ../panels/midori-history.c:162 ../panels/midori-history.c:186 -#, 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:165 ../panels/midori-history.c:184 -msgid "A week ago" -msgstr "Duela aste bat" - -#: ../panels/midori-history.c:232 -#, c-format -msgid "Failed to remove history item: %s\n" -msgstr "Huts egin du historiako elementua kentzean: %s\n" - -#: ../panels/midori-history.c:360 -msgid "Are you sure you want to remove all history items?" -msgstr "Ziur zaude historiako elementu guztiak kendu nahi dituzula?" - -#: ../panels/midori-history.c:407 -msgid "Bookmark the selected history item" -msgstr "Egin hautatutako historiako elementuaren laster-marka" - -#: ../panels/midori-history.c:416 -msgid "Delete the selected history item" -msgstr "Ezabatu hautatutako historiako elementua" - -#: ../panels/midori-history.c:424 -msgid "Clear the entire history" -msgstr "Garbitu historia osoa" - -#: ../panels/midori-history.c:1008 -#, fuzzy -msgid "Search History" -msgstr "Bilatu _honekin" - -#: ../panels/midori-transfers.c:87 -msgid "Transfers" -msgstr "Transferentziak" - -#: ../panels/midori-transfers.c:470 -msgid "Open Destination _Folder" -msgstr "Ireki helburuko _karpeta" - -#: ../panels/midori-transfers.c:473 -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:443 ../katze/katze-utils.c:867 -#, c-format -msgid "Property '%s' is invalid for %s" -msgstr "" - -#: ../katze/katze-utils.c:489 ../katze/katze-utils.c:518 -#: ../extensions/addons.c:308 -msgid "Choose file" -msgstr "Aukeratu fitxategia" - -#: ../katze/katze-utils.c:504 -msgid "Choose folder" -msgstr "Aukeratu karpeta" - -#: ../katze/katze-utils.c:602 -msgid "None" -msgstr "Bat ere ez" - -#: ../katze/katze-utils.c:717 -msgid "1 hour" -msgstr "Ordu 1" - -#: ../katze/katze-utils.c:718 -msgid "1 day" -msgstr "Egun 1" - -#: ../katze/katze-utils.c:719 -msgid "1 week" -msgstr "Aste 1" - -#: ../katze/katze-utils.c:720 -msgid "1 month" -msgstr "Hilabete 1" - -#: ../katze/katze-utils.c:721 -msgid "1 year" -msgstr "Urte 1" - -#: ../katze/katze-preferences.c:98 ../extensions/history-list.vala:235 -#, c-format -msgid "Preferences for %s" -msgstr "%s-(r)en hobespenak" - -#: ../extensions/adblock.c:470 -msgid "Configure Advertisement filters" -msgstr "Konfiguratu iragarkien iragazkiak" - -#: ../extensions/adblock.c:503 -#, 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:917 -msgid "Edit rule" -msgstr "Editatu araua" - -#: ../extensions/adblock.c:931 -msgid "_Rule:" -msgstr "_Araua:" - -#: ../extensions/adblock.c:985 -msgid "Bl_ock image" -msgstr "Bl_okeatu irudia" - -#: ../extensions/adblock.c:990 -msgid "Bl_ock link" -msgstr "Bl_okeatu esteka" - -#: ../extensions/adblock.c:1689 -msgid "Advertisement blocker" -msgstr "Iragarkien blokeatzailea" - -#: ../extensions/adblock.c:1690 -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:677 -msgid "Userscripts" -msgstr "Erabiltzaile-script-ak" - -#: ../extensions/addons.c:324 ../extensions/addons.c:679 -msgid "Userstyles" -msgstr "Erabiltzaile-estiloak" - -#: ../extensions/addons.c:370 ../extensions/addons.c:449 -#: ../extensions/feed-panel/main.c:129 -msgid "Error" -msgstr "Errorea" - -#: ../extensions/addons.c:411 -#, c-format -msgid "Do you want to delete '%s'?" -msgstr "'%s' ezabatu nahi duzu?" - -#: ../extensions/addons.c:417 -msgid "Delete user script" -msgstr "Ezabatu erabiltzaile-script-a" - -#: ../extensions/addons.c:418 -msgid "Delete user style" -msgstr "Ezabatu erabiltzaile-estiloa" - -#: ../extensions/addons.c:421 -#, c-format -msgid "The file %s will be permanently deleted." -msgstr "%s fitxategia betirako ezabatuko da." - -#: ../extensions/addons.c:566 ../extensions/addons.c:643 -msgid "Open in Text Editor" -msgstr "Ireki testu-editorean" - -#: ../extensions/addons.c:568 ../extensions/addons.c:652 -msgid "Open Target Folder" -msgstr "Ireki helburuko karpeta" - -#: ../extensions/addons.c:634 -msgid "Add new addon" -msgstr "Gehitu gehigarri berria" - -#: ../extensions/addons.c:660 -msgid "Remove selected addon" -msgstr "Kendu hautatutako gehigarria" - -#: ../extensions/addons.c:1689 ../extensions/addons.c:1907 -msgid "User addons" -msgstr "Erabiltzailearen gehigarriak" - -#: ../extensions/addons.c:1819 -#, c-format -msgid "Can't monitor folder '%s': %s" -msgstr "" - -#: ../extensions/addons.c:1908 -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:1025 -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:1138 -msgid "Search Cookies by Name or Domain" -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:294 -msgid "Remember password on this page?" -msgstr "Pasahitza gogoratu orri honetan?" - -#: ../extensions/formhistory/formhistory.c:299 -msgid "Remember" -msgstr "Gogoratu" - -#: ../extensions/formhistory/formhistory.c:300 -msgid "Not now" -msgstr "Orain ez" - -#: ../extensions/formhistory/formhistory.c:301 -msgid "Never for this page" -msgstr "Inoiz ez orri honentzat" - -#: ../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 "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 -#, fuzzy -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:152 -msgid "Images" -msgstr "Irudiak" - -#: ../extensions/statusbar-features.c:162 -msgid "Scripts" -msgstr "Script-ak" - -#: ../extensions/statusbar-features.c:174 -msgid "Netscape plugins" -msgstr "Netscape pluginak" - -#: ../extensions/statusbar-features.c:259 -msgid "Statusbar Features" -msgstr "Egoera-barraren ezaugarriak" - -#: ../extensions/statusbar-features.c:260 -msgid "Easily toggle features on web pages on and off" -msgstr "" - -#: ../extensions/tab-panel.c:589 ../extensions/tab-panel.c:676 -msgid "Tab Panel" -msgstr "Fitxen panela" - -#: ../extensions/tab-panel.c:659 -msgid "T_ab Panel" -msgstr "_Fitxen panela" - -#: ../extensions/tab-panel.c:677 -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:395 -msgid "Customize Toolbar" -msgstr "Pertsonalizatu tresna-barra" - -#: ../extensions/toolbar-editor.c:411 -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:427 -msgid "Available Items" -msgstr "Elementu erabilgarriak" - -#: ../extensions/toolbar-editor.c:448 -msgid "Displayed Items" -msgstr "Bistaratutako elementuak" - -#: ../extensions/toolbar-editor.c:588 -#, fuzzy -msgid "_Customize Toolbar…" -msgstr "Pertsonalizatu _tresna-barra…" - -#: ../extensions/toolbar-editor.c:617 -msgid "Toolbar Editor" -msgstr "Tresna-barra editorea" - -#: ../extensions/toolbar-editor.c:618 -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 "" - -#~ msgid "_Bookmark" -#~ msgstr "_Laster-marka" - -#~ msgid "_Console" -#~ msgstr "Kontsola" - -#~ msgid "_Title:" -#~ msgstr "_Izenburua:" - -#~ msgid "_Folder:" -#~ msgstr "_Karpeta:" - -#~ msgid "Close ot_her Tabs" -#~ msgstr "Itxi _beste fitxak" - -#~ msgid "_Icon:" -#~ msgstr "_Ikonoa:" - -#~ msgid "Filter:" -#~ msgstr "Iragazi:" - -#~ msgid "_Customize…" -#~ msgstr "_Pertsonalizatu…" - -#~ msgid "The bookmarks couldn't be saved. %s" -#~ msgstr "Ezin izan dira laster-markak gorde. %s" diff --git a/po/fi.po b/po/fi.po index 11699670..a7e1d322 100644 --- a/po/fi.po +++ b/po/fi.po @@ -459,8 +459,8 @@ msgid "Epiphany" msgstr "Epiphany" #: ../midori/midori-browser.c:4016 -msgid "Import bookmarks…" -msgstr "Tuo kirjanmerkit…" +msgid "Import bookmarks..." +msgstr "Tuo kirjanmerkit..." #: ../midori/midori-browser.c:4019 ../midori/midori-browser.c:4957 msgid "_Import bookmarks" @@ -792,24 +792,24 @@ msgid "_Manage Search Engines" msgstr "_Hallitse hakukoneita" #: ../midori/midori-browser.c:4964 -msgid "Add, edit and remove search engines…" -msgstr "Lisää, muokkaa ja poista hakukoneita…" +msgid "Add, edit and remove search engines..." +msgstr "Lisää, muokkaa ja poista hakukoneita..." #: ../midori/midori-browser.c:4967 msgid "_Clear Private Data" msgstr "_Poista yksityisyystietoja" #: ../midori/midori-browser.c:4968 -msgid "Clear private data…" -msgstr "Poista yksityisyystietoja…" +msgid "Clear private data..." +msgstr "Poista yksityisyystietoja..." #: ../midori/midori-browser.c:4972 msgid "_Inspect Page" msgstr "_Tutki sivua" #: ../midori/midori-browser.c:4973 -msgid "Inspect page details and access developer tools…" -msgstr "Tutki sivun ominaisuuksia ja käytä kehitystyökaluja…" +msgid "Inspect page details and access developer tools..." +msgstr "Tutki sivun ominaisuuksia ja käytä kehitystyökaluja..." #: ../midori/midori-browser.c:4978 msgid "_Previous Tab" @@ -978,23 +978,23 @@ msgstr "Länsimainen (ISO-8859-1)" #: ../midori/midori-browser.c:5070 ../midori/midori-websettings.c:229 #: ../midori/midori-websettings.c:320 ../katze/katze-utils.c:706 -msgid "Custom…" -msgstr "Mukautettu…" +msgid "Custom..." +msgstr "Mukautettu..." #: ../midori/midori-browser.c:5591 msgid "_Separator" msgstr "_Erotin" #: ../midori/midori-browser.c:5598 -msgid "_Location…" -msgstr "_Sijainti…" +msgid "_Location..." +msgstr "_Sijainti..." #: ../midori/midori-browser.c:5600 msgid "Open a particular location" msgstr "Avaa tarkka sijainti" #: ../midori/midori-browser.c:5624 -msgid "_Web Search…" +msgid "_Web Search..." msgstr "_Verkkohaku" #: ../midori/midori-browser.c:5626 @@ -2370,8 +2370,8 @@ msgstr "" "napsauttamalla \"Lisää\". Löydät lisää listoja osoitteesta %s." #: ../extensions/adblock.c:587 -msgid "Configure _Advertisement filters…" -msgstr "Säädä _mainossuodattimia…" +msgid "Configure _Advertisement filters..." +msgstr "Säädä _mainossuodattimia..." #: ../extensions/adblock.c:841 msgid "Edit rule" @@ -2788,7 +2788,7 @@ msgid "Customize Keyboard shortcuts" msgstr "Muokkaa pikanäppäimiä" #: ../extensions/shortcuts.c:276 -msgid "Customize Sh_ortcuts…" +msgid "Customize Sh_ortcuts..." msgstr "Muokkaa pika_näppäimiä,,," #: ../extensions/shortcuts.c:313 @@ -2853,7 +2853,7 @@ msgstr "Mukauta työkalupalkkia" #: ../extensions/toolbar-editor.c:403 msgid "" -"Select items to be displayed on the toolbar. Items can be reordered by drag " +"Select items to be displayed on the toolbar. Items can be reodered by drag " "and drop." msgstr "" "Valitse työkalupalkissa näkyvät kohteet. Voit järjestää kohteita raahaamalla " @@ -2868,8 +2868,8 @@ msgid "Displayed Items" msgstr "Käytössä" #: ../extensions/toolbar-editor.c:575 -msgid "Customize _Toolbar…" -msgstr "Mukauta työ_kalupalkkia…" +msgid "Customize _Toolbar..." +msgstr "Mukauta työ_kalupalkkia..." #: ../extensions/toolbar-editor.c:604 msgid "Toolbar Editor" diff --git a/po/fr.po b/po/fr.po index 8f6125de..357585a3 100644 --- a/po/fr.po +++ b/po/fr.po @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.2.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-01 10:24+0000\n" -"PO-Revision-Date: 2012-08-29 14:29+0100\n" -"Last-Translator: \n" +"POT-Creation-Date: 2011-11-11 23:12+0000\n" +"PO-Revision-Date: 2011-05-01 12:40+0100\n" +"Last-Translator: Marin Moulinier \n" "Language-Team: French \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -24,128 +24,99 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #: ../data/midori.desktop.in.h:1 -msgid "Browse the Web" -msgstr "Rechercher sur Internet" +msgid "Lightweight web browser" +msgstr "Navigateur Internet léger" -#: ../data/midori.desktop.in.h:2 -msgid "Internet;WWW;Explorer" -msgstr "Internet;WWW;Explorer" - -#: ../data/midori.desktop.in.h:3 ../midori/main.c:1944 ../midori/main.c:1968 -#: ../midori/main.c:1982 ../midori/midori-websettings.c:199 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:2011 ../midori/main.c:2031 +#: ../midori/main.c:2047 ../midori/midori-websettings.c:300 msgid "Midori" msgstr "Midori" -#: ../data/midori.desktop.in.h:4 -msgid "Midori Web Browser" -msgstr "Navigateur Web Midori" - -#: ../data/midori.desktop.in.h:5 -msgid "New Private Browsing Window" -msgstr "Nouvelle fenêtre de navigation privée" - -#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1435 -msgid "New Tab" -msgstr "Nouvel onglet" - -#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1432 -msgid "New Window" -msgstr "Nouvelle fenêtre" - -#: ../data/midori.desktop.in.h:8 +#: ../data/midori.desktop.in.h:3 msgid "Web Browser" msgstr "Navigateur Internet" #: ../data/midori-private.desktop.in.h:1 -msgid "Midori Private Browsing" -msgstr "Midori (Navigation privée)" - -#: ../data/midori-private.desktop.in.h:2 +#, fuzzy msgid "Open a new private browsing window" -msgstr "Ouvrir une nouvelle fenêtre (Navigation privée)" +msgstr "Navigation en mode _privé" -#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4370 +#: ../data/midori-private.desktop.in.h:2 +#, fuzzy msgid "Private Browsing" -msgstr "Navigation privée" +msgstr "Navigation en mode _privé" -#: ../midori/main.c:91 ../midori/main.c:97 +#: ../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:145 +#: ../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:150 ../midori/main.c:254 +#: ../midori/main.c:155 ../midori/main.c:261 #, c-format msgid "Invalid configuration value '%s'" msgstr "Valeur de paramètre non valide « %s »" -#: ../midori/main.c:375 +#: ../midori/main.c:366 #, 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:429 +#: ../midori/main.c:420 #, c-format msgid "Failed to clear history: %s\n" msgstr "Impossible de supprimer l'historique : %s\n" -#: ../midori/main.c:451 ../extensions/formhistory/formhistory.c:531 +#: ../midori/main.c:440 ../midori/main.c:561 ../extensions/formhistory.c:415 #, 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:523 +#: ../midori/main.c:504 #, 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:545 +#: ../midori/main.c:544 ../panels/midori-history.c:189 +#, 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:591 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "Les signets n'ont pas pu être enregistrés. %s" + +#: ../midori/main.c:626 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "La configuration n'a pas pu être enregistrée. %s" -#: ../midori/main.c:571 +#: ../midori/main.c:661 #, 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:608 +#: ../midori/main.c:687 ../midori/main.c:707 #, c-format msgid "The trash couldn't be saved. %s" msgstr "La corbeille n'a pas pu être enregistrée. %s" -#: ../midori/main.c:681 ../panels/midori-extensions.c:90 +#: ../midori/main.c:741 ../panels/midori-extensions.c:91 msgid "Extensions" msgstr "Extensions" -#: ../midori/main.c:695 +#: ../midori/main.c:755 msgid "Privacy" msgstr "Vie privée" -#: ../midori/main.c:697 -msgid "Delete old Cookies after:" -msgstr "Effacer les anciens cookies après :" - -#: ../midori/main.c:699 ../midori/main.c:702 -msgid "The maximum number of days to save cookies for" -msgstr "" -"Le nombre maximal de jours durant lesquels conserver les fichiers témoins" - -#: ../midori/main.c:706 -msgid "Only accept Cookies from sites you visit" -msgstr "N'accepter les cookies que de sites que vous visitez" - -#: ../midori/main.c:707 -msgid "Block cookies sent by third-party websites" -msgstr "Bloquer les cookies envoyés par des sites tiers" - -#: ../midori/main.c:712 +#: ../midori/main.c:767 msgid "" "Cookies store login data, saved games, or user profiles for advertisement " "purposes." @@ -154,47 +125,19 @@ msgstr "" "jeu ou des profils informations\n" " sur vous utilisées à des fins publicitaires." -#: ../midori/main.c:719 -msgid "Enable offline web application cache" -msgstr "Activer le cache d'applications web hors ligne" - -#: ../midori/main.c:722 -msgid "Enable HTML5 local storage support" -msgstr "Activer le support de stockage local de HTML5" - -#. i18n: Reworded: Shorten details propagated when going to another page -#: ../midori/main.c:726 -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/main.c:728 -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/main.c:731 -msgid "Delete pages from history after:" -msgstr "Effacer les pages de l'historique après :" - -#: ../midori/main.c:733 ../midori/main.c:736 -msgid "The maximum number of days to save the history for" -msgstr "Le nombre maximal de jours durant lesquels conserver l'historique" - -#: ../midori/main.c:777 +#: ../midori/main.c:823 #, c-format msgid "The session couldn't be saved. %s" msgstr "La session n'a pas pu être enregistrée. %s" -#: ../midori/main.c:1003 +#: ../midori/main.c:1033 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:1095 +#: ../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." @@ -203,235 +146,245 @@ msgstr "" "utilisation. Si cela se produit de façon répétée, essayez l'une des options " "suivantes pour résoudre le problème." -#: ../midori/main.c:1114 +#: ../midori/main.c:1120 msgid "Modify _preferences" msgstr "Modifier les _préférences" -#: ../midori/main.c:1118 +#: ../midori/main.c:1124 msgid "Disable all _extensions" msgstr "Désactiver toutes les _extensions" -#: ../midori/main.c:1127 -msgid "Show a dialog after Midori crashed" -msgstr "Afficher une fenêtre en cas de fermeture inattendue de Midori" - -#: ../midori/main.c:1132 +#: ../midori/main.c:1137 msgid "Discard old tabs" -msgstr "Ignorer les derniers onglets" +msgstr "" -#: ../midori/main.c:1133 ../midori/midori-websettings.c:107 +#: ../midori/main.c:1138 ../midori/midori-websettings.c:209 msgid "Show last tabs without loading" msgstr "Afficher les derniers onglets sans les charger" -#: ../midori/main.c:1134 ../midori/midori-websettings.c:106 +#: ../midori/main.c:1139 ../midori/midori-websettings.c:208 msgid "Show last open tabs" msgstr "Afficher les derniers onglets ouverts" -#: ../midori/main.c:1381 ../midori/main.c:2360 +#: ../midori/main.c:1349 ../midori/main.c:2419 #, 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:1519 +#: ../midori/main.c:1490 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Capture enregistrée sous : %s\n" -#: ../midori/main.c:1847 +#: ../midori/main.c:1914 msgid "Run ADDRESS as a web application" msgstr "Lancer l'ADRESSE comme une application internet" -#: ../midori/main.c:1847 +#: ../midori/main.c:1914 msgid "ADDRESS" msgstr "ADRESSE" -#: ../midori/main.c:1850 +#: ../midori/main.c:1917 msgid "Use FOLDER as configuration folder" msgstr "Utiliser DOSSIER comme dossier de configuration" -#: ../midori/main.c:1850 +#: ../midori/main.c:1917 msgid "FOLDER" msgstr "DOSSIER" -#: ../midori/main.c:1853 +#: ../midori/main.c:1920 msgid "Private browsing, no changes are saved" msgstr "Navigation privée, les modifications ne sont pas enregistrées" -#: ../midori/main.c:1856 -msgid "Portable mode, all runtime files are stored in one place" -msgstr "" -"Mode portable, tous les fichiers exécutables sont stockés dans un endroit" - -#: ../midori/main.c:1859 +#: ../midori/main.c:1922 msgid "Show a diagnostic dialog" msgstr "Afficher une fenêtre de diagnostic" -#: ../midori/main.c:1861 +#: ../midori/main.c:1924 msgid "Run the specified filename as javascript" msgstr "Lancer le fichier spécifié en tant que javascript" -#: ../midori/main.c:1863 +#: ../midori/main.c:1926 msgid "Take a snapshot of the specified URI" msgstr "Prendre une capture de l'URI spécifiée" -#: ../midori/main.c:1865 +#: ../midori/main.c:1928 msgid "Execute the specified command" msgstr "Exécuter la commande spécifiée" -#: ../midori/main.c:1867 +#: ../midori/main.c:1930 msgid "List available commands to execute with -e/ --execute" msgstr "Lister les commandes disponibles avec l'option -e/ --execute" -#: ../midori/main.c:1869 +#: ../midori/main.c:1932 msgid "Display program version" msgstr "Afficher la version du programme" -#: ../midori/main.c:1871 +#: ../midori/main.c:1934 msgid "Addresses" msgstr "Adresses" -#: ../midori/main.c:1873 +#: ../midori/main.c:1936 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:1873 +#: ../midori/main.c:1936 msgid "PATTERN" msgstr "MODÈLE" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1877 +#: ../midori/main.c:1940 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "Réinitialiser Midori après SECONDES secondes d'inactivité" -#: ../midori/main.c:1877 +#: ../midori/main.c:1940 msgid "SECONDS" msgstr "SECONDES" -#: ../midori/main.c:1880 +#: ../midori/main.c:1943 msgid "Redirects console warnings to the specified FILENAME" -msgstr "Redirige les avertissements console dans le FICHIER spécifié" +msgstr "" -#: ../midori/main.c:1880 +#: ../midori/main.c:1943 msgid "FILENAME" -msgstr "FICHIER" +msgstr "" + +#: ../midori/main.c:2008 +msgid "[Addresses]" +msgstr "[Adresses]" -#: ../midori/main.c:1983 +#: ../midori/main.c:2018 +msgid "The specified configuration folder is invalid." +msgstr "Le dossier de configuration specifié n'est pas valide." + +#: ../midori/main.c:2048 msgid "Please report comments, suggestions and bugs to:" msgstr "" "Merci d'envoyer vos commentaires, suggestions et rapports d'anomalies à :" -#: ../midori/main.c:1985 +#: ../midori/main.c:2050 msgid "Check for new versions at:" msgstr "Vérifier l'existence de nouvelles versions à :" +#: ../midori/main.c:2133 +msgid "Website icons" +msgstr "Icônes des pages Internet" + #. i18n: Logins and passwords in websites and web forms -#: ../midori/main.c:2080 +#: ../midori/main.c:2136 msgid "Saved logins and _passwords" -msgstr "Mots de _passe et identifiants enregistrés" +msgstr "" -#: ../midori/main.c:2082 -msgid "Cookies and Website data" -msgstr "Cookies et données des sites web" +#: ../midori/main.c:2138 +msgid "Cookies" +msgstr "Fichiers témoins / Cookies" -#. TODO: Preserve page icons of search engines and merge privacy items -#: ../midori/main.c:2086 ../midori/midori-preferences.c:505 -#: ../extensions/web-cache.c:461 ../extensions/web-cache.c:470 +#: ../midori/main.c:2141 +msgid "'Flash' Cookies" +msgstr "Cookies « Flash »" + +#: ../midori/main.c:2144 +msgid "HTML5 _Databases" +msgstr "_Base de données HTML5" + +#: ../midori/main.c:2147 ../midori/midori-websettings.c:933 +#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471 msgid "Web Cache" msgstr "Cache internet" -#: ../midori/main.c:2089 -msgid "Website icons" -msgstr "Icônes des pages Internet" +#: ../midori/main.c:2149 +msgid "Offline Application Cache" +msgstr "Cache des applications hors-ligne" -#: ../midori/main.c:2193 +#: ../midori/main.c:2252 +#, fuzzy msgid "An unknown error occured" msgstr "Une erreur inconnue est survenue." -#: ../midori/main.c:2308 +#: ../midori/main.c:2350 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:2342 +#: ../midori/main.c:2386 #, 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:2375 +#: ../midori/main.c:2434 #, 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:2388 +#: ../midori/main.c:2447 #, 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:2403 +#: ../midori/main.c:2463 msgid "The following errors occured:" msgstr "Les erreurs suivantes sont survenues :" -#: ../midori/main.c:2419 +#: ../midori/main.c:2479 msgid "_Ignore" msgstr "_Ignorer" -#: ../midori/midori-app.c:1156 ../midori/midori-browser.c:557 -#, c-format -msgid "Unexpected action '%s'." -msgstr "Action inattendue « %s »." +#: ../midori/midori-app.c:1323 +msgid "_Bookmark" +msgstr "_Signet" -#: ../midori/midori-app.c:1372 ../midori/midori-browser.c:6394 +#: ../midori/midori-app.c:1324 ../midori/midori-browser.c:5972 msgid "_Bookmarks" msgstr "_Signets" -#: ../midori/midori-app.c:1373 +#: ../midori/midori-app.c:1325 msgid "Add Boo_kmark" msgstr "Ajouter un s_ignet" -#: ../midori/midori-app.c:1374 +#: ../midori/midori-app.c:1326 +msgid "_Console" +msgstr "_Console" + +#: ../midori/midori-app.c:1327 msgid "_Extensions" msgstr "_Extensions" #. i18n: Browsing history, visited web pages, closed tabs -#: ../midori/midori-app.c:1375 ../midori/midori-browser.c:4847 +#: ../midori/midori-app.c:1328 ../midori/midori-browser.c:4573 msgid "_History" msgstr "_Historique" -#: ../midori/midori-app.c:1376 +#: ../midori/midori-app.c:1329 +msgid "_Homepage" +msgstr "Page d'a_ccueil" + +#: ../midori/midori-app.c:1330 msgid "_Userscripts" msgstr "Scripts _utilisateur" -#: ../midori/midori-app.c:1377 -msgid "User_styles" -msgstr "Styles utilisateur" - -#: ../midori/midori-app.c:1378 +#: ../midori/midori-app.c:1331 msgid "New _Tab" msgstr "Nouvel o_nglet" -#: ../midori/midori-app.c:1379 +#: ../midori/midori-app.c:1332 msgid "_Transfers" msgstr "_Transferts" -#: ../midori/midori-app.c:1380 +#: ../midori/midori-app.c:1333 msgid "Netscape p_lugins" msgstr "Greffons _Netscape" -#: ../midori/midori-app.c:1381 +#: ../midori/midori-app.c:1334 msgid "_Closed Tabs" msgstr "Onglets _fermés" -#: ../midori/midori-app.c:1382 ../midori/midori-browser.c:5530 +#: ../midori/midori-app.c:1335 ../midori/midori-browser.c:5161 msgid "New _Window" msgstr "Nouvelle _fenêtre" -#: ../midori/midori-app.c:1383 +#: ../midori/midori-app.c:1336 msgid "New _Folder" msgstr "Nouveau dossier" -#: ../midori/midori-app.c:1437 -msgid "[Addresses]" -msgstr "[Adresses]" - #: ../midori/midori-array.c:522 msgid "File not found." msgstr "Fichier non trouvé." @@ -445,138 +398,129 @@ msgstr "Document mal formé." msgid "Unrecognized bookmark format." msgstr "Format de signets inconnus." -#: ../midori/midori-array.c:915 +#: ../midori/midori-array.c:916 msgid "Writing failed." msgstr "L'écriture a échoué." -#: ../midori/midori-browser.c:359 ../midori/midori-browser.c:5618 -#: ../midori/midori-browser.c:5627 +#: ../midori/midori-browser.c:328 ../midori/midori-browser.c:5243 +#: ../midori/midori-browser.c:5252 msgid "Reload the current page" msgstr "Actualiser la page courante" -#: ../midori/midori-browser.c:368 ../midori/midori-browser.c:5624 +#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:5249 msgid "Stop loading the current page" msgstr "Arrêter le chargement de la page courante" -#: ../midori/midori-browser.c:376 ../midori/midori-browser.c:5669 -msgid "Go forward to the next page" -msgstr "Aller à la page suivante" - -#. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:383 ../midori/midori-browser.c:5677 -#: ../midori/midori-browser.c:5680 -msgid "Go to the next sub-page" -msgstr "Aller à la sous-page suivante" - -#: ../midori/midori-browser.c:542 +#: ../midori/midori-browser.c:461 #, c-format msgid "Failed to update title: %s\n" msgstr "Impossible de mettre à jour le titre : %s\n" -#: ../midori/midori-browser.c:637 +#: ../midori/midori-browser.c:474 #, c-format +msgid "Unexpected action '%s'." +msgstr "Action inattendue « %s »." + +#: ../midori/midori-browser.c:575 +#, fuzzy, c-format msgid "%s (Private Browsing)" -msgstr "%s (Navigation privée)" +msgstr "Navigation en mode _privé" -#: ../midori/midori-browser.c:747 ../midori/midori-browser.c:789 -#: ../panels/midori-bookmarks.c:114 -msgid "Bookmarks" -msgstr "Signets" +#: ../midori/midori-browser.c:686 ../midori/midori-browser.c:719 +msgid "Toplevel folder" +msgstr "Dossier supérieur" -#: ../midori/midori-browser.c:849 +#: ../midori/midori-browser.c:776 msgid "New folder" msgstr "Nouveau dossier" -#: ../midori/midori-browser.c:849 +#: ../midori/midori-browser.c:776 msgid "Edit folder" msgstr "Modifier le dossier" -#: ../midori/midori-browser.c:851 +#: ../midori/midori-browser.c:778 msgid "New bookmark" msgstr "Nouveau signet" -#: ../midori/midori-browser.c:851 +#: ../midori/midori-browser.c:778 msgid "Edit bookmark" msgstr "Modifier le signet" -#: ../midori/midori-browser.c:885 -msgid "Type a name for this bookmark and choose where to keep it." -msgstr "Taper un nom pour ce signet et choisisser où le conserver." +#: ../midori/midori-browser.c:809 +msgid "_Title:" +msgstr "_Titre :" + +#: ../midori/midori-browser.c:829 ../midori/midori-searchaction.c:966 +#: ../extensions/feed-panel/main.c:377 +msgid "_Address:" +msgstr "_Adresse :" + +# manque un raccourcis Alt+X +#: ../midori/midori-browser.c:852 ../midori/midori-browser.c:4308 +msgid "_Folder:" +msgstr "_Dossier :" -#: ../midori/midori-browser.c:946 +#: ../midori/midori-browser.c:868 msgid "Add to _Speed Dial" msgstr "Ajouter à la page d'appel rapide" -#: ../midori/midori-browser.c:952 +#: ../midori/midori-browser.c:881 msgid "Show in the tool_bar" msgstr "Afficher dans la _barre d'outils" -#: ../midori/midori-browser.c:960 +#: ../midori/midori-browser.c:896 msgid "Run as _web application" msgstr "Lancer comme une application _internet" -#: ../midori/midori-browser.c:1031 +#: ../midori/midori-browser.c:967 #, 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:1033 +#: ../midori/midori-browser.c:969 #, 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:1040 +#: ../midori/midori-browser.c:976 #, 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:1043 +#: ../midori/midori-browser.c:979 #, 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:1179 ../midori/midori-browser.c:4651 +#: ../midori/midori-browser.c:1023 ../midori/midori-browser.c:4378 msgid "Save file as" msgstr "Enregistrer le fichier sous" -#: ../midori/midori-browser.c:1185 -msgid "Save associated _resources" -msgstr "sauver les _ressources associées" +#: ../midori/midori-browser.c:1332 +msgid "New Window" +msgstr "Nouvelle fenêtre" -#: ../midori/midori-browser.c:1432 +#: ../midori/midori-browser.c:1332 msgid "A new window has been opened" msgstr "Une nouvelle fenêtre a été ouverte" -#: ../midori/midori-browser.c:1435 +#: ../midori/midori-browser.c:1335 +msgid "New Tab" +msgstr "Nouvel onglet" + +#: ../midori/midori-browser.c:1335 msgid "A new tab has been opened" msgstr "Un nouvel onglet a été ouvert" -#: ../midori/midori-browser.c:1452 -msgid "Error opening the image!" -msgstr "Erreur pendant l'ouverture de l'image !" - -#: ../midori/midori-browser.c:1453 -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:1459 -msgid "Error downloading the image!" -msgstr "Erreur lors du téléchargement de l'image !" - -#: ../midori/midori-browser.c:1460 -msgid "Can not download selected image." -msgstr "Ne peut pas télécharger l'image sélectionnez." - -#: ../midori/midori-browser.c:1579 +#: ../midori/midori-browser.c:1372 msgid "Save file" msgstr "Enregistrer le fichier" -#: ../midori/midori-browser.c:2482 +#: ../midori/midori-browser.c:2262 msgid "Open file" msgstr "Ouvrir le fichier" -#: ../midori/midori-browser.c:2614 +#: ../midori/midori-browser.c:2392 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" @@ -590,161 +534,144 @@ msgstr "" "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:2620 ../extensions/feed-panel/main.c:365 +#: ../midori/midori-browser.c:2398 ../extensions/feed-panel/main.c:365 msgid "New feed" msgstr "Nouveau flux" -#: ../midori/midori-browser.c:2663 ../midori/midori-browser.c:5693 -#: ../panels/midori-bookmarks.c:527 +#: ../midori/midori-browser.c:2441 ../midori/midori-browser.c:5312 +#: ../panels/midori-bookmarks.c:463 msgid "Add a new bookmark" msgstr "Ajouter un nouveau signet" -#: ../midori/midori-browser.c:3207 ../midori/midori-searchaction.c:487 +#: ../midori/midori-browser.c:2962 ../midori/midori-searchaction.c:487 msgid "Empty" msgstr "Vide" -#: ../midori/midori-browser.c:3653 ../midori/midori-browser.c:3654 +#: ../midori/midori-browser.c:3457 msgid "Toggle text cursor navigation" msgstr "Activer ou désactiver la navigation au curseur" -#: ../midori/midori-browser.c:3656 -#, fuzzy -msgid "" -"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in " -"all websites." -msgstr "" -"Appuyer sur F7 permet de basculer à la navigation au curseur. Lorsqu'elle " -"est activée, un curseur texte apparaît sur tous les sites." - -#: ../midori/midori-browser.c:3659 -#, fuzzy -msgid "_Enable Caret Browsing" -msgstr "Navigation au _curseur" - -#: ../midori/midori-browser.c:4051 ../midori/midori-browser.c:6087 +#: ../midori/midori-browser.c:3769 ../midori/midori-browser.c:5719 #, 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:4377 ../panels/midori-bookmarks.c:850 -#: ../panels/midori-history.c:806 +#: ../midori/midori-browser.c:4105 ../panels/midori-bookmarks.c:779 +#: ../panels/midori-history.c:747 msgid "Open all in _Tabs" msgstr "Tout ouvrir dans des _onglets" -#: ../midori/midori-browser.c:4384 ../panels/midori-bookmarks.c:856 -#: ../panels/midori-history.c:812 ../extensions/feed-panel/feed-panel.c:528 +#: ../midori/midori-browser.c:4112 ../panels/midori-bookmarks.c:785 +#: ../panels/midori-history.c:753 ../extensions/feed-panel/feed-panel.c:528 msgid "Open in New _Tab" msgstr "Ouvrir dans un nouvel _onglet" -#: ../midori/midori-browser.c:4387 ../midori/midori-view.c:2940 -#: ../midori/midori-view.c:4943 ../panels/midori-bookmarks.c:858 -#: ../panels/midori-history.c:814 ../extensions/feed-panel/feed-panel.c:530 +#: ../midori/midori-browser.c:4115 ../midori/midori-view.c:2528 +#: ../midori/midori-view.c:4352 ../panels/midori-bookmarks.c:787 +#: ../panels/midori-history.c:755 ../extensions/feed-panel/feed-panel.c:530 msgid "Open in New _Window" msgstr "Ouvrir dans une nouvelle _fenêtre" -#: ../midori/midori-browser.c:4476 +#: ../midori/midori-browser.c:4195 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4477 +#: ../midori/midori-browser.c:4196 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4478 +#: ../midori/midori-browser.c:4197 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4479 +#: ../midori/midori-browser.c:4198 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4480 +#: ../midori/midori-browser.c:4199 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4481 -#, c-format +#: ../midori/midori-browser.c:4200 +#, fuzzy, c-format msgid "Firefox (%s)" -msgstr "Firefox (%s)" - -#: ../midori/midori-browser.c:4482 -msgid "Midori 0.2.6" -msgstr "Midori 0.2.6" +msgstr "Firefox" -#: ../midori/midori-browser.c:4503 -msgid "Import bookmarks…" -msgstr "Importer des signets…" +#: ../midori/midori-browser.c:4221 +msgid "Import bookmarks..." +msgstr "Importer des signets..." -#: ../midori/midori-browser.c:4506 ../midori/midori-browser.c:5698 +#: ../midori/midori-browser.c:4224 ../midori/midori-browser.c:5317 msgid "_Import bookmarks" msgstr "_Importer des signets" -#: ../midori/midori-browser.c:4517 +#: ../midori/midori-browser.c:4235 msgid "_Application:" msgstr "_Application :" -#: ../midori/midori-browser.c:4582 +#: ../midori/midori-browser.c:4300 msgid "Import from XBEL or HTML file" msgstr "Importer depuis un fichier XBEL ou HTML" -#: ../midori/midori-browser.c:4610 +#: ../midori/midori-browser.c:4335 msgid "Import from a file" msgstr "Importer depuis un fichier" -#: ../midori/midori-browser.c:4622 +#: ../midori/midori-browser.c:4347 msgid "Failed to import bookmarks" msgstr "Impossible d'importer les signets" -#: ../midori/midori-browser.c:4656 +#: ../midori/midori-browser.c:4383 msgid "XBEL Bookmarks" msgstr "Signets XBEL" -#: ../midori/midori-browser.c:4661 +#: ../midori/midori-browser.c:4388 msgid "Netscape Bookmarks" msgstr "Signets Netscape" -#: ../midori/midori-browser.c:4675 +#: ../midori/midori-browser.c:4402 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:4690 +#: ../midori/midori-browser.c:4418 msgid "Failed to export bookmarks" msgstr "Impossible d'exporter les signets" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4812 +#: ../midori/midori-browser.c:4540 msgid "Clear Private Data" msgstr "Effacer les informations privées" -#: ../midori/midori-browser.c:4816 +#: ../midori/midori-browser.c:4544 msgid "_Clear private data" msgstr "_Effacer les informations privées" -#: ../midori/midori-browser.c:4831 +#: ../midori/midori-browser.c:4557 msgid "Clear the following data:" msgstr "Effacer les informations suivantes :" -#: ../midori/midori-browser.c:4841 +#: ../midori/midori-browser.c:4567 +#, fuzzy msgid "Last open _tabs" -msgstr "Derniers ongle_ts ouverts" +msgstr "Afficher les derniers onglets ouverts" -#: ../midori/midori-browser.c:4867 +#: ../midori/midori-browser.c:4593 msgid "Clear private data when _quitting Midori" msgstr "Effacer les informations privées en _quittant Midori" -#: ../midori/midori-browser.c:5082 +#: ../midori/midori-browser.c:4769 msgid "A lightweight web browser." msgstr "Un navigateur Internet léger." -#: ../midori/midori-browser.c:5083 +#: ../midori/midori-browser.c:4770 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:5085 +#: ../midori/midori-browser.c:4772 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 " @@ -756,1156 +683,1335 @@ msgstr "" "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:5115 +#: ../midori/midori-browser.c:4793 msgid "translator-credits" msgstr "" "Christian Dywan \n" "Adrien Nader \n" "Robert-André Mauchin \n" "Pascal Gervais \n" -"Jérôme Geulfucci \n" -"Iliyas Jorio " +"Jérôme Geulfucci " -#: ../midori/midori-browser.c:5528 +#: ../midori/midori-browser.c:5159 msgid "_File" msgstr "_Fichier" -#: ../midori/midori-browser.c:5531 +#: ../midori/midori-browser.c:5162 msgid "Open a new window" msgstr "Ouvrir une nouvelle fenêtre" -#: ../midori/midori-browser.c:5534 +#: ../midori/midori-browser.c:5165 msgid "Open a new tab" msgstr "Ouvrir un nouvel onglet" -#: ../midori/midori-browser.c:5536 +#: ../midori/midori-browser.c:5167 +#, fuzzy msgid "New P_rivate Browsing Window" -msgstr "Nouvelle fenêtre (Navigation _privée)" +msgstr "Navigation en mode _privé" -#: ../midori/midori-browser.c:5540 +#: ../midori/midori-browser.c:5171 msgid "Open a file" msgstr "Ouvrir un fichier" -#: ../midori/midori-browser.c:5542 -msgid "_Save Page As…" -msgstr "_Sauvegarder la page sous…" +#: ../midori/midori-browser.c:5173 +msgid "_Save Page As..." +msgstr "_Sauvegarder la page sous..." -#: ../midori/midori-browser.c:5543 +#: ../midori/midori-browser.c:5174 msgid "Save to a file" msgstr "Enregistrer dans un fichier" -#: ../midori/midori-browser.c:5545 +#: ../midori/midori-browser.c:5176 msgid "Add to Speed _dial" msgstr "Ajouter à la page d'appel rapi_de" -#: ../midori/midori-browser.c:5549 +#: ../midori/midori-browser.c:5180 msgid "Add Shortcut to the _desktop" msgstr "Ajouter un raccourci sur le _bureau" -#: ../midori/midori-browser.c:5551 +#: ../midori/midori-browser.c:5182 msgid "Create _Launcher" msgstr "Créer un _lanceur" -#: ../midori/midori-browser.c:5555 +#: ../midori/midori-browser.c:5186 msgid "Subscribe to News _feed" msgstr "Souscrire au flux de _nouvelles" -#: ../midori/midori-browser.c:5561 +#: ../midori/midori-browser.c:5192 msgid "_Close Tab" msgstr "Fe_rmer l'onglet" -#: ../midori/midori-browser.c:5562 +#: ../midori/midori-browser.c:5193 msgid "Close the current tab" msgstr "Fermer l'onglet actuel" -#: ../midori/midori-browser.c:5564 +#: ../midori/midori-browser.c:5195 msgid "C_lose Window" msgstr "Fer_mer la fenêtre" -#: ../midori/midori-browser.c:5568 -msgid "_Share" -msgstr "Partager" - -#: ../midori/midori-browser.c:5573 +#: ../midori/midori-browser.c:5199 msgid "Print the current page" msgstr "Imprimer la page actuelle" -#: ../midori/midori-browser.c:5576 +#: ../midori/midori-browser.c:5201 msgid "Close a_ll Windows" msgstr "Fermer _toutes les fenêtres" -#: ../midori/midori-browser.c:5579 +#: ../midori/midori-browser.c:5204 msgid "_Edit" msgstr "É_dition" -#: ../midori/midori-browser.c:5602 -msgid "_Find…" +#: ../midori/midori-browser.c:5227 +msgid "_Find..." msgstr "_Trouver" -#: ../midori/midori-browser.c:5603 +#: ../midori/midori-browser.c:5228 msgid "Find a word or phrase in the page" msgstr "Rechercher un mot ou une phrase dans la page" -#: ../midori/midori-browser.c:5605 +#: ../midori/midori-browser.c:5230 msgid "Find _Next" msgstr "Rechercher le sui_vant" -#: ../midori/midori-browser.c:5608 +#: ../midori/midori-browser.c:5233 msgid "Find _Previous" msgstr "Rechercher le _précédent" -#: ../midori/midori-browser.c:5612 +#: ../midori/midori-browser.c:5237 msgid "Configure the application preferences" msgstr "Configurer les préférences de l'application" -#: ../midori/midori-browser.c:5614 +#: ../midori/midori-browser.c:5239 msgid "_View" msgstr "_Affichage" -#: ../midori/midori-browser.c:5615 +#: ../midori/midori-browser.c:5240 msgid "_Toolbars" msgstr "_Barre d'outils" -#: ../midori/midori-browser.c:5620 +#: ../midori/midori-browser.c:5245 msgid "Reload page without caching" msgstr "Actualiser la page sans mettre en cache" -#: ../midori/midori-browser.c:5630 +#: ../midori/midori-browser.c:5255 msgid "Increase the zoom level" msgstr "Augmenter le niveau d'agrandissement" -#: ../midori/midori-browser.c:5633 +#: ../midori/midori-browser.c:5258 msgid "Decrease the zoom level" msgstr "Diminuer le niveau d'agrandissement" -#: ../midori/midori-browser.c:5637 +#: ../midori/midori-browser.c:5262 msgid "_Encoding" msgstr "_Encodage" -#: ../midori/midori-browser.c:5639 +#: ../midori/midori-browser.c:5264 msgid "View So_urce" msgstr "Afficher le code so_urce" -#: ../midori/midori-browser.c:5642 +#: ../midori/midori-browser.c:5267 msgid "Ca_ret Browsing" msgstr "Navigation au _curseur" -#: ../midori/midori-browser.c:5646 +#: ../midori/midori-browser.c:5271 msgid "Toggle fullscreen view" msgstr "Activer/désactiver le plein écran" -#: ../midori/midori-browser.c:5648 +#: ../midori/midori-browser.c:5273 msgid "Scroll _Left" msgstr "Défilement à _gauche" -#: ../midori/midori-browser.c:5651 +#: ../midori/midori-browser.c:5276 msgid "Scroll _Down" msgstr "Défilement en _bas" -#: ../midori/midori-browser.c:5654 +#: ../midori/midori-browser.c:5279 msgid "Scroll _Up" msgstr "Défilement en _haut" -#: ../midori/midori-browser.c:5657 +#: ../midori/midori-browser.c:5282 msgid "Scroll _Right" msgstr "Défilement à _droite" -#: ../midori/midori-browser.c:5660 -msgid "_Readable" -msgstr "Lisible" - -#: ../midori/midori-browser.c:5663 +#: ../midori/midori-browser.c:5285 msgid "_Go" msgstr "A_ller" -#: ../midori/midori-browser.c:5666 +#: ../midori/midori-browser.c:5288 msgid "Go back to the previous page" msgstr "Aller à la page précédente" +#: ../midori/midori-browser.c:5291 +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:5673 +#: ../midori/midori-browser.c:5295 msgid "Go to the previous sub-page" msgstr "Aller à la sous-page précédente" -#: ../midori/midori-browser.c:5682 -msgid "_Homepage" -msgstr "Page d'a_ccueil" +#. i18n: Visit the following logical page, ie. in a forum or blog +#: ../midori/midori-browser.c:5299 +msgid "Go to the next sub-page" +msgstr "Aller à la sous-page suivante" -#: ../midori/midori-browser.c:5683 +#: ../midori/midori-browser.c:5302 msgid "Go to your homepage" msgstr "Aller à la page d'accueil" -#: ../midori/midori-browser.c:5685 +#: ../midori/midori-browser.c:5304 msgid "Empty Trash" msgstr "Vider la corbeille" -#: ../midori/midori-browser.c:5688 +#: ../midori/midori-browser.c:5307 msgid "Undo _Close Tab" msgstr "A_nnuler la fermeture de l'onglet" -#: ../midori/midori-browser.c:5695 +#: ../midori/midori-browser.c:5314 msgid "Add a new _folder" msgstr "Ajouter un nouveau _dossier" -#: ../midori/midori-browser.c:5701 +#: ../midori/midori-browser.c:5320 msgid "_Export bookmarks" msgstr "_Exporter des signets" -#: ../midori/midori-browser.c:5704 ../midori/midori-searchaction.c:496 +#: ../midori/midori-browser.c:5323 ../midori/midori-searchaction.c:496 msgid "_Manage Search Engines" msgstr "_Gestion des moteurs de recherche" -#: ../midori/midori-browser.c:5707 +#: ../midori/midori-browser.c:5326 msgid "_Clear Private Data" msgstr "_Effacer les informations privées" -#: ../midori/midori-browser.c:5710 +#: ../midori/midori-browser.c:5329 msgid "_Inspect Page" msgstr "_Inspecter la page" -#: ../midori/midori-browser.c:5714 +#: ../midori/midori-browser.c:5333 msgid "_Previous Tab" msgstr "Onglet _précédent" -#: ../midori/midori-browser.c:5717 +#: ../midori/midori-browser.c:5336 msgid "_Next Tab" msgstr "Onglet _suivant" -#: ../midori/midori-browser.c:5719 +#: ../midori/midori-browser.c:5338 msgid "Move Tab _Backward" msgstr "Déplacer l'onglet en _arrière" -#: ../midori/midori-browser.c:5721 +#: ../midori/midori-browser.c:5340 msgid "_Move Tab Forward" msgstr "_Déplacer l'onglet en avant" -#: ../midori/midori-browser.c:5724 +#: ../midori/midori-browser.c:5343 msgid "Focus _Current Tab" msgstr "Mettre le focus sur l'onglet _actuel" -#: ../midori/midori-browser.c:5727 +#: ../midori/midori-browser.c:5346 msgid "Focus _Next view" msgstr "Mettre le focus sur la vue _suivante" -#: ../midori/midori-browser.c:5730 +#: ../midori/midori-browser.c:5349 msgid "Only show the Icon of the _Current Tab" msgstr "Afficher uniquement l'icône de l'onglet _courant" -#: ../midori/midori-browser.c:5733 +#: ../midori/midori-browser.c:5352 msgid "_Duplicate Current Tab" msgstr "_Dupliquer l'onglet actif" -#: ../midori/midori-browser.c:5736 +#: ../midori/midori-browser.c:5355 msgid "Close Ot_her Tabs" msgstr "Fermer les _autres onglets" -#: ../midori/midori-browser.c:5739 +#: ../midori/midori-browser.c:5358 msgid "Open last _session" msgstr "Ouvrir la _dernière session" -#: ../midori/midori-browser.c:5742 +#: ../midori/midori-browser.c:5361 msgid "_Help" msgstr "Aid_e" -#: ../midori/midori-browser.c:5744 +#: ../midori/midori-browser.c:5363 msgid "_Frequent Questions" msgstr "_Questions fréquentes" -#: ../midori/midori-browser.c:5747 -msgid "_Report a Problem…" +#: ../midori/midori-browser.c:5366 +msgid "_Report a Problem..." msgstr "_Signaler un _problème" -#: ../midori/midori-browser.c:5752 ../midori/midori-browser.c:6413 -msgid "_Tools" -msgstr "_Outils" - -#: ../midori/midori-browser.c:5759 +#: ../midori/midori-browser.c:5378 msgid "_Menubar" msgstr "Barre de _menu" -#: ../midori/midori-browser.c:5763 +#: ../midori/midori-browser.c:5382 msgid "_Navigationbar" msgstr "Barre de _navigation" -#: ../midori/midori-browser.c:5767 +#: ../midori/midori-browser.c:5386 msgid "Side_panel" msgstr "Panneau la_téral" -#: ../midori/midori-browser.c:5768 +#: ../midori/midori-browser.c:5387 +#, fuzzy msgid "Sidepanel" -msgstr "Panneau latéral" +msgstr "Panneau la_téral" -#: ../midori/midori-browser.c:5771 +#: ../midori/midori-browser.c:5390 msgid "_Bookmarkbar" msgstr "Barre des _signets" -#: ../midori/midori-browser.c:5775 +#: ../midori/midori-browser.c:5394 msgid "_Statusbar" msgstr "Barre d'ét_at" -#: ../midori/midori-browser.c:5784 ../midori/midori-websettings.c:198 +#: ../midori/midori-browser.c:5403 ../midori/midori-websettings.c:299 msgid "_Automatic" msgstr "_Automatique" -#: ../midori/midori-browser.c:5787 ../midori/midori-websettings.c:122 -msgid "Chinese Traditional (BIG5)" -msgstr "Chinois traditionnel (BIG5)" - -#: ../midori/midori-browser.c:5790 ../midori/midori-websettings.c:123 -msgid "Chinese Simplified (GB18030)" -msgstr "Chinois simplifié (GB18030)" +#: ../midori/midori-browser.c:5406 ../midori/midori-websettings.c:224 +msgid "Chinese (BIG5)" +msgstr "Chinois (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5794 +#: ../midori/midori-browser.c:5410 msgid "Japanese (SHIFT__JIS)" msgstr "Japonais (SHIFT__JIS)" -#: ../midori/midori-browser.c:5797 ../midori/midori-websettings.c:125 +#: ../midori/midori-browser.c:5413 ../midori/midori-websettings.c:226 msgid "Korean (EUC-KR)" msgstr "Coréen (EUC-KR)" -#: ../midori/midori-browser.c:5800 ../midori/midori-websettings.c:126 +#: ../midori/midori-browser.c:5416 ../midori/midori-websettings.c:227 msgid "Russian (KOI8-R)" msgstr "Russe (KOI8-R)" -#: ../midori/midori-browser.c:5803 ../midori/midori-websettings.c:127 +#: ../midori/midori-browser.c:5419 ../midori/midori-websettings.c:228 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5806 ../midori/midori-websettings.c:128 +#: ../midori/midori-browser.c:5422 ../midori/midori-websettings.c:229 msgid "Western (ISO-8859-1)" msgstr "Occidental (ISO-8859-1)" -#: ../midori/midori-browser.c:5809 -msgid "Custom…" -msgstr "Personnalisé…" +#: ../midori/midori-browser.c:5425 ../midori/midori-websettings.c:230 +#: ../midori/midori-websettings.c:305 ../katze/katze-utils.c:635 +msgid "Custom..." +msgstr "Personnalisé..." -#: ../midori/midori-browser.c:6319 +#: ../midori/midori-browser.c:5905 msgid "_Separator" msgstr "_Séparateur" -#: ../midori/midori-browser.c:6326 -msgid "_Location…" -msgstr "_Emplacement…" +#: ../midori/midori-browser.c:5912 +msgid "_Location..." +msgstr "_Emplacement..." -#: ../midori/midori-browser.c:6328 +#: ../midori/midori-browser.c:5914 msgid "Open a particular location" msgstr "Ouvrir un emplacement particulier" -#: ../midori/midori-browser.c:6350 -msgid "_Web Search…" -msgstr "Recherche _Internet…" +#: ../midori/midori-browser.c:5936 +msgid "_Web Search..." +msgstr "Recherche _Internet..." -#: ../midori/midori-browser.c:6352 +#: ../midori/midori-browser.c:5938 msgid "Run a web search" msgstr "Lancer une recherche sur Internet" -#: ../midori/midori-browser.c:6379 +#: ../midori/midori-browser.c:5959 msgid "Reopen a previously closed tab or window" msgstr "Rouvrir un onglet ou une fenêtre précédemment fermé" -#: ../midori/midori-browser.c:6396 +#: ../midori/midori-browser.c:5974 msgid "Show the saved bookmarks" msgstr "Afficher les signets sauvegardés" -#: ../midori/midori-browser.c:6429 +#: ../midori/midori-browser.c:5988 +msgid "_Tools" +msgstr "_Outils" + +#: ../midori/midori-browser.c:6003 msgid "_Window" msgstr "Fe_nêtre" -#: ../midori/midori-browser.c:6431 +#: ../midori/midori-browser.c:6005 msgid "Show a list of all open tabs" msgstr "Afficher une liste de tous les onglets ouverts" -#: ../midori/midori-browser.c:6445 +#: ../midori/midori-browser.c:6019 msgid "_Menu" msgstr "_Menu" -#: ../midori/midori-browser.c:6447 +#: ../midori/midori-browser.c:6021 msgid "Menu" msgstr "Menu" -#: ../midori/midori-browser.c:7272 +#: ../midori/midori-browser.c:6588 #, c-format msgid "Unexpected setting '%s'" msgstr "Paramètre inattendu « %s »" -#: ../midori/midori-extension.c:330 +#: ../midori/midori-extension.c:310 #, c-format 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-extension.c:749 ../midori/midori-extension.c:846 -#: ../midori/midori-extension.c:943 ../midori/midori-extension.c:1055 -#: ../extensions/addons.c:1685 +#: ../midori/midori-extension.c:721 ../midori/midori-extension.c:818 +#: ../midori/midori-extension.c:915 ../midori/midori-extension.c:1027 +#: ../extensions/addons.c:1690 #, 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" -#: ../midori/midori-locationaction.c:398 -#, c-format -msgid "Search with %s" -msgstr "Rechercher avec %s" - -#: ../midori/midori-locationaction.c:418 -msgid "Search with…" -msgstr "Rechercher avec…" - -#: ../midori/midori-locationaction.c:545 +#: ../midori/midori-locationaction.c:425 #, c-format msgid "Failed to select from history\n" msgstr "Impossible de sélectionner dans l'historique\n" -#: ../midori/midori-locationaction.c:632 +#: ../midori/midori-locationaction.c:509 #, c-format msgid "Search for %s" msgstr "Rechercher %s" -#: ../midori/midori-locationaction.c:1227 -msgid "Export certificate" -msgstr "Exporter le certificat" - -#: ../midori/midori-locationaction.c:1259 -msgid "The signing certificate authority is not known." -msgstr "L'autorité de signature de certificat est inconnue." - -#: ../midori/midori-locationaction.c:1261 -msgid "" -"The certificate does not match the expected identity of the site that it was " -"retrieved from." -msgstr "" -"Le certificat ne correspond pas à l'identité attendue du site qui a été reçu." - -#: ../midori/midori-locationaction.c:1263 -#, fuzzy -msgid "The certificate's activation time is still in the future." -msgstr "le temps d'activation du certificat est encore dans le futur." - -#: ../midori/midori-locationaction.c:1265 -msgid "The certificate has expired" -msgstr "Le certificat a expiré" - -#: ../midori/midori-locationaction.c:1267 -#, fuzzy -msgid "" -"The certificate has been revoked according to the GTlsConnection's " -"certificate revocation list." -msgstr "" -"Le certificat a été révoqué conformément à la liste de révocation de " -"certificats GTL Connexions." - -#: ../midori/midori-locationaction.c:1269 -msgid "The certificate's algorithm is considered insecure." -msgstr "L'algorithme du certificat est considéré comme peu sûr." - -#: ../midori/midori-locationaction.c:1271 -msgid "Some other error occurred validating the certificate." -msgstr "Une autre erreur s'est produite lors de la validation du certificat." - -#: ../midori/midori-locationaction.c:1318 -msgid "_Export certificate" -msgstr "_Exporter le certificat" - -#: ../midori/midori-locationaction.c:1333 -msgid "Self-signed" -msgstr "Auto-signé" - -#: ../midori/midori-locationaction.c:1367 -msgid "Security details" -msgstr "Détails de sécurité" +#: ../midori/midori-locationaction.c:535 +#, c-format +msgid "Search with %s" +msgstr "Rechercher avec %s" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1650 +#: ../midori/midori-locationaction.c:1285 msgid "Paste and p_roceed" msgstr "Coller et continue_r" -#: ../midori/midori-locationaction.c:1974 +#: ../midori/midori-locationaction.c:1652 msgid "Not verified" msgstr "Non vérifié" -#: ../midori/midori-locationaction.c:1982 +#: ../midori/midori-locationaction.c:1667 msgid "Verified and encrypted connection" msgstr "Connection sécurisée" -#: ../midori/midori-locationaction.c:1989 -msgid "Open, unencrypted connection" -msgstr "Ouvrir une connection sécurisée" - -#: ../midori/midori-panel.c:317 ../midori/midori-panel.c:319 -#: ../midori/midori-panel.c:483 ../midori/midori-panel.c:486 +#: ../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:329 ../midori/midori-panel.c:330 +#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410 msgid "Close panel" msgstr "Fermer le panneau" -#: ../midori/midori-panel.c:484 ../midori/midori-panel.c:487 +#: ../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-websettings.c:104 +#: ../midori/midori-websettings.c:206 msgid "Show Speed Dial" msgstr "Montrer l'Appel rapide" -#: ../midori/midori-websettings.c:105 +#: ../midori/midori-websettings.c:207 msgid "Show Homepage" msgstr "Afficher la page d'accueil" -#: ../midori/midori-websettings.c:124 +#: ../midori/midori-websettings.c:225 msgid "Japanese (SHIFT_JIS)" msgstr "Japonais (SHIFT_JIS)" -#: ../midori/midori-websettings.c:129 ../midori/midori-websettings.c:205 -#: ../katze/katze-utils.c:633 -msgid "Custom..." -msgstr "Personnalisé…" - -#: ../midori/midori-websettings.c:144 +#: ../midori/midori-websettings.c:245 msgid "New tab" msgstr "Nouvel onglet" -#: ../midori/midori-websettings.c:145 +#: ../midori/midori-websettings.c:246 msgid "New window" msgstr "Nouvelle fenêtre" -#: ../midori/midori-websettings.c:146 +#: ../midori/midori-websettings.c:247 msgid "Current tab" msgstr "Onglet actuel" -#: ../midori/midori-websettings.c:161 +#: ../midori/midori-websettings.c:262 msgid "Default" msgstr "Par défaut" -#: ../midori/midori-websettings.c:162 +#: ../midori/midori-websettings.c:263 msgid "Icons" msgstr "Icônes" -#: ../midori/midori-websettings.c:163 +#: ../midori/midori-websettings.c:264 msgid "Small icons" msgstr "Petites icônes" -#: ../midori/midori-websettings.c:164 +#: ../midori/midori-websettings.c:265 msgid "Text" msgstr "Texte" -#: ../midori/midori-websettings.c:165 +#: ../midori/midori-websettings.c:266 msgid "Icons and text" msgstr "Icônes et texte" -#: ../midori/midori-websettings.c:166 +#: ../midori/midori-websettings.c:267 msgid "Text beside icons" msgstr "Texte à côté des icônes" -#: ../midori/midori-websettings.c:181 +#: ../midori/midori-websettings.c:282 msgid "Automatic (GNOME or environment)" msgstr "Automatique (GNOME ou de l'environnement)" -#: ../midori/midori-websettings.c:182 +#: ../midori/midori-websettings.c:283 msgid "HTTP proxy server" msgstr "Serveur mandataire HTTP" -#: ../midori/midori-websettings.c:183 +#: ../midori/midori-websettings.c:284 msgid "No proxy server" msgstr "Pas de serveur mandataire" -#: ../midori/midori-websettings.c:200 -msgid "Chrome" -msgstr "Chrome" - -#: ../midori/midori-websettings.c:201 +#: ../midori/midori-websettings.c:301 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:202 +#: ../midori/midori-websettings.c:302 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:203 +#: ../midori/midori-websettings.c:303 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:304 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:277 +#: ../midori/midori-websettings.c:357 +msgid "Remember last window size" +msgstr "Se souvenir de la taille de la fenêtre" + +#: ../midori/midori-websettings.c:358 +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:366 +msgid "Last window width" +msgstr "Dernière largeur de la fenêtre" + +#: ../midori/midori-websettings.c:367 +msgid "The last saved window width" +msgstr "La dernière largeur enregistrée de la fenêtre" + +#: ../midori/midori-websettings.c:375 +msgid "Last window height" +msgstr "Dernière hauteur de la fenêtre" + +#: ../midori/midori-websettings.c:376 +msgid "The last saved window height" +msgstr "La dernière hauteur enregistrée de la fenêtre" + +#: ../midori/midori-websettings.c:401 +msgid "Last panel position" +msgstr "Dernière position du panneau" + +#: ../midori/midori-websettings.c:402 +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:411 +msgid "Last panel page" +msgstr "Dernière page du panneau" + +#: ../midori/midori-websettings.c:412 +msgid "The last saved panel page" +msgstr "La dernière page enregistrée du panneau" + +#: ../midori/midori-websettings.c:420 +msgid "Last Web search" +msgstr "Dernière recherche sur Internet" + +#: ../midori/midori-websettings.c:421 +msgid "The last saved Web search" +msgstr "La dernière recherche sur Internet enregistrée" + +#: ../midori/midori-websettings.c:430 +msgid "Show Menubar" +msgstr "Afficher la barre de menu" + +#: ../midori/midori-websettings.c:431 +msgid "Whether to show the menubar" +msgstr "Indique s'il faut afficher la barre de menu" + +#: ../midori/midori-websettings.c:439 +msgid "Show Navigationbar" +msgstr "Afficher la barre de navigation" + +#: ../midori/midori-websettings.c:440 +msgid "Whether to show the navigationbar" +msgstr "Indique s'il faut afficher la barre de navigation" + +#: ../midori/midori-websettings.c:448 +msgid "Show Bookmarkbar" +msgstr "Afficher la barre des _signets" + +#: ../midori/midori-websettings.c:449 +msgid "Whether to show the bookmarkbar" +msgstr "Indique s'il faut afficher la barre des signets" + +#: ../midori/midori-websettings.c:457 +msgid "Show Panel" +msgstr "Afficher le panneau" + +#: ../midori/midori-websettings.c:458 +msgid "Whether to show the panel" +msgstr "Indique s'il faut afficher le panneau" + +#: ../midori/midori-websettings.c:466 +msgid "Show Statusbar" +msgstr "Afficher la barre d'état" + +#: ../midori/midori-websettings.c:467 +msgid "Whether to show the statusbar" +msgstr "Indique s'il faut afficher la barre d'état" + +#: ../midori/midori-websettings.c:476 msgid "Toolbar Style:" msgstr "Style de la barre d'outils" -#: ../midori/midori-websettings.c:278 +#: ../midori/midori-websettings.c:477 msgid "The style of the toolbar" msgstr "Le style de la barre d'outils" -#: ../midori/midori-websettings.c:287 +#: ../midori/midori-websettings.c:486 +msgid "Toolbar Items" +msgstr "Éléments de la barre d'outils" + +#: ../midori/midori-websettings.c:487 +msgid "The items to show on the toolbar" +msgstr "Les éléments à afficher dans la barre d'outils" + +#: ../midori/midori-websettings.c:495 +msgid "Compact Sidepanel" +msgstr "Panneau latéral compact" + +#: ../midori/midori-websettings.c:496 +msgid "Whether to make the sidepanel compact" +msgstr "Indique s'il faut mettre le panneau latéral compact" + +#: ../midori/midori-websettings.c:511 +msgid "Align sidepanel on the right" +msgstr "Aligner le panneau latéral sur la droite" + +#: ../midori/midori-websettings.c:512 +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:527 +msgid "Open panels in separate windows" +msgstr "Ouvrir les panneaux dans une fenêtre séparée" + +#: ../midori/midori-websettings.c:528 +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:537 msgid "When Midori starts:" msgstr "Au lancement de Midori :" -#: ../midori/midori-websettings.c:297 +#: ../midori/midori-websettings.c:538 +msgid "What to do when Midori starts" +msgstr "Que faire au lancement de Midori" + +#: ../midori/midori-websettings.c:547 +msgid "Homepage:" +msgstr "Page d'accueil :" + +#: ../midori/midori-websettings.c:548 +msgid "The homepage" +msgstr "La page d'accueil" + +#: ../midori/midori-websettings.c:563 +msgid "Show crash dialog" +msgstr "Fenêtre de fermeture inattendue" + +#: ../midori/midori-websettings.c:564 +msgid "Show a dialog after Midori crashed" +msgstr "Afficher une fenêtre en cas de fermeture inattendue de Midori" + +#: ../midori/midori-websettings.c:572 +msgid "Save downloaded files to:" +msgstr "Enregistrer les téléchargements sous :" + +#: ../midori/midori-websettings.c:573 +msgid "The folder downloaded files are saved to" +msgstr "Le dossier où enregistrer les fichiers téléchargés" + +#: ../midori/midori-websettings.c:581 +msgid "Text Editor" +msgstr "Éditeur de texte" + +#: ../midori/midori-websettings.c:582 +msgid "An external text editor" +msgstr "Un éditeur de texte externe" + +#: ../midori/midori-websettings.c:597 +msgid "News Aggregator" +msgstr "Agrégateur de flux" + +#: ../midori/midori-websettings.c:598 +msgid "An external news aggregator" +msgstr "Un agrégateur de flux externe" + +#: ../midori/midori-websettings.c:606 +msgid "Location entry Search" +msgstr "Recherche depuis la barre d'adresse" + +#: ../midori/midori-websettings.c:607 +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:615 msgid "Preferred Encoding" msgstr "Encodage favori" -#: ../midori/midori-websettings.c:324 +#: ../midori/midori-websettings.c:616 +msgid "The preferred character encoding" +msgstr "Encodage favori des caractères" + +#: ../midori/midori-websettings.c:626 +msgid "Always Show Tabbar" +msgstr "Toujours afficher la barre d'onglets" + +#: ../midori/midori-websettings.c:627 +msgid "Always show the tabbar" +msgstr "Toujours afficher la barre d'onglets" + +#: ../midori/midori-websettings.c:635 +msgid "Close Buttons on Tabs" +msgstr "Boutons de fermeture sur les onglets" + +#: ../midori/midori-websettings.c:636 +msgid "Whether tabs have close buttons" +msgstr "Indique s'il faut afficher un bouton de fermeture sur les onglets" + +#: ../midori/midori-websettings.c:661 msgid "Open new pages in:" msgstr "Ouvrir les nouvelles pages dans :" +#: ../midori/midori-websettings.c:662 +msgid "Where to open new pages" +msgstr "Lieu où les nouvelles pages doivent être ouvertes" + +#: ../midori/midori-websettings.c:671 +msgid "Middle click opens Selection" +msgstr "Un clic milieu ouvre la sélection" + +#: ../midori/midori-websettings.c:672 +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:680 +msgid "Open tabs in the background" +msgstr "Ouvrir les onglets en arrière-plan" + +#: ../midori/midori-websettings.c:681 +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:689 +msgid "Open Tabs next to Current" +msgstr "Ouvrir les onglets à côté de l'onglet actif" + +#: ../midori/midori-websettings.c:690 +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:698 +msgid "Open popups in tabs" +msgstr "Ouvrir les fenêtre intempestives dans des onglets" + +#: ../midori/midori-websettings.c:699 +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:709 ../extensions/statusbar-features.c:131 +msgid "Load images automatically" +msgstr "Charger les images automatiquement" + +#: ../midori/midori-websettings.c:710 +msgid "Load and display images automatically" +msgstr "Charger et afficher les images automatiquement" + +#: ../midori/midori-websettings.c:717 ../extensions/statusbar-features.c:140 +msgid "Enable scripts" +msgstr "Activer les scripts" + +#: ../midori/midori-websettings.c:718 +msgid "Enable embedded scripting languages" +msgstr "Active la prise en charge interne des scripts" + +#: ../midori/midori-websettings.c:725 ../extensions/statusbar-features.c:149 +msgid "Enable Netscape plugins" +msgstr "Activer les greffons Netscape" + +#: ../midori/midori-websettings.c:726 +msgid "Enable embedded Netscape plugin objects" +msgstr "Active la prise en charge interne des greffons Netscape" + +#: ../midori/midori-websettings.c:746 +msgid "Enable Spell Checking" +msgstr "Activer la vérification de l'orthographe" + +#: ../midori/midori-websettings.c:747 +msgid "Enable spell checking while typing" +msgstr "Activer la vérification de l'orthographe lors de la saisie" + +#: ../midori/midori-websettings.c:753 +msgid "Enable HTML5 database support" +msgstr "Activer le support de base de données HTML5" + +#: ../midori/midori-websettings.c:754 +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:760 +msgid "Enable HTML5 local storage support" +msgstr "Activer le support de stockage local de HTML5" + +#: ../midori/midori-websettings.c:761 +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:767 +msgid "Enable offline web application cache" +msgstr "Activer le cache d'applications web hors ligne" + +#: ../midori/midori-websettings.c:768 +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:784 +#, fuzzy +msgid "Flash window on background tabs" +msgstr "Ouvrir le lien en a_rrière plan" + +#: ../midori/midori-websettings.c:785 +#, fuzzy +msgid "Flash the browser window if a new tab was opened in the background" +msgstr "Indique s'il faut ouvrir les nouveaux onglets en arrière-plan" + +#: ../midori/midori-websettings.c:800 +msgid "Zoom Text and Images" +msgstr "Agrandir le texte et les images" + +#: ../midori/midori-websettings.c:801 +msgid "Whether to zoom text and images" +msgstr "Indique s'il faut agrandir le texte et les images" + +#: ../midori/midori-websettings.c:816 +msgid "Find inline while typing" +msgstr "Chercher pendant la saisie" + +#: ../midori/midori-websettings.c:817 +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:832 +msgid "Kinetic scrolling" +msgstr "Défilement cinétique" + +#: ../midori/midori-websettings.c:833 +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:841 +#, fuzzy +msgid "Delete old Cookies after:" +msgstr "Effacer les anciens cookies après 1 jour" + +#: ../midori/midori-websettings.c:842 +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:858 +msgid "Only accept Cookies from sites you visit" +msgstr "N'accepter les cookies que de sites que vous visitez" + +#: ../midori/midori-websettings.c:859 +#, fuzzy +msgid "Block cookies sent by third-party websites" +msgstr "Bloquer les cookies envoyés par des sites tiers" + +#: ../midori/midori-websettings.c:873 +#, fuzzy +msgid "Delete pages from history after:" +msgstr "Onglet suivant dans l'historique" + +#: ../midori/midori-websettings.c:874 +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:889 +msgid "Proxy server" +msgstr "Serveur mandataire" + +#: ../midori/midori-websettings.c:890 +msgid "The type of proxy server to use" +msgstr "Le type de serveur mandataire à utiliser" + +#: ../midori/midori-websettings.c:899 +msgid "HTTP Proxy Server" +msgstr "Serveur mandataire HTTP" + +#: ../midori/midori-websettings.c:900 +msgid "The proxy server used for HTTP connections" +msgstr "Le serveur mandataire (proxy) pour les connexions HTTP" + +#: ../midori/midori-websettings.c:915 +#, fuzzy +msgid "Port" +msgstr "Port" + +#: ../midori/midori-websettings.c:916 +#, fuzzy +msgid "The proxy server port used for HTTP connections" +msgstr "Le serveur mandataire (proxy) pour les connexions HTTP" + +#: ../midori/midori-websettings.c:934 +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:387 +#: ../midori/midori-websettings.c:951 msgid "Identify as" msgstr "S'identifier comme" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:952 msgid "What to identify as to web pages" msgstr "Comment s'identifier sur les pages Internet" -#: ../midori/midori-websettings.c:421 +#: ../midori/midori-websettings.c:968 +msgid "Identification string" +msgstr "Chaîne d'identification" + +#: ../midori/midori-websettings.c:969 +msgid "The application identification string" +msgstr "La chaîne d'identification de l'application" + +#: ../midori/midori-websettings.c:985 msgid "Preferred languages" msgstr "Langues préférés" -#: ../midori/midori-websettings.c:422 -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:986 +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:1001 +msgid "Clear private data" +msgstr "Effacer les informations privées" + +#: ../midori/midori-websettings.c:1002 +msgid "The private data selected for deletion" +msgstr "Les informations privées sélectionnées pour la suppression" + +#: ../midori/midori-websettings.c:1017 +msgid "Clear data" +msgstr "Effacer les informations" + +#: ../midori/midori-websettings.c:1018 +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:1051 +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:1053 +msgid "Whether the \"Referer\" header should be shortened to the hostname" 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\"" +"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:471 +#: ../midori/midori-websettings.c:1067 msgid "Always use my font choices" msgstr "Toujours utiliser les polices choisies" -#: ../midori/midori-websettings.c:472 +#: ../midori/midori-websettings.c:1068 msgid "Override fonts picked by websites with user preferences" -msgstr "Forcer toute page web à utiliser les polices ci-dessus" - -#: ../midori/midori-view.c:997 ../midori/midori-view.c:1136 -msgid "Trust this website" -msgstr "Faire confiance à ce site" - -#: ../midori/midori-view.c:1134 -msgid "Security unknown" -msgstr "Sécurité inconnue" +msgstr "" -#: ../midori/midori-view.c:1432 +#: ../midori/midori-view.c:1343 #, c-format msgid "%s wants to save an HTML5 database." msgstr "%s veut enregistrer une base de donnée HTML5." -#: ../midori/midori-view.c:1436 ../midori/midori-view.c:1470 +#: ../midori/midori-view.c:1347 ../midori/midori-view.c:1376 msgid "_Deny" msgstr "_Refuser" -#: ../midori/midori-view.c:1436 ../midori/midori-view.c:1470 +#: ../midori/midori-view.c:1347 ../midori/midori-view.c:1376 msgid "_Allow" msgstr "_Autoriser" -#: ../midori/midori-view.c:1465 +#: ../midori/midori-view.c:1372 #, c-format msgid "%s wants to know your location." msgstr "%s veut connaître votre position" -#: ../midori/midori-view.c:1561 +#: ../midori/midori-view.c:1459 #, c-format msgid "Error - %s" msgstr "Erreur - %s" -#: ../midori/midori-view.c:1562 +#: ../midori/midori-view.c:1460 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "La page « %s » n'a pu être chargée." -#: ../midori/midori-view.c:1564 +#: ../midori/midori-view.c:1462 msgid "Try again" msgstr "Réessayer" -#: ../midori/midori-view.c:1762 ../midori/midori-view.c:2875 +#: ../midori/midori-view.c:1624 ../midori/midori-view.c:2469 #, c-format msgid "Send a message to %s" msgstr "Envoyer un message à %s" -#: ../midori/midori-view.c:2661 -msgid "Add _search engine..." -msgstr "Ajouter un moteur de recherche" - -#: ../midori/midori-view.c:2705 ../midori/midori-view.c:3031 +#: ../midori/midori-view.c:2311 ../midori/midori-view.c:2622 msgid "Inspect _Element" msgstr "Inspecter l'élé_ment" -#: ../midori/midori-view.c:2757 +#: ../midori/midori-view.c:2361 msgid "Open Link in New _Tab" msgstr "Ouvrir le lien dans un nouvel _onglet" -#: ../midori/midori-view.c:2761 +#: ../midori/midori-view.c:2365 msgid "Open Link in _Foreground Tab" msgstr "Ouvrir le lien en a_vant plan" -#: ../midori/midori-view.c:2762 +#: ../midori/midori-view.c:2366 msgid "Open Link in _Background Tab" msgstr "Ouvrir le lien en a_rrière plan" -#: ../midori/midori-view.c:2765 +#: ../midori/midori-view.c:2369 msgid "Open Link in New _Window" msgstr "Ouvrir le lien dans une nouvelle _fenêtre" -#: ../midori/midori-view.c:2768 +#: ../midori/midori-view.c:2372 msgid "Open Link as Web A_pplication" msgstr "Ouvrir le lien comme une appli_cation internet" -#: ../midori/midori-view.c:2773 +#: ../midori/midori-view.c:2375 msgid "Copy Link de_stination" msgstr "Copier l'adre_sse du lien" -#: ../midori/midori-view.c:2789 +#: ../midori/midori-view.c:2387 msgid "Open _Image in New Tab" msgstr "Ouvrir l'image dans un _nouvel onglet" -#: ../midori/midori-view.c:2792 +#: ../midori/midori-view.c:2390 msgid "Copy Image _Address" msgstr "Copier l'_adresse de l'image" -#: ../midori/midori-view.c:2795 +#: ../midori/midori-view.c:2393 msgid "Save I_mage" msgstr "Enregistrer l'i_mage" -#: ../midori/midori-view.c:2798 -msgid "Open in Image _Viewer" -msgstr "Ouvrir dans la _Visionneuse d'images" - -#: ../midori/midori-view.c:2805 +#: ../midori/midori-view.c:2400 msgid "Copy Video _Address" msgstr "Copier l'_adresse de la vidéo" -#: ../midori/midori-view.c:2808 +#: ../midori/midori-view.c:2403 msgid "Save _Video" msgstr "Enregistrer la _vidéo" -#: ../midori/midori-view.c:2808 +#: ../midori/midori-view.c:2403 msgid "Download _Video" msgstr "Télécharger la _vidéo" -#: ../midori/midori-view.c:2834 +#: ../midori/midori-view.c:2429 msgid "Search _with" msgstr "Rechercher _avec" -#: ../midori/midori-view.c:2866 +#: ../midori/midori-view.c:2461 msgid "_Search the Web" msgstr "_Rechercher sur Internet" -#: ../midori/midori-view.c:2883 +#: ../midori/midori-view.c:2477 msgid "Open Address in New _Tab" msgstr "Ouvrir l'adresse dans un nouvel _onglet" -#: ../midori/midori-view.c:2936 -msgid "Open _Frame in New Tab" -msgstr "Ouvrir le cadre dans un _nouvel onglet" - -#: ../midori/midori-view.c:3193 -#, c-format -msgid "Open or download file from %s" -msgstr "Ouvrir ou télécharger le fichier depuis %s" - -#: ../midori/midori-view.c:3217 -#, c-format -msgid "File Name: %s" -msgstr "Nom du fichier : %s" +#: ../midori/midori-view.c:2773 +msgid "Open or download file" +msgstr "Ouvrir ou télécharger le fichier" -#: ../midori/midori-view.c:3222 +#: ../midori/midori-view.c:2792 #, c-format msgid "File Type: '%s'" msgstr "Type de fichier : « %s »" -#: ../midori/midori-view.c:3224 +#: ../midori/midori-view.c:2794 #, c-format msgid "File Type: %s ('%s')" msgstr "Type de fichier : %s (« %s »)" -#: ../midori/midori-view.c:3259 -#, c-format -msgid "Size: %s" -msgstr "Taille : %s" - #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:3270 +#: ../midori/midori-view.c:2811 #, c-format msgid "Open %s" msgstr "Ouvrir %s" -#: ../midori/midori-view.c:3895 +#: ../midori/midori-view.c:3397 #, c-format msgid "Inspect page - %s" msgstr "Analyser la page - %s" -#: ../midori/midori-view.c:4294 -#, c-format -msgid "No documentation installed" -msgstr "Pas de documentation installée" - -#: ../midori/midori-view.c:4371 -msgid "Midori doesn't store any personal data:" -msgstr "Midori ne stocke aucune donnée personnelle :" - -#: ../midori/midori-view.c:4372 -msgid "No history or web cookies are being saved." -msgstr "Aucun historique ou cookie n'est enregistré." - -#: ../midori/midori-view.c:4373 -msgid "Extensions are disabled." -msgstr "Les extensions sont désactivées." - -#: ../midori/midori-view.c:4374 -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:3685 +msgid "Speed Dial" +msgstr "Appel rapide" -#: ../midori/midori-view.c:4375 -msgid "Midori prevents websites from tracking the user:" -msgstr "Midori empêche les sites web de traquer l'utilisateur :" +#: ../midori/midori-view.c:3686 ../midori/midori-view.c:3778 +msgid "Click to add a shortcut" +msgstr "Cliquez pour ajouter un raccourci" -#: ../midori/midori-view.c:4376 -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:3687 +msgid "Enter shortcut address" +msgstr "Entrez l'adresse du raccourci" -#: ../midori/midori-view.c:4377 -msgid "DNS prefetching is disabled." -msgstr "Le DNS préchargé est désactivé." +#: ../midori/midori-view.c:3688 +msgid "Enter shortcut title" +msgstr "Entrez le titre du raccourci" -#: ../midori/midori-view.c:4378 -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:3689 +msgid "Are you sure you want to delete this shortcut?" +msgstr "Ètes-vous certain de vouloir supprimer ce raccourci ?" -#: ../midori/midori-view.c:4379 -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:3855 +#, c-format +msgid "No documentation installed" +msgstr "Pas de documentation installée" -#: ../midori/midori-view.c:4465 +#: ../midori/midori-view.c:3905 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:4514 +#: ../midori/midori-view.c:3950 msgid "Page loading delayed" msgstr "Chargement de la page différé" -#: ../midori/midori-view.c:4515 +#: ../midori/midori-view.c:3951 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:4516 +#: ../midori/midori-view.c:3952 msgid "Load Page" msgstr "Charger la page" -#: ../midori/midori-view.c:4683 +#: ../midori/midori-view.c:4092 msgid "Blank page" msgstr "Page vierge" -#: ../midori/midori-view.c:4947 +#: ../midori/midori-view.c:4356 msgid "_Duplicate Tab" msgstr "_Dupliquer l'onglet" -#: ../midori/midori-view.c:4952 +#: ../midori/midori-view.c:4361 msgid "Show Tab _Label" msgstr "Afficher l'intitulé de l'onglet" -#: ../midori/midori-view.c:4952 +#: ../midori/midori-view.c:4361 msgid "Show Tab _Icon Only" msgstr "Afficher l'icône de l'onglet uniquement" -#: ../midori/midori-view.c:4959 -msgid "Close Ot_her Tab" -msgid_plural "Close Ot_her Tabs" -msgstr[0] "Fermer l'_autre onglet" -msgstr[1] "Fermer les _autres onglets" +#: ../midori/midori-view.c:4367 +msgid "Close ot_her Tabs" +msgstr "Fermer les _autres onglets" #. i18n: word stem of "previous page" type links, case is not important -#: ../midori/midori-view.c:5779 +#: ../midori/midori-view.c:4984 msgid "previous" msgstr "précedent" #. i18n: word stem of "next page" type links, case is not important -#: ../midori/midori-view.c:5798 +#: ../midori/midori-view.c:5003 msgid "next" msgstr "suivant" -#: ../midori/midori-view.c:5811 +#: ../midori/midori-view.c:5016 msgid "Print background images" msgstr "Imprimer les images d'arrière-plan" -#: ../midori/midori-view.c:5812 +#: ../midori/midori-view.c:5017 msgid "Whether background images should be printed" msgstr "Indique s'il faut imprimer les images d'arrière-plan" -#: ../midori/midori-view.c:5844 +#: ../midori/midori-view.c:5049 msgid "Features" msgstr "Fonctionnalités" -#: ../midori/midori-speeddial.vala:142 -msgid "Speed Dial" -msgstr "Appel rapide" - -#: ../midori/midori-speeddial.vala:143 ../midori/midori-speeddial.vala:229 -msgid "Click to add a shortcut" -msgstr "Cliquez pour ajouter un raccourci" - -#: ../midori/midori-speeddial.vala:144 -msgid "Enter shortcut address" -msgstr "Entrez l'adresse du raccourci" - -#: ../midori/midori-speeddial.vala:145 -msgid "Enter shortcut title" -msgstr "Entrez le titre du raccourci" - -#: ../midori/midori-speeddial.vala:146 -msgid "Are you sure you want to delete this shortcut?" -msgstr "Ètes-vous certain de vouloir supprimer ce raccourci ?" - -#: ../midori/midori-preferences.c:299 +#: ../midori/midori-preferences.c:297 msgid "Startup" msgstr "Démarrage" -#: ../midori/midori-preferences.c:305 -msgid "Homepage:" -msgstr "Page d'accueil :" - -#: ../midori/midori-preferences.c:313 +#: ../midori/midori-preferences.c:310 +#, fuzzy msgid "Use _current page" -msgstr "Utiliser la page _actuelle" +msgstr "Imprimer la page actuelle" -#: ../midori/midori-preferences.c:317 +#: ../midori/midori-preferences.c:314 msgid "Use current page as homepage" msgstr "Utiliser la page courante comme page d'accueil" #. Page "Appearance" -#: ../midori/midori-preferences.c:326 +#: ../midori/midori-preferences.c:323 msgid "Fonts" msgstr "Polices" -#: ../midori/midori-preferences.c:329 +#: ../midori/midori-preferences.c:326 +#, fuzzy msgid "Proportional Font Family" -msgstr "Police proportionnelle" +msgstr "Police par défaut" -#: ../midori/midori-preferences.c:333 +#: ../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:336 +#: ../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:338 +#: ../midori/midori-preferences.c:335 msgid "Fixed-width Font Family" msgstr "Police à largeur fixe" -#: ../midori/midori-preferences.c:342 +#: ../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:345 +#: ../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:347 +#: ../midori/midori-preferences.c:344 msgid "Minimum Font Size" msgstr "Taille minimale de la police" -#: ../midori/midori-preferences.c:351 +#: ../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:362 +#: ../midori/midori-preferences.c:359 msgid "Behavior" msgstr "Comportement" -#: ../midori/midori-preferences.c:366 ../extensions/statusbar-features.c:155 -msgid "Load images automatically" -msgstr "Charger les images automatiquement" - -#: ../midori/midori-preferences.c:369 -msgid "Enable Spell Checking" -msgstr "Activer la vérification de l'orthographe" - -#: ../midori/midori-preferences.c:383 ../extensions/statusbar-features.c:165 -msgid "Enable scripts" -msgstr "Activer les scripts" - -#: ../midori/midori-preferences.c:386 ../extensions/statusbar-features.c:177 -msgid "Enable Netscape plugins" -msgstr "Activer les greffons Netscape" - -#: ../midori/midori-preferences.c:391 -msgid "Zoom Text and Images" -msgstr "Agrandir le texte et les images" - -#: ../midori/midori-preferences.c:394 +#: ../midori/midori-preferences.c:385 msgid "Allow scripts to open popups" msgstr "Autoriser les scripts à ouvrir des popups" -#: ../midori/midori-preferences.c:395 +#: ../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:401 -msgid "Kinetic scrolling" -msgstr "Défilement cinétique" - -#: ../midori/midori-preferences.c:402 -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-preferences.c:407 -msgid "Middle click opens Selection" -msgstr "Un clic milieu ouvre la sélection" - -#: ../midori/midori-preferences.c:408 -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-preferences.c:414 -msgid "Enable WebGL support" -msgstr "Activer le support WebGL" - -#: ../midori/midori-preferences.c:419 -msgid "Flash window on background tabs" -msgstr "Clignoter en cas d'onglet en arrière-plan" - -#: ../midori/midori-preferences.c:428 -msgid "Save downloaded files to:" -msgstr "Enregistrer les téléchargements dans :" - #. Page "Interface" -#: ../midori/midori-preferences.c:435 +#: ../midori/midori-preferences.c:409 msgid "Browsing" msgstr "Navigation" -#: ../midori/midori-preferences.c:451 -msgid "Close Buttons on Tabs" -msgstr "Boutons de fermeture sur les onglets" - -#: ../midori/midori-preferences.c:455 -msgid "Always Show Tabbar" -msgstr "Toujours afficher la barre d'onglets" - -#: ../midori/midori-preferences.c:459 -msgid "Open Tabs next to Current" -msgstr "Ouvrir les onglets à côté de l'onglet actif" - -#: ../midori/midori-preferences.c:460 -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-preferences.c:463 -msgid "Open tabs in the background" -msgstr "Ouvrir les onglets en arrière-plan" - -#: ../midori/midori-preferences.c:467 -msgid "Text Editor" -msgstr "Éditeur de texte" - -#: ../midori/midori-preferences.c:472 -msgid "News Aggregator" -msgstr "Agrégateur de flux" - #. Page "Network" -#: ../midori/midori-preferences.c:479 +#: ../midori/midori-preferences.c:447 msgid "Network" msgstr "Réseau" -#: ../midori/midori-preferences.c:481 -msgid "Proxy server" -msgstr "Serveur mandataire" - -#: ../midori/midori-preferences.c:486 +#: ../midori/midori-preferences.c:454 msgid "Hostname" msgstr "Nom de l'hôte" -#: ../midori/midori-preferences.c:494 -msgid "Port" -msgstr "Port" - -#: ../midori/midori-preferences.c:506 ../midori/midori-preferences.c:509 -msgid "The maximum size of cached pages on disk" -msgstr "La taille maximale des pages mises en cache sur le disque" - -#: ../midori/midori-preferences.c:511 +#: ../midori/midori-preferences.c:478 msgid "MB" msgstr "Mo" -#: ../midori/midori-searchaction.c:957 +#: ../midori/midori-searchaction.c:907 msgid "Add search engine" msgstr "Ajouter un moteur de recherche" -#: ../midori/midori-searchaction.c:957 +#: ../midori/midori-searchaction.c:907 msgid "Edit search engine" msgstr "Modifier le moteur de recherche" -#: ../midori/midori-searchaction.c:985 +#: ../midori/midori-searchaction.c:936 msgid "_Name:" msgstr "_Nom :" -#: ../midori/midori-searchaction.c:1000 +#: ../midori/midori-searchaction.c:952 msgid "_Description:" msgstr "_Description :" -#: ../midori/midori-searchaction.c:1013 ../extensions/feed-panel/main.c:377 -msgid "_Address:" -msgstr "_Adresse :" +#: ../midori/midori-searchaction.c:985 +msgid "_Icon:" +msgstr "_Icône :" -#: ../midori/midori-searchaction.c:1032 +#: ../midori/midori-searchaction.c:999 msgid "_Token:" msgstr "_Identifiant :" -#: ../midori/midori-searchaction.c:1330 +#: ../midori/midori-searchaction.c:1299 msgid "Manage Search Engines" msgstr "Gestion des moteurs de recherche" -#: ../midori/midori-searchaction.c:1432 +#: ../midori/midori-searchaction.c:1399 msgid "Use as _default" msgstr "Par dé_faut" -#: ../midori/sokoke.c:353 +#: ../midori/sokoke.c:406 msgid "Open with" msgstr "Ouvrir avec" -#: ../midori/sokoke.c:361 +#: ../midori/sokoke.c:414 #, c-format msgid "Choose an application or command to open \"%s\":" msgstr "Choisir une application ou une commande pour ouvrir \"%s\":" -#: ../midori/sokoke.c:475 ../midori/sokoke.c:489 +#: ../midori/sokoke.c:455 ../midori/sokoke.c:465 ../midori/sokoke.c:493 +#: ../midori/sokoke.c:522 ../midori/sokoke.c:536 msgid "Could not run external program." msgstr "Impossible de lancer le programme externe." -#: ../midori/sokoke.c:1327 +#: ../midori/sokoke.c:1691 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d heure" msgstr[1] "%d heures" -#: ../midori/sokoke.c:1328 +#: ../midori/sokoke.c:1692 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minute" msgstr[1] "%d minutes" -#: ../midori/sokoke.c:1329 +#: ../midori/sokoke.c:1693 #, c-format msgid "%d second" msgid_plural "%d seconds" @@ -1913,67 +2019,67 @@ msgstr[0] "%d seconed" msgstr[1] "%d secondes" #. i18n: Download tooltip (size): 4KB of 43MB -#: ../midori/sokoke.c:1337 ../panels/midori-transfers.c:268 +#: ../midori/sokoke.c:1701 ../panels/midori-transfers.c:267 #, c-format msgid "%s of %s" msgstr "%s sur %s" #. i18n: Unknown number of bytes, used for transfer rate like ?B/s -#: ../midori/sokoke.c:1346 +#: ../midori/sokoke.c:1710 msgid "?B" msgstr "?o" #. i18n: Download tooltip (transfer rate): (130KB/s) -#: ../midori/sokoke.c:1349 +#: ../midori/sokoke.c:1713 #, c-format msgid " (%s/s)" msgstr "(%s/s)" #. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning -#: ../midori/sokoke.c:1366 +#: ../midori/sokoke.c:1730 #, c-format msgid " - %s remaining" msgstr " - %s restantes" #. i18n: A panel at the bottom, to search text in pages -#: ../toolbars/midori-findbar.c:265 +#: ../toolbars/midori-findbar.c:264 msgid "_Inline Find:" msgstr "_Recherche rapide :" -#: ../toolbars/midori-findbar.c:287 +#: ../toolbars/midori-findbar.c:291 msgid "Previous" msgstr "Précedent" -#: ../toolbars/midori-findbar.c:293 +#: ../toolbars/midori-findbar.c:297 msgid "Next" msgstr "Suivant" -#: ../toolbars/midori-findbar.c:297 +#: ../toolbars/midori-findbar.c:301 msgid "Match Case" msgstr "Sensible à la casse" -#: ../toolbars/midori-findbar.c:306 +#: ../toolbars/midori-findbar.c:310 msgid "Highlight Matches" msgstr "Surligner les résultats" -#: ../toolbars/midori-findbar.c:317 +#: ../toolbars/midori-findbar.c:321 msgid "Close Findbar" msgstr "Fermer la barre de recherche" -#: ../toolbars/midori-transferbar.c:124 +#: ../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:129 +#: ../toolbars/midori-transferbar.c:125 msgid "Transfer completed" msgstr "Transfert terminé" -#: ../toolbars/midori-transferbar.c:198 +#: ../toolbars/midori-transferbar.c:193 msgid "The downloaded file is erroneous." msgstr "Le fichier téléchargé est erroné." -#: ../toolbars/midori-transferbar.c:199 +#: ../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." @@ -1981,111 +2087,95 @@ 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:342 ../panels/midori-transfers.c:142 +#: ../toolbars/midori-transferbar.c:331 ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "Effacer tout" -#: ../toolbars/midori-transferbar.c:379 ../toolbars/midori-transferbar.c:381 +#: ../toolbars/midori-transferbar.c:368 ../toolbars/midori-transferbar.c:370 msgid "Some files are being downloaded" msgstr "Des fichiers sont en cours de téléchargement" -#: ../toolbars/midori-transferbar.c:385 +#: ../toolbars/midori-transferbar.c:374 msgid "_Quit Midori" msgstr "_Quitter Midori" -#: ../toolbars/midori-transferbar.c:387 +#: ../toolbars/midori-transferbar.c:376 msgid "The transfers will be cancelled if Midori quits." msgstr "Les transferts seront annulés si Midori se ferme." -#: ../panels/midori-bookmarks.c:308 +#: ../panels/midori-bookmarks.c:113 +msgid "Bookmarks" +msgstr "Signets" + +#: ../panels/midori-bookmarks.c:291 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "Échec de l'ajout du signet : %s\n" -#: ../panels/midori-bookmarks.c:475 -#, c-format -msgid "Failed to update bookmark : %s\n" -msgstr "Échec à l'ajout du signet : %s\n" - -#: ../panels/midori-bookmarks.c:535 +#: ../panels/midori-bookmarks.c:471 msgid "Edit the selected bookmark" msgstr "Modifier le signet sélectionné" -#: ../panels/midori-bookmarks.c:543 +#: ../panels/midori-bookmarks.c:479 msgid "Delete the selected bookmark" msgstr "Supprimer le signet sélectionné" -#: ../panels/midori-bookmarks.c:558 +#: ../panels/midori-bookmarks.c:494 msgid "Add a new folder" msgstr "Ajouter un nouveau dossier" -#: ../panels/midori-bookmarks.c:697 ../panels/midori-history.c:638 +#: ../panels/midori-bookmarks.c:628 ../panels/midori-history.c:579 msgid "Separator" msgstr "Séparateur" -#. Create the filter entry -#: ../panels/midori-bookmarks.c:1027 -msgid "Search Bookmarks" -msgstr "Recherche dans signets" - -#: ../panels/midori-history.c:111 +#: ../panels/midori-history.c:110 msgid "History" msgstr "Historique" -#: ../panels/midori-history.c:158 ../panels/midori-history.c:189 -msgid "Today" -msgstr "Aujourd'hui" - -#: ../panels/midori-history.c:160 ../panels/midori-history.c:191 -msgid "Yesterday" -msgstr "Hier" +#: ../panels/midori-history.c:142 +msgid "A week ago" +msgstr "Il y a une semaine" -#: ../panels/midori-history.c:162 ../panels/midori-history.c:186 +#: ../panels/midori-history.c:144 #, 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:165 ../panels/midori-history.c:184 -msgid "A week ago" -msgstr "Il y a une semaine" +#: ../panels/midori-history.c:147 +msgid "Today" +msgstr "Aujourd'hui" -#: ../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" +#: ../panels/midori-history.c:149 +msgid "Yesterday" +msgstr "Hier" -#: ../panels/midori-history.c:360 +#: ../panels/midori-history.c:317 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:407 +#: ../panels/midori-history.c:363 msgid "Bookmark the selected history item" msgstr "Ajouter un signet pour l'élément sélectionné dans l'historique" -#: ../panels/midori-history.c:416 +#: ../panels/midori-history.c:372 msgid "Delete the selected history item" msgstr "Supprimer l'élément sélectionné dans l'historique" -#: ../panels/midori-history.c:424 +#: ../panels/midori-history.c:380 msgid "Clear the entire history" msgstr "Effacer tout l'historique" -#. Create the filter entry -#: ../panels/midori-history.c:997 -msgid "Search History" -msgstr "Historique de recherche" - -#: ../panels/midori-transfers.c:87 +#: ../panels/midori-transfers.c:86 msgid "Transfers" msgstr "Transferts" -#: ../panels/midori-transfers.c:470 +#: ../panels/midori-transfers.c:467 msgid "Open Destination _Folder" msgstr "Ouvrir le _dossier de destination" -#: ../panels/midori-transfers.c:473 +#: ../panels/midori-transfers.c:470 msgid "Copy Link Loc_ation" msgstr "Copier l'_adresse du lien" @@ -2113,76 +2203,68 @@ msgstr "Mot de passe" msgid "_Remember password" msgstr "Se _souvenir du mot de passe" -#: ../katze/katze-throbber.c:949 +#: ../katze/katze-throbber.c:942 #, 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:962 +#: ../katze/katze-throbber.c:955 #, 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:1042 +#: ../katze/katze-throbber.c:1035 msgid "Animation frames are broken" msgstr "Les trames d'animation sont corrompues" -#: ../katze/katze-utils.c:443 ../katze/katze-utils.c:866 +#: ../katze/katze-utils.c:439 ../katze/katze-utils.c:873 #, c-format msgid "Property '%s' is invalid for %s" msgstr "La propriété « %s » n'est pas valide pour %s" -#: ../katze/katze-utils.c:489 ../katze/katze-utils.c:518 -#: ../extensions/addons.c:309 +#: ../katze/katze-utils.c:485 ../katze/katze-utils.c:514 +#: ../extensions/addons.c:308 msgid "Choose file" msgstr "Choisissez un fichier" -#: ../katze/katze-utils.c:504 +#: ../katze/katze-utils.c:500 msgid "Choose folder" msgstr "Choisissez un dossier" -#: ../katze/katze-utils.c:602 +#: ../katze/katze-utils.c:604 msgid "None" msgstr "Aucun" -#: ../katze/katze-utils.c:717 +#: ../katze/katze-utils.c:719 msgid "1 hour" msgstr "1 heure" -#: ../katze/katze-utils.c:718 +#: ../katze/katze-utils.c:720 msgid "1 day" msgstr "1 jour" -#: ../katze/katze-utils.c:719 +#: ../katze/katze-utils.c:721 msgid "1 week" msgstr "1 semaine" -#: ../katze/katze-utils.c:720 +#: ../katze/katze-utils.c:722 msgid "1 month" msgstr "1 mois" -#: ../katze/katze-utils.c:721 +#: ../katze/katze-utils.c:723 msgid "1 year" msgstr "1 an" -#: ../katze/katze-preferences.c:98 ../extensions/history-list.vala:235 +#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235 #, c-format msgid "Preferences for %s" msgstr "Préférences pour %s" -#: ../katze/midori-uri.vala:158 -msgid "MD5-Checksum:" -msgstr "Somme de contrôle MD5 :" - -#: ../katze/midori-uri.vala:165 -msgid "SHA1-Checksum:" -msgstr "Somme de contrôle SHA1 :" - -#: ../extensions/adblock.c:474 +#: ../extensions/adblock.c:433 msgid "Configure Advertisement filters" msgstr "Configurer les filtres de publicité" -#: ../extensions/adblock.c:507 +#: ../extensions/adblock.c:464 #, c-format msgid "" "Type the address of a preconfigured filter list in the text entry and click " @@ -2192,132 +2274,132 @@ msgstr "" "et cliquez sur « Ajouter » pour l'ajouter à la liste. Vous trouverez plus de " "listes à %s." -#: ../extensions/adblock.c:921 +#: ../extensions/adblock.c:828 msgid "Edit rule" msgstr "Modifier les règles" -#: ../extensions/adblock.c:935 +#: ../extensions/adblock.c:842 msgid "_Rule:" msgstr "_Règles :" -#: ../extensions/adblock.c:989 +#: ../extensions/adblock.c:896 msgid "Bl_ock image" msgstr "_Bloquer l'image" -#: ../extensions/adblock.c:994 +#: ../extensions/adblock.c:901 msgid "Bl_ock link" msgstr "B_loquer le lien" -#: ../extensions/adblock.c:1772 +#: ../extensions/adblock.c:1492 msgid "Advertisement blocker" msgstr "Bloqueur de publicités" -#: ../extensions/adblock.c:1773 +#: ../extensions/adblock.c:1493 msgid "Block advertisements according to a filter list" msgstr "Bloquer les publicités en fonction d'une liste de filtres" #. i18n: An infobar shows up when viewing a script on userscripts.org -#: ../extensions/addons.c:222 +#: ../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:223 +#: ../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:228 +#: ../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:229 +#: ../extensions/addons.c:228 msgid "_Install user style" msgstr "_Installer un style utilisateur" -#: ../extensions/addons.c:237 +#: ../extensions/addons.c:236 msgid "Don't install" msgstr "Ne pas installer" -#: ../extensions/addons.c:320 ../extensions/addons.c:675 +#: ../extensions/addons.c:319 ../extensions/addons.c:681 msgid "Userscripts" msgstr "Scripts utilisateur" -#: ../extensions/addons.c:325 ../extensions/addons.c:677 +#: ../extensions/addons.c:324 ../extensions/addons.c:683 msgid "Userstyles" msgstr "Styles utilisateur" -#: ../extensions/addons.c:371 ../extensions/addons.c:450 +#: ../extensions/addons.c:380 ../extensions/addons.c:459 #: ../extensions/feed-panel/main.c:129 msgid "Error" msgstr "Erreur" -#: ../extensions/addons.c:412 +#: ../extensions/addons.c:421 #, c-format msgid "Do you want to delete '%s'?" msgstr "Ètes-vous certain de vouloir supprimer '%s' ?" -#: ../extensions/addons.c:418 +#: ../extensions/addons.c:427 msgid "Delete user script" msgstr "Supprime le script utilisateur" -#: ../extensions/addons.c:419 +#: ../extensions/addons.c:428 msgid "Delete user style" msgstr "Supprimer un style utilisateur" -#: ../extensions/addons.c:422 +#: ../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:564 ../extensions/addons.c:641 +#: ../extensions/addons.c:570 ../extensions/addons.c:647 msgid "Open in Text Editor" msgstr "Ouvrir dans l'éditeur de texte" -#: ../extensions/addons.c:566 ../extensions/addons.c:650 +#: ../extensions/addons.c:572 ../extensions/addons.c:656 msgid "Open Target Folder" msgstr "Ouvrir le _dossier de destination" -#: ../extensions/addons.c:632 +#: ../extensions/addons.c:638 msgid "Add new addon" msgstr "Ajouter une extension" -#: ../extensions/addons.c:658 +#: ../extensions/addons.c:664 msgid "Remove selected addon" msgstr "Supprimer l'extension sélectionnée" -#: ../extensions/addons.c:1686 ../extensions/addons.c:1904 +#: ../extensions/addons.c:1691 ../extensions/addons.c:1868 msgid "User addons" msgstr "Extensions utilisateur" -#: ../extensions/addons.c:1816 +#: ../extensions/addons.c:1821 #, c-format msgid "Can't monitor folder '%s': %s" msgstr "Impossible de surveiller le dossier « %s » : %s" -#: ../extensions/addons.c:1905 +#: ../extensions/addons.c:1869 msgid "Support for userscripts and userstyles" msgstr "Support des scripts et styles utilisateur" -#: ../extensions/colorful-tabs.c:201 +#: ../extensions/colorful-tabs.c:202 msgid "Colorful Tabs" msgstr "Onglets colorés" -#: ../extensions/colorful-tabs.c:202 +#: ../extensions/colorful-tabs.c:203 msgid "Tint each tab distinctly" msgstr "Donner une couleur distincte à chaque onglet" -#: ../extensions/cookie-manager/cookie-manager-page.c:73 +#: ../extensions/cookie-manager/cookie-manager-page.c:80 #: ../extensions/cookie-manager/main.c:35 msgid "Cookie Manager" msgstr "Gestionnaire de cookies" -#: ../extensions/cookie-manager/cookie-manager-page.c:103 +#: ../extensions/cookie-manager/cookie-manager-page.c:110 msgid "Delete All" msgstr "Supprimer tous" -#: ../extensions/cookie-manager/cookie-manager-page.c:105 +#: ../extensions/cookie-manager/cookie-manager-page.c:112 msgid "" "Deletes all shown cookies. If a filter is set, only those cookies are " "deleted which match the filter." @@ -2325,31 +2407,31 @@ 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:120 +#: ../extensions/cookie-manager/cookie-manager-page.c:127 msgid "Expand All" msgstr "Afficher tous" -#: ../extensions/cookie-manager/cookie-manager-page.c:127 +#: ../extensions/cookie-manager/cookie-manager-page.c:134 msgid "Collapse All" msgstr "Masquer tous" -#: ../extensions/cookie-manager/cookie-manager-page.c:572 +#: ../extensions/cookie-manager/cookie-manager-page.c:576 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:574 +#: ../extensions/cookie-manager/cookie-manager-page.c:578 msgid "Question" msgstr "Question" -#: ../extensions/cookie-manager/cookie-manager-page.c:583 +#: ../extensions/cookie-manager/cookie-manager-page.c:587 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:671 +#: ../extensions/cookie-manager/cookie-manager-page.c:675 msgid "At the end of the session" msgstr "À la fin de la session" -#: ../extensions/cookie-manager/cookie-manager-page.c:674 +#: ../extensions/cookie-manager/cookie-manager-page.c:678 #, c-format msgid "" "Host: %s\n" @@ -2366,15 +2448,15 @@ msgstr "" "Sécuritaire : %s\n" "Expire : %s" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:684 msgid "Yes" msgstr "Oui" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:684 msgid "No" msgstr "Non" -#: ../extensions/cookie-manager/cookie-manager-page.c:694 +#: ../extensions/cookie-manager/cookie-manager-page.c:698 #, c-format msgid "" "Domain: %s\n" @@ -2383,21 +2465,30 @@ msgstr "" "Domaine : %s\n" "Fichiers témoins: %d" -#: ../extensions/cookie-manager/cookie-manager-page.c:1017 +#: ../extensions/cookie-manager/cookie-manager-page.c:1028 msgid "Name" msgstr "Nom" -#: ../extensions/cookie-manager/cookie-manager-page.c:1069 +#: ../extensions/cookie-manager/cookie-manager-page.c:1081 msgid "_Expand All" msgstr "_Afficher tous" -#: ../extensions/cookie-manager/cookie-manager-page.c:1077 +#: ../extensions/cookie-manager/cookie-manager-page.c:1089 msgid "_Collapse All" msgstr "_Masquer tous" -#: ../extensions/cookie-manager/cookie-manager-page.c:1129 -msgid "Search Cookies by Name or Domain" -msgstr "Recherche les cookies par nom ou domaine" +# manque un raccourcis Alt+X +#: ../extensions/cookie-manager/cookie-manager-page.c:1142 +msgid "Filter:" +msgstr "Filtre :" + +#: ../extensions/cookie-manager/cookie-manager-page.c:1147 +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:36 msgid "List, view and delete cookies" @@ -2502,74 +2593,44 @@ msgstr "Panneau de flux" msgid "Read Atom/ RSS feeds" msgstr "Lire des flux Atom et RSS" -#: ../extensions/formhistory/formhistory.c:39 +#: ../extensions/formhistory.c:143 #, c-format msgid "Failed to add form value: %s\n" msgstr "Impossible d'ajouter la valeur de formulaire : %s\n" -#: ../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 -#, fuzzy +#: ../extensions/formhistory.c:295 msgid "Toggle form history state" -msgstr "Basculer vers le formulaire état historique " +msgstr "" -#: ../extensions/formhistory/formhistory.c:438 +#: ../extensions/formhistory.c:296 msgid "Activate or deactivate form history for the current tab." -msgstr "Activer ou désactiver l'historique de l'onglet courant." +msgstr "" -#: ../extensions/formhistory/formhistory.c:549 -#: ../extensions/formhistory/formhistory.c:553 +#: ../extensions/formhistory.c:430 ../extensions/formhistory.c:434 #, 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/formhistory.c:629 -#, fuzzy -msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab" +#: ../extensions/formhistory.c:509 +msgid "only activate form history via hotkey (Ctrl+Shift+F) per tab" msgstr "" -"Active suelement l'historique via le raccourci clavier (Ctrl+Maj+F) par " -"onglet" - -#: ../extensions/formhistory/formhistory.c:668 -msgid "Form history filler" -msgstr "Autocomplétion des formulaires" -#: ../extensions/formhistory/formhistory.c:669 +#: ../extensions/formhistory.c:568 msgid "Stores history of entered form data" msgstr "Stocke l'historique des saisies de formulaire" -#: ../extensions/formhistory/formhistory-gdom-frontend.c:225 -#: ../extensions/formhistory/formhistory-js-frontend.c:106 +#: ../extensions/formhistory.c:572 #, c-format -msgid "Failed to select suggestions\n" -msgstr "Impossible de sélectionner les suggestions\n" +msgid "Not available: %s" +msgstr "Non disponible : %s" + +#: ../extensions/formhistory.c:573 +msgid "Resource files not installed" +msgstr "Fichiers ressources non installés" + +#: ../extensions/formhistory.c:579 +msgid "Form history filler" +msgstr "Autocomplétion des formulaires" #: ../extensions/history-list.vala:197 msgid "There are no unvisited tabs" @@ -2578,7 +2639,7 @@ msgstr "Ils n'y a pas d'onglets qui n'ont pas été visités" #: ../extensions/history-list.vala:235 #, fuzzy, c-format msgid "History-List" -msgstr "Liste historique" +msgstr "Liste de l'historique des onglets" #: ../extensions/history-list.vala:275 msgid "Tab closing behavior" @@ -2614,11 +2675,11 @@ msgstr "Onglet précédent dans l'historique" #: ../extensions/history-list.vala:443 msgid "Display tab in background (History List)" -msgstr "Afficher l'onglet en arrière-plan (liste de l'historique)" +msgstr "" #: ../extensions/history-list.vala:444 msgid "Display the current selected tab in background" -msgstr "Afficher les onglets sélectionnés en arrière-plan" +msgstr "" #: ../extensions/history-list.vala:569 msgid "History List" @@ -2626,7 +2687,7 @@ msgstr "Liste de l'historique des onglets" #: ../extensions/history-list.vala:570 msgid "Move to the last used tab when switching or closing tabs" -msgstr "Aller au onglets utilisé quand on change ou ferme des onglets" +msgstr "" #: ../extensions/mouse-gestures.c:301 msgid "Mouse Gestures" @@ -2644,15 +2705,15 @@ msgstr "Actualiser la page ou arrêter le chargement" msgid "Customize Keyboard shortcuts" msgstr "Personnaliser les raccourcis clavier" -#: ../extensions/shortcuts.c:283 +#: ../extensions/shortcuts.c:285 msgid "Customize Sh_ortcuts..." -msgstr "_Personnaliser les raccourcis…" +msgstr "_Personnaliser les raccourcis..." -#: ../extensions/shortcuts.c:320 +#: ../extensions/shortcuts.c:322 msgid "Shortcuts" msgstr "Raccourcis" -#: ../extensions/shortcuts.c:321 +#: ../extensions/shortcuts.c:323 msgid "View and edit keyboard shortcuts" msgstr "Afficher et modifier les raccourcis clavier" @@ -2664,36 +2725,36 @@ msgstr "Horloge de barre d'état" msgid "Display date and time in the statusbar" msgstr "Afficher la date et l'heure dans la barre d'état" -#: ../extensions/statusbar-features.c:152 +#: ../extensions/statusbar-features.c:128 msgid "Images" msgstr "Images" -#: ../extensions/statusbar-features.c:162 +#: ../extensions/statusbar-features.c:137 msgid "Scripts" msgstr "Scripts" -#: ../extensions/statusbar-features.c:174 +#: ../extensions/statusbar-features.c:146 msgid "Netscape plugins" msgstr "Greffons Netscape" -#: ../extensions/statusbar-features.c:259 +#: ../extensions/statusbar-features.c:192 msgid "Statusbar Features" msgstr "Fonctionnalités dans la barre d'état" -#: ../extensions/statusbar-features.c:260 +#: ../extensions/statusbar-features.c:193 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:589 ../extensions/tab-panel.c:676 +#: ../extensions/tab-panel.c:596 ../extensions/tab-panel.c:683 msgid "Tab Panel" msgstr "Panneau d'onglets" -#: ../extensions/tab-panel.c:659 +#: ../extensions/tab-panel.c:666 msgid "T_ab Panel" msgstr "P_anneau d'onglets" -#: ../extensions/tab-panel.c:677 +#: ../extensions/tab-panel.c:684 msgid "Show tabs in a vertical panel" msgstr "Afficher les onglets dans un panneau vertical" @@ -2705,262 +2766,341 @@ msgstr "Onglets sans intitulé" 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:395 +#: ../extensions/toolbar-editor.c:393 msgid "Customize Toolbar" msgstr "Personnaliser la barre d'outils" -#: ../extensions/toolbar-editor.c:411 +#: ../extensions/toolbar-editor.c:413 msgid "" -"Select items to be displayed on the toolbar. Items can be reordered by drag " +"Select items to be displayed on the toolbar. Items can be reodered by drag " "and drop." msgstr "" "Sélectionnez les éléments à afficher sur la barre d'outils.\n" "Ils peuvent être réorganisés par glisser-déposer." -#: ../extensions/toolbar-editor.c:427 +#: ../extensions/toolbar-editor.c:429 msgid "Available Items" msgstr "Éléments disponibles" -#: ../extensions/toolbar-editor.c:448 +#: ../extensions/toolbar-editor.c:450 msgid "Displayed Items" msgstr "Éléments affichés" -#: ../extensions/toolbar-editor.c:588 -msgid "_Customize Toolbar…" -msgstr "Personnaliser la barre d'outi_ls…" +#: ../extensions/toolbar-editor.c:585 +msgid "Customize _Toolbar..." +msgstr "Personnaliser la barre d'outi_ls..." -#: ../extensions/toolbar-editor.c:617 +#: ../extensions/toolbar-editor.c:601 +msgid "_Customize..." +msgstr "_Personnaliser..." + +#: ../extensions/toolbar-editor.c:631 msgid "Toolbar Editor" msgstr "Éditeur de barre d'outils" -#: ../extensions/toolbar-editor.c:618 +#: ../extensions/toolbar-editor.c:632 msgid "Easily edit the toolbar layout" msgstr "Éditer facilement la disposition de la barre d'outils" -#: ../extensions/web-cache.c:462 +#: ../extensions/web-cache.c:463 msgid "Cache HTTP communication on disk" msgstr "Mettre en cache les communication HTTP sur le disque" -#~ msgid "Remember last window size" -#~ msgstr "Se souvenir de la taille de la fenêtre" +#~ msgid "Don't save any private data while browsing" +#~ msgstr "Ne pas enregistrer de données privées durant la navigation" -#~ msgid "Whether to save the last window size" -#~ msgstr "Indique s'il faut enregistrer la dernière taille de la fenêtre" +#~ msgid "Add shortcut to speed dial" +#~ msgstr "Ajouter un raccourci à la page d'appel rapide" -#~ msgid "Last window width" -#~ msgstr "Dernière largeur de la fenêtre" +#~ msgid "Add shortcut to the desktop" +#~ msgstr "Ajouter un raccourci sur le bureau" -#~ msgid "The last saved window width" -#~ msgstr "La dernière largeur enregistrée de la fenêtre" +#~ msgid "Create a launcher" +#~ msgstr "Créer un lanceur" -#~ msgid "Last window height" -#~ msgstr "Dernière hauteur de la fenêtre" +#~ msgid "Subscribe to this news feed" +#~ msgstr "Souscrire à ce flux de _nouvelles" -#~ msgid "The last saved window height" -#~ msgstr "La dernière hauteur enregistrée de la fenêtre" +#~ msgid "Close this window" +#~ msgstr "Fermer cette fenêtre" -#~ msgid "Last panel position" -#~ msgstr "Dernière position du panneau" +#~ msgid "Close all open windows" +#~ msgstr "Fermer toutes les fenêtres ouvertes" -#~ msgid "The last saved panel position" -#~ msgstr "La dernière position enregistrée du panneau" +#~ msgid "Undo the last modification" +#~ msgstr "Annuler la dernière modification" -#~ msgid "Last panel page" -#~ msgstr "Dernière page du panneau" +#~ msgid "Redo the last modification" +#~ msgstr "Refaire la dernière modification" -#~ msgid "The last saved panel page" -#~ msgstr "La dernière page enregistrée du panneau" +#~ msgid "Cut the selected text" +#~ msgstr "Couper le texte sélectionné" -#~ msgid "Last Web search" -#~ msgstr "Dernière recherche sur Internet" +#~ msgid "Copy the selected text" +#~ msgstr "Copier le texte sélectionné" -#~ msgid "The last saved Web search" -#~ msgstr "La dernière recherche sur Internet enregistrée" +#~ msgid "Paste text from the clipboard" +#~ msgstr "Coller le texte à partir du presse-papiers" -#~ msgid "Show Menubar" -#~ msgstr "Afficher la barre de menu" +#~ msgid "Delete the selected text" +#~ msgstr "Supprimer le texte sélectionné" -#~ msgid "Whether to show the menubar" -#~ msgstr "Indique s'il faut afficher la barre de menu" +#~ msgid "Select all text" +#~ msgstr "Sélectionner tout le texte" -#~ msgid "Show Navigationbar" -#~ msgstr "Afficher la barre de navigation" +#~ msgid "Find the next occurrence of a word or phrase" +#~ msgstr "Rechercher l'occurrence suivante d'un mot ou d'une phrase" -#~ msgid "Whether to show the navigationbar" -#~ msgstr "Indique s'il faut afficher la barre de navigation" +#~ 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 "Show Bookmarkbar" -#~ msgstr "Afficher la barre des _signets" +#~ msgid "Reset the zoom level" +#~ msgstr "Réinitialiser le niveau d'agrandissement" -#~ msgid "Whether to show the bookmarkbar" -#~ msgstr "Indique s'il faut afficher la barre des signets" +#~ msgid "View the source code of the page" +#~ msgstr "Affiche le code source de la page" -#~ msgid "Show Panel" -#~ msgstr "Afficher le panneau" +#~ msgid "Scroll to the left" +#~ msgstr "Défilement vers la gauche" -#~ msgid "Whether to show the panel" -#~ msgstr "Indique s'il faut afficher le panneau" +#~ msgid "Scroll down" +#~ msgstr "Défilement vers le bas" -#~ msgid "Show Statusbar" -#~ msgstr "Afficher la barre d'état" +#~ msgid "Scroll up" +#~ msgstr "Défilement vers le haut" -#~ msgid "Whether to show the statusbar" -#~ msgstr "Indique s'il faut afficher la barre d'état" +#~ msgid "Scroll to the right" +#~ msgstr "Défilement vers la droite" -#~ msgid "Toolbar Items" -#~ msgstr "Éléments de la barre d'outils" +#~ msgid "Delete the contents of the trash" +#~ msgstr "Supprimer le contenu de la corbeille" -#~ msgid "The items to show on the toolbar" -#~ msgstr "Les éléments à afficher dans la barre d'outils" +#~ msgid "Open the last closed tab" +#~ msgstr "Ouvrir le dernier onglet fermé" -#~ msgid "Compact Sidepanel" -#~ msgstr "Panneau latéral compact" +#~ msgid "Add a new bookmark folder" +#~ msgstr "Ajouter un nouveau dossier de signets" -#~ msgid "Whether to make the sidepanel compact" -#~ msgstr "Indique s'il faut mettre le panneau latéral compact" +#~ msgid "Add, edit and remove search engines..." +#~ msgstr "Ajouter, modifier et supprimer des moteurs de recherche..." -#~ msgid "Align sidepanel on the right" -#~ msgstr "Aligner le panneau latéral sur la droite" +#~ msgid "Clear private data..." +#~ msgstr "Effacer les informations privées..." -#~ msgid "Whether to align the sidepanel on the right" -#~ msgstr "Indique s'il faut aligner le panneau latéral sur la droite" +#~ msgid "Inspect page details and access developer tools..." +#~ msgstr "" +#~ "Inspecter les détails de la page et accéder aux outils développeur..." -#~ msgid "Open panels in separate windows" -#~ msgstr "Ouvrir les panneaux dans une fenêtre séparée" +#~ msgid "Switch to the previous tab" +#~ msgstr "Bascule vers l'onglet précédent" -#~ 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" +#~ msgid "Switch to the next tab" +#~ msgstr "Bascule vers l'onglet suivant" -#~ msgid "What to do when Midori starts" -#~ msgstr "Que faire au lancement de Midori" +#~ msgid "Move tab behind the previous tab" +#~ msgstr "Basculer vers l'onglet précédent" -#~ msgid "The homepage" -#~ msgstr "La page d'accueil" +#~ msgid "Move tab in front of the next tab" +#~ msgstr "Basculer vers l'onglet suivant" -#~ msgid "Show crash dialog" -#~ msgstr "Fenêtre de fermeture inattendue" +#~ msgid "Focus the current tab" +#~ msgstr "Mettre le focus sur l'onglet actuel" -#~ msgid "The folder downloaded files are saved to" -#~ msgstr "Le dossier où enregistrer les fichiers téléchargés" +#~ msgid "Cycle focus between views" +#~ msgstr "Changer le focus d'une vue à l'autre, en boucle" -#~ msgid "An external text editor" -#~ msgstr "Un éditeur de texte externe" +#~ msgid "Only show the icon of the current tab" +#~ msgstr "Afficher uniquement l'icône de l'onglet courant" -#~ msgid "An external news aggregator" -#~ msgstr "Un agrégateur de flux externe" +#~ msgid "Duplicate the current tab" +#~ msgstr "Duplique l'onglet actif" -#~ msgid "Location entry Search" -#~ msgstr "Recherche depuis la barre d'adresse" +#~ msgid "Close all tabs except the current tab" +#~ msgstr "Fermer tous les onglets sauf l'onglet actuel" -#~ msgid "The search to perform inside the location entry" -#~ msgstr "La recherche à effectuer à partir du contenu de la barre d'adresse" +#~ msgid "Open the tabs saved in the last session" +#~ msgstr "Ouvrir les onglets enregistrés dans la dernière session" -#~ msgid "The preferred character encoding" -#~ msgstr "Encodage favori des caractères" +#~ msgid "Show the Frequently Asked Questions" +#~ msgstr "Afficher la foire aux questions" -#~ msgid "Always show the tabbar" -#~ msgstr "Toujours afficher la barre d'onglets" +#~ msgid "Open Midori's bug tracker" +#~ msgstr "Ouvrir l'outil de suivi d'anomalies de Midori" -#~ msgid "Whether tabs have close buttons" -#~ msgstr "Indique s'il faut afficher un bouton de fermeture sur les onglets" +#~ msgid "Show information about the program" +#~ msgstr "Afficher les informations sur le programme" -#~ msgid "Where to open new pages" -#~ msgstr "Lieu où les nouvelles pages doivent être ouvertes" +#~ msgid "Show menubar" +#~ msgstr "Afficher la barre de menu" + +#~ msgid "Show navigationbar" +#~ msgstr "Afficher la barre de navigation" -#~ msgid "Whether to open new tabs in the background" -#~ msgstr "Indique s'il faut ouvrir les nouveaux onglets en arrière-plan" +#~ msgid "Show sidepanel" +#~ msgstr "Afficher le panneau latéral" -#~ msgid "Open popups in tabs" -#~ msgstr "Ouvrir les fenêtre intempestives dans des onglets" +#~ msgid "Show bookmarkbar" +#~ msgstr "Afficher la barre des signets" -#~ msgid "Whether to open popup windows in tabs" -#~ msgstr "" -#~ "Indique s'il faut ouvrir les fenêtres intempestives (popups) dans des " -#~ "onglets" +#~ msgid "Show statusbar" +#~ msgstr "Afficher la barre d'état" -#~ msgid "Load and display images automatically" -#~ msgstr "Charger et afficher les images automatiquement" +#~ msgid "MD5-Checksum:" +#~ msgstr "Emprunte MD5 :" -#~ msgid "Enable embedded scripting languages" -#~ msgstr "Active la prise en charge interne des scripts" +#~ msgid "SHA1-Checksum:" +#~ msgstr "Emprunte SHA1 :" -#~ msgid "Enable embedded Netscape plugin objects" -#~ msgstr "Active la prise en charge interne des greffons Netscape" +#~ msgid "Web Cookies" +#~ msgstr "Fichiers témoins" -#~ msgid "Enable spell checking while typing" -#~ msgstr "Activer la vérification de l'orthographe lors de la saisie" +#~ msgid "Delete old cookies after 1 hour" +#~ msgstr "Effacer les anciens cookies après 1 heure" -#~ msgid "Enable HTML5 database support" -#~ msgstr "Activer le support de base de données HTML5" +#~ msgid "Delete old cookies after 1 week" +#~ msgstr "Effacer les anciens cookies après 1 semaine" -#~ msgid "Whether to enable HTML5 database support" -#~ msgstr "Indique s'il faut activer le support de base de données de HTML5" +#~ msgid "Delete old cookies after 1 month" +#~ msgstr "Effacer les anciens cookies après 1 mois" -#~ msgid "Whether to enable HTML5 local storage support" -#~ msgstr "Indique s'il faut activer le support de stockage local de HTML5" +#~ msgid "Delete old cookies after 1 year" +#~ msgstr "Effacer les anciens cookies après 1 an" -#~ msgid "Whether to enable offline web application cache" -#~ msgstr "Indique s'il faut activer le cache des applications web hors ligne" +#~ msgid "days" +#~ msgstr "jours" -#~ 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" +#~ msgid "Reset the last _session" +#~ msgstr "Réinitialiser la dernière _session" + +#~ msgid "No filename specified" +#~ msgstr "Aucun nom de fichier spécifié" + +#~ msgid "Midori (Private Browsing)" +#~ msgstr "Midori (Navigation privée)" -#~ msgid "Allow websites to use OpenGL rendering" -#~ msgstr "Permettre aux sites d'utiliser le rendu OpenGL" +#~ msgid "All cookies" +#~ msgstr "Tous les fichiers témoins" -#~ msgid "Whether to zoom text and images" -#~ msgstr "Indique s'il faut agrandir le texte et les images" +#~ msgid "Session cookies" +#~ msgstr "Témoins de session" -#~ msgid "Find inline while typing" -#~ msgstr "Chercher pendant la saisie" +#~ msgid "Show Transferbar" +#~ msgstr "Afficher la barre des transferts" -#~ msgid "Whether to automatically find inline while typing" +#~ msgid "Whether to show the transferbar" +#~ msgstr "Indique s'il faut afficher la barre des transferts" + +#~ msgid "Search engines in location completion" +#~ msgstr "Moteurs de recherche dans la complétion" + +#~ msgid "Whether to show search engines in the location completion" #~ msgstr "" -#~ "Indique s'il faut chercher automatiquement dans la page pendant la saisie" +#~ "Indique s'il faut afficher les moteurs de recherche dans les résultats de " +#~ "complétion de la barre d'adresse" + +#~ msgid "Show operating controls of the panel" +#~ msgstr "Afficher les élements de contrôle du panneau" + +#~ msgid "Whether to show the operating controls of the panel" +#~ msgstr "Indique s'il faut afficher les élements de contrôle du panneau" + +#~ msgid "Show speed dial in new tabs" +#~ msgstr "Appel rapide dans les nouveaux onglets" + +#~ msgid "Show speed dial in newly opened tabs" +#~ msgstr "Afficher la page d'appel rapide dans les nouveaux onglets" + +#~ msgid "Download Manager" +#~ msgstr "Gestionnaire de téléchargements" + +#~ msgid "An external download manager" +#~ msgstr "Un gestionnaire de téléchargements externe" -#~ msgid "The type of proxy server to use" -#~ msgstr "Le type de serveur mandataire à utiliser" +#~ msgid "Open external pages in:" +#~ msgstr "Ouvrir les pages externes dans :" -#~ msgid "HTTP Proxy Server" -#~ msgstr "Serveur mandataire HTTP" +#~ msgid "Where to open externally opened pages" +#~ msgstr "Lieu où les pages externes doivent être ouvertes" -#~ msgid "The proxy server used for HTTP connections" -#~ msgstr "Le serveur mandataire (proxy) pour les connexions HTTP" +#~ msgid "Accept cookies" +#~ msgstr "Accepter les cookies" -#~ msgid "The proxy server port used for HTTP connections" +#~ msgid "What type of cookies to accept" +#~ msgstr "Type de fichiers témoins (cookies) à accepter" + +#~ msgid "Maximum cookie age" +#~ msgstr "Âge maximal des cookies" + +#~ msgid "Maximum history age" +#~ msgstr "Âge maximal de l'historique" + +#~ msgid "Remember last downloaded files" +#~ msgstr "Se souvenir des derniers fichiers téléchargés" + +#~ msgid "Whether the last downloaded files are saved" #~ msgstr "" -#~ "Le port utilisé pour contacter le serveur mandataire (proxy) pour les " -#~ "connexions HTTP" +#~ "Indique s'il faut enregistrer la liste des derniers fichiers téléchargés" + +#~ msgid "Not found - %s" +#~ msgstr "Page introuvable - %s" + +#~ msgid "Set number of columns and rows" +#~ msgstr "Choisir le nombre de colonnes et de lignes" + +#~ msgid "Enter number of columns and rows:" +#~ msgstr "Entrer le nombre de colonnes et de lignes" + +#~ msgid "Invalid input for the size of the speed dial" +#~ msgstr "Entrée invalide pour la taille de la page d'appel rapide" -#~ msgid "Identification string" -#~ msgstr "Chaîne d'identification" +#~ msgid "Thumb size:" +#~ msgstr "Taille des vignettes :" -#~ msgid "The application identification string" -#~ msgstr "La chaîne d'identification de l'application" +#~ msgid "Small" +#~ msgstr "Petites" -#~ msgid "Clear private data" -#~ msgstr "Effacer les informations privées" +#~ msgid "Medium" +#~ msgstr "Moyennes" -#~ msgid "The private data selected for deletion" -#~ msgstr "Les informations privées sélectionnées pour la suppression" +#~ msgid "Big" +#~ msgstr "Grandes" -#~ msgid "Clear data" -#~ msgstr "Effacer les informations" +#~ msgid "Document cannot be displayed" +#~ msgstr "Le document ne peut être affiché" -#~ msgid "The data selected for deletion" -#~ msgstr "Les informations sélectionnées pour la suppression" +#~ msgid "General" +#~ msgstr "Général" -#~ msgid "_Bookmark" -#~ msgstr "_Signet" +#~ msgid "Appearance" +#~ msgstr "Apparence" -#~ msgid "_Console" -#~ msgstr "_Console" +#~ msgid "Font settings" +#~ msgstr "Paramètres des polices" -#~ msgid "Toplevel folder" -#~ msgstr "Dossier supérieur" +#~ msgid "Enforce 96 dots per inch" +#~ msgstr "Forcer 96 points par pouce" -#~ msgid "_Title:" -#~ msgstr "_Titre :" +#~ msgid "Enforce a video dot density of 96 DPI" +#~ msgstr "Force une densité visuelle de 96 DPI" + +#~ msgid "Interface" +#~ msgstr "Interface" + +#~ msgid "Navigationbar" +#~ msgstr "Barre de navigation" + +#~ msgid "Applications" +#~ msgstr "Applications" + +#~ msgid "External applications" +#~ msgstr "Applications externes" + +#~ msgid "Configure _Advertisement filters..." +#~ msgstr "Configurer les filtres de _publicité" + +#~ msgid "_Form History" +#~ msgstr "_Historique des formulaires" + +#~ 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 --git a/po/gl.po b/po/gl.po index 1d9acfe3..6062eb15 100644 --- a/po/gl.po +++ b/po/gl.po @@ -2,18 +2,18 @@ # Copyright (C) 2008, 2009 Miguel Anxo Bouzada. # Copyright (C) 2009, 2010 Leandro Regueiro. # This file is distributed under the same license as the Xfce package. -# +# # Miguel Anxo Bouzada 2008, 2009. # Leandro Regueiro , 2009, 2010. -# +# # Proxecto Trasno - Adaptación do software libre á lingua galega: Se desexas # colaborar connosco, podes atopar máis información en -# +# msgid "" msgstr "" "Project-Id-Version: midori-0.1.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-03 16:15+0000\n" +"POT-Creation-Date: 2011-11-30 16:42+0000\n" "PO-Revision-Date: 2011-11-30 19:29+0100\n" "Last-Translator: Miguel Anxo Bouzada \n" "Language-Team: Galician \n" @@ -25,35 +25,22 @@ msgstr "" "X-Poedit-Language: Galician\n" #: ../data/midori.desktop.in.h:1 -msgid "Browse the Web" -msgstr "Buscar na rede" - -#: ../data/midori.desktop.in.h:2 msgid "Internet;WWW;Explorer" msgstr "Internet;WWW;Explorer" -#: ../data/midori.desktop.in.h:3 ../midori/main.c:2028 ../midori/main.c:2052 -#: ../midori/main.c:2066 ../midori/midori-websettings.c:315 +#: ../data/midori.desktop.in.h:2 +msgid "Lightweight web browser" +msgstr "Navegador web lixeiro" + +#: ../data/midori.desktop.in.h:3 +#: ../midori/main.c:2005 +#: ../midori/main.c:2025 +#: ../midori/main.c:2036 +#: ../midori/midori-websettings.c:303 msgid "Midori" msgstr "Midori" #: ../data/midori.desktop.in.h:4 -msgid "Midori Web Browser" -msgstr "Navegador web Midori" - -#: ../data/midori.desktop.in.h:5 -msgid "New Private Browsing Window" -msgstr "Nova xanela de navegación privada" - -#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1434 -msgid "New Tab" -msgstr "Nova lapela" - -#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1431 -msgid "New Window" -msgstr "Nova xanela" - -#: ../data/midori.desktop.in.h:8 msgid "Web Browser" msgstr "Navegador web" @@ -65,314 +52,346 @@ msgstr "Midori, navegación privada" 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:4481 +#: ../data/midori-private.desktop.in.h:3 msgid "Private Browsing" msgstr "Navegación privada" -#: ../midori/main.c:91 ../midori/main.c:97 +#: ../midori/main.c:96 +#: ../midori/main.c:102 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Non foi posíbel cargar a configuración: %s\n" -#: ../midori/main.c:145 +#: ../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:150 ../midori/main.c:254 +#: ../midori/main.c:155 +#: ../midori/main.c:261 #, c-format msgid "Invalid configuration value '%s'" msgstr "O valor de configuración «%s» non é válido" -#: ../midori/main.c:375 +#: ../midori/main.c:366 #, 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:429 +#: ../midori/main.c:420 #, c-format msgid "Failed to clear history: %s\n" msgstr "Produciuse un erro ao limpar o historial: %s\n" -#: ../midori/main.c:451 ../extensions/formhistory/formhistory.c:531 +#: ../midori/main.c:440 +#: ../midori/main.c:561 +#: ../extensions/formhistory.c:417 #, c-format msgid "Failed to open database: %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:523 +#: ../midori/main.c:504 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Produciuse un fallo ao eliminar elementos antigos do historial: %s\n" -#: ../midori/main.c:545 +#: ../midori/main.c:544 +#: ../panels/midori-history.c:189 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "Produciuse un fallo ao eliminar o elemento do historial: %s\n" + +#: ../midori/main.c:591 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "Non foi posíbel gardar os marcadores. %s" + +#: ../midori/main.c:624 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Non foi posíbel gardar a configuración. %s" -#: ../midori/main.c:571 +#: ../midori/main.c:659 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Non foi posíbel gardar os motores de busca. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:608 +#: ../midori/main.c:685 +#: ../midori/main.c:705 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Non foi posíbel gardar o lixo. %s" -#: ../midori/main.c:681 ../panels/midori-extensions.c:90 +#: ../midori/main.c:739 +#: ../panels/midori-extensions.c:91 msgid "Extensions" msgstr "Extensións" -#: ../midori/main.c:695 +#: ../midori/main.c:753 msgid "Privacy" msgstr "Intimidade" -#: ../midori/main.c:707 -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:765 +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:763 +#: ../midori/main.c:821 #, c-format msgid "The session couldn't be saved. %s" msgstr "Non foi posíbel gardar a sesión. %s" -#: ../midori/main.c:1001 -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:1031 +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:1093 -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: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 "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:1112 +#: ../midori/main.c:1118 msgid "Modify _preferences" msgstr "Modificar as _preferencias" -#: ../midori/main.c:1116 +#: ../midori/main.c:1122 msgid "Disable all _extensions" msgstr "Desactivar todas as _extensións" -#: ../midori/main.c:1129 +#: ../midori/main.c:1135 msgid "Discard old tabs" msgstr "Desbotar as lapelas antigas" -#: ../midori/main.c:1130 ../midori/midori-websettings.c:223 +#: ../midori/main.c:1136 +#: ../midori/midori-websettings.c:212 msgid "Show last tabs without loading" msgstr "Mostrar as últimas lapelas sen cargalas" -#: ../midori/main.c:1131 ../midori/midori-websettings.c:222 +#: ../midori/main.c:1137 +#: ../midori/midori-websettings.c:211 msgid "Show last open tabs" msgstr "Mostrar as últimas lapelas abertas" -#: ../midori/main.c:1379 ../midori/main.c:2436 +#: ../midori/main.c:1345 +#: ../midori/main.c:2408 #, 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:1517 +#: ../midori/main.c:1484 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Captura gardada en: %s\n" -#: ../midori/main.c:1933 +#: ../midori/main.c:1908 msgid "Run ADDRESS as a web application" msgstr "Executar ENDEREZO como un aplicativo web" -#: ../midori/main.c:1933 +#: ../midori/main.c:1908 msgid "ADDRESS" msgstr "ENDEREZO" -#: ../midori/main.c:1936 +#: ../midori/main.c:1911 msgid "Use FOLDER as configuration folder" msgstr "Usar CARTAFOL como cartafol de configuración" -#: ../midori/main.c:1936 +#: ../midori/main.c:1911 msgid "FOLDER" msgstr "CARTAFOL" -#: ../midori/main.c:1939 +#: ../midori/main.c:1914 msgid "Private browsing, no changes are saved" msgstr "Navegación privada, non se garda ningún cambio" -#: ../midori/main.c:1941 +#: ../midori/main.c:1916 msgid "Show a diagnostic dialog" msgstr "Mostrar un diálogo de diagnóstico" -#: ../midori/main.c:1943 +#: ../midori/main.c:1918 msgid "Run the specified filename as javascript" msgstr "Execute o nome de ficheiro especificado como JavaScript" -#: ../midori/main.c:1945 +#: ../midori/main.c:1920 msgid "Take a snapshot of the specified URI" msgstr "Facer unha captura do URI especificado" -#: ../midori/main.c:1947 +#: ../midori/main.c:1922 msgid "Execute the specified command" msgstr "Executar a orde especificada" -#: ../midori/main.c:1949 +#: ../midori/main.c:1924 msgid "List available commands to execute with -e/ --execute" msgstr "Liste as ordes dispoñíbeis para executar con -e/ --execute" -#: ../midori/main.c:1951 +#: ../midori/main.c:1926 msgid "Display program version" msgstr "Mostrar a versión do programa" -#: ../midori/main.c:1953 +#: ../midori/main.c:1928 msgid "Addresses" msgstr "Enderezos" -#: ../midori/main.c:1955 +#: ../midori/main.c:1930 msgid "Block URIs according to regular expression PATTERN" msgstr "Bloquear os URI de acordo ca expresión regular PATRÓN" -#: ../midori/main.c:1955 +#: ../midori/main.c:1930 msgid "PATTERN" msgstr "PATRÓN" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1959 +#: ../midori/main.c:1934 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "Restabelecer Midori despois de SEGUNDOS segundos de inactividade" -#: ../midori/main.c:1959 +#: ../midori/main.c:1934 msgid "SECONDS" msgstr "SEGUNDOS" -#: ../midori/main.c:1962 +#: ../midori/main.c:1937 msgid "Redirects console warnings to the specified FILENAME" msgstr "Redirixir os avisos ao NOMEFICHEIRO indicado" -#: ../midori/main.c:1962 +#: ../midori/main.c:1937 msgid "FILENAME" msgstr "NOMEFICHEIRO" -#: ../midori/main.c:2025 +#: ../midori/main.c:2002 msgid "[Addresses]" msgstr "[Enderezos]" -#: ../midori/main.c:2067 +#: ../midori/main.c:2012 +msgid "The specified configuration folder is invalid." +msgstr "O cartafol de configuración especificado non é correcto." + +#: ../midori/main.c:2037 msgid "Please report comments, suggestions and bugs to:" msgstr "Envíe comentarios, suxestións e fallos a:" -#: ../midori/main.c:2069 +#: ../midori/main.c:2039 msgid "Check for new versions at:" msgstr "Comprobar se existen novas versións en:" +#: ../midori/main.c:2122 +msgid "Website icons" +msgstr "Iconas de sitios web" + #. i18n: Logins and passwords in websites and web forms -#: ../midori/main.c:2164 +#: ../midori/main.c:2125 msgid "Saved logins and _passwords" msgstr "Gardar os nomes de usuario e os _contrasinais" -#: ../midori/main.c:2166 -msgid "Cookies and Website data" -msgstr "Cookies e datos do sitio web" +#: ../midori/main.c:2127 +msgid "Cookies" +msgstr "Cookies" + +#: ../midori/main.c:2130 +msgid "'Flash' Cookies" +msgstr "Cookies de «Flash»" + +#: ../midori/main.c:2133 +msgid "HTML5 _Databases" +msgstr "Bases de _datos HTML5" -#. TODO: Preserve page icons of search engines and merge privacy items -#: ../midori/main.c:2170 ../midori/midori-websettings.c:1020 -#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471 +#: ../midori/main.c:2136 +#: ../midori/midori-websettings.c:936 +#: ../extensions/web-cache.c:462 +#: ../extensions/web-cache.c:471 msgid "Web Cache" msgstr "Caché web" -#: ../midori/main.c:2173 -msgid "Website icons" -msgstr "Iconas de sitios web" +#: ../midori/main.c:2138 +msgid "Offline Application Cache" +msgstr "Caché de navegación sen conexión" -#: ../midori/main.c:2277 +#: ../midori/main.c:2241 msgid "An unknown error occured" msgstr "Produciuse un erro descoñecido" -#: ../midori/main.c:2384 +#: ../midori/main.c:2339 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:2418 +#: ../midori/main.c:2375 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Non foi posíbel cargar os marcadores: %s\n" -#: ../midori/main.c:2451 +#: ../midori/main.c:2423 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Non foi posíbel cargar o lixo: %s\n" -#: ../midori/main.c:2464 +#: ../midori/main.c:2436 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Non foi posíbel cargar o historial: %s\n" -#: ../midori/main.c:2479 +#: ../midori/main.c:2452 msgid "The following errors occured:" msgstr "Producíronse os seguintes erros:" -#: ../midori/main.c:2495 +#: ../midori/main.c:2468 msgid "_Ignore" msgstr "_Ignorar" -#: ../midori/midori-app.c:1155 ../midori/midori-browser.c:499 -#, c-format -msgid "Unexpected action '%s'." -msgstr "Acción inesperada «%s»" +#: ../midori/midori-app.c:1335 +msgid "_Bookmark" +msgstr "_Marcador" -#: ../midori/midori-app.c:1453 ../midori/midori-browser.c:6380 +#: ../midori/midori-app.c:1336 +#: ../midori/midori-browser.c:5982 msgid "_Bookmarks" msgstr "_Marcadores" -#: ../midori/midori-app.c:1454 +#: ../midori/midori-app.c:1337 msgid "Add Boo_kmark" msgstr "Engadir mar_cador…" -#: ../midori/midori-app.c:1455 +#: ../midori/midori-app.c:1338 +msgid "_Console" +msgstr "_Consola" + +#: ../midori/midori-app.c:1339 msgid "_Extensions" msgstr "_Extensións" #. i18n: Browsing history, visited web pages, closed tabs -#: ../midori/midori-app.c:1456 ../midori/midori-browser.c:4836 +#: ../midori/midori-app.c:1340 +#: ../midori/midori-browser.c:4577 msgid "_History" msgstr "_Historial" -#: ../midori/midori-app.c:1457 +#: ../midori/midori-app.c:1341 +msgid "_Homepage" +msgstr "P_áxina de inicio" + +#: ../midori/midori-app.c:1342 msgid "_Userscripts" msgstr "_Scripts de usuario" -#: ../midori/midori-app.c:1458 -msgid "User_styles" -msgstr "_Estilos de usuario" - -#: ../midori/midori-app.c:1459 +#: ../midori/midori-app.c:1343 msgid "New _Tab" msgstr "Nova _lapela" -#: ../midori/midori-app.c:1460 +#: ../midori/midori-app.c:1344 msgid "_Transfers" msgstr "_Transferencias" -#: ../midori/midori-app.c:1461 +#: ../midori/midori-app.c:1345 msgid "Netscape p_lugins" msgstr "En_gadidos de Netscape" -#: ../midori/midori-app.c:1462 +#: ../midori/midori-app.c:1346 msgid "_Closed Tabs" msgstr "_Lapelas pechadas" -#: ../midori/midori-app.c:1463 ../midori/midori-browser.c:5519 +#: ../midori/midori-app.c:1347 +#: ../midori/midori-browser.c:5165 msgid "New _Window" msgstr "Nova _xanela" -#: ../midori/midori-app.c:1464 +#: ../midori/midori-app.c:1348 msgid "New _Folder" msgstr "Cartafol _novo" @@ -380,8 +399,10 @@ msgstr "Cartafol _novo" msgid "File not found." msgstr "Non se atopou o ficheiro." -#: ../midori/midori-array.c:547 ../midori/midori-array.c:586 -#: ../midori/midori-array.c:609 ../midori/midori-array.c:619 +#: ../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 construído." @@ -393,296 +414,285 @@ msgstr "Formato de marcador non recoñecido." msgid "Writing failed." msgstr "Produciuse un fallo de escritura." -#: ../midori/midori-browser.c:360 ../midori/midori-browser.c:5607 -#: ../midori/midori-browser.c:5616 +#: ../midori/midori-browser.c:329 +#: ../midori/midori-browser.c:5247 +#: ../midori/midori-browser.c:5256 msgid "Reload the current page" msgstr "Recargar a páxina actual" -#: ../midori/midori-browser.c:369 ../midori/midori-browser.c:5613 +#: ../midori/midori-browser.c:337 +#: ../midori/midori-browser.c:5253 msgid "Stop loading the current page" msgstr "Deter a carga da páxina" -#: ../midori/midori-browser.c:486 +#: ../midori/midori-browser.c:462 #, c-format msgid "Failed to update title: %s\n" msgstr "Produciuse un erro ao actualizar o título: %s\n" -#: ../midori/midori-browser.c:579 +#: ../midori/midori-browser.c:475 +#, c-format +msgid "Unexpected action '%s'." +msgstr "Acción inesperada «%s»" + +#: ../midori/midori-browser.c:576 #, c-format msgid "%s (Private Browsing)" msgstr "%s (Navegación privada)" -#: ../midori/midori-browser.c:692 ../midori/midori-browser.c:734 -#: ../panels/midori-bookmarks.c:114 -msgid "Bookmarks" -msgstr "Marcadores" +#: ../midori/midori-browser.c:687 +#: ../midori/midori-browser.c:720 +msgid "Toplevel folder" +msgstr "Cartafol principal" -#: ../midori/midori-browser.c:794 +#: ../midori/midori-browser.c:777 msgid "New folder" msgstr "Novo cartafol" -#: ../midori/midori-browser.c:794 +#: ../midori/midori-browser.c:777 msgid "Edit folder" msgstr "Editar o cartafol" -#: ../midori/midori-browser.c:796 +#: ../midori/midori-browser.c:779 msgid "New bookmark" msgstr "Novo marcador" -#: ../midori/midori-browser.c:796 +#: ../midori/midori-browser.c:779 msgid "Edit bookmark" msgstr "Editar o marcador" +#: ../midori/midori-browser.c:810 +msgid "_Title:" +msgstr "_Título:" + #: ../midori/midori-browser.c:830 -msgid "Type a name for this bookmark and choose where to keep it." -msgstr "Escriba un nome para este marcador e escolla onde gardalo." +#: ../midori/midori-searchaction.c:966 +#: ../extensions/feed-panel/main.c:377 +msgid "_Address:" +msgstr "_Enderezo:" -#: ../midori/midori-browser.c:891 +#: ../midori/midori-browser.c:853 +#: ../midori/midori-browser.c:4312 +msgid "_Folder:" +msgstr "_Cartafol:" + +#: ../midori/midori-browser.c:869 msgid "Add to _Speed Dial" msgstr "Enga_dir a marcación rápida" -#: ../midori/midori-browser.c:897 +#: ../midori/midori-browser.c:882 msgid "Show in the tool_bar" msgstr "Mostrar na _barra de ferramentas" -#: ../midori/midori-browser.c:905 +#: ../midori/midori-browser.c:897 msgid "Run as _web application" msgstr "Executar como aplicativo _web" -#: ../midori/midori-browser.c:975 +#: ../midori/midori-browser.c:968 #, 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:977 +#: ../midori/midori-browser.c:970 #, 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:984 +#: ../midori/midori-browser.c:977 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Non hai espazo libre abondo para descargar «%s»." -#: ../midori/midori-browser.c:987 +#: ../midori/midori-browser.c:980 #, 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:1123 ../midori/midori-browser.c:4640 +#: ../midori/midori-browser.c:1024 +#: ../midori/midori-browser.c:4382 msgid "Save file as" msgstr "Gardar o ficheiro como" -#: ../midori/midori-browser.c:1129 -msgid "Save associated _resources" -msgstr "Gardar os _recursos asociados" +#: ../midori/midori-browser.c:1333 +msgid "New Window" +msgstr "Nova xanela" -#: ../midori/midori-browser.c:1431 +#: ../midori/midori-browser.c:1333 msgid "A new window has been opened" msgstr "Abriuse unha nova xanela" -#: ../midori/midori-browser.c:1434 +#: ../midori/midori-browser.c:1336 +msgid "New Tab" +msgstr "Nova lapela" + +#: ../midori/midori-browser.c:1336 msgid "A new tab has been opened" msgstr "Abriuse unha nova lapela" -#: ../midori/midori-browser.c:1451 -msgid "Error opening the image!" -msgstr "Produciuse un erro ao abrir a imaxe!" - -#: ../midori/midori-browser.c:1452 -msgid "Can not open selected image in a default viewer." -msgstr "Non é posíbel abrir a imaxe no visor predeterminado" - -#: ../midori/midori-browser.c:1458 -msgid "Error downloading the image!" -msgstr "Produciuse un erro ao descargar a imaxe!" - -#: ../midori/midori-browser.c:1459 -msgid "Can not download selected image." -msgstr "Non foi posíbel descargar a imaxe seleccionada." - -#: ../midori/midori-browser.c:1580 +#: ../midori/midori-browser.c:1373 msgid "Save file" msgstr "Gardar ficheiro" -#: ../midori/midori-browser.c:2476 +#: ../midori/midori-browser.c:2265 msgid "Open file" msgstr "Abrir ficheiro" -#: ../midori/midori-browser.c:2608 +#: ../midori/midori-browser.c:2396 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 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:2614 ../extensions/feed-panel/main.c:365 +"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:2402 +#: ../extensions/feed-panel/main.c:365 msgid "New feed" msgstr "Nova fonte" -#: ../midori/midori-browser.c:2657 ../midori/midori-browser.c:5679 -#: ../panels/midori-bookmarks.c:527 +#: ../midori/midori-browser.c:2445 +#: ../midori/midori-browser.c:5316 +#: ../panels/midori-bookmarks.c:432 msgid "Add a new bookmark" msgstr "Engadir novo marcador" -#: ../midori/midori-browser.c:3201 ../midori/midori-searchaction.c:488 +#: ../midori/midori-browser.c:2971 +#: ../midori/midori-searchaction.c:487 msgid "Empty" msgstr "Baleiro" -#: ../midori/midori-browser.c:3644 ../midori/midori-browser.c:3645 +#: ../midori/midori-browser.c:3461 msgid "Toggle text cursor navigation" msgstr "Activar/desactivar a navegación con cursor" -#: ../midori/midori-browser.c:3647 -msgid "" -"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in " -"all websites." -msgstr "" - -#: ../midori/midori-browser.c:3650 -msgid "_Enable Caret Browsing" -msgstr "Activar a _navegación con cursor" - -#: ../midori/midori-browser.c:4040 ../midori/midori-browser.c:6073 +#: ../midori/midori-browser.c:3773 +#: ../midori/midori-browser.c:5723 #, 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:4366 ../panels/midori-bookmarks.c:847 -#: ../panels/midori-history.c:803 +#: ../midori/midori-browser.c:4109 +#: ../panels/midori-bookmarks.c:748 +#: ../panels/midori-history.c:747 msgid "Open all in _Tabs" msgstr "Abrir todo en _lapelas" -#: ../midori/midori-browser.c:4373 ../panels/midori-bookmarks.c:853 -#: ../panels/midori-history.c:809 ../extensions/feed-panel/feed-panel.c:528 +#: ../midori/midori-browser.c:4116 +#: ../panels/midori-bookmarks.c:754 +#: ../panels/midori-history.c:753 +#: ../extensions/feed-panel/feed-panel.c:528 msgid "Open in New _Tab" msgstr "Abrir nunha nova _lapela" -#: ../midori/midori-browser.c:4376 ../midori/midori-view.c:2940 -#: ../midori/midori-view.c:5058 ../panels/midori-bookmarks.c:855 -#: ../panels/midori-history.c:811 ../extensions/feed-panel/feed-panel.c:530 +#: ../midori/midori-browser.c:4119 +#: ../midori/midori-view.c:2530 +#: ../midori/midori-view.c:4357 +#: ../panels/midori-bookmarks.c:756 +#: ../panels/midori-history.c:755 +#: ../extensions/feed-panel/feed-panel.c:530 msgid "Open in New _Window" msgstr "Abrir nunha nova _xanela" -#: ../midori/midori-browser.c:4465 +#: ../midori/midori-browser.c:4199 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4466 +#: ../midori/midori-browser.c:4200 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4467 +#: ../midori/midori-browser.c:4201 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4468 +#: ../midori/midori-browser.c:4202 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4469 +#: ../midori/midori-browser.c:4203 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4470 +#: ../midori/midori-browser.c:4204 #, c-format msgid "Firefox (%s)" msgstr "Firefox (%s)" -#: ../midori/midori-browser.c:4471 -msgid "Midori 0.2.6" -msgstr "Midori 0.2.6" +#: ../midori/midori-browser.c:4225 +msgid "Import bookmarks..." +msgstr "Importar marcadores..." -#: ../midori/midori-browser.c:4492 -msgid "Import bookmarks…" -msgstr "Importar marcadores…" - -#: ../midori/midori-browser.c:4495 ../midori/midori-browser.c:5684 +#: ../midori/midori-browser.c:4228 +#: ../midori/midori-browser.c:5321 msgid "_Import bookmarks" msgstr "_Importar marcadores" -#: ../midori/midori-browser.c:4506 +#: ../midori/midori-browser.c:4239 msgid "_Application:" msgstr "_Aplicativo:" -#: ../midori/midori-browser.c:4571 +#: ../midori/midori-browser.c:4304 msgid "Import from XBEL or HTML file" msgstr "Importar desde un ficheiro XBEL ou HTML" -#: ../midori/midori-browser.c:4599 +#: ../midori/midori-browser.c:4339 msgid "Import from a file" msgstr "Importar desde un ficheiro" -#: ../midori/midori-browser.c:4611 +#: ../midori/midori-browser.c:4351 msgid "Failed to import bookmarks" msgstr "Produciuse un erro ao importar os marcadores" -#: ../midori/midori-browser.c:4645 +#: ../midori/midori-browser.c:4387 msgid "XBEL Bookmarks" msgstr "Marcadores XBEL" -#: ../midori/midori-browser.c:4650 +#: ../midori/midori-browser.c:4392 msgid "Netscape Bookmarks" msgstr "Marcadores de Netscape" -#: ../midori/midori-browser.c:4664 +#: ../midori/midori-browser.c:4406 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:4679 +#: ../midori/midori-browser.c:4422 msgid "Failed to export bookmarks" msgstr "Produciuse un erro ao exportar os marcadores" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4801 +#: ../midori/midori-browser.c:4544 msgid "Clear Private Data" msgstr "Limpar os datos privados" -#: ../midori/midori-browser.c:4805 +#: ../midori/midori-browser.c:4548 msgid "_Clear private data" msgstr "_Limpar os datos privados" -#: ../midori/midori-browser.c:4820 +#: ../midori/midori-browser.c:4561 msgid "Clear the following data:" msgstr "Limpar os seguintes datos:" -#: ../midori/midori-browser.c:4830 +#: ../midori/midori-browser.c:4571 msgid "Last open _tabs" msgstr "Últimas lapelas abertas" -#: ../midori/midori-browser.c:4856 +#: ../midori/midori-browser.c:4597 msgid "Clear private data when _quitting Midori" msgstr "_Limpar os datos privados ao saír de Midori" -#: ../midori/midori-browser.c:5071 +#: ../midori/midori-browser.c:4773 msgid "A lightweight web browser." msgstr "Un navegador moi lixeiro" -#: ../midori/midori-browser.c:5072 +#: ../midori/midori-browser.c:4774 msgid "See about:version for version info." msgstr "Ver a información de versión en about:version" -#: ../midori/midori-browser.c:5074 -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:4776 +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:5104 +#: ../midori/midori-browser.c:4797 msgid "translator-credits" msgstr "" "Miguel Anxo Bouzada, 2008, 2009, 2010, 2011\n" @@ -690,1458 +700,1316 @@ msgstr "" "\n" "Proxecto Trasno http://trasno.net" -#: ../midori/midori-browser.c:5517 +#: ../midori/midori-browser.c:5163 msgid "_File" msgstr "_Ficheiro" -#: ../midori/midori-browser.c:5520 +#: ../midori/midori-browser.c:5166 msgid "Open a new window" msgstr "Abrir unha nova xanela" -#: ../midori/midori-browser.c:5523 +#: ../midori/midori-browser.c:5169 msgid "Open a new tab" msgstr "Abrir unha nova lapela" -#: ../midori/midori-browser.c:5525 +#: ../midori/midori-browser.c:5171 msgid "New P_rivate Browsing Window" msgstr "Nova xanela de navegación p_rivada" -#: ../midori/midori-browser.c:5529 +#: ../midori/midori-browser.c:5175 msgid "Open a file" msgstr "Abrir un ficheiro" -#: ../midori/midori-browser.c:5531 -msgid "_Save Page As…" -msgstr "_Gardar a páxina como…" +#: ../midori/midori-browser.c:5177 +msgid "_Save Page As..." +msgstr "_Gardar a páxina como..." -#: ../midori/midori-browser.c:5532 +#: ../midori/midori-browser.c:5178 msgid "Save to a file" msgstr "Gardar nun ficheiro" -#: ../midori/midori-browser.c:5534 +#: ../midori/midori-browser.c:5180 msgid "Add to Speed _dial" msgstr "Enga_dir a marcación rápida" -#: ../midori/midori-browser.c:5538 +#: ../midori/midori-browser.c:5184 msgid "Add Shortcut to the _desktop" msgstr "Engadir un atallo no _escritorio" -#: ../midori/midori-browser.c:5540 +#: ../midori/midori-browser.c:5186 msgid "Create _Launcher" msgstr "Crear _iniciador" -#: ../midori/midori-browser.c:5544 +#: ../midori/midori-browser.c:5190 msgid "Subscribe to News _feed" msgstr "Subscribirse á _fonte de novas" -#: ../midori/midori-browser.c:5550 +#: ../midori/midori-browser.c:5196 msgid "_Close Tab" msgstr "Pechar a _lapela" -#: ../midori/midori-browser.c:5551 +#: ../midori/midori-browser.c:5197 msgid "Close the current tab" msgstr "Pechar a lapela actual" -#: ../midori/midori-browser.c:5553 +#: ../midori/midori-browser.c:5199 msgid "C_lose Window" msgstr "_Pechar a xanela" -#: ../midori/midori-browser.c:5557 -msgid "_Share" -msgstr "_Compartir" - -#: ../midori/midori-browser.c:5562 +#: ../midori/midori-browser.c:5203 msgid "Print the current page" msgstr "Imprimir a páxina actual" -#: ../midori/midori-browser.c:5565 +#: ../midori/midori-browser.c:5205 msgid "Close a_ll Windows" msgstr "Pechar todas as xane_las" -#: ../midori/midori-browser.c:5568 +#: ../midori/midori-browser.c:5208 msgid "_Edit" msgstr "_Editar" -#: ../midori/midori-browser.c:5591 -msgid "_Find…" -msgstr "_Buscar…" +#: ../midori/midori-browser.c:5231 +msgid "_Find..." +msgstr "_Buscar..." -#: ../midori/midori-browser.c:5592 +#: ../midori/midori-browser.c:5232 msgid "Find a word or phrase in the page" msgstr "Buscar unha palabra ou frase nesta páxina" -#: ../midori/midori-browser.c:5594 +#: ../midori/midori-browser.c:5234 msgid "Find _Next" msgstr "Buscar _seguinte" -#: ../midori/midori-browser.c:5597 +#: ../midori/midori-browser.c:5237 msgid "Find _Previous" msgstr "Buscar _anterior" -#: ../midori/midori-browser.c:5601 +#: ../midori/midori-browser.c:5241 msgid "Configure the application preferences" msgstr "Configurar as preferencias do aplicativo" -#: ../midori/midori-browser.c:5603 +#: ../midori/midori-browser.c:5243 msgid "_View" msgstr "_Ver" -#: ../midori/midori-browser.c:5604 +#: ../midori/midori-browser.c:5244 msgid "_Toolbars" msgstr "_Barra de ferramentas" -#: ../midori/midori-browser.c:5609 +#: ../midori/midori-browser.c:5249 msgid "Reload page without caching" msgstr "Recargar a páxina sen usar a caché" -#: ../midori/midori-browser.c:5619 +#: ../midori/midori-browser.c:5259 msgid "Increase the zoom level" msgstr "Aumentar o nivel de zoom" -#: ../midori/midori-browser.c:5622 +#: ../midori/midori-browser.c:5262 msgid "Decrease the zoom level" msgstr "Diminuír o nivel de zoom" -#: ../midori/midori-browser.c:5626 +#: ../midori/midori-browser.c:5266 msgid "_Encoding" msgstr "_Codificación" -#: ../midori/midori-browser.c:5628 +#: ../midori/midori-browser.c:5268 msgid "View So_urce" msgstr "Ver o códi_go da páxina" -#: ../midori/midori-browser.c:5631 +#: ../midori/midori-browser.c:5271 msgid "Ca_ret Browsing" msgstr "Navegación con cu_rsor" -#: ../midori/midori-browser.c:5635 +#: ../midori/midori-browser.c:5275 msgid "Toggle fullscreen view" msgstr "Activar/desactivar a pantalla completa" -#: ../midori/midori-browser.c:5637 +#: ../midori/midori-browser.c:5277 msgid "Scroll _Left" msgstr "Desprazar cara á _esquerda" -#: ../midori/midori-browser.c:5640 +#: ../midori/midori-browser.c:5280 msgid "Scroll _Down" msgstr "Desprazar cara a_baixo" -#: ../midori/midori-browser.c:5643 +#: ../midori/midori-browser.c:5283 msgid "Scroll _Up" msgstr "Desprazar cara _arriba" -#: ../midori/midori-browser.c:5646 +#: ../midori/midori-browser.c:5286 msgid "Scroll _Right" msgstr "Desprazar cara á _dereita" -#: ../midori/midori-browser.c:5649 -msgid "_Readable" -msgstr "_Lexíbel" - -#: ../midori/midori-browser.c:5652 +#: ../midori/midori-browser.c:5289 msgid "_Go" msgstr "_Ir" -#: ../midori/midori-browser.c:5655 +#: ../midori/midori-browser.c:5292 msgid "Go back to the previous page" msgstr "Ir á páxina anterior" -#: ../midori/midori-browser.c:5658 +#: ../midori/midori-browser.c:5295 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:5662 +#: ../midori/midori-browser.c:5299 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:5666 +#: ../midori/midori-browser.c:5303 msgid "Go to the next sub-page" msgstr "Ir á seguinte subpáxina" -#: ../midori/midori-browser.c:5668 -msgid "_Homepage" -msgstr "P_áxina de inicio" - -#: ../midori/midori-browser.c:5669 +#: ../midori/midori-browser.c:5306 msgid "Go to your homepage" msgstr "Ir á súa páxina de inicio" -#: ../midori/midori-browser.c:5671 +#: ../midori/midori-browser.c:5308 msgid "Empty Trash" msgstr "Baleirar o lixo" -#: ../midori/midori-browser.c:5674 +#: ../midori/midori-browser.c:5311 msgid "Undo _Close Tab" msgstr "Desfa_cer o pechar lapela" -#: ../midori/midori-browser.c:5681 +#: ../midori/midori-browser.c:5318 msgid "Add a new _folder" msgstr "Engadir un carta_fol novo" -#: ../midori/midori-browser.c:5687 +#: ../midori/midori-browser.c:5324 msgid "_Export bookmarks" msgstr "_Exportar os marcadores" -#: ../midori/midori-browser.c:5690 ../midori/midori-searchaction.c:497 +#: ../midori/midori-browser.c:5327 +#: ../midori/midori-searchaction.c:496 msgid "_Manage Search Engines" msgstr "_Xestor de motores de busca" -#: ../midori/midori-browser.c:5693 +#: ../midori/midori-browser.c:5330 msgid "_Clear Private Data" msgstr "_Limpar datos privados" -#: ../midori/midori-browser.c:5696 +#: ../midori/midori-browser.c:5333 msgid "_Inspect Page" msgstr "_Inspeccionar a páxina" -#: ../midori/midori-browser.c:5700 +#: ../midori/midori-browser.c:5337 msgid "_Previous Tab" msgstr "Lapela _anterior" -#: ../midori/midori-browser.c:5703 +#: ../midori/midori-browser.c:5340 msgid "_Next Tab" msgstr "Lapela _seguinte" -#: ../midori/midori-browser.c:5705 +#: ../midori/midori-browser.c:5342 msgid "Move Tab _Backward" msgstr "Mover a lapela cara _atrás" -#: ../midori/midori-browser.c:5707 +#: ../midori/midori-browser.c:5344 msgid "_Move Tab Forward" msgstr "_Mover a lapela cara adiante" -#: ../midori/midori-browser.c:5710 +#: ../midori/midori-browser.c:5347 msgid "Focus _Current Tab" msgstr "Enfocar a lapela a_ctual" -#: ../midori/midori-browser.c:5713 +#: ../midori/midori-browser.c:5350 msgid "Focus _Next view" msgstr "Enfocar a _seguinte vista" -#: ../midori/midori-browser.c:5716 +#: ../midori/midori-browser.c:5353 msgid "Only show the Icon of the _Current Tab" msgstr "Mostrar só a icona da lapela a_ctual" -#: ../midori/midori-browser.c:5719 +#: ../midori/midori-browser.c:5356 msgid "_Duplicate Current Tab" msgstr "_Duplicar a lapela actual" -#: ../midori/midori-browser.c:5722 +#: ../midori/midori-browser.c:5359 msgid "Close Ot_her Tabs" msgstr "Pechar ou_tras lapelas" -#: ../midori/midori-browser.c:5725 +#: ../midori/midori-browser.c:5362 msgid "Open last _session" msgstr "Abrir a última _sesión" -#: ../midori/midori-browser.c:5728 +#: ../midori/midori-browser.c:5365 msgid "_Help" msgstr "_Axuda" -#: ../midori/midori-browser.c:5730 +#: ../midori/midori-browser.c:5367 msgid "_Frequent Questions" msgstr "Preguntas _frecuentes" -#: ../midori/midori-browser.c:5733 -msgid "_Report a Problem…" -msgstr "_Informar dun problema…" +#: ../midori/midori-browser.c:5370 +msgid "_Report a Problem..." +msgstr "_Informar dun problema..." -#: ../midori/midori-browser.c:5738 ../midori/midori-browser.c:6399 -msgid "_Tools" -msgstr "_Ferramentas" - -#: ../midori/midori-browser.c:5745 +#: ../midori/midori-browser.c:5382 msgid "_Menubar" msgstr "Barra de _menú" -#: ../midori/midori-browser.c:5749 +#: ../midori/midori-browser.c:5386 msgid "_Navigationbar" msgstr "Barra de _navegación" -#: ../midori/midori-browser.c:5753 +#: ../midori/midori-browser.c:5390 msgid "Side_panel" msgstr "_Panel lateral" -#: ../midori/midori-browser.c:5754 +#: ../midori/midori-browser.c:5391 msgid "Sidepanel" msgstr "Panel lateral" -#: ../midori/midori-browser.c:5757 +#: ../midori/midori-browser.c:5394 msgid "_Bookmarkbar" msgstr "Barra de marcadores" -#: ../midori/midori-browser.c:5761 +#: ../midori/midori-browser.c:5398 msgid "_Statusbar" msgstr "Barra de es_tado" -#: ../midori/midori-browser.c:5770 ../midori/midori-websettings.c:314 +#: ../midori/midori-browser.c:5407 +#: ../midori/midori-websettings.c:302 msgid "_Automatic" msgstr "_Automático" -#: ../midori/midori-browser.c:5773 ../midori/midori-websettings.c:238 -msgid "Chinese Traditional (BIG5)" -msgstr "Chinés tradicional(BIG5)" - -#: ../midori/midori-browser.c:5776 ../midori/midori-websettings.c:239 -msgid "Chinese Simplified (GB18030)" -msgstr "Chinéss simplificado (GB18030)" +#: ../midori/midori-browser.c:5410 +#: ../midori/midori-websettings.c:227 +msgid "Chinese (BIG5)" +msgstr "Chinés (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5780 +#: ../midori/midori-browser.c:5414 msgid "Japanese (SHIFT__JIS)" msgstr "Xaponés (SHIFT__JIS)" -#: ../midori/midori-browser.c:5783 ../midori/midori-websettings.c:241 +#: ../midori/midori-browser.c:5417 +#: ../midori/midori-websettings.c:229 msgid "Korean (EUC-KR)" msgstr "Coreano (EUC-KR)" -#: ../midori/midori-browser.c:5786 ../midori/midori-websettings.c:242 +#: ../midori/midori-browser.c:5420 +#: ../midori/midori-websettings.c:230 msgid "Russian (KOI8-R)" msgstr "Ruso (KOI8-R)" -#: ../midori/midori-browser.c:5789 ../midori/midori-websettings.c:243 +#: ../midori/midori-browser.c:5423 +#: ../midori/midori-websettings.c:231 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5792 ../midori/midori-websettings.c:244 +#: ../midori/midori-browser.c:5426 +#: ../midori/midori-websettings.c:232 msgid "Western (ISO-8859-1)" msgstr "Occidental (ISO-8859-1)" -#: ../midori/midori-browser.c:5795 -msgid "Custom…" -msgstr "Personalizado…" +#: ../midori/midori-browser.c:5429 +#: ../midori/midori-websettings.c:233 +#: ../midori/midori-websettings.c:308 +#: ../katze/katze-utils.c:635 +msgid "Custom..." +msgstr "Personalizado..." -#: ../midori/midori-browser.c:6305 +#: ../midori/midori-browser.c:5909 msgid "_Separator" msgstr "_Separador" -#: ../midori/midori-browser.c:6312 -msgid "_Location…" +#: ../midori/midori-browser.c:5916 +msgid "_Location..." msgstr "Lugar" -#: ../midori/midori-browser.c:6314 +#: ../midori/midori-browser.c:5918 msgid "Open a particular location" msgstr "Abrir un enderezo determinado" -#: ../midori/midori-browser.c:6336 -msgid "_Web Search…" -msgstr "Buscar no _web…" +#: ../midori/midori-browser.c:5940 +msgid "_Web Search..." +msgstr "Buscar no _web..." -#: ../midori/midori-browser.c:6338 +#: ../midori/midori-browser.c:5942 msgid "Run a web search" msgstr "Executar unha busca no web" -#: ../midori/midori-browser.c:6365 +#: ../midori/midori-browser.c:5969 msgid "Reopen a previously closed tab or window" msgstr "Volver abrir xanelas ou lapelas pechadas" -#: ../midori/midori-browser.c:6382 +#: ../midori/midori-browser.c:5984 msgid "Show the saved bookmarks" msgstr "Mostrar os marcadores gardados" -#: ../midori/midori-browser.c:6415 +#: ../midori/midori-browser.c:5998 +msgid "_Tools" +msgstr "_Ferramentas" + +#: ../midori/midori-browser.c:6013 msgid "_Window" msgstr "_Xanela" -#: ../midori/midori-browser.c:6417 +#: ../midori/midori-browser.c:6015 msgid "Show a list of all open tabs" msgstr "Mostrar unha lista de todas as lapelas abertas" -#: ../midori/midori-browser.c:6431 +#: ../midori/midori-browser.c:6029 msgid "_Menu" msgstr "_Menú" -#: ../midori/midori-browser.c:6433 +#: ../midori/midori-browser.c:6031 msgid "Menu" msgstr "Menú" -#: ../midori/midori-browser.c:7258 +#: ../midori/midori-browser.c:6679 #, c-format msgid "Unexpected setting '%s'" msgstr "Opción inesperada «%s»" -#: ../midori/midori-extension.c:329 +#: ../midori/midori-extension.c:310 #, c-format 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-extension.c:747 ../midori/midori-extension.c:844 -#: ../midori/midori-extension.c:941 ../midori/midori-extension.c:1053 -#: ../extensions/addons.c:1688 +#: ../midori/midori-extension.c:721 +#: ../midori/midori-extension.c:818 +#: ../midori/midori-extension.c:915 +#: ../midori/midori-extension.c:1027 +#: ../extensions/addons.c:1690 #, c-format 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:394 -#, c-format -msgid "Search with %s" -msgstr "Buscar con %s" - -#: ../midori/midori-locationaction.c:414 -msgid "Search with…" -msgstr "Buscar con…" - -#: ../midori/midori-locationaction.c:541 +#: ../midori/midori-locationaction.c:425 #, c-format msgid "Failed to select from history\n" msgstr "Produciuse un erro ao seleccionar do historial\n" -#: ../midori/midori-locationaction.c:628 +#: ../midori/midori-locationaction.c:509 #, c-format msgid "Search for %s" msgstr "Buscar %s" -#: ../midori/midori-locationaction.c:1195 -msgid "Export certificate" -msgstr "Exportar o certificado" - -#: ../midori/midori-locationaction.c:1227 -msgid "The signing certificate authority is not known." -msgstr "Non se coñece a firma da Entidade de acreditación" - -#: ../midori/midori-locationaction.c:1229 -msgid "" -"The certificate does not match the expected identity of the site that it was " -"retrieved from." -msgstr "" - -#: ../midori/midori-locationaction.c:1231 -msgid "The certificate's activation time is still in the future." -msgstr "A data de activación do certificado está aínda no futuro." - -#: ../midori/midori-locationaction.c:1233 -msgid "The certificate has expired" -msgstr "Este certificado xa caducou" - -#: ../midori/midori-locationaction.c:1235 -msgid "" -"The certificate has been revoked according to the GTlsConnection's " -"certificate revocation list." -msgstr "" - -#: ../midori/midori-locationaction.c:1237 -msgid "The certificate's algorithm is considered insecure." -msgstr "" - -#: ../midori/midori-locationaction.c:1239 -msgid "Some other error occurred validating the certificate." -msgstr "" - -#: ../midori/midori-locationaction.c:1286 -msgid "_Export certificate" -msgstr "_Exportar o certificado" - -#: ../midori/midori-locationaction.c:1301 -msgid "Self-signed" -msgstr "" - -#: ../midori/midori-locationaction.c:1335 -msgid "Security details" -msgstr "Detalles de segiuranza" +#: ../midori/midori-locationaction.c:535 +#, c-format +msgid "Search with %s" +msgstr "Buscar con %s" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1618 +#: ../midori/midori-locationaction.c:1287 msgid "Paste and p_roceed" msgstr "Pegar e _continuar" -#: ../midori/midori-locationaction.c:1942 +#: ../midori/midori-locationaction.c:1656 msgid "Not verified" msgstr "Non verificada" -#: ../midori/midori-locationaction.c:1950 +#: ../midori/midori-locationaction.c:1671 msgid "Verified and encrypted connection" msgstr "Conexión verificada e cifrada" -#: ../midori/midori-locationaction.c:1957 -msgid "Open, unencrypted connection" -msgstr "Conexión aberta e non cifrada" - -#: ../midori/midori-panel.c:317 ../midori/midori-panel.c:319 -#: ../midori/midori-panel.c:483 ../midori/midori-panel.c:486 +#: ../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:329 ../midori/midori-panel.c:330 +#: ../midori/midori-panel.c:409 +#: ../midori/midori-panel.c:410 msgid "Close panel" msgstr "Pechar o panel" -#: ../midori/midori-panel.c:484 ../midori/midori-panel.c:487 +#: ../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-websettings.c:220 +#: ../midori/midori-websettings.c:209 msgid "Show Speed Dial" msgstr "Mostrar a marcación rápida" -#: ../midori/midori-websettings.c:221 +#: ../midori/midori-websettings.c:210 msgid "Show Homepage" msgstr "Mostrar a páxina inicial" -#: ../midori/midori-websettings.c:240 +#: ../midori/midori-websettings.c:228 msgid "Japanese (SHIFT_JIS)" msgstr "Xaponés (SHIFT_JIS)" -#: ../midori/midori-websettings.c:245 ../midori/midori-websettings.c:321 -#: ../katze/katze-utils.c:633 -msgid "Custom..." -msgstr "Personalizado…" - -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:248 msgid "New tab" msgstr "Nova lapela" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:249 msgid "New window" msgstr "Nova xanela" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:250 msgid "Current tab" msgstr "Lapela actual" -#: ../midori/midori-websettings.c:277 +#: ../midori/midori-websettings.c:265 msgid "Default" msgstr "Predeterminada" -#: ../midori/midori-websettings.c:278 +#: ../midori/midori-websettings.c:266 msgid "Icons" msgstr "Iconas" -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-websettings.c:267 msgid "Small icons" msgstr "Iconas pequenas" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:268 msgid "Text" msgstr "Texto" -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:269 msgid "Icons and text" msgstr "Iconas e texto" -#: ../midori/midori-websettings.c:282 +#: ../midori/midori-websettings.c:270 msgid "Text beside icons" msgstr "Texto a carón das iconas" -#: ../midori/midori-websettings.c:297 +#: ../midori/midori-websettings.c:285 msgid "Automatic (GNOME or environment)" msgstr "Automático (GNOME ou entorno)" -#: ../midori/midori-websettings.c:298 +#: ../midori/midori-websettings.c:286 msgid "HTTP proxy server" msgstr "Servidor proxy HTTP" -#: ../midori/midori-websettings.c:299 +#: ../midori/midori-websettings.c:287 msgid "No proxy server" msgstr "Sen servidor proxy" -#: ../midori/midori-websettings.c:316 -msgid "Chrome" -msgstr "Chrome" - -#: ../midori/midori-websettings.c:317 +#: ../midori/midori-websettings.c:304 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:318 +#: ../midori/midori-websettings.c:305 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:319 +#: ../midori/midori-websettings.c:306 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:320 +#: ../midori/midori-websettings.c:307 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:404 +#: ../midori/midori-websettings.c:360 msgid "Remember last window size" msgstr "Lembrar o último tamaño de xanela" -#: ../midori/midori-websettings.c:405 +#: ../midori/midori-websettings.c:361 msgid "Whether to save the last window size" msgstr "Gardar (ou non) o último tamaño de xanela" -#: ../midori/midori-websettings.c:413 +#: ../midori/midori-websettings.c:369 msgid "Last window width" msgstr "Última largura da xanela" -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:370 msgid "The last saved window width" msgstr "Última largura da xanela gardada" -#: ../midori/midori-websettings.c:422 +#: ../midori/midori-websettings.c:378 msgid "Last window height" msgstr "Última altura da xanela" -#: ../midori/midori-websettings.c:423 +#: ../midori/midori-websettings.c:379 msgid "The last saved window height" msgstr "Última altura da xanela gardada" -#: ../midori/midori-websettings.c:448 +#: ../midori/midori-websettings.c:404 msgid "Last panel position" msgstr "Última posición do panel" -#: ../midori/midori-websettings.c:449 +#: ../midori/midori-websettings.c:405 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:458 +#: ../midori/midori-websettings.c:414 msgid "Last panel page" msgstr "Última páxina do panel" -#: ../midori/midori-websettings.c:459 +#: ../midori/midori-websettings.c:415 msgid "The last saved panel page" msgstr "Última páxina gardada do panel" -#: ../midori/midori-websettings.c:467 +#: ../midori/midori-websettings.c:423 msgid "Last Web search" msgstr "Última busca no web" -#: ../midori/midori-websettings.c:468 +#: ../midori/midori-websettings.c:424 msgid "The last saved Web search" msgstr "Última busca no web gardada" -#: ../midori/midori-websettings.c:492 +#: ../midori/midori-websettings.c:433 msgid "Show Menubar" msgstr "Mostrar a barra de menú" -#: ../midori/midori-websettings.c:493 +#: ../midori/midori-websettings.c:434 msgid "Whether to show the menubar" msgstr "Mostrar (ou non) a barra de menú" -#: ../midori/midori-websettings.c:501 +#: ../midori/midori-websettings.c:442 msgid "Show Navigationbar" msgstr "Mostrar a barra de navegación" -#: ../midori/midori-websettings.c:502 +#: ../midori/midori-websettings.c:443 msgid "Whether to show the navigationbar" msgstr "Mostrar (ou non) a barra de navegación" -#: ../midori/midori-websettings.c:510 +#: ../midori/midori-websettings.c:451 msgid "Show Bookmarkbar" msgstr "Mostrar a barra de marcadores" -#: ../midori/midori-websettings.c:511 +#: ../midori/midori-websettings.c:452 msgid "Whether to show the bookmarkbar" msgstr "Mostrar (ou non) a barra de marcadores" -#: ../midori/midori-websettings.c:519 +#: ../midori/midori-websettings.c:460 msgid "Show Panel" msgstr "Mostrar o panel" -#: ../midori/midori-websettings.c:520 +#: ../midori/midori-websettings.c:461 msgid "Whether to show the panel" msgstr "Mostrar (ou non) o panel" -#: ../midori/midori-websettings.c:528 +#: ../midori/midori-websettings.c:469 msgid "Show Statusbar" msgstr "Mostrar a barra de estado" -#: ../midori/midori-websettings.c:529 +#: ../midori/midori-websettings.c:470 msgid "Whether to show the statusbar" msgstr "Mostrar (ou non) a barra de estado" -#: ../midori/midori-websettings.c:538 +#: ../midori/midori-websettings.c:479 msgid "Toolbar Style:" msgstr "Estilo da barra de ferramentas:" -#: ../midori/midori-websettings.c:539 +#: ../midori/midori-websettings.c:480 msgid "The style of the toolbar" msgstr "O estilo da barra de ferramentas" -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:489 msgid "Toolbar Items" msgstr "Elementos da barra de ferramentas" -#: ../midori/midori-websettings.c:549 +#: ../midori/midori-websettings.c:490 msgid "The items to show on the toolbar" msgstr "Elementos que se van mostrar na barra de ferramentas" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:498 msgid "Compact Sidepanel" msgstr "Panel lateral compacto" -#: ../midori/midori-websettings.c:558 +#: ../midori/midori-websettings.c:499 msgid "Whether to make the sidepanel compact" msgstr "Facer (ou non) o panel lateral compacto" -#: ../midori/midori-websettings.c:573 +#: ../midori/midori-websettings.c:514 msgid "Align sidepanel on the right" msgstr "Aliñar á dereita o panel lateral" -#: ../midori/midori-websettings.c:574 +#: ../midori/midori-websettings.c:515 msgid "Whether to align the sidepanel on the right" msgstr "Aliñar (ou non) á dereita o panel lateral" -#: ../midori/midori-websettings.c:589 +#: ../midori/midori-websettings.c:530 msgid "Open panels in separate windows" msgstr "Abrir os paneis en xanelas separadas" -#: ../midori/midori-websettings.c:590 +#: ../midori/midori-websettings.c:531 msgid "Whether to always open panels in separate windows" msgstr "Indica se os paneis se abren sempre en xanelas separadas" -#: ../midori/midori-websettings.c:599 +#: ../midori/midori-websettings.c:540 msgid "When Midori starts:" msgstr "Cando se inicia Midori:" -#: ../midori/midori-websettings.c:600 +#: ../midori/midori-websettings.c:541 msgid "What to do when Midori starts" msgstr "Que facer ao iniciar Midori" -#: ../midori/midori-websettings.c:609 +#: ../midori/midori-websettings.c:550 msgid "Homepage:" msgstr "Páxina de inicio:" -#: ../midori/midori-websettings.c:610 +#: ../midori/midori-websettings.c:551 msgid "The homepage" msgstr "A páxina de inicio" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:566 msgid "Show crash dialog" msgstr "Mostrar o diálogo de fallo" -#: ../midori/midori-websettings.c:626 +#: ../midori/midori-websettings.c:567 msgid "Show a dialog after Midori crashed" msgstr "Mostrar un cadro de dialogo despois de que Midori falle" -#: ../midori/midori-websettings.c:634 +#: ../midori/midori-websettings.c:575 msgid "Save downloaded files to:" msgstr "Gardar os ficheiros descargados en:" -#: ../midori/midori-websettings.c:635 +#: ../midori/midori-websettings.c:576 msgid "The folder downloaded files are saved to" msgstr "O cartafol de descargas foi gardado en" -#: ../midori/midori-websettings.c:643 +#: ../midori/midori-websettings.c:584 msgid "Text Editor" msgstr "Editor de texto" -#: ../midori/midori-websettings.c:644 +#: ../midori/midori-websettings.c:585 msgid "An external text editor" msgstr "Un editor de texto externo" -#: ../midori/midori-websettings.c:659 +#: ../midori/midori-websettings.c:600 msgid "News Aggregator" msgstr "Agregador de novas" -#: ../midori/midori-websettings.c:660 +#: ../midori/midori-websettings.c:601 msgid "An external news aggregator" msgstr "Un agregador de novas externo" -#: ../midori/midori-websettings.c:668 +#: ../midori/midori-websettings.c:609 msgid "Location entry Search" msgstr "Busca de barra de enderezos" -#: ../midori/midori-websettings.c:669 +#: ../midori/midori-websettings.c:610 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:677 +#: ../midori/midori-websettings.c:618 msgid "Preferred Encoding" msgstr "Codificación preferida" -#: ../midori/midori-websettings.c:678 +#: ../midori/midori-websettings.c:619 msgid "The preferred character encoding" msgstr "Codificación de caracteres preferida" -#: ../midori/midori-websettings.c:688 +#: ../midori/midori-websettings.c:629 msgid "Always Show Tabbar" msgstr "Mostrar sempre a barra de lapelas" -#: ../midori/midori-websettings.c:689 +#: ../midori/midori-websettings.c:630 msgid "Always show the tabbar" msgstr "Mostrar sempre a barra de lapelas" -#: ../midori/midori-websettings.c:702 +#: ../midori/midori-websettings.c:638 msgid "Close Buttons on Tabs" msgstr "Botón de pechar nas lapelas" -#: ../midori/midori-websettings.c:703 +#: ../midori/midori-websettings.c:639 msgid "Whether tabs have close buttons" msgstr "Cada unha das lapelas terá o seu botón para pechala" -#: ../midori/midori-websettings.c:728 +#: ../midori/midori-websettings.c:664 msgid "Open new pages in:" msgstr "Abrir as páxinas novas en:" -#: ../midori/midori-websettings.c:729 +#: ../midori/midori-websettings.c:665 msgid "Where to open new pages" msgstr "Onde se van abrir as páxinas novas" -#: ../midori/midori-websettings.c:738 +#: ../midori/midori-websettings.c:674 msgid "Middle click opens Selection" msgstr "Prema no botón central para abrir a selección" -#: ../midori/midori-websettings.c:739 +#: ../midori/midori-websettings.c:675 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:747 +#: ../midori/midori-websettings.c:683 msgid "Open tabs in the background" msgstr "Abrir as lapelas en segundo plano" -#: ../midori/midori-websettings.c:748 +#: ../midori/midori-websettings.c:684 msgid "Whether to open new tabs in the background" msgstr "Abrir (ou non) as novas lapelas en segundo plano" -#: ../midori/midori-websettings.c:756 +#: ../midori/midori-websettings.c:692 msgid "Open Tabs next to Current" msgstr "Abrir lapelas xunto á actual" -#: ../midori/midori-websettings.c:757 +#: ../midori/midori-websettings.c:693 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:765 +#: ../midori/midori-websettings.c:701 msgid "Open popups in tabs" msgstr "Abrir as xanelas emerxentes en lapelas" -#: ../midori/midori-websettings.c:766 +#: ../midori/midori-websettings.c:702 msgid "Whether to open popup windows in tabs" msgstr "Abrir (ou non) as xanelas emerxentes en lapelas" -#: ../midori/midori-websettings.c:776 ../extensions/statusbar-features.c:155 +#: ../midori/midori-websettings.c:712 +#: ../extensions/statusbar-features.c:131 msgid "Load images automatically" msgstr "Cargar as imaxes automaticamente" -#: ../midori/midori-websettings.c:777 +#: ../midori/midori-websettings.c:713 msgid "Load and display images automatically" msgstr "Cargar e mostrar as imaxes automaticamente" -#: ../midori/midori-websettings.c:784 ../extensions/statusbar-features.c:165 +#: ../midori/midori-websettings.c:720 +#: ../extensions/statusbar-features.c:140 msgid "Enable scripts" msgstr "Activar scripts" -#: ../midori/midori-websettings.c:785 +#: ../midori/midori-websettings.c:721 msgid "Enable embedded scripting languages" msgstr "Activar linguaxes de script incrustadas" -#: ../midori/midori-websettings.c:792 ../extensions/statusbar-features.c:177 +#: ../midori/midori-websettings.c:728 +#: ../extensions/statusbar-features.c:149 msgid "Enable Netscape plugins" msgstr "Activar os engadidos de Netscape" -#: ../midori/midori-websettings.c:793 +#: ../midori/midori-websettings.c:729 msgid "Enable embedded Netscape plugin objects" msgstr "Activar o engadido de obxectos incrustados de Netscape" -#: ../midori/midori-websettings.c:808 +#: ../midori/midori-websettings.c:749 msgid "Enable Spell Checking" msgstr "Activar a corrección ortográfica" -#: ../midori/midori-websettings.c:809 +#: ../midori/midori-websettings.c:750 msgid "Enable spell checking while typing" msgstr "Activar o corrector ortográfico ao escribir" -#: ../midori/midori-websettings.c:815 +#: ../midori/midori-websettings.c:756 msgid "Enable HTML5 database support" msgstr "Activar a compatibilidade de base de datos HTML5" -#: ../midori/midori-websettings.c:816 +#: ../midori/midori-websettings.c:757 msgid "Whether to enable HTML5 database support" msgstr "Activar ou desactivar a compatibilidade de base de datos HTML5" -#: ../midori/midori-websettings.c:822 +#: ../midori/midori-websettings.c:763 msgid "Enable HTML5 local storage support" msgstr "Activar a opción de almacenamento local de HTML5" -#: ../midori/midori-websettings.c:823 +#: ../midori/midori-websettings.c:764 msgid "Whether to enable HTML5 local storage support" -msgstr "" -"Activar ou desactivar a compatibilidade de almacenamento local de HTML5" +msgstr "Activar ou desactivar a compatibilidade de almacenamento local de HTML5" -#: ../midori/midori-websettings.c:829 +#: ../midori/midori-websettings.c:770 msgid "Enable offline web application cache" msgstr "Activar a caché de aplicativos web sen conexión" -#: ../midori/midori-websettings.c:830 +#: ../midori/midori-websettings.c:771 msgid "Whether to enable offline web application cache" msgstr "Activar ou desactivar a caché de aplicativos web sen conexión" -#: ../midori/midori-websettings.c:851 +#: ../midori/midori-websettings.c:787 msgid "Flash window on background tabs" msgstr "Xanela intermitente nas lapelas en segundo plano" -#: ../midori/midori-websettings.c:852 +#: ../midori/midori-websettings.c:788 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:860 -msgid "Enable WebGL support" -msgstr "Activar a compatibilidade para WebGL" +msgstr "Xanela do navegador intermitente se foi aberta unha nova lapela en segundo plano" -#: ../midori/midori-websettings.c:861 -msgid "Allow websites to use OpenGL rendering" -msgstr "Permitir que os sitios web empreguen OpenGL" - -#: ../midori/midori-websettings.c:887 +#: ../midori/midori-websettings.c:803 msgid "Zoom Text and Images" msgstr "Zoom sobre o texto e as imaxes" -#: ../midori/midori-websettings.c:888 +#: ../midori/midori-websettings.c:804 msgid "Whether to zoom text and images" msgstr "Aplicar zoom (ou non) ao texto e ás imaxes" -#: ../midori/midori-websettings.c:903 +#: ../midori/midori-websettings.c:819 msgid "Find inline while typing" msgstr "Buscar en liña ao escribir" -#: ../midori/midori-websettings.c:904 +#: ../midori/midori-websettings.c:820 msgid "Whether to automatically find inline while typing" msgstr "Buscar en liña automaticamente (ou non) mentres se escribe" -#: ../midori/midori-websettings.c:919 +#: ../midori/midori-websettings.c:835 msgid "Kinetic scrolling" msgstr "Desprazamento cinético" -#: ../midori/midori-websettings.c:920 +#: ../midori/midori-websettings.c:836 msgid "Whether scrolling should kinetically move according to speed" msgstr "O desprazamento móvese de acordo ca velocidade" -#: ../midori/midori-websettings.c:928 +#: ../midori/midori-websettings.c:844 msgid "Delete old Cookies after:" msgstr "Eliminar as «cookies» antigas despois de:" -#: ../midori/midori-websettings.c:929 +#: ../midori/midori-websettings.c:845 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:945 +#: ../midori/midori-websettings.c:861 msgid "Only accept Cookies from sites you visit" msgstr "Só se aceptan as «cookies» dos sitios que visite" -#: ../midori/midori-websettings.c:946 +#: ../midori/midori-websettings.c:862 msgid "Block cookies sent by third-party websites" msgstr "Bloquear as «cookies» dos sitios de terceiros" -#: ../midori/midori-websettings.c:960 +#: ../midori/midori-websettings.c:876 msgid "Delete pages from history after:" msgstr "Eliminar as páxinas do historial despois de:" -#: ../midori/midori-websettings.c:961 +#: ../midori/midori-websettings.c:877 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:976 +#: ../midori/midori-websettings.c:892 msgid "Proxy server" msgstr "Servidor proxy" -#: ../midori/midori-websettings.c:977 +#: ../midori/midori-websettings.c:893 msgid "The type of proxy server to use" msgstr "O tipo de servidor proxy a usar" -#: ../midori/midori-websettings.c:986 +#: ../midori/midori-websettings.c:902 msgid "HTTP Proxy Server" msgstr "Servidor proxy HTTP" -#: ../midori/midori-websettings.c:987 +#: ../midori/midori-websettings.c:903 msgid "The proxy server used for HTTP connections" msgstr "Servidor proxy que se usa para as conexións HTTP" -#: ../midori/midori-websettings.c:1002 +#: ../midori/midori-websettings.c:918 msgid "Port" msgstr "Porto" -#: ../midori/midori-websettings.c:1003 +#: ../midori/midori-websettings.c:919 msgid "The proxy server port used for HTTP connections" msgstr "Servidor proxy que se usa para as conexións HTTP" -#: ../midori/midori-websettings.c:1021 +#: ../midori/midori-websettings.c:937 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:1038 +#: ../midori/midori-websettings.c:954 msgid "Identify as" msgstr "Identificarse como" -#: ../midori/midori-websettings.c:1039 +#: ../midori/midori-websettings.c:955 msgid "What to identify as to web pages" msgstr "Como se identifica nas páxinas web" -#: ../midori/midori-websettings.c:1055 +#: ../midori/midori-websettings.c:971 msgid "Identification string" msgstr "Cadea de identificación" -#: ../midori/midori-websettings.c:1056 +#: ../midori/midori-websettings.c:972 msgid "The application identification string" msgstr "Cadea de identificación do aplicativo" -#: ../midori/midori-websettings.c:1072 +#: ../midori/midori-websettings.c:988 msgid "Preferred languages" msgstr "Idiomas preferidos" -#: ../midori/midori-websettings.c:1073 -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:989 +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:1088 +#: ../midori/midori-websettings.c:1004 msgid "Clear private data" msgstr "Limpar a información persoal" -#: ../midori/midori-websettings.c:1089 +#: ../midori/midori-websettings.c:1005 msgid "The private data selected for deletion" msgstr "Os datos privados seleccionados para eliminar" -#: ../midori/midori-websettings.c:1104 +#: ../midori/midori-websettings.c:1020 msgid "Clear data" msgstr "Limpar os datos" -#: ../midori/midori-websettings.c:1105 +#: ../midori/midori-websettings.c:1021 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:1154 +#: ../midori/midori-websettings.c:1054 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:1156 +#: ../midori/midori-websettings.c:1056 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:1170 +#: ../midori/midori-websettings.c:1070 msgid "Always use my font choices" msgstr "Utilizar sempre as miñas escollas de tipo de letras" -#: ../midori/midori-websettings.c:1171 +#: ../midori/midori-websettings.c:1071 msgid "Override fonts picked by websites with user preferences" -msgstr "" -"Substituír os tipos de letras dos sitios web polos preferidos do usuario" +msgstr "Substituír os tipos de letras dos sitios web polos preferidos do usuario" -#: ../midori/midori-view.c:1002 ../midori/midori-view.c:1140 -msgid "Trust this website" -msgstr "Confiar neste sitio web" - -#: ../midori/midori-view.c:1138 -msgid "Security unknown" -msgstr "Seguranza descoñecida" - -#: ../midori/midori-view.c:1436 +#: ../midori/midori-view.c:1343 #, c-format msgid "%s wants to save an HTML5 database." msgstr "%s desexa gardar unha base de datos HTML5." -#: ../midori/midori-view.c:1440 ../midori/midori-view.c:1474 +#: ../midori/midori-view.c:1347 +#: ../midori/midori-view.c:1377 msgid "_Deny" msgstr "_Denegar" -#: ../midori/midori-view.c:1440 ../midori/midori-view.c:1474 +#: ../midori/midori-view.c:1347 +#: ../midori/midori-view.c:1377 msgid "_Allow" msgstr "_Permitir" -#: ../midori/midori-view.c:1469 +#: ../midori/midori-view.c:1373 #, c-format msgid "%s wants to know your location." msgstr "%s desexa coñecer a súa localización." -#: ../midori/midori-view.c:1565 +#: ../midori/midori-view.c:1461 #, c-format msgid "Error - %s" msgstr "Erro - %s" -#: ../midori/midori-view.c:1566 +#: ../midori/midori-view.c:1462 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "Non foi posíbel cargar a páxina «%s»." -#: ../midori/midori-view.c:1568 +#: ../midori/midori-view.c:1464 msgid "Try again" msgstr "Ténteo de novo" -#: ../midori/midori-view.c:1766 ../midori/midori-view.c:2875 +#: ../midori/midori-view.c:1626 +#: ../midori/midori-view.c:2471 #, c-format msgid "Send a message to %s" msgstr "Enviarlle unha mensaxe a %s" -#: ../midori/midori-view.c:2661 -msgid "Add _search engine..." -msgstr "Engadir un _motor de busca" - -#: ../midori/midori-view.c:2705 ../midori/midori-view.c:3031 +#: ../midori/midori-view.c:2313 +#: ../midori/midori-view.c:2624 msgid "Inspect _Element" msgstr "Inspeccionar _elemento" -#: ../midori/midori-view.c:2757 +#: ../midori/midori-view.c:2363 msgid "Open Link in New _Tab" msgstr "Abrir a ligazón nunha nova _lapela" -#: ../midori/midori-view.c:2761 +#: ../midori/midori-view.c:2367 msgid "Open Link in _Foreground Tab" msgstr "Abrir a ligazón na lapela de _primeiro plano" -#: ../midori/midori-view.c:2762 +#: ../midori/midori-view.c:2368 msgid "Open Link in _Background Tab" msgstr "Abrir a ligazón na lapela de _segundo plano" -#: ../midori/midori-view.c:2765 +#: ../midori/midori-view.c:2371 msgid "Open Link in New _Window" msgstr "Abrir a ligazón nunha _xanela nova" -#: ../midori/midori-view.c:2768 +#: ../midori/midori-view.c:2374 msgid "Open Link as Web A_pplication" msgstr "Abrir a ligazón como aplicativo _web" -#: ../midori/midori-view.c:2773 +#: ../midori/midori-view.c:2377 msgid "Copy Link de_stination" msgstr "Copiar o de_stino da ligazón" -#: ../midori/midori-view.c:2789 +#: ../midori/midori-view.c:2389 msgid "Open _Image in New Tab" msgstr "Abrir a _imaxe nunha nova lapela" -#: ../midori/midori-view.c:2792 +#: ../midori/midori-view.c:2392 msgid "Copy Image _Address" msgstr "Copiar o _enderezo da imaxe" -#: ../midori/midori-view.c:2795 +#: ../midori/midori-view.c:2395 msgid "Save I_mage" msgstr "Gardar a i_maxe" -#: ../midori/midori-view.c:2798 -msgid "Open in Image _Viewer" -msgstr "Abrir no _visor de imaxes" - -#: ../midori/midori-view.c:2805 +#: ../midori/midori-view.c:2402 msgid "Copy Video _Address" msgstr "Copiar o _enderezo do vídeo" -#: ../midori/midori-view.c:2808 +#: ../midori/midori-view.c:2405 msgid "Save _Video" msgstr "Gardar o _vídeo" -#: ../midori/midori-view.c:2808 +#: ../midori/midori-view.c:2405 msgid "Download _Video" msgstr "Descargar o _vídeo" -#: ../midori/midori-view.c:2834 +#: ../midori/midori-view.c:2431 msgid "Search _with" msgstr "Buscar _con: " -#: ../midori/midori-view.c:2866 +#: ../midori/midori-view.c:2463 msgid "_Search the Web" msgstr "_Buscar na rede" -#: ../midori/midori-view.c:2883 +#: ../midori/midori-view.c:2479 msgid "Open Address in New _Tab" msgstr "Abrir o enderezo nunha nova _lapela" -#: ../midori/midori-view.c:2936 -msgid "Open _Frame in New Tab" -msgstr "Abrir o _marco nunha nova lapela" - -#: ../midori/midori-view.c:3189 +#: ../midori/midori-view.c:2775 msgid "Open or download file" msgstr "Abrir ou descargar o ficheiro" -#: ../midori/midori-view.c:3213 -#, c-format -msgid "File Name: %s" -msgstr "Nome de ficheiro: «%s»" - -#: ../midori/midori-view.c:3218 +#: ../midori/midori-view.c:2794 #, c-format msgid "File Type: '%s'" msgstr "Tipo de ficheiro: «%s»" -#: ../midori/midori-view.c:3220 +#: ../midori/midori-view.c:2796 #, c-format msgid "File Type: %s ('%s')" msgstr "Tipo de ficheiro: %s («%s»)" -#: ../midori/midori-view.c:3255 -#, c-format -msgid "Size: %s" -msgstr "Tamaño: %s" - #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:3266 +#: ../midori/midori-view.c:2813 #, c-format msgid "Open %s" msgstr "Abrir %s" -#: ../midori/midori-view.c:3885 +#: ../midori/midori-view.c:3405 #, c-format msgid "Inspect page - %s" msgstr "Inspeccionar a páxina - %s" -#: ../midori/midori-view.c:4239 +#: ../midori/midori-view.c:3692 msgid "Speed Dial" msgstr "Marcación rápida" -#: ../midori/midori-view.c:4240 ../midori/midori-view.c:4336 +#: ../midori/midori-view.c:3693 +#: ../midori/midori-view.c:3789 msgid "Click to add a shortcut" msgstr "Prema para engadir un atallo" -#: ../midori/midori-view.c:4241 +#: ../midori/midori-view.c:3694 msgid "Enter shortcut address" msgstr "Introduza o enderezo do atallo" -#: ../midori/midori-view.c:4242 +#: ../midori/midori-view.c:3695 msgid "Enter shortcut title" msgstr "Introduza o título do atallo" -#: ../midori/midori-view.c:4243 +#: ../midori/midori-view.c:3696 msgid "Are you sure you want to delete this shortcut?" msgstr "Está seguro de que desexa eliminar este atallo?" -#: ../midori/midori-view.c:4405 +#: ../midori/midori-view.c:3860 #, c-format msgid "No documentation installed" msgstr "A documentación non está instalada" -#: ../midori/midori-view.c:4482 -msgid "Midori doesn't store any personal data:" -msgstr "Midori non almacena ningún dato persoal:" - -#: ../midori/midori-view.c:4483 -msgid "No history or web cookies are being saved." -msgstr "Non se gardan cookies nin historiais." - -#: ../midori/midori-view.c:4484 -msgid "Extensions are disabled." -msgstr "Os complementos están desactivados." - -#: ../midori/midori-view.c:4485 -msgid "HTML5 storage, local database and application caches are disabled." -msgstr "" - -#: ../midori/midori-view.c:4486 -msgid "Midori prevents websites from tracking the user:" -msgstr "" - -#: ../midori/midori-view.c:4487 -msgid "Referrer URLs are stripped down to the hostname." -msgstr "" - -#: ../midori/midori-view.c:4488 -msgid "DNS prefetching is disabled." -msgstr "A oObtención previa de DNS está desactivada." - -#: ../midori/midori-view.c:4489 -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:4490 -msgid "Flash and other Netscape plugins cannot be listed by websites." -msgstr "Non é posíbel listar Flash e outros complementos de Netscape nos sitios web." - -#: ../midori/midori-view.c:4579 +#: ../midori/midori-view.c:3910 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." +msgstr "Os números de versión entre os corchetes mostran a versión en tempo de execución." -#: ../midori/midori-view.c:4629 +#: ../midori/midori-view.c:3955 msgid "Page loading delayed" msgstr "Pospúxose a carga da páxina" -#: ../midori/midori-view.c:4630 +#: ../midori/midori-view.c:3956 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:4631 +#: ../midori/midori-view.c:3957 msgid "Load Page" msgstr "Cargar a páxina" -#: ../midori/midori-view.c:4798 +#: ../midori/midori-view.c:4097 msgid "Blank page" msgstr "Páxina en branco" -#: ../midori/midori-view.c:5062 +#: ../midori/midori-view.c:4361 msgid "_Duplicate Tab" msgstr "_Duplicar a lapela" -#: ../midori/midori-view.c:5067 +#: ../midori/midori-view.c:4366 msgid "Show Tab _Label" msgstr "Mostrar a _etiqueta da lapela" -#: ../midori/midori-view.c:5067 +#: ../midori/midori-view.c:4366 msgid "Show Tab _Icon Only" msgstr "Só mostrar a _icona da lapela" -#: ../midori/midori-view.c:5074 -msgid "Close Ot_her Tab" -msgid_plural "Close Ot_her Tabs" -msgstr[0] "Pechar ou_tra lapela" -msgstr[1] "Pechar ou_tras lapelas" +#: ../midori/midori-view.c:4372 +msgid "Close ot_her Tabs" +msgstr "Pechar ou_tras lapelas" #. i18n: word stem of "previous page" type links, case is not important -#: ../midori/midori-view.c:5910 +#: ../midori/midori-view.c:4989 msgid "previous" msgstr "anterior" #. i18n: word stem of "next page" type links, case is not important -#: ../midori/midori-view.c:5929 +#: ../midori/midori-view.c:5008 msgid "next" msgstr "seguinte" -#: ../midori/midori-view.c:5942 +#: ../midori/midori-view.c:5021 msgid "Print background images" msgstr "Imprimir imaxes de fondo" -#: ../midori/midori-view.c:5943 +#: ../midori/midori-view.c:5022 msgid "Whether background images should be printed" msgstr "Se se imprimen (ou non) as imaxes de fondo" -#: ../midori/midori-view.c:5975 +#: ../midori/midori-view.c:5054 msgid "Features" msgstr "Funcionalidades" -#: ../midori/midori-preferences.c:298 +#: ../midori/midori-preferences.c:297 msgid "Startup" msgstr "Inicio" -#: ../midori/midori-preferences.c:311 +#: ../midori/midori-preferences.c:310 msgid "Use _current page" msgstr "Usar a páxina a_ctual" -#: ../midori/midori-preferences.c:315 +#: ../midori/midori-preferences.c:314 msgid "Use current page as homepage" msgstr "Usar a páxina actual como páxina de inicio" #. Page "Appearance" -#: ../midori/midori-preferences.c:324 +#: ../midori/midori-preferences.c:323 msgid "Fonts" msgstr "Tipos de letra" -#: ../midori/midori-preferences.c:327 +#: ../midori/midori-preferences.c:326 msgid "Proportional Font Family" msgstr "Familia de letras proporcionais" -#: ../midori/midori-preferences.c:331 +#: ../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:334 +#: ../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:336 +#: ../midori/midori-preferences.c:335 msgid "Fixed-width Font Family" msgstr "Tipo de letra de ancho fixo" -#: ../midori/midori-preferences.c:340 +#: ../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:343 +#: ../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:345 +#: ../midori/midori-preferences.c:344 msgid "Minimum Font Size" msgstr "Tamaño mínimo do tipo de letra" -#: ../midori/midori-preferences.c:349 +#: ../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:360 +#: ../midori/midori-preferences.c:359 msgid "Behavior" msgstr "Comportamento" -#: ../midori/midori-preferences.c:386 +#: ../midori/midori-preferences.c:385 msgid "Allow scripts to open popups" msgstr "Permitir que os «scripts» abran xanelas emerxentes" -#: ../midori/midori-preferences.c:387 +#: ../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 xanelas emerxentes " -"automaticamente" +msgstr "Definir se os scripts teñen permiso ou non para abrir xanelas emerxentes automaticamente" #. Page "Interface" -#: ../midori/midori-preferences.c:418 +#: ../midori/midori-preferences.c:409 msgid "Browsing" msgstr "Navegación" #. Page "Network" -#: ../midori/midori-preferences.c:458 +#: ../midori/midori-preferences.c:447 msgid "Network" msgstr "Rede" -#: ../midori/midori-preferences.c:465 +#: ../midori/midori-preferences.c:454 msgid "Hostname" msgstr "Nome de máquina" -#: ../midori/midori-preferences.c:489 +#: ../midori/midori-preferences.c:478 msgid "MB" msgstr "MB" -#: ../midori/midori-searchaction.c:958 +#: ../midori/midori-searchaction.c:907 msgid "Add search engine" msgstr "Engadir un motor de busca" -#: ../midori/midori-searchaction.c:958 +#: ../midori/midori-searchaction.c:907 msgid "Edit search engine" msgstr "Editar o motor de busca" -#: ../midori/midori-searchaction.c:986 +#: ../midori/midori-searchaction.c:936 msgid "_Name:" msgstr "_Nome:" -#: ../midori/midori-searchaction.c:1001 +#: ../midori/midori-searchaction.c:952 msgid "_Description:" msgstr "_Descrición" -#: ../midori/midori-searchaction.c:1014 ../extensions/feed-panel/main.c:377 -msgid "_Address:" -msgstr "_Enderezo:" +#: ../midori/midori-searchaction.c:985 +msgid "_Icon:" +msgstr "_Icona" -#: ../midori/midori-searchaction.c:1033 +#: ../midori/midori-searchaction.c:999 msgid "_Token:" msgstr "_Marca" -#: ../midori/midori-searchaction.c:1331 +#: ../midori/midori-searchaction.c:1299 msgid "Manage Search Engines" msgstr "Xestionar os motores de busca" -#: ../midori/midori-searchaction.c:1433 +#: ../midori/midori-searchaction.c:1399 msgid "Use as _default" msgstr "Usar como pre_determinado" -#: ../midori/sokoke.c:346 +#: ../midori/sokoke.c:410 msgid "Open with" msgstr "Abrir con" -#: ../midori/sokoke.c:354 +#: ../midori/sokoke.c:418 #, c-format msgid "Choose an application or command to open \"%s\":" msgstr "Escoller un aplicativo ou orde para abrir «%s»:" -#: ../midori/sokoke.c:468 ../midori/sokoke.c:482 +#: ../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 "Non foi posíbel executar o programa externo." -#: ../midori/sokoke.c:1529 +#: ../midori/sokoke.c:1677 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d hora" msgstr[1] "%d horas" -#: ../midori/sokoke.c:1530 +#: ../midori/sokoke.c:1678 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minuto" msgstr[1] "%d minutos" -#: ../midori/sokoke.c:1531 +#: ../midori/sokoke.c:1679 #, c-format msgid "%d second" msgid_plural "%d seconds" @@ -2149,178 +2017,163 @@ msgstr[0] "%d segundo" msgstr[1] "%d segundos" #. i18n: Download tooltip (size): 4KB of 43MB -#: ../midori/sokoke.c:1539 ../panels/midori-transfers.c:269 +#: ../midori/sokoke.c:1687 +#: ../panels/midori-transfers.c:267 #, c-format msgid "%s of %s" msgstr "%s de %s" #. i18n: Unknown number of bytes, used for transfer rate like ?B/s -#: ../midori/sokoke.c:1548 +#: ../midori/sokoke.c:1696 msgid "?B" msgstr "?B" #. i18n: Download tooltip (transfer rate): (130KB/s) -#: ../midori/sokoke.c:1551 +#: ../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:1568 +#: ../midori/sokoke.c:1716 #, c-format msgid " - %s remaining" msgstr "- restan %s" #. i18n: A panel at the bottom, to search text in pages -#: ../toolbars/midori-findbar.c:277 +#: ../toolbars/midori-findbar.c:264 msgid "_Inline Find:" msgstr "_Busca en liña:" -#: ../toolbars/midori-findbar.c:303 +#: ../toolbars/midori-findbar.c:291 msgid "Previous" msgstr "Anterior" -#: ../toolbars/midori-findbar.c:309 +#: ../toolbars/midori-findbar.c:297 msgid "Next" msgstr "Seguinte" -#: ../toolbars/midori-findbar.c:313 +#: ../toolbars/midori-findbar.c:301 msgid "Match Case" msgstr "Diferenciar maiúsculas de minúsculas" -#: ../toolbars/midori-findbar.c:322 +#: ../toolbars/midori-findbar.c:310 msgid "Highlight Matches" msgstr "Resaltar coincidencias" -#: ../toolbars/midori-findbar.c:333 +#: ../toolbars/midori-findbar.c:321 msgid "Close Findbar" msgstr "Pechar a barra de buscas" -#: ../toolbars/midori-transferbar.c:124 +#: ../toolbars/midori-transferbar.c:122 #, c-format msgid "The file '%s' has been downloaded." msgstr "Descargouse o ficheiro «%s»." -#: ../toolbars/midori-transferbar.c:127 +#: ../toolbars/midori-transferbar.c:125 msgid "Transfer completed" msgstr "Transferencia completada" -#: ../toolbars/midori-transferbar.c:195 +#: ../toolbars/midori-transferbar.c:193 msgid "The downloaded file is erroneous." msgstr "O ficheiro descargado é erróneo." -#: ../toolbars/midori-transferbar.c:196 -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: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:339 ../panels/midori-transfers.c:142 +#: ../toolbars/midori-transferbar.c:331 +#: ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "Limpar todo" -#: ../toolbars/midori-transferbar.c:376 ../toolbars/midori-transferbar.c:378 +#: ../toolbars/midori-transferbar.c:368 +#: ../toolbars/midori-transferbar.c:370 msgid "Some files are being downloaded" msgstr "Estanse a descargar algúns ficheiros" -#: ../toolbars/midori-transferbar.c:382 +#: ../toolbars/midori-transferbar.c:374 msgid "_Quit Midori" msgstr "Saír de Midori" -#: ../toolbars/midori-transferbar.c:384 +#: ../toolbars/midori-transferbar.c:376 msgid "The transfers will be cancelled if Midori quits." msgstr "Se sae de Midori hanse cancelar as transferencias." -#: ../panels/midori-bookmarks.c:308 +#: ../panels/midori-bookmarks.c:113 +msgid "Bookmarks" +msgstr "Marcadores" + +#: ../panels/midori-bookmarks.c:260 #, 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:475 -#, c-format -msgid "Failed to update bookmark : %s\n" -msgstr "Non foi posíbel actualizar o marcador: %s\n" - -#: ../panels/midori-bookmarks.c:535 +#: ../panels/midori-bookmarks.c:440 msgid "Edit the selected bookmark" msgstr "Editar o marcador seleccionado" -#: ../panels/midori-bookmarks.c:543 +#: ../panels/midori-bookmarks.c:448 msgid "Delete the selected bookmark" msgstr "Eliminar o marcador seleccionado" -#: ../panels/midori-bookmarks.c:558 +#: ../panels/midori-bookmarks.c:463 msgid "Add a new folder" msgstr "Engadir un cartafol novo" -#: ../panels/midori-bookmarks.c:694 ../panels/midori-history.c:635 +#: ../panels/midori-bookmarks.c:597 +#: ../panels/midori-history.c:579 msgid "Separator" msgstr "Separador" -#: ../panels/midori-bookmarks.c:1030 -msgid "Search Bookmarks" -msgstr "Buscar marcadores" - -#: ../panels/midori-history.c:111 +#: ../panels/midori-history.c:110 msgid "History" msgstr "Historial" -#: ../panels/midori-history.c:158 ../panels/midori-history.c:189 -msgid "Today" -msgstr "Hoxe" - -#: ../panels/midori-history.c:160 ../panels/midori-history.c:191 -msgid "Yesterday" -msgstr "Onte" +#: ../panels/midori-history.c:142 +msgid "A week ago" +msgstr "Fai unha semana" -#: ../panels/midori-history.c:162 ../panels/midori-history.c:186 +#: ../panels/midori-history.c:144 #, 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:165 ../panels/midori-history.c:184 -msgid "A week ago" -msgstr "Fai unha semana" +#: ../panels/midori-history.c:147 +msgid "Today" +msgstr "Hoxe" -#: ../panels/midori-history.c:232 -#, c-format -msgid "Failed to remove history item: %s\n" -msgstr "Produciuse un fallo ao eliminar o elemento do historial: %s\n" +#: ../panels/midori-history.c:149 +msgid "Yesterday" +msgstr "Onte" -#: ../panels/midori-history.c:360 +#: ../panels/midori-history.c:317 msgid "Are you sure you want to remove all history items?" msgstr "Esta seguro de que desexa eliminar todos os elementos do historial?" -#: ../panels/midori-history.c:407 +#: ../panels/midori-history.c:363 msgid "Bookmark the selected history item" msgstr "Por en marcadores o elemento seleccionado no historial" -#: ../panels/midori-history.c:416 +#: ../panels/midori-history.c:372 msgid "Delete the selected history item" msgstr "Eliminar o elemento seleccionado no historial" -#: ../panels/midori-history.c:424 +#: ../panels/midori-history.c:380 msgid "Clear the entire history" msgstr "Limpar completamente o historial" -#: ../panels/midori-history.c:1001 -msgid "Search History" -msgstr "Buscar no historial " - -#: ../panels/midori-transfers.c:87 +#: ../panels/midori-transfers.c:86 msgid "Transfers" msgstr "Transferencias" -#: ../panels/midori-transfers.c:470 +#: ../panels/midori-transfers.c:467 msgid "Open Destination _Folder" msgstr "Abrir o carta_fol de destino" -#: ../panels/midori-transfers.c:473 +#: ../panels/midori-transfers.c:470 msgid "Copy Link Loc_ation" msgstr "Copiar o enderezo da lig_azón" @@ -2348,106 +2201,103 @@ msgstr "Contrasinal" msgid "_Remember password" msgstr "_Lembrar o contrasinal" -#: ../katze/katze-throbber.c:949 +#: ../katze/katze-throbber.c:942 #, c-format msgid "Named icon '%s' couldn't be loaded" msgstr "Non foi posíbel cargar a icona chamada «%s»" -#: ../katze/katze-throbber.c:962 +#: ../katze/katze-throbber.c:955 #, c-format msgid "Stock icon '%s' couldn't be loaded" msgstr "Non é posíbel cargar a icona de inventario «%s»" -#: ../katze/katze-throbber.c:1042 +#: ../katze/katze-throbber.c:1035 msgid "Animation frames are broken" msgstr "Os marcos de animación están rotos" -#: ../katze/katze-utils.c:443 ../katze/katze-utils.c:867 +#: ../katze/katze-utils.c:439 +#: ../katze/katze-utils.c:873 #, c-format msgid "Property '%s' is invalid for %s" msgstr "A propiedade «%s» non é válida para %s" -#: ../katze/katze-utils.c:489 ../katze/katze-utils.c:518 +#: ../katze/katze-utils.c:485 +#: ../katze/katze-utils.c:514 #: ../extensions/addons.c:308 msgid "Choose file" msgstr "Escoller un ficheiro" -#: ../katze/katze-utils.c:504 +#: ../katze/katze-utils.c:500 msgid "Choose folder" msgstr "Escoller un cartafol" -#: ../katze/katze-utils.c:602 +#: ../katze/katze-utils.c:604 msgid "None" msgstr "Ningunha" -#: ../katze/katze-utils.c:717 +#: ../katze/katze-utils.c:719 msgid "1 hour" msgstr "1 hora" -#: ../katze/katze-utils.c:718 +#: ../katze/katze-utils.c:720 msgid "1 day" msgstr "1 día" -#: ../katze/katze-utils.c:719 +#: ../katze/katze-utils.c:721 msgid "1 week" msgstr "1 semana" -#: ../katze/katze-utils.c:720 +#: ../katze/katze-utils.c:722 msgid "1 month" msgstr "1 mes" -#: ../katze/katze-utils.c:721 +#: ../katze/katze-utils.c:723 msgid "1 year" msgstr "1 ano" -#: ../katze/katze-preferences.c:98 ../extensions/history-list.vala:235 +#: ../katze/katze-preferences.c:91 +#: ../extensions/history-list.vala:235 #, c-format msgid "Preferences for %s" msgstr "Preferencias de %s" -#: ../extensions/adblock.c:470 +#: ../extensions/adblock.c:434 msgid "Configure Advertisement filters" msgstr "Configurar os filtros de publicidade" -#: ../extensions/adblock.c:503 +#: ../extensions/adblock.c:465 #, 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." +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:917 +#: ../extensions/adblock.c:816 msgid "Edit rule" msgstr "Editar regra" -#: ../extensions/adblock.c:931 +#: ../extensions/adblock.c:830 msgid "_Rule:" msgstr "_Regra:" -#: ../extensions/adblock.c:985 +#: ../extensions/adblock.c:884 msgid "Bl_ock image" msgstr "Bl_oquear a imaxe" -#: ../extensions/adblock.c:990 +#: ../extensions/adblock.c:889 msgid "Bl_ock link" msgstr "Bl_oquear a ligazón" -#: ../extensions/adblock.c:1689 +#: ../extensions/adblock.c:1483 msgid "Advertisement blocker" msgstr "Bloqueo de publicidade" -#: ../extensions/adblock.c:1690 +#: ../extensions/adblock.c:1484 msgid "Block advertisements according to a filter list" msgstr "Bloquear a publicidade de acordo cunha lista de filtros" #. 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?" +msgstr "Parece que esta páxina contén un script de usuario. Desexa instalalalo?" #: ../extensions/addons.c:222 msgid "_Install user script" @@ -2456,8 +2306,7 @@ 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?" +msgstr "Parece que esta páxina contén un estilo de usuario. Desexa instalalalo?" #: ../extensions/addons.c:228 msgid "_Install user style" @@ -2467,116 +2316,118 @@ msgstr "_instalar un estilo de usuario" msgid "Don't install" msgstr "Non instalar" -#: ../extensions/addons.c:319 ../extensions/addons.c:677 +#: ../extensions/addons.c:319 +#: ../extensions/addons.c:681 msgid "Userscripts" msgstr "«Scripts» de usuario" -#: ../extensions/addons.c:324 ../extensions/addons.c:679 +#: ../extensions/addons.c:324 +#: ../extensions/addons.c:683 msgid "Userstyles" msgstr "Estilos de usuario" -#: ../extensions/addons.c:370 ../extensions/addons.c:449 +#: ../extensions/addons.c:380 +#: ../extensions/addons.c:459 #: ../extensions/feed-panel/main.c:129 msgid "Error" msgstr "Erro" -#: ../extensions/addons.c:411 +#: ../extensions/addons.c:421 #, c-format msgid "Do you want to delete '%s'?" msgstr "Está seguro de que desexa eliminar «%s»?" -#: ../extensions/addons.c:417 +#: ../extensions/addons.c:427 msgid "Delete user script" msgstr "Eliminar o «script» de usuario" -#: ../extensions/addons.c:418 +#: ../extensions/addons.c:428 msgid "Delete user style" msgstr "Eliminar o estilo de usuario" -#: ../extensions/addons.c:421 +#: ../extensions/addons.c:431 #, c-format msgid "The file %s will be permanently deleted." msgstr "Eliminouse de forma permanente o ficheiro %s." -#: ../extensions/addons.c:566 ../extensions/addons.c:643 +#: ../extensions/addons.c:570 +#: ../extensions/addons.c:647 msgid "Open in Text Editor" msgstr "Abrir nun editor de texto" -#: ../extensions/addons.c:568 ../extensions/addons.c:652 +#: ../extensions/addons.c:572 +#: ../extensions/addons.c:656 msgid "Open Target Folder" msgstr "Abrir o cartafol de destino" -#: ../extensions/addons.c:634 +#: ../extensions/addons.c:638 msgid "Add new addon" msgstr "Engadir un novo complemento" -#: ../extensions/addons.c:660 +#: ../extensions/addons.c:664 msgid "Remove selected addon" msgstr "Eliminar o complemento seleccionado" -#: ../extensions/addons.c:1689 ../extensions/addons.c:1907 +#: ../extensions/addons.c:1691 +#: ../extensions/addons.c:1909 msgid "User addons" msgstr "Complementos de usuario" -#: ../extensions/addons.c:1819 +#: ../extensions/addons.c:1821 #, c-format msgid "Can't monitor folder '%s': %s" msgstr "Non é posíbel monitorizar o cartafol «%s»: %s" -#: ../extensions/addons.c:1908 +#: ../extensions/addons.c:1910 msgid "Support for userscripts and userstyles" msgstr "Compatibilidade para «scripts» e estilos de usuario" -#: ../extensions/colorful-tabs.c:201 +#: ../extensions/colorful-tabs.c:202 msgid "Colorful Tabs" msgstr "Lapelas de cores" -#: ../extensions/colorful-tabs.c:202 +#: ../extensions/colorful-tabs.c:203 msgid "Tint each tab distinctly" msgstr "Colorea cada lapela para distinguilas" -#: ../extensions/cookie-manager/cookie-manager-page.c:73 +#: ../extensions/cookie-manager/cookie-manager-page.c:80 #: ../extensions/cookie-manager/main.c:35 msgid "Cookie Manager" msgstr "Xestor de «cookies»" -#: ../extensions/cookie-manager/cookie-manager-page.c:103 +#: ../extensions/cookie-manager/cookie-manager-page.c:110 msgid "Delete All" msgstr "Eliminar todo" -#: ../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:112 +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:120 +#: ../extensions/cookie-manager/cookie-manager-page.c:127 msgid "Expand All" msgstr "Expandir todo" -#: ../extensions/cookie-manager/cookie-manager-page.c:127 +#: ../extensions/cookie-manager/cookie-manager-page.c:134 msgid "Collapse All" msgstr "Contraer todo" -#: ../extensions/cookie-manager/cookie-manager-page.c:572 +#: ../extensions/cookie-manager/cookie-manager-page.c:576 msgid "Do you really want to delete all cookies?" msgstr "Está seguro de que desexa eliminar todas as cookies?" -#: ../extensions/cookie-manager/cookie-manager-page.c:574 +#: ../extensions/cookie-manager/cookie-manager-page.c:578 msgid "Question" msgstr "Pregunta" -#: ../extensions/cookie-manager/cookie-manager-page.c:583 +#: ../extensions/cookie-manager/cookie-manager-page.c:587 msgid "Only cookies which match the filter will be deleted." msgstr "Só se eliminarán as cookies que coincidan co filtro." -#: ../extensions/cookie-manager/cookie-manager-page.c:671 +#: ../extensions/cookie-manager/cookie-manager-page.c:675 msgid "At the end of the session" msgstr "Na fin da sesión" -#: ../extensions/cookie-manager/cookie-manager-page.c:674 +#: ../extensions/cookie-manager/cookie-manager-page.c:678 #, c-format msgid "" "Host: %s\n" @@ -2593,15 +2444,15 @@ msgstr "" "Segura: %s\n" "Caduca: %s" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:684 msgid "Yes" msgstr "Si" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:684 msgid "No" msgstr "Non" -#: ../extensions/cookie-manager/cookie-manager-page.c:694 +#: ../extensions/cookie-manager/cookie-manager-page.c:698 #, c-format msgid "" "Domain: %s\n" @@ -2610,21 +2461,25 @@ msgstr "" "Dominio: %s\n" "Cookies: %d" -#: ../extensions/cookie-manager/cookie-manager-page.c:1021 +#: ../extensions/cookie-manager/cookie-manager-page.c:1028 msgid "Name" msgstr "Nome" -#: ../extensions/cookie-manager/cookie-manager-page.c:1072 +#: ../extensions/cookie-manager/cookie-manager-page.c:1081 msgid "_Expand All" msgstr "_Expandir todo" -#: ../extensions/cookie-manager/cookie-manager-page.c:1080 +#: ../extensions/cookie-manager/cookie-manager-page.c:1089 msgid "_Collapse All" msgstr "_Contraer todo" -#: ../extensions/cookie-manager/cookie-manager-page.c:1133 -msgid "Search Cookies by Name or Domain" -msgstr "Buscar cookies por nome ou dominio" +#: ../extensions/cookie-manager/cookie-manager-page.c:1142 +msgid "Filter:" +msgstr " Filtro:" + +#: ../extensions/cookie-manager/cookie-manager-page.c:1147 +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:36 msgid "List, view and delete cookies" @@ -2644,13 +2499,11 @@ msgstr "Copiar os enderezos de todas as lapelas ao portarretallos" #: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." -msgstr "" -"Non foi posíbel 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 foi posíbel 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:387 @@ -2700,13 +2553,11 @@ 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 foi posíbel 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 foi posíbel 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 @@ -2726,71 +2577,45 @@ msgstr "Panel de fontes" msgid "Read Atom/ RSS feeds" msgstr "Lector de fontes Atom/RSS" -#: ../extensions/formhistory/formhistory.c:39 +#: ../extensions/formhistory.c:143 #, c-format msgid "Failed to add form value: %s\n" msgstr "Produciuse un erro ao engadir o valor ao formulario: %s\n" -#: ../extensions/formhistory/formhistory.c:95 -msgid "Form history" -msgstr "Historial de formularios" - -#: ../extensions/formhistory/formhistory.c:112 -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 +#: ../extensions/formhistory.c:295 msgid "Toggle form history state" msgstr "Alternar o estado do historial de formularios" -#: ../extensions/formhistory/formhistory.c:438 +#: ../extensions/formhistory.c:296 msgid "Activate or deactivate form history for the current tab." -msgstr "" -"Activar ou desactivar o historial dos formularios para a lapela actual." +msgstr "Activar ou desactivar o historial dos formularios para a lapela actual." -#: ../extensions/formhistory/formhistory.c:549 -#: ../extensions/formhistory/formhistory.c:553 +#: ../extensions/formhistory.c:432 +#: ../extensions/formhistory.c:436 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Produciuse un fallo ao executar a declaración na base de datos: %s\n" -#: ../extensions/formhistory/formhistory.c:629 -msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab" -msgstr "Activar o historial de formularios 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:511 +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:669 +#: ../extensions/formhistory.c:570 msgid "Stores history of entered form data" msgstr "Almacena un historial dos datos introducidos nos formularios" -#: ../extensions/formhistory/formhistory-gdom-frontend.c:225 -#: ../extensions/formhistory/formhistory-js-frontend.c:106 +#: ../extensions/formhistory.c:574 #, c-format -msgid "Failed to select suggestions\n" -msgstr "Produciuse un erro ao seleccionar suxestións\n" +msgid "Not available: %s" +msgstr "Non dispoñíbel: %s" + +#: ../extensions/formhistory.c:575 +msgid "Resource files not installed" +msgstr "Os ficheiros de recursos non están instalados" + +#: ../extensions/formhistory.c:581 +msgid "Form history filler" +msgstr "Completador de historial de formularios" #: ../extensions/history-list.vala:197 msgid "There are no unvisited tabs" @@ -2865,15 +2690,15 @@ msgstr "Recargar a páxina ou deter a carga" msgid "Customize Keyboard shortcuts" msgstr "Personalizar os atallos de teclado" -#: ../extensions/shortcuts.c:283 +#: ../extensions/shortcuts.c:285 msgid "Customize Sh_ortcuts..." -msgstr "Personali_zar os atallos…" +msgstr "Personalizar _os atallos..." -#: ../extensions/shortcuts.c:320 +#: ../extensions/shortcuts.c:322 msgid "Shortcuts" msgstr "Atallos" -#: ../extensions/shortcuts.c:321 +#: ../extensions/shortcuts.c:323 msgid "View and edit keyboard shortcuts" msgstr "Ver e modificar os atallos de teclado" @@ -2885,75 +2710,76 @@ msgstr "Reloxo na barra de estado" msgid "Display date and time in the statusbar" msgstr "Mostrar data e hora na barra de estado" -#: ../extensions/statusbar-features.c:152 +#: ../extensions/statusbar-features.c:128 msgid "Images" msgstr "Imaxes" -#: ../extensions/statusbar-features.c:162 +#: ../extensions/statusbar-features.c:137 msgid "Scripts" msgstr "Scripts" -#: ../extensions/statusbar-features.c:174 +#: ../extensions/statusbar-features.c:146 msgid "Netscape plugins" msgstr "Engadidos de Netscape" -#: ../extensions/statusbar-features.c:259 +#: ../extensions/statusbar-features.c:192 msgid "Statusbar Features" msgstr "Características da barra de estado" -#: ../extensions/statusbar-features.c:260 +#: ../extensions/statusbar-features.c:193 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:589 ../extensions/tab-panel.c:676 +#: ../extensions/tab-panel.c:596 +#: ../extensions/tab-panel.c:683 msgid "Tab Panel" msgstr "Panel de lapelas" -#: ../extensions/tab-panel.c:659 +#: ../extensions/tab-panel.c:666 msgid "T_ab Panel" msgstr "Panel de _lapelas" -#: ../extensions/tab-panel.c:677 +#: ../extensions/tab-panel.c:684 msgid "Show tabs in a vertical panel" msgstr "Mostrar as lapelas nun panel vertical" #: ../extensions/tabs-minimized.c:76 msgid "Only Icons on Tabs by default" -msgstr "De xeito predeterminado só se mostran as iconas nas lapelas" +msgstr "Por defecto só se mostran as iconas nas lapelas" #: ../extensions/tabs-minimized.c:77 msgid "New tabs have no label by default" -msgstr "De xeito predeterminado as novas lapelas non teñen etiqueta" +msgstr "Por defecto as novas lapelas non teñen etiqueta" -#: ../extensions/toolbar-editor.c:395 +#: ../extensions/toolbar-editor.c:393 msgid "Customize Toolbar" msgstr "Personalizar a barra de ferramentas" -#: ../extensions/toolbar-editor.c:411 -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:413 +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:427 +#: ../extensions/toolbar-editor.c:429 msgid "Available Items" msgstr "Elementos dispoñíbeis" -#: ../extensions/toolbar-editor.c:448 +#: ../extensions/toolbar-editor.c:450 msgid "Displayed Items" msgstr "Elementos mostrados" -#: ../extensions/toolbar-editor.c:588 -msgid "_Customize Toolbar…" -msgstr "_Personalizar a barra de ferramentas…" +#: ../extensions/toolbar-editor.c:585 +msgid "Customize _Toolbar..." +msgstr "Personalizar a barra de ferramen_tas..." -#: ../extensions/toolbar-editor.c:617 +#: ../extensions/toolbar-editor.c:601 +msgid "_Customize..." +msgstr "_Personalizar..." + +#: ../extensions/toolbar-editor.c:631 msgid "Toolbar Editor" msgstr "Editor da barra de ferramentas" -#: ../extensions/toolbar-editor.c:618 +#: ../extensions/toolbar-editor.c:632 msgid "Easily edit the toolbar layout" msgstr "Modificar de xeito sinxelo a disposición da barra de ferramentas" @@ -2961,575 +2787,355 @@ msgstr "Modificar de xeito sinxelo a disposición da barra de ferramentas" msgid "Cache HTTP communication on disk" msgstr "Gardar unha caché da comunicación HTTP no disco" -#~ msgid "The bookmarks couldn't be saved. %s" -#~ msgstr "Non foi posíbel gardar os marcadores. %s" - -#~ msgid "_Bookmark" -#~ msgstr "_Marcador" - -#~ msgid "_Console" -#~ msgstr "_Consola" - -#~ msgid "Toplevel folder" -#~ msgstr "Cartafol principal" - -#~ msgid "_Title:" -#~ msgstr "_Título:" - -#~ msgid "_Folder:" -#~ msgstr "_Cartafol:" - -#~ msgid "Close ot_her Tabs" -#~ msgstr "Pechar ou_tras lapelas" - -#~ msgid "_Icon:" -#~ msgstr "_Icona" - -#~ msgid "Filter:" -#~ msgstr " Filtro:" - -#~ 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" - -#~ msgid "_Customize…" -#~ msgstr "_Personalizar…" - -#~ 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…" +#~ 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…" - +#~ "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 "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 "_Form History" +#~ msgstr "Historial de _formularios" #~ 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 "Original cookies only" #~ msgstr "Só as «cookies» do sitio orixinal" - #~ msgid "Remember last visited pages" #~ msgstr "Lembrar as últimas páxinas visitadas" - #~ msgid "Whether the last visited pages are saved" #~ msgstr "Lembrar (ou non) as últimas páxinas que se visitaron" - #~ msgid "Detect proxy server automatically" #~ msgstr "Detectar o servidor proxy automaticamente" - #~ msgid "" #~ "Whether to detect the proxy server automatically from the environment" #~ msgstr "Detectar (ou non) o servidor proxy automaticamente neste contorno" - #~ msgid "_Restore Tab" #~ msgstr "_Restaurar a lapela" - #~ msgid "_Minimize Tab" #~ msgstr "_Minimizar a lapela" - #~ 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." #~ msgstr "A hora do reloxo está atrasada. Comprobe a data e hora actuais." - #~ msgid "Copy %s to the folder %s." #~ msgstr "Copiar %s ao cartafol %s." - #~ msgid "New tabs open minimized" #~ msgstr "As novas lapelas ábrense minimizadas" - #~ msgid "REGEX" #~ msgstr "EXP.REG" - #~ msgid "Open _Link" #~ msgstr "Abrir unha _ligazón" - #~ 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 "Failed to get current time: %s\n" #~ msgstr "Produciuse un erro ao obter a hora actual: %s\n" - #~ msgid "Show panel _titles" #~ msgstr "Mostrar os _títulos dos paneis" - #~ msgid "Options" #~ msgstr "Opcións" - #~ msgid "Not available on this platform" #~ msgstr "Non dispoñible nesta plataforma" - #~ msgid "View Selection Source" #~ msgstr "Mostrar código da selección" - #~ msgid "View the source code of the selection" #~ msgstr "Ver o código fonte da selección" - #~ msgid "Remember last form inputs" #~ msgstr "Lembrar as últimas sesións de formularios" - #~ msgid "Whether the last form inputs are saved" #~ msgstr "Lembrar (ou non) as últimas sesións cos seus datos de formularios" - #~ msgid "Cache size" #~ msgstr "Tamaño da caché" - #~ msgid "The allowed size of the cache" #~ msgstr "Tamaño asignado á memoria caché" - #~ msgid "Encoding" #~ msgstr "Codificación" - #~ msgid "The character encoding to use by default" #~ msgstr "Codificación de caracteres prefedeterminada" - #~ msgid "Shrink images automatically" #~ msgstr "Reducir as imaxes automaticamente" - #~ msgid "Automatically shrink standalone images to fit" #~ msgstr "Redimensionar as imaxes automaticamente para axustalas" - #~ msgid "Enable developer tools" #~ msgstr "Activar ferramentas de desenvolvedor" - #~ msgid "Enable special extensions for developers" #~ msgstr "Activar as extensións especiais para desenvolvedores" - +#~ msgid "User_styles" +#~ msgstr "_Estilos de usuario" #~ msgid "Tint tabs distinctly" #~ msgstr "Pintar as lapelas con cores diferentes" + diff --git a/po/he.po b/po/he.po index 992b9603..ced67dc0 100644 --- a/po/he.po +++ b/po/he.po @@ -3,36 +3,31 @@ # 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: 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" +"POT-Creation-Date: 2011-11-19 22:10+0000\n" +"PO-Revision-Date: 2009-11-28 23:34+0200\n" +"Last-Translator: Mark Krapivner \n" +"Language-Team: Hebrew \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "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 "Browse the Web" -msgstr "גלישה באינטרנט" +msgid "Lightweight web browser" +msgstr "דפדפן קל משקל" -#: ../data/midori.desktop.in.h:2 -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 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:2009 ../midori/main.c:2029 +#: ../midori/main.c:2045 ../midori/midori-websettings.c:303 msgid "Midori" msgstr "Midori" -#: ../data/midori.desktop.in.h:4 +#: ../data/midori.desktop.in.h:3 msgid "Web Browser" msgstr "דפדפן" @@ -44,7 +39,7 @@ msgstr "גלישה פרטית" msgid "Open a new private browsing window" msgstr "פתיחת חלון גלישה פרטית חדש" -#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4147 +#: ../data/midori-private.desktop.in.h:3 msgid "Private Browsing" msgstr "גלישה פרטית" @@ -58,83 +53,81 @@ msgstr "ההגדרות לא ניתנות לטעינה: %s\n" msgid "Value '%s' is invalid for %s" msgstr "הערך %s אינו תקף עבור %s" -#: ../midori/main.c:155 ../midori/main.c:259 +#: ../midori/main.c:155 ../midori/main.c:261 #, c-format msgid "Invalid configuration value '%s'" msgstr "ערך הגדרה אינו תקף '%s'" -#: ../midori/main.c:364 +#: ../midori/main.c:366 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "מנועי החיפוש לא ניתנים לטעינה. %s\n" -#: ../midori/main.c:418 +#: ../midori/main.c:420 #, c-format msgid "Failed to clear history: %s\n" msgstr "נכשל בניקוי ההיסטוריה: %s\n" -#: ../midori/main.c:438 ../midori/main.c:565 -#: ../extensions/formhistory/formhistory.c:531 +#: ../midori/main.c:440 ../midori/main.c:561 ../extensions/formhistory.c:417 #, 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:508 +#: ../midori/main.c:504 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "נכשל בהסרת פריטי היסטוריה ישנים: %s\n" -#: ../midori/main.c:548 ../panels/midori-history.c:232 +#: ../midori/main.c:544 ../panels/midori-history.c:189 #, c-format msgid "Failed to remove history item: %s\n" msgstr "נכשל בהסרת פריט היסטוריה: %s\n" -#: ../midori/main.c:595 +#: ../midori/main.c:591 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "הסימנייה לא ניתנת לשמירה. %s" -#: ../midori/main.c:617 +#: ../midori/main.c:624 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "ההגדרות לא ניתנות לשמירה. %s" -#: ../midori/main.c:652 +#: ../midori/main.c:659 #, 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:689 +#: ../midori/main.c:685 ../midori/main.c:705 #, c-format msgid "The trash couldn't be saved. %s" msgstr "האשפה לא ניתנת לשמירה. %s" -#: ../midori/main.c:730 ../panels/midori-extensions.c:91 +#: ../midori/main.c:739 ../panels/midori-extensions.c:91 msgid "Extensions" msgstr "הרחבות" -#: ../midori/main.c:744 +#: ../midori/main.c:753 msgid "Privacy" msgstr "פרטיות" -#: ../midori/main.c:756 +#: ../midori/main.c:765 msgid "" "Cookies store login data, saved games, or user profiles for advertisement " "purposes." msgstr "" -"עוגיות מאחסנות פריטי גישה, משחקים שמורים או פרופילים של משתמשים למטרות פרסום." -#: ../midori/main.c:812 +#: ../midori/main.c:821 #, c-format msgid "The session couldn't be saved. %s" msgstr "ההפעלה לא ניתנת לשמירה. %s" -#: ../midori/main.c:1030 +#: ../midori/main.c:1031 msgid "" "No root certificate file is available. SSL certificates cannot be verified." -msgstr "אין אישורי על (root) זמינים. לא ניתן לאמת את אישורי ה־SSL." +msgstr "" #: ../midori/main.c:1099 msgid "" @@ -146,225 +139,244 @@ msgstr "" #: ../midori/main.c:1118 msgid "Modify _preferences" -msgstr "עריכת ה_העדפות" +msgstr "ערוך _העדפות" #: ../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 +#: ../midori/main.c:1136 ../midori/midori-websettings.c:212 msgid "Show last tabs without loading" msgstr "הצגת הלשוניות האחרונות מבלי לטעון אותן" -#: ../midori/main.c:1137 ../midori/midori-websettings.c:220 +#: ../midori/main.c:1137 ../midori/midori-websettings.c:211 msgid "Show last open tabs" msgstr "הצג רשימת לשוניות שנפתחו קודם" -#: ../midori/main.c:1372 ../midori/main.c:2436 +#: ../midori/main.c:1347 ../midori/main.c:2417 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "תצורת ההפעלה לא ניתנת לטעינה: %s\n" -#: ../midori/main.c:1510 +#: ../midori/main.c:1488 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Snapshot saved to: %s\n" -#: ../midori/main.c:1923 +#: ../midori/main.c:1912 msgid "Run ADDRESS as a web application" msgstr "Run ADDRESS as a web application" -#: ../midori/main.c:1923 +#: ../midori/main.c:1912 msgid "ADDRESS" msgstr "ADDRESS" -#: ../midori/main.c:1926 +#: ../midori/main.c:1915 msgid "Use FOLDER as configuration folder" msgstr "Use FOLDER as configuration folder" -#: ../midori/main.c:1926 +#: ../midori/main.c:1915 msgid "FOLDER" msgstr "FOLDER" -#: ../midori/main.c:1929 +#: ../midori/main.c:1918 msgid "Private browsing, no changes are saved" -msgstr "Private browsing, no changes are saved" +msgstr "" -#: ../midori/main.c:1931 +#: ../midori/main.c:1920 +#, fuzzy msgid "Show a diagnostic dialog" -msgstr "Show a diagnostic dialog" +msgstr "הצג חלון קריסה" -#: ../midori/main.c:1933 +#: ../midori/main.c:1922 msgid "Run the specified filename as javascript" msgstr "Run the specified filename as javascript" -#: ../midori/main.c:1935 +#: ../midori/main.c:1924 msgid "Take a snapshot of the specified URI" msgstr "Take a snapshot of the specified URI" -#: ../midori/main.c:1937 +#: ../midori/main.c:1926 msgid "Execute the specified command" msgstr "Execute the specified command" -#: ../midori/main.c:1939 +#: ../midori/main.c:1928 msgid "List available commands to execute with -e/ --execute" -msgstr "List available commands to execute with -e/ --execute" +msgstr "" -#: ../midori/main.c:1941 +#: ../midori/main.c:1930 msgid "Display program version" msgstr "Display program version" -#: ../midori/main.c:1943 +#: ../midori/main.c:1932 msgid "Addresses" msgstr "כתובות" -#: ../midori/main.c:1945 +#: ../midori/main.c:1934 msgid "Block URIs according to regular expression PATTERN" -msgstr "Block URIs according to regular expression PATTERN" +msgstr "" -#: ../midori/main.c:1945 +#: ../midori/main.c:1934 msgid "PATTERN" -msgstr "PATTERN" +msgstr "" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1949 +#: ../midori/main.c:1938 msgid "Reset Midori after SECONDS seconds of inactivity" -msgstr "Reset Midori after SECONDS seconds of inactivity" +msgstr "" -#: ../midori/main.c:1949 +#: ../midori/main.c:1938 msgid "SECONDS" -msgstr "SECONDS" +msgstr "" -#: ../midori/main.c:1952 +#: ../midori/main.c:1941 msgid "Redirects console warnings to the specified FILENAME" -msgstr "Redirects console warnings to the specified FILENAME" +msgstr "" -#: ../midori/main.c:1952 +#: ../midori/main.c:1941 msgid "FILENAME" -msgstr "FILENAME" +msgstr "" -#: ../midori/main.c:2017 +#: ../midori/main.c:2006 msgid "[Addresses]" msgstr "[כתובות]" -#: ../midori/main.c:2059 +#: ../midori/main.c:2016 +msgid "The specified configuration folder is invalid." +msgstr "The specified configuration folder is invalid." + +#: ../midori/main.c:2046 msgid "Please report comments, suggestions and bugs to:" msgstr "אנא דווח תגובות, הצעות ובאגים אל:" -#: ../midori/main.c:2061 +#: ../midori/main.c:2048 msgid "Check for new versions at:" msgstr "בדוק גרסות חדשות ב:" +#: ../midori/main.c:2131 +msgid "Website icons" +msgstr "אייקונים של אתרים" + #. i18n: Logins and passwords in websites and web forms -#: ../midori/main.c:2145 +#: ../midori/main.c:2134 msgid "Saved logins and _passwords" -msgstr "פרטי גישה וססמאות ש_נשמרו" +msgstr "" -#: ../midori/main.c:2147 -msgid "Cookies and Website data" -msgstr "קובצי עוגיה ונתוני אתרים" +#: ../midori/main.c:2136 +msgid "Cookies" +msgstr "עוגיות" + +#: ../midori/main.c:2139 +msgid "'Flash' Cookies" +msgstr "עוגיות 'Flash'" + +#: ../midori/main.c:2142 +msgid "HTML5 _Databases" +msgstr "" -#. TODO: Preserve page icons of search engines and merge privacy items -#: ../midori/main.c:2151 ../midori/midori-websettings.c:996 +#: ../midori/main.c:2145 ../midori/midori-websettings.c:936 #: ../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:2147 +#, fuzzy +msgid "Offline Application Cache" +msgstr "הפעל כיישום _רשת" -#: ../midori/main.c:2260 +#: ../midori/main.c:2250 +#, fuzzy msgid "An unknown error occured" -msgstr "אירעה שגיאה בלתי מוכרת" +msgstr "התרחשה שגיאה לא מזוהה." -#: ../midori/main.c:2367 +#: ../midori/main.c:2348 msgid "An instance of Midori is already running but not responding.\n" msgstr "מופע של Midori כבר רץ אך אינו מגיב. \n" -#: ../midori/main.c:2403 -#, c-format +#: ../midori/main.c:2384 +#, fuzzy, c-format msgid "Bookmarks couldn't be loaded: %s\n" -msgstr "לא ניתן לטעון את הסימנייה: %s\n" +msgstr "הסימנייה לא ניתנת לטעינה: %s\n" -#: ../midori/main.c:2451 +#: ../midori/main.c:2432 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "האשפה לא ניתנת לטעינה: %s\n" -#: ../midori/main.c:2464 +#: ../midori/main.c:2445 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "ההיסטוריה לא ניתנת לטעינה: %s\n" -#: ../midori/main.c:2480 +#: ../midori/main.c:2461 msgid "The following errors occured:" msgstr "השגיאות הבאות התרחשו:" -#: ../midori/main.c:2496 +#: ../midori/main.c:2477 msgid "_Ignore" -msgstr "הת_עלמות" +msgstr "folderהתעלם" -#: ../midori/midori-app.c:1334 +#: ../midori/midori-app.c:1329 msgid "_Bookmark" msgstr "_סימניה" -#: ../midori/midori-app.c:1335 ../midori/midori-browser.c:6039 +#: ../midori/midori-app.c:1330 ../midori/midori-browser.c:5985 msgid "_Bookmarks" msgstr "_סימניות" -#: ../midori/midori-app.c:1336 +#: ../midori/midori-app.c:1331 msgid "Add Boo_kmark" msgstr "הוסף סימ_ניה" -#: ../midori/midori-app.c:1337 +#: ../midori/midori-app.c:1332 msgid "_Console" msgstr "_מסוף" -#: ../midori/midori-app.c:1338 +#: ../midori/midori-app.c:1333 msgid "_Extensions" msgstr "_הרחבות" #. i18n: Browsing history, visited web pages, closed tabs -#: ../midori/midori-app.c:1339 ../midori/midori-browser.c:4566 +#: ../midori/midori-app.c:1334 ../midori/midori-browser.c:4580 msgid "_History" msgstr "_היסטוריה" -#: ../midori/midori-app.c:1340 +#: ../midori/midori-app.c:1335 msgid "_Homepage" msgstr "_דף הבית" -#: ../midori/midori-app.c:1341 +#: ../midori/midori-app.c:1336 msgid "_Userscripts" msgstr "תסריטי _משתמש" -#: ../midori/midori-app.c:1342 +#: ../midori/midori-app.c:1337 msgid "New _Tab" msgstr "_לשונית חדשה" -#: ../midori/midori-app.c:1343 +#: ../midori/midori-app.c:1338 msgid "_Transfers" msgstr "_העברות" -#: ../midori/midori-app.c:1344 +#: ../midori/midori-app.c:1339 msgid "Netscape p_lugins" msgstr "ת_וספי Netscape" -#: ../midori/midori-app.c:1345 +#: ../midori/midori-app.c:1340 msgid "_Closed Tabs" msgstr "לשוניות _שנסגרו" -#: ../midori/midori-app.c:1346 ../midori/midori-browser.c:5195 +#: ../midori/midori-app.c:1341 ../midori/midori-browser.c:5168 msgid "New _Window" msgstr "_חלון חדש" -#: ../midori/midori-app.c:1347 +#: ../midori/midori-app.c:1342 +#, fuzzy msgid "New _Folder" -msgstr "תיקייה _חדשה" +msgstr "תיקייה חדשה" #: ../midori/midori-array.c:522 msgid "File not found." @@ -383,140 +395,128 @@ msgstr "סוג סימניות לא מזוהה" msgid "Writing failed." msgstr "הכתיבה נכשלה." -#: ../midori/midori-browser.c:331 ../midori/midori-browser.c:5277 -#: ../midori/midori-browser.c:5286 +#: ../midori/midori-browser.c:329 ../midori/midori-browser.c:5250 +#: ../midori/midori-browser.c:5259 msgid "Reload the current page" msgstr "טען את הדף הנוכחי מחדש" -#: ../midori/midori-browser.c:340 ../midori/midori-browser.c:5283 +#: ../midori/midori-browser.c:337 ../midori/midori-browser.c:5256 msgid "Stop loading the current page" msgstr "הפסק לטעון את הדף הנוכחי" -#: ../midori/midori-browser.c:476 -#, c-format +#: ../midori/midori-browser.c:462 +#, fuzzy, c-format msgid "Failed to update title: %s\n" -msgstr "עדכון הכותרת נכשל: %s\n" +msgstr "נכשל בפתיחת מסד הנתונים: %s\n" -#: ../midori/midori-browser.c:489 +#: ../midori/midori-browser.c:475 #, c-format msgid "Unexpected action '%s'." msgstr "פעולה בלתי צפויה '%s'." -#: ../midori/midori-browser.c:579 -#, c-format +#: ../midori/midori-browser.c:576 +#, fuzzy, c-format msgid "%s (Private Browsing)" -msgstr "%s (גלישה פרטית)" +msgstr "גלישה פ_רטית" -#: ../midori/midori-browser.c:693 ../midori/midori-browser.c:726 +#: ../midori/midori-browser.c:687 ../midori/midori-browser.c:720 msgid "Toplevel folder" -msgstr "תיקיית השורש" +msgstr "תיקיית שורש" -#: ../midori/midori-browser.c:784 +#: ../midori/midori-browser.c:777 msgid "New folder" msgstr "תיקייה חדשה" -#: ../midori/midori-browser.c:784 +#: ../midori/midori-browser.c:777 msgid "Edit folder" -msgstr "עריכת התיקייה" +msgstr "ערוך תיקייה" -#: ../midori/midori-browser.c:786 +#: ../midori/midori-browser.c:779 msgid "New bookmark" -msgstr "סימנייה חדשה" +msgstr "סימניה חדשה" -#: ../midori/midori-browser.c:786 +#: ../midori/midori-browser.c:779 msgid "Edit bookmark" -msgstr "עריכת הסימנייה" +msgstr "ערוך סימניה" -#: ../midori/midori-browser.c:828 +#: ../midori/midori-browser.c:810 msgid "_Title:" msgstr "_כותרת:" -#: ../midori/midori-browser.c:848 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:830 ../midori/midori-searchaction.c:966 #: ../extensions/feed-panel/main.c:377 msgid "_Address:" msgstr "_כתובת:" -#: ../midori/midori-browser.c:871 ../midori/midori-browser.c:4303 +#: ../midori/midori-browser.c:853 ../midori/midori-browser.c:4315 msgid "_Folder:" msgstr "_תיקייה:" -#: ../midori/midori-browser.c:887 +#: ../midori/midori-browser.c:869 +#, fuzzy msgid "Add to _Speed Dial" -msgstr "הוספה ל_חיוג מהיר" +msgstr "הוסף _לחיוג מהיר" -#: ../midori/midori-browser.c:900 +#: ../midori/midori-browser.c:882 msgid "Show in the tool_bar" msgstr "הסג ב_סרגל הכלים" -#: ../midori/midori-browser.c:915 +#: ../midori/midori-browser.c:897 msgid "Run as _web application" msgstr "הפעל כיישום _רשת" -#: ../midori/midori-browser.c:986 +#: ../midori/midori-browser.c:968 #, c-format msgid "The file \"%s\" can't be saved in this folder." -msgstr "לא ניתן לשמור את הקובץ „%s“ בתיקייה זו." +msgstr "" -#: ../midori/midori-browser.c:988 +#: ../midori/midori-browser.c:970 #, c-format msgid "You don't have permission to write in this location." -msgstr "אין לך הרשאות לכתוב למיקום זה." +msgstr "" -#: ../midori/midori-browser.c:995 +#: ../midori/midori-browser.c:977 #, c-format msgid "There is not enough free space to download \"%s\"." -msgstr "אין די מקום פנוי כדי להוריד את „%s“." +msgstr "" -#: ../midori/midori-browser.c:998 +#: ../midori/midori-browser.c:980 #, c-format msgid "The file needs %s but only %s are left." -msgstr "הקובץ זקוק ל־%s אך נותרו רק %s." +msgstr "" -#: ../midori/midori-browser.c:1036 ../midori/midori-browser.c:4372 +#: ../midori/midori-browser.c:1024 ../midori/midori-browser.c:4385 msgid "Save file as" -msgstr "שמירת קובץ בשם" +msgstr "שמור קובץ בשם" -#: ../midori/midori-browser.c:1330 +#: ../midori/midori-browser.c:1333 +#, fuzzy msgid "New Window" -msgstr "חלון חדש" +msgstr "_חלון חדש" -#: ../midori/midori-browser.c:1330 +#: ../midori/midori-browser.c:1333 msgid "A new window has been opened" -msgstr "חלון חדש נפתח" +msgstr "" -#: ../midori/midori-browser.c:1333 +#: ../midori/midori-browser.c:1336 +#, fuzzy msgid "New Tab" -msgstr "לשונית חדשה" +msgstr "_לשונית חדשה" -#: ../midori/midori-browser.c:1333 +#: ../midori/midori-browser.c:1336 +#, fuzzy 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 "לא ניתן לפתוח את התמונה הנבחרת במציג בררת המחדל" +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 +#: ../midori/midori-browser.c:1373 msgid "Save file" -msgstr "שמירת קובץ" +msgstr "שמור קובץ" -#: ../midori/midori-browser.c:2346 +#: ../midori/midori-browser.c:2263 msgid "Open file" -msgstr "פתיחת קובץ" +msgstr "פתח קובץ" -#: ../midori/midori-browser.c:2478 +#: ../midori/midori-browser.c:2393 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" @@ -525,139 +525,141 @@ msgid "" "automatically." msgstr "" -#: ../midori/midori-browser.c:2484 ../extensions/feed-panel/main.c:365 +#: ../midori/midori-browser.c:2399 ../extensions/feed-panel/main.c:365 msgid "New feed" msgstr "הזנה חדשה" -#: ../midori/midori-browser.c:2527 ../midori/midori-browser.c:5346 -#: ../panels/midori-bookmarks.c:427 +#: ../midori/midori-browser.c:2442 ../midori/midori-browser.c:5319 +#: ../panels/midori-bookmarks.c:463 msgid "Add a new bookmark" msgstr "הוסף לשונית חדשה" -#: ../midori/midori-browser.c:3026 ../midori/midori-searchaction.c:488 +#: ../midori/midori-browser.c:2974 ../midori/midori-searchaction.c:487 msgid "Empty" msgstr "ריק" -#: ../midori/midori-browser.c:3446 +#: ../midori/midori-browser.c:3464 msgid "Toggle text cursor navigation" msgstr "" -#: ../midori/midori-browser.c:3762 ../midori/midori-browser.c:5732 +#: ../midori/midori-browser.c:3776 ../midori/midori-browser.c:5726 #, fuzzy, 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 +#: ../midori/midori-browser.c:4112 ../panels/midori-bookmarks.c:779 +#: ../panels/midori-history.c:747 msgid "Open all in _Tabs" msgstr "פתח הכל ב_לשוניות" -#: ../midori/midori-browser.c:4098 ../panels/midori-bookmarks.c:749 -#: ../panels/midori-history.c:807 ../extensions/feed-panel/feed-panel.c:528 +#: ../midori/midori-browser.c:4119 ../panels/midori-bookmarks.c:785 +#: ../panels/midori-history.c:753 ../extensions/feed-panel/feed-panel.c:528 msgid "Open in New _Tab" msgstr "פתח ב_לשונית חדשה" -#: ../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 +#: ../midori/midori-browser.c:4122 ../midori/midori-view.c:2530 +#: ../midori/midori-view.c:4353 ../panels/midori-bookmarks.c:787 +#: ../panels/midori-history.c:755 ../extensions/feed-panel/feed-panel.c:530 msgid "Open in New _Window" msgstr "פתח ב_חלון חדש" -#: ../midori/midori-browser.c:4190 +#: ../midori/midori-browser.c:4202 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4191 +#: ../midori/midori-browser.c:4203 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4192 +#: ../midori/midori-browser.c:4204 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4193 +#: ../midori/midori-browser.c:4205 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4194 +#: ../midori/midori-browser.c:4206 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4195 -#, c-format +#: ../midori/midori-browser.c:4207 +#, fuzzy, c-format msgid "Firefox (%s)" -msgstr "Firefox (%s)" +msgstr "Firefox" -#: ../midori/midori-browser.c:4216 -msgid "Import bookmarks…" -msgstr "ייבוא סימניות…" +#: ../midori/midori-browser.c:4228 +msgid "Import bookmarks..." +msgstr "ייבוא סימניות..." -#: ../midori/midori-browser.c:4219 ../midori/midori-browser.c:5351 +#: ../midori/midori-browser.c:4231 ../midori/midori-browser.c:5324 msgid "_Import bookmarks" msgstr "יי_בוא סימניות" -#: ../midori/midori-browser.c:4230 +#: ../midori/midori-browser.c:4242 msgid "_Application:" msgstr "יי_שום:" -#: ../midori/midori-browser.c:4295 +#: ../midori/midori-browser.c:4307 msgid "Import from XBEL or HTML file" -msgstr "ייבוא מקובץ XBEL או HTML" +msgstr "" -#: ../midori/midori-browser.c:4330 +#: ../midori/midori-browser.c:4342 msgid "Import from a file" -msgstr "ייבוא מקובץ" +msgstr "יבוא מקובץ" -#: ../midori/midori-browser.c:4342 +#: ../midori/midori-browser.c:4354 msgid "Failed to import bookmarks" -msgstr "ייבוא הסימניות נכשל" +msgstr "נכשל בייבוא סימניות" -#: ../midori/midori-browser.c:4377 +#: ../midori/midori-browser.c:4390 msgid "XBEL Bookmarks" msgstr "סימניות XBEL" -#: ../midori/midori-browser.c:4382 +#: ../midori/midori-browser.c:4395 msgid "Netscape Bookmarks" msgstr "סימניות של Netscape" -#: ../midori/midori-browser.c:4396 +#: ../midori/midori-browser.c:4409 msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)" -msgstr "באפשרות Midori לייצא אך ורק לתצורות XBEL‏ (‎*.xbel) ו־Netscape‏ (‎*.html)" +msgstr "" -#: ../midori/midori-browser.c:4411 +#: ../midori/midori-browser.c:4425 +#, fuzzy msgid "Failed to export bookmarks" -msgstr "ייצוא הסימניות נכשל" +msgstr "נכשל בייבוא סימניות" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4533 +#: ../midori/midori-browser.c:4547 msgid "Clear Private Data" -msgstr "מחיקת נתונים אישיים" +msgstr "נקה נתונים אישיים" -#: ../midori/midori-browser.c:4537 +#: ../midori/midori-browser.c:4551 msgid "_Clear private data" -msgstr "מ_חיקת נתונים אישיים" +msgstr "_נקה נתונים אישיים" -#: ../midori/midori-browser.c:4550 +#: ../midori/midori-browser.c:4564 msgid "Clear the following data:" -msgstr "מחיקת הנתונים הבאים:" +msgstr "נקה את הנתונים הבאים" -#: ../midori/midori-browser.c:4560 +#: ../midori/midori-browser.c:4574 +#, fuzzy msgid "Last open _tabs" -msgstr "הלשוניות שנפתחו ל_אחרונה" +msgstr "הדפים שנפתחו אחרונים" -#: ../midori/midori-browser.c:4586 +#: ../midori/midori-browser.c:4600 msgid "Clear private data when _quitting Midori" msgstr "נקה נתונים אישיים בזמן י_ציאה מ־Midori" -#: ../midori/midori-browser.c:4781 +#: ../midori/midori-browser.c:4776 msgid "A lightweight web browser." msgstr "דפדפן קל משקל." -#: ../midori/midori-browser.c:4782 +#: ../midori/midori-browser.c:4777 msgid "See about:version for version info." -msgstr "יש לעיין ב־about:version לקבלת פרטים על הגרסה." +msgstr "" -#: ../midori/midori-browser.c:4784 +#: ../midori/midori-browser.c:4779 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 " @@ -665,1238 +667,1214 @@ msgid "" "option) any later version." msgstr "" -#: ../midori/midori-browser.c:4805 +#: ../midori/midori-browser.c:4800 msgid "translator-credits" msgstr "" "Shlomi Israel \n" -"Mark Krapivner \n" -"Yaron Shahrabani " +"Mark Krapivner " -#: ../midori/midori-browser.c:5193 +#: ../midori/midori-browser.c:5166 msgid "_File" msgstr "_קובץ" -#: ../midori/midori-browser.c:5196 +#: ../midori/midori-browser.c:5169 msgid "Open a new window" msgstr "פתח חלון חדש" -#: ../midori/midori-browser.c:5199 +#: ../midori/midori-browser.c:5172 msgid "Open a new tab" msgstr "פתח לשונית חדשה" -#: ../midori/midori-browser.c:5201 +#: ../midori/midori-browser.c:5174 +#, fuzzy msgid "New P_rivate Browsing Window" -msgstr "חלון גלישה פ_רטית חדש" +msgstr "גלישה פ_רטית" -#: ../midori/midori-browser.c:5205 +#: ../midori/midori-browser.c:5178 msgid "Open a file" msgstr "פתח קובץ" -#: ../midori/midori-browser.c:5207 -msgid "_Save Page As…" -msgstr "שמירת ה_עמוד בשם…" +#: ../midori/midori-browser.c:5180 +msgid "_Save Page As..." +msgstr "" -#: ../midori/midori-browser.c:5208 +#: ../midori/midori-browser.c:5181 msgid "Save to a file" -msgstr "שמירה לקובץ" +msgstr "שמור לקובץ" -#: ../midori/midori-browser.c:5210 +#: ../midori/midori-browser.c:5183 msgid "Add to Speed _dial" -msgstr "הוספה _לחיוג מהיר" +msgstr "הוסף _לחיוג מהיר" -#: ../midori/midori-browser.c:5214 +#: ../midori/midori-browser.c:5187 msgid "Add Shortcut to the _desktop" msgstr "הוספת קיצור דרך ל_שולחן העבודה" -#: ../midori/midori-browser.c:5216 +#: ../midori/midori-browser.c:5189 msgid "Create _Launcher" -msgstr "יצירת מש_גר" +msgstr "" -#: ../midori/midori-browser.c:5220 +#: ../midori/midori-browser.c:5193 msgid "Subscribe to News _feed" -msgstr "הרשמה ל_הזנת חדשות" +msgstr "הרשם ל_הזנת חדשות" -#: ../midori/midori-browser.c:5226 +#: ../midori/midori-browser.c:5199 msgid "_Close Tab" -msgstr "_סגירת הלשונית" +msgstr "_סגור לשונית" -#: ../midori/midori-browser.c:5227 +#: ../midori/midori-browser.c:5200 msgid "Close the current tab" -msgstr "סגירת הלשונית הנוכחית" +msgstr "סגור את הלשונית הנוכחית" -#: ../midori/midori-browser.c:5229 +#: ../midori/midori-browser.c:5202 msgid "C_lose Window" -msgstr "ס_גירת החלון" +msgstr "ס_גור חלון" -#: ../midori/midori-browser.c:5233 +#: ../midori/midori-browser.c:5206 msgid "Print the current page" -msgstr "הדפסת העמוד הנוכחי" +msgstr "הדפס את הדף הנוכחי" -#: ../midori/midori-browser.c:5235 +#: ../midori/midori-browser.c:5208 +#, fuzzy msgid "Close a_ll Windows" -msgstr "ס_גירת כל החלונות" +msgstr "ס_גור חלון" -#: ../midori/midori-browser.c:5238 +#: ../midori/midori-browser.c:5211 msgid "_Edit" -msgstr "_עריכה" +msgstr "_ערוך" -#: ../midori/midori-browser.c:5261 -msgid "_Find…" -msgstr "_חיפוש…" +#: ../midori/midori-browser.c:5234 +msgid "_Find..." +msgstr "" -#: ../midori/midori-browser.c:5262 +#: ../midori/midori-browser.c:5235 msgid "Find a word or phrase in the page" msgstr "חפש מילה או ביטוי בדף" -#: ../midori/midori-browser.c:5264 +#: ../midori/midori-browser.c:5237 msgid "Find _Next" -msgstr "חיפוש ה_בא" +msgstr "חפש את ה_בא" -#: ../midori/midori-browser.c:5267 +#: ../midori/midori-browser.c:5240 msgid "Find _Previous" -msgstr "חיפוש ה_קודם" +msgstr "חפש את ה_קודם" -#: ../midori/midori-browser.c:5271 +#: ../midori/midori-browser.c:5244 msgid "Configure the application preferences" -msgstr "הגדרת העדפות היישום" +msgstr "הגדר את העדפות היישום" -#: ../midori/midori-browser.c:5273 +#: ../midori/midori-browser.c:5246 msgid "_View" msgstr "_תצוגה" -#: ../midori/midori-browser.c:5274 +#: ../midori/midori-browser.c:5247 msgid "_Toolbars" msgstr "_סרגלי כלים" -#: ../midori/midori-browser.c:5279 +#: ../midori/midori-browser.c:5252 msgid "Reload page without caching" -msgstr "רענון העמוד ללא שימוש במטמון" +msgstr "" -#: ../midori/midori-browser.c:5289 +#: ../midori/midori-browser.c:5262 msgid "Increase the zoom level" -msgstr "התקרבות" +msgstr "הגדל את רמת ההגדלה" -#: ../midori/midori-browser.c:5292 +#: ../midori/midori-browser.c:5265 msgid "Decrease the zoom level" -msgstr "התרחקות" +msgstr "הקטן את רמת ההגדלה" -#: ../midori/midori-browser.c:5296 +#: ../midori/midori-browser.c:5269 msgid "_Encoding" msgstr "_קידוד" -#: ../midori/midori-browser.c:5298 +#: ../midori/midori-browser.c:5271 msgid "View So_urce" -msgstr "הצגת המ_קור" +msgstr "הצג מ_קור" -#: ../midori/midori-browser.c:5301 +#: ../midori/midori-browser.c:5274 +#, fuzzy msgid "Ca_ret Browsing" -msgstr "גלישת _סמן" +msgstr "גלישה פ_רטית" -#: ../midori/midori-browser.c:5305 +#: ../midori/midori-browser.c:5278 msgid "Toggle fullscreen view" -msgstr "הפעלה/נטרול מסך מלא" +msgstr "מסך מלא" -#: ../midori/midori-browser.c:5307 +#: ../midori/midori-browser.c:5280 msgid "Scroll _Left" -msgstr "גלילה שמ_אלה" +msgstr "" -#: ../midori/midori-browser.c:5310 +#: ../midori/midori-browser.c:5283 msgid "Scroll _Down" -msgstr "גלילה למ_טה" +msgstr "" -#: ../midori/midori-browser.c:5313 +#: ../midori/midori-browser.c:5286 msgid "Scroll _Up" -msgstr "גלילה למ_עלה" +msgstr "" -#: ../midori/midori-browser.c:5316 +#: ../midori/midori-browser.c:5289 msgid "Scroll _Right" -msgstr "גלילה ימי_נה" +msgstr "" -#: ../midori/midori-browser.c:5319 +#: ../midori/midori-browser.c:5292 msgid "_Go" -msgstr "מעבר" +msgstr "לך" -#: ../midori/midori-browser.c:5322 +#: ../midori/midori-browser.c:5295 msgid "Go back to the previous page" -msgstr "מעבר לעמוד הקודם" +msgstr "לך אל הדף הקודם" -#: ../midori/midori-browser.c:5325 +#: ../midori/midori-browser.c:5298 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:5329 +#: ../midori/midori-browser.c:5302 +#, fuzzy 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:5333 +#: ../midori/midori-browser.c:5306 +#, fuzzy msgid "Go to the next sub-page" -msgstr "מעבר לתת־העמוד הבא" +msgstr "לך אל הדף הבא" -#: ../midori/midori-browser.c:5336 +#: ../midori/midori-browser.c:5309 msgid "Go to your homepage" msgstr "לך אל דף הבית" -#: ../midori/midori-browser.c:5338 +#: ../midori/midori-browser.c:5311 msgid "Empty Trash" -msgstr "פינוי האשפה" +msgstr "רוקן אשפה" -#: ../midori/midori-browser.c:5341 +#: ../midori/midori-browser.c:5314 msgid "Undo _Close Tab" -msgstr "ביטול _סגירת לשונית" +msgstr "בטל _סגירת לשונית" -#: ../midori/midori-browser.c:5348 +#: ../midori/midori-browser.c:5321 msgid "Add a new _folder" -msgstr "הוספת _תיקייה חדשה" +msgstr "הוסף _תיקייה חדשה" -#: ../midori/midori-browser.c:5354 +#: ../midori/midori-browser.c:5327 +#, fuzzy msgid "_Export bookmarks" -msgstr "יי_צוא סימניות" +msgstr "יי_בוא סימניות" -#: ../midori/midori-browser.c:5357 ../midori/midori-searchaction.c:497 +#: ../midori/midori-browser.c:5330 ../midori/midori-searchaction.c:496 msgid "_Manage Search Engines" msgstr "_נהל מנועי חיפוש" -#: ../midori/midori-browser.c:5360 +#: ../midori/midori-browser.c:5333 msgid "_Clear Private Data" msgstr "_נקה נתונים אישיים" -#: ../midori/midori-browser.c:5363 +#: ../midori/midori-browser.c:5336 +#, fuzzy msgid "_Inspect Page" -msgstr "_ניתוח העמוד" +msgstr "בדיקת עמוד - %s" -#: ../midori/midori-browser.c:5367 +#: ../midori/midori-browser.c:5340 msgid "_Previous Tab" msgstr "לשונית _קודמת" -#: ../midori/midori-browser.c:5370 +#: ../midori/midori-browser.c:5343 msgid "_Next Tab" msgstr "לשונית _הבאה" -#: ../midori/midori-browser.c:5372 +#: ../midori/midori-browser.c:5345 msgid "Move Tab _Backward" -msgstr "העברת הלשונית _אחורה" +msgstr "" -#: ../midori/midori-browser.c:5374 +#: ../midori/midori-browser.c:5347 msgid "_Move Tab Forward" -msgstr "העברת הלשונית _קדימה" +msgstr "" -#: ../midori/midori-browser.c:5377 +#: ../midori/midori-browser.c:5350 msgid "Focus _Current Tab" msgstr "מיקוד לשונית _נוכחית" -#: ../midori/midori-browser.c:5380 +#: ../midori/midori-browser.c:5353 msgid "Focus _Next view" -msgstr "התמקדות על התצוגה ה_באה" +msgstr "" -#: ../midori/midori-browser.c:5383 +#: ../midori/midori-browser.c:5356 msgid "Only show the Icon of the _Current Tab" -msgstr "יש להציג רק את ה_סמל של הלשונית הנוכחית" +msgstr "" -#: ../midori/midori-browser.c:5386 +#: ../midori/midori-browser.c:5359 +#, fuzzy msgid "_Duplicate Current Tab" -msgstr "ש_כפול הלשונית הנוכחית" +msgstr "_שכפל לשונית" -#: ../midori/midori-browser.c:5389 +#: ../midori/midori-browser.c:5362 +#, fuzzy msgid "Close Ot_her Tabs" -msgstr "סגירת ש_אר הלשוניות" +msgstr "לשוניות _שנסגרו" -#: ../midori/midori-browser.c:5392 +#: ../midori/midori-browser.c:5365 msgid "Open last _session" msgstr "פתח _הפעלה קודמת" -#: ../midori/midori-browser.c:5395 +#: ../midori/midori-browser.c:5368 msgid "_Help" msgstr "_עזרה" -#: ../midori/midori-browser.c:5397 +#: ../midori/midori-browser.c:5370 msgid "_Frequent Questions" msgstr "שאלות _נפוצות" -#: ../midori/midori-browser.c:5400 -msgid "_Report a Problem…" -msgstr "_דיווח על תקלה…" +#: ../midori/midori-browser.c:5373 +#, fuzzy +msgid "_Report a Problem..." +msgstr "_דווח על באג" -#: ../midori/midori-browser.c:5412 +#: ../midori/midori-browser.c:5385 msgid "_Menubar" msgstr "סרגל _תפריט" -#: ../midori/midori-browser.c:5416 +#: ../midori/midori-browser.c:5389 msgid "_Navigationbar" msgstr "סרגל _ניווט" -#: ../midori/midori-browser.c:5420 +#: ../midori/midori-browser.c:5393 msgid "Side_panel" msgstr "_סרגל צד" -#: ../midori/midori-browser.c:5421 +#: ../midori/midori-browser.c:5394 +#, fuzzy msgid "Sidepanel" -msgstr "חלונית צד" +msgstr "_סרגל צד" -#: ../midori/midori-browser.c:5424 +#: ../midori/midori-browser.c:5397 msgid "_Bookmarkbar" msgstr "_סרגל סימניות" -#: ../midori/midori-browser.c:5428 +#: ../midori/midori-browser.c:5401 msgid "_Statusbar" msgstr "_שורת מצב" -#: ../midori/midori-browser.c:5437 ../midori/midori-websettings.c:311 +#: ../midori/midori-browser.c:5410 ../midori/midori-websettings.c:302 msgid "_Automatic" msgstr "_אוטומטי" -#: ../midori/midori-browser.c:5440 ../midori/midori-websettings.c:236 +#: ../midori/midori-browser.c:5413 ../midori/midori-websettings.c:227 msgid "Chinese (BIG5)" msgstr "סינית (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5444 +#: ../midori/midori-browser.c:5417 msgid "Japanese (SHIFT__JIS)" msgstr "יפנית (SHIFT__JIS)" -#: ../midori/midori-browser.c:5447 ../midori/midori-websettings.c:238 +#: ../midori/midori-browser.c:5420 ../midori/midori-websettings.c:229 msgid "Korean (EUC-KR)" msgstr "קוריאנית (EUC-KR)" -#: ../midori/midori-browser.c:5450 ../midori/midori-websettings.c:239 +#: ../midori/midori-browser.c:5423 ../midori/midori-websettings.c:230 msgid "Russian (KOI8-R)" msgstr "רוסית (KOI8-R)" -#: ../midori/midori-browser.c:5453 ../midori/midori-websettings.c:240 +#: ../midori/midori-browser.c:5426 ../midori/midori-websettings.c:231 msgid "Unicode (UTF-8)" msgstr "יוניקוד (UTF-8)" -#: ../midori/midori-browser.c:5456 ../midori/midori-websettings.c:241 +#: ../midori/midori-browser.c:5429 ../midori/midori-websettings.c:232 msgid "Western (ISO-8859-1)" msgstr "מערבי (ISO-8859-1)" -#: ../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:5432 ../midori/midori-websettings.c:233 +#: ../midori/midori-websettings.c:308 ../katze/katze-utils.c:635 +msgid "Custom..." +msgstr "מותאם..." -#: ../midori/midori-browser.c:5964 +#: ../midori/midori-browser.c:5912 msgid "_Separator" msgstr "קו _מפריד" -#: ../midori/midori-browser.c:5971 -msgid "_Location…" -msgstr "_מיקום…" +#: ../midori/midori-browser.c:5919 +msgid "_Location..." +msgstr "_מיקום..." -#: ../midori/midori-browser.c:5973 +#: ../midori/midori-browser.c:5921 msgid "Open a particular location" msgstr "פתיחת מיקום מסוים" -#: ../midori/midori-browser.c:5995 -msgid "_Web Search…" -msgstr "חיפוש ב_רשת…" +#: ../midori/midori-browser.c:5943 +msgid "_Web Search..." +msgstr "חיפוש ב_רשת..." -#: ../midori/midori-browser.c:5997 +#: ../midori/midori-browser.c:5945 msgid "Run a web search" msgstr "הרץ חיפוש באינטרנט" -#: ../midori/midori-browser.c:6024 +#: ../midori/midori-browser.c:5972 msgid "Reopen a previously closed tab or window" msgstr "פתח מחדש לשונית או חלון שנסגרו קודם לכן" -#: ../midori/midori-browser.c:6041 +#: ../midori/midori-browser.c:5987 msgid "Show the saved bookmarks" -msgstr "הצגת הסימניות השמורות" +msgstr "הצג את הסימניות השמורות" -#: ../midori/midori-browser.c:6058 +#: ../midori/midori-browser.c:6001 msgid "_Tools" msgstr "_כלים" -#: ../midori/midori-browser.c:6074 +#: ../midori/midori-browser.c:6016 msgid "_Window" msgstr "_חלון" -#: ../midori/midori-browser.c:6076 +#: ../midori/midori-browser.c:6018 msgid "Show a list of all open tabs" msgstr "הצג רשימה של כל הלשוניות הפתוחות" -#: ../midori/midori-browser.c:6090 +#: ../midori/midori-browser.c:6032 msgid "_Menu" msgstr "_תפריט" -#: ../midori/midori-browser.c:6092 +#: ../midori/midori-browser.c:6034 msgid "Menu" msgstr "תפריט" -#: ../midori/midori-browser.c:6906 +#: ../midori/midori-browser.c:6676 #, c-format msgid "Unexpected setting '%s'" msgstr "הגדרה לא צפויה '%s'" #: ../midori/midori-extension.c:310 -#, c-format +#, fuzzy, c-format msgid "The configuration of the extension '%s' couldn't be loaded: %s\n" -msgstr "לא ניתן לטעון את הגדרות ההרחבה '%s':‏ %s\n" +msgstr "ההגדרות לא ניתנות לטעינה: %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 +#: ../extensions/addons.c:1690 +#, fuzzy, c-format msgid "The configuration of the extension '%s' couldn't be saved: %s\n" -msgstr "לא ניתן לשמור את הגדרות ההרחבה '%s':‏ %s\n" - -#: ../midori/midori-locationaction.c:394 -#, c-format -msgid "Search with %s" -msgstr "חיפוש בעזרת %s" - -#: ../midori/midori-locationaction.c:412 -msgid "Search with…" -msgstr "חיפוש באמצעות…" +msgstr "ההגדרות לא ניתנות לשמירה. %s" -#: ../midori/midori-locationaction.c:537 -#, c-format +#: ../midori/midori-locationaction.c:425 +#, fuzzy, c-format msgid "Failed to select from history\n" -msgstr "הבחירה מההיסטוריה נכשלה\n" +msgstr "נכשל בניקוי ההיסטוריה: %s\n" -#: ../midori/midori-locationaction.c:624 -#, c-format +#: ../midori/midori-locationaction.c:509 +#, fuzzy, c-format msgid "Search for %s" -msgstr "חיפוש אחר %s" +msgstr "חיפוש בעזרת %s" + +#: ../midori/midori-locationaction.c:535 +#, c-format +msgid "Search with %s" +msgstr "חיפוש בעזרת %s" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1400 +#: ../midori/midori-locationaction.c:1285 msgid "Paste and p_roceed" -msgstr "ה_דבקה ומעבר" +msgstr "" -#: ../midori/midori-locationaction.c:1768 +#: ../midori/midori-locationaction.c:1652 msgid "Not verified" -msgstr "לא מאומת" +msgstr "" -#: ../midori/midori-locationaction.c:1788 +#: ../midori/midori-locationaction.c:1667 msgid "Verified and encrypted connection" -msgstr "חיבור מאומת ומוצפן" +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 "יישור סרגל הצד לימין" +msgstr "יישר סרגל צד לימין" #: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410 msgid "Close panel" -msgstr "סגירת הסרגל" +msgstr "סגור סרגל" #: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566 +#, fuzzy msgid "Align sidepanel to the left" -msgstr "יישור סרגל הצד לשמאל" +msgstr "יישר סרגל צד לימין" -#: ../midori/midori-websettings.c:218 +#: ../midori/midori-websettings.c:209 +#, fuzzy msgid "Show Speed Dial" -msgstr "הצגת חיוג מהיר" +msgstr "חיוג מהיר" -#: ../midori/midori-websettings.c:219 +#: ../midori/midori-websettings.c:210 msgid "Show Homepage" -msgstr "הצגת דף הבית" +msgstr "הצג את דף הבית" -#: ../midori/midori-websettings.c:237 +#: ../midori/midori-websettings.c:228 msgid "Japanese (SHIFT_JIS)" msgstr "יפנית (SHIFT_JIS)" -#: ../midori/midori-websettings.c:257 +#: ../midori/midori-websettings.c:248 msgid "New tab" msgstr "לשונית חדשה" -#: ../midori/midori-websettings.c:258 +#: ../midori/midori-websettings.c:249 msgid "New window" msgstr "חלון חדש" -#: ../midori/midori-websettings.c:259 +#: ../midori/midori-websettings.c:250 msgid "Current tab" msgstr "לשונית נוכחית" -#: ../midori/midori-websettings.c:274 +#: ../midori/midori-websettings.c:265 msgid "Default" -msgstr "בררת מחדל" +msgstr "ברירת מחדל" -#: ../midori/midori-websettings.c:275 +#: ../midori/midori-websettings.c:266 msgid "Icons" msgstr "סמלים" -#: ../midori/midori-websettings.c:276 +#: ../midori/midori-websettings.c:267 msgid "Small icons" msgstr "סמלים קטנים" -#: ../midori/midori-websettings.c:277 +#: ../midori/midori-websettings.c:268 msgid "Text" msgstr "טקסט" -#: ../midori/midori-websettings.c:278 +#: ../midori/midori-websettings.c:269 msgid "Icons and text" msgstr "סמלים וטקסט" -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-websettings.c:270 msgid "Text beside icons" msgstr "טקסט לצד סמלים" -#: ../midori/midori-websettings.c:294 +#: ../midori/midori-websettings.c:285 msgid "Automatic (GNOME or environment)" -msgstr "אוטומטית (GNOME או סביבה אחרת)" +msgstr "" -#: ../midori/midori-websettings.c:295 +#: ../midori/midori-websettings.c:286 +#, fuzzy msgid "HTTP proxy server" -msgstr "שרת מתווך ל־HTTP" +msgstr "שרת מתווך" -#: ../midori/midori-websettings.c:296 +#: ../midori/midori-websettings.c:287 +#, fuzzy msgid "No proxy server" -msgstr "אין שרת מתווך" +msgstr "שרת מתווך" -#: ../midori/midori-websettings.c:313 +#: ../midori/midori-websettings.c:304 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:314 +#: ../midori/midori-websettings.c:305 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:315 +#: ../midori/midori-websettings.c:306 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:316 +#: ../midori/midori-websettings.c:307 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:400 +#: ../midori/midori-websettings.c:360 msgid "Remember last window size" msgstr "זכור את גודל החלון האחרון" -#: ../midori/midori-websettings.c:401 +#: ../midori/midori-websettings.c:361 msgid "Whether to save the last window size" msgstr "האם לשמור את גודל החלון האחרון" -#: ../midori/midori-websettings.c:409 +#: ../midori/midori-websettings.c:369 msgid "Last window width" msgstr "רוחב החלון האחרון" -#: ../midori/midori-websettings.c:410 +#: ../midori/midori-websettings.c:370 msgid "The last saved window width" msgstr "הרוחב האחרון של החלון הנשמר" -#: ../midori/midori-websettings.c:418 +#: ../midori/midori-websettings.c:378 msgid "Last window height" msgstr "אורך החלון האחרון" -#: ../midori/midori-websettings.c:419 +#: ../midori/midori-websettings.c:379 msgid "The last saved window height" msgstr "האורך האחרון של החלון הנשמר" -#: ../midori/midori-websettings.c:444 +#: ../midori/midori-websettings.c:404 msgid "Last panel position" msgstr "המיקום האחרון של הסרגל" -#: ../midori/midori-websettings.c:445 +#: ../midori/midori-websettings.c:405 msgid "The last saved panel position" msgstr "המיקום האחרון של הסרגל שנשמר" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:454 +#: ../midori/midori-websettings.c:414 msgid "Last panel page" msgstr "העמוד האחרון של הסרגל" -#: ../midori/midori-websettings.c:455 +#: ../midori/midori-websettings.c:415 msgid "The last saved panel page" msgstr "העמוד האחרון של הסרגל שנשמר" -#: ../midori/midori-websettings.c:463 +#: ../midori/midori-websettings.c:423 msgid "Last Web search" msgstr "החיפוש האחרון" -#: ../midori/midori-websettings.c:464 +#: ../midori/midori-websettings.c:424 msgid "The last saved Web search" msgstr "חיפוש האינטרנט האחרון שנשמר" -#: ../midori/midori-websettings.c:473 +#: ../midori/midori-websettings.c:433 msgid "Show Menubar" msgstr "הצג סרגל תפריט" -#: ../midori/midori-websettings.c:474 +#: ../midori/midori-websettings.c:434 msgid "Whether to show the menubar" msgstr "האם להראות את סרגל התפריטים" -#: ../midori/midori-websettings.c:482 +#: ../midori/midori-websettings.c:442 msgid "Show Navigationbar" msgstr "הצג סרגל ניווט" -#: ../midori/midori-websettings.c:483 +#: ../midori/midori-websettings.c:443 msgid "Whether to show the navigationbar" msgstr "האם להציג את סרגל הניווט" -#: ../midori/midori-websettings.c:491 +#: ../midori/midori-websettings.c:451 msgid "Show Bookmarkbar" msgstr "הצג סרגל סימניות" -#: ../midori/midori-websettings.c:492 +#: ../midori/midori-websettings.c:452 msgid "Whether to show the bookmarkbar" msgstr "האם להראות את סרגל הסימניות" -#: ../midori/midori-websettings.c:500 +#: ../midori/midori-websettings.c:460 msgid "Show Panel" msgstr "הצג סרגל" -#: ../midori/midori-websettings.c:501 +#: ../midori/midori-websettings.c:461 msgid "Whether to show the panel" msgstr "האם להציג את הסרגל" -#: ../midori/midori-websettings.c:509 +#: ../midori/midori-websettings.c:469 msgid "Show Statusbar" msgstr "הצג שורת מצב" -#: ../midori/midori-websettings.c:510 +#: ../midori/midori-websettings.c:470 msgid "Whether to show the statusbar" msgstr "האם להציג את שורת המצב" -#: ../midori/midori-websettings.c:519 +#: ../midori/midori-websettings.c:479 msgid "Toolbar Style:" msgstr "סגנון סרגל כלים:" -#: ../midori/midori-websettings.c:520 +#: ../midori/midori-websettings.c:480 msgid "The style of the toolbar" msgstr "הסגנון של סרגל הכלים" -#: ../midori/midori-websettings.c:529 +#: ../midori/midori-websettings.c:489 msgid "Toolbar Items" msgstr "פריטי סרגל כלים" -#: ../midori/midori-websettings.c:530 +#: ../midori/midori-websettings.c:490 msgid "The items to show on the toolbar" msgstr "הפריטים להצגה בסרגל הכלים" -#: ../midori/midori-websettings.c:538 +#: ../midori/midori-websettings.c:498 msgid "Compact Sidepanel" msgstr "סרגל צד קומפקטי" -#: ../midori/midori-websettings.c:539 +#: ../midori/midori-websettings.c:499 msgid "Whether to make the sidepanel compact" msgstr "האם להפוך את סרגל הצד לקומפקטי" -#: ../midori/midori-websettings.c:554 +#: ../midori/midori-websettings.c:514 msgid "Align sidepanel on the right" msgstr "יישר סרגל צד לימין" -#: ../midori/midori-websettings.c:555 +#: ../midori/midori-websettings.c:515 msgid "Whether to align the sidepanel on the right" msgstr "האם ליישר את סרגל הצד לימין" -#: ../midori/midori-websettings.c:570 +#: ../midori/midori-websettings.c:530 +#, fuzzy msgid "Open panels in separate windows" -msgstr "פתיחת סרגלים בחלונות נפרדים" +msgstr "פתח חלון חדש" -#: ../midori/midori-websettings.c:571 +#: ../midori/midori-websettings.c:531 +#, fuzzy msgid "Whether to always open panels in separate windows" -msgstr "האם תמיד לפתוח את הסרגלים בחלונות נפרדים" +msgstr "האם לפתוח לשוניות חדשות ברקע" -#: ../midori/midori-websettings.c:580 +#: ../midori/midori-websettings.c:540 msgid "When Midori starts:" msgstr "כאשר Midori מופעל:" -#: ../midori/midori-websettings.c:581 +#: ../midori/midori-websettings.c:541 msgid "What to do when Midori starts" msgstr "מה לעשות כאשר Midori מופעל" -#: ../midori/midori-websettings.c:590 +#: ../midori/midori-websettings.c:550 msgid "Homepage:" msgstr "דף הבית:" -#: ../midori/midori-websettings.c:591 +#: ../midori/midori-websettings.c:551 msgid "The homepage" msgstr "דף הבית" -#: ../midori/midori-websettings.c:606 +#: ../midori/midori-websettings.c:566 msgid "Show crash dialog" msgstr "הצג חלון קריסה" -#: ../midori/midori-websettings.c:607 +#: ../midori/midori-websettings.c:567 msgid "Show a dialog after Midori crashed" msgstr "הצג חלון לאחר ש־Midori קורס" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:575 msgid "Save downloaded files to:" msgstr "שמור קבצים שהורדו אל:" -#: ../midori/midori-websettings.c:616 +#: ../midori/midori-websettings.c:576 msgid "The folder downloaded files are saved to" msgstr "קבצים שהורדו ישמרו בתיקייה" -#: ../midori/midori-websettings.c:624 +#: ../midori/midori-websettings.c:584 msgid "Text Editor" msgstr "עורך טקסט" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:585 msgid "An external text editor" msgstr "עורך טקסט חיצוני" -#: ../midori/midori-websettings.c:640 +#: ../midori/midori-websettings.c:600 msgid "News Aggregator" msgstr "אוגר חדשות" -#: ../midori/midori-websettings.c:641 +#: ../midori/midori-websettings.c:601 msgid "An external news aggregator" msgstr "אוגר חדשות חיצוני" -#: ../midori/midori-websettings.c:649 +#: ../midori/midori-websettings.c:609 msgid "Location entry Search" msgstr "חיפוש בתיבת מיקום" -#: ../midori/midori-websettings.c:650 +#: ../midori/midori-websettings.c:610 msgid "The search to perform inside the location entry" msgstr "החיפוש לביצוע בתוך תיבת המיקום" -#: ../midori/midori-websettings.c:658 +#: ../midori/midori-websettings.c:618 msgid "Preferred Encoding" msgstr "קידוד מועדף" -#: ../midori/midori-websettings.c:659 +#: ../midori/midori-websettings.c:619 msgid "The preferred character encoding" msgstr "הקידוד המועדף" -#: ../midori/midori-websettings.c:669 +#: ../midori/midori-websettings.c:629 msgid "Always Show Tabbar" msgstr "תמיד הצג סרגל לשוניות" -#: ../midori/midori-websettings.c:670 +#: ../midori/midori-websettings.c:630 msgid "Always show the tabbar" msgstr "תמיד הצג את סרגל הלשוניות" -#: ../midori/midori-websettings.c:683 +#: ../midori/midori-websettings.c:638 msgid "Close Buttons on Tabs" msgstr "לחצני סגירה בלשוניות" -#: ../midori/midori-websettings.c:684 +#: ../midori/midori-websettings.c:639 msgid "Whether tabs have close buttons" msgstr "האם ללשוניות יש לחצני סגירה" -#: ../midori/midori-websettings.c:709 +#: ../midori/midori-websettings.c:664 msgid "Open new pages in:" msgstr "פתיחת דפים חדשים ב:" -#: ../midori/midori-websettings.c:710 +#: ../midori/midori-websettings.c:665 msgid "Where to open new pages" msgstr "איפה לפתוח דפים חדשים" -#: ../midori/midori-websettings.c:719 +#: ../midori/midori-websettings.c:674 msgid "Middle click opens Selection" msgstr "לחיצה אמצעית פותחת בחירה" -#: ../midori/midori-websettings.c:720 +#: ../midori/midori-websettings.c:675 msgid "Load an address from the selection via middle click" msgstr "פתח את הכתובת הנבחרת באמצעות לחצן אמצעי בעכבר" -#: ../midori/midori-websettings.c:728 +#: ../midori/midori-websettings.c:683 msgid "Open tabs in the background" msgstr "פתח לשוניות ברקע" -#: ../midori/midori-websettings.c:729 +#: ../midori/midori-websettings.c:684 msgid "Whether to open new tabs in the background" msgstr "האם לפתוח לשוניות חדשות ברקע" -#: ../midori/midori-websettings.c:737 +#: ../midori/midori-websettings.c:692 msgid "Open Tabs next to Current" msgstr "פתח לשוניות אחרי הנוכחית" -#: ../midori/midori-websettings.c:738 +#: ../midori/midori-websettings.c:693 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "האם לפתוח לשוניות אחרי הלשונית הנוכחית או אחרי הלשונית האחרונה" -#: ../midori/midori-websettings.c:746 +#: ../midori/midori-websettings.c:701 msgid "Open popups in tabs" msgstr "פתח חלונות קופצים בלשוניות" -#: ../midori/midori-websettings.c:747 +#: ../midori/midori-websettings.c:702 msgid "Whether to open popup windows in tabs" msgstr "האם לפתוח חלונות קופצים בלשוניות" -#: ../midori/midori-websettings.c:757 ../extensions/statusbar-features.c:134 +#: ../midori/midori-websettings.c:712 ../extensions/statusbar-features.c:131 msgid "Load images automatically" msgstr "טען תמונות אוטומטית" -#: ../midori/midori-websettings.c:758 +#: ../midori/midori-websettings.c:713 msgid "Load and display images automatically" -msgstr "טעינה והצגה אוטומטית של תמונות" +msgstr "טען והצג תמונות אוטומטית" -#: ../midori/midori-websettings.c:765 ../extensions/statusbar-features.c:143 +#: ../midori/midori-websettings.c:720 ../extensions/statusbar-features.c:140 msgid "Enable scripts" -msgstr "הפעלת סקריפטים" +msgstr "הפעל תסריטים" -#: ../midori/midori-websettings.c:766 +#: ../midori/midori-websettings.c:721 msgid "Enable embedded scripting languages" -msgstr "הפעל שפות סקריפט משובצות" +msgstr "הפעל שפות תסריטים משובצות" -#: ../midori/midori-websettings.c:773 ../extensions/statusbar-features.c:154 +#: ../midori/midori-websettings.c:728 ../extensions/statusbar-features.c:149 msgid "Enable Netscape plugins" -msgstr "הפעלת תוספי Netscape" +msgstr "הפעל תוספי Netscape" -#: ../midori/midori-websettings.c:774 +#: ../midori/midori-websettings.c:729 msgid "Enable embedded Netscape plugin objects" -msgstr "הפעלת רכיבי תוספי Netscape משובצים" +msgstr "הפעל אובייקטי תוספי Netscape משובצים" -#: ../midori/midori-websettings.c:789 +#: ../midori/midori-websettings.c:749 msgid "Enable Spell Checking" -msgstr "הפעלת בדיקת איות" +msgstr "הפעל בדיקת איות" -#: ../midori/midori-websettings.c:790 +#: ../midori/midori-websettings.c:750 msgid "Enable spell checking while typing" -msgstr "הפעלת בדיקת איות תוך כדי הקלדה" +msgstr "הפעל בדיקת איות תוך כדי הקלדה" -#: ../midori/midori-websettings.c:796 +#: ../midori/midori-websettings.c:756 msgid "Enable HTML5 database support" -msgstr "הפעלת תמיכה במסד נתונים עבור HTML5" +msgstr "" -#: ../midori/midori-websettings.c:797 +#: ../midori/midori-websettings.c:757 msgid "Whether to enable HTML5 database support" -msgstr "האם להפעיל תמיכה במסד נתונים עבור HTML5" +msgstr "" -#: ../midori/midori-websettings.c:803 +#: ../midori/midori-websettings.c:763 msgid "Enable HTML5 local storage support" -msgstr "הפעלת תמיכה באחסון מקומי עבור HTML5" +msgstr "" -#: ../midori/midori-websettings.c:804 +#: ../midori/midori-websettings.c:764 msgid "Whether to enable HTML5 local storage support" -msgstr "האם להפעיל תמיכה באחסון מקומי עבור HTML5" +msgstr "" -#: ../midori/midori-websettings.c:810 +#: ../midori/midori-websettings.c:770 +#, fuzzy msgid "Enable offline web application cache" -msgstr "הפעלת מטמון יישומי הרשת" +msgstr "הפעל כיישום _רשת" -#: ../midori/midori-websettings.c:811 +#: ../midori/midori-websettings.c:771 msgid "Whether to enable offline web application cache" -msgstr "האם להפעיל את מטמון יישומי הרשת" +msgstr "" -#: ../midori/midori-websettings.c:827 +#: ../midori/midori-websettings.c:787 +#, fuzzy msgid "Flash window on background tabs" -msgstr "הבהוב החלון בלשוניות הרקע" +msgstr "פתח קישור בלשונית ש_ברקע" -#: ../midori/midori-websettings.c:828 +#: ../midori/midori-websettings.c:788 +#, fuzzy 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" +msgstr "האם לפתוח לשוניות חדשות ברקע" -#: ../midori/midori-websettings.c:863 +#: ../midori/midori-websettings.c:803 msgid "Zoom Text and Images" msgstr "קרב טקסט ותמונות" -#: ../midori/midori-websettings.c:864 +#: ../midori/midori-websettings.c:804 msgid "Whether to zoom text and images" msgstr "האם לקרב טקסט ותמונות" -#: ../midori/midori-websettings.c:879 +#: ../midori/midori-websettings.c:819 msgid "Find inline while typing" msgstr "חפש תוך כדי הקלדה" -#: ../midori/midori-websettings.c:880 +#: ../midori/midori-websettings.c:820 msgid "Whether to automatically find inline while typing" msgstr "האם לחפש אוטומטית בתוך הטקסט בזמן הקלדה" -#: ../midori/midori-websettings.c:895 +#: ../midori/midori-websettings.c:835 msgid "Kinetic scrolling" -msgstr "גלילה קינטית" +msgstr "" -#: ../midori/midori-websettings.c:896 +#: ../midori/midori-websettings.c:836 msgid "Whether scrolling should kinetically move according to speed" -msgstr "האם הגלילה אמורה לזוז באופן קינטי בהתאם למהירות" +msgstr "" -#: ../midori/midori-websettings.c:904 +#: ../midori/midori-websettings.c:844 msgid "Delete old Cookies after:" -msgstr "מחיקת קובצי עוגייה לאחר:" +msgstr "" -#: ../midori/midori-websettings.c:905 +#: ../midori/midori-websettings.c:845 msgid "The maximum number of days to save cookies for" msgstr "מספר הימים המקסימלי לשמירת עוגיות" -#: ../midori/midori-websettings.c:921 +#: ../midori/midori-websettings.c:861 +#, fuzzy msgid "Only accept Cookies from sites you visit" -msgstr "קבלת קובצי עוגייה מהאתרים בהם אני מבקר בלבד" +msgstr "קבל עוגיות מהאתר המקורי בלבד" -#: ../midori/midori-websettings.c:922 +#: ../midori/midori-websettings.c:862 msgid "Block cookies sent by third-party websites" -msgstr "חסימת קובצי עוגייה שנשלחים על ידי אתרי צד שלישי" +msgstr "" -#: ../midori/midori-websettings.c:936 +#: ../midori/midori-websettings.c:876 +#, fuzzy msgid "Delete pages from history after:" -msgstr "מחיקת דפים מההיסטוריה לאחר:" +msgstr "מחק את פריט ההיסטוריה הנבחר" -#: ../midori/midori-websettings.c:937 +#: ../midori/midori-websettings.c:877 msgid "The maximum number of days to save the history for" msgstr "מספר הימים המקסימלי לשמירת היסטוריה" -#: ../midori/midori-websettings.c:952 +#: ../midori/midori-websettings.c:892 +#, fuzzy msgid "Proxy server" msgstr "שרת מתווך" -#: ../midori/midori-websettings.c:953 +#: ../midori/midori-websettings.c:893 msgid "The type of proxy server to use" -msgstr "סוג שרת המתווך לשימוש" +msgstr "" -#: ../midori/midori-websettings.c:962 +#: ../midori/midori-websettings.c:902 +#, fuzzy msgid "HTTP Proxy Server" -msgstr "שרת מתווך HTTP" +msgstr "שרת מתווך" -#: ../midori/midori-websettings.c:963 +#: ../midori/midori-websettings.c:903 msgid "The proxy server used for HTTP connections" msgstr "השרת המתווך המשמש עבור חיבורי HTTP" -#: ../midori/midori-websettings.c:978 +#: ../midori/midori-websettings.c:918 msgid "Port" -msgstr "פתחה" +msgstr "" -#: ../midori/midori-websettings.c:979 +#: ../midori/midori-websettings.c:919 #, fuzzy msgid "The proxy server port used for HTTP connections" msgstr "השרת המתווך המשמש עבור חיבורי HTTP" -#: ../midori/midori-websettings.c:997 +#: ../midori/midori-websettings.c:937 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 +#: ../midori/midori-websettings.c:954 msgid "Identify as" msgstr "הזדהה בתור" -#: ../midori/midori-websettings.c:1015 +#: ../midori/midori-websettings.c:955 msgid "What to identify as to web pages" msgstr "כיצד להזדהות עבור דפי אינטרנט" -#: ../midori/midori-websettings.c:1031 +#: ../midori/midori-websettings.c:971 msgid "Identification string" msgstr "מחרוזת זיהוי" -#: ../midori/midori-websettings.c:1032 +#: ../midori/midori-websettings.c:972 msgid "The application identification string" msgstr "מחרוזת הזיהוי של היישום" -#: ../midori/midori-websettings.c:1048 +#: ../midori/midori-websettings.c:988 #, fuzzy msgid "Preferred languages" msgstr "קידוד מועדף" -#: ../midori/midori-websettings.c:1049 +#: ../midori/midori-websettings.c:989 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 +#: ../midori/midori-websettings.c:1004 msgid "Clear private data" msgstr "נקה נתונים אישיים" -#: ../midori/midori-websettings.c:1065 +#: ../midori/midori-websettings.c:1005 msgid "The private data selected for deletion" msgstr "המידע האישי שנבחר למחיקה" -#: ../midori/midori-websettings.c:1080 +#: ../midori/midori-websettings.c:1020 +#, fuzzy msgid "Clear data" -msgstr "מחיקת נתונים אישיים" +msgstr "נקה נתונים אישיים" -#: ../midori/midori-websettings.c:1081 +#: ../midori/midori-websettings.c:1021 +#, fuzzy msgid "The data selected for deletion" -msgstr "הנתונים שנבחרו למחיקה" +msgstr "המידע האישי שנבחר למחיקה" #. i18n: Reworded: Shorten details propagated when going to another page -#: ../midori/midori-websettings.c:1130 +#: ../midori/midori-websettings.c:1054 msgid "Strip referrer details sent to websites" msgstr "" #. i18n: Referer here is not a typo but a technical term -#: ../midori/midori-websettings.c:1132 +#: ../midori/midori-websettings.c:1056 msgid "Whether the \"Referer\" header should be shortened to the hostname" msgstr "" -#: ../midori/midori-websettings.c:1146 +#: ../midori/midori-websettings.c:1070 msgid "Always use my font choices" -msgstr "תמיד להשתמש בבחירות הגופן שלי" +msgstr "" -#: ../midori/midori-websettings.c:1147 +#: ../midori/midori-websettings.c:1071 msgid "Override fonts picked by websites with user preferences" -msgstr "דריסת גופנים שנבחרו על ידי האתרים באמצעות העדפות המשתמש" +msgstr "" -#: ../midori/midori-view.c:1353 +#: ../midori/midori-view.c:1343 #, c-format msgid "%s wants to save an HTML5 database." -msgstr "האתר %s מעוניין לשמור מסד נתונים עם HTML5." +msgstr "" -#: ../midori/midori-view.c:1357 ../midori/midori-view.c:1389 +#: ../midori/midori-view.c:1347 ../midori/midori-view.c:1377 +#, fuzzy msgid "_Deny" -msgstr "_דחייה" +msgstr "_תפריט" -#: ../midori/midori-view.c:1357 ../midori/midori-view.c:1389 +#: ../midori/midori-view.c:1347 ../midori/midori-view.c:1377 msgid "_Allow" -msgstr "_אישור" +msgstr "" -#: ../midori/midori-view.c:1385 +#: ../midori/midori-view.c:1373 #, c-format msgid "%s wants to know your location." -msgstr "האתר %s מעוניין לדעת מהו מיקומך." +msgstr "" -#: ../midori/midori-view.c:1476 +#: ../midori/midori-view.c:1461 #, c-format msgid "Error - %s" msgstr "שגיאה - %s" -#: ../midori/midori-view.c:1477 +#: ../midori/midori-view.c:1462 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "העמוד '%s' לא ניתן לטעינה." -#: ../midori/midori-view.c:1479 +#: ../midori/midori-view.c:1464 msgid "Try again" msgstr "נסה שוב" -#: ../midori/midori-view.c:1676 ../midori/midori-view.c:2589 +#: ../midori/midori-view.c:1626 ../midori/midori-view.c:2471 #, c-format msgid "Send a message to %s" msgstr "שלח הודעה אל %s" -#: ../midori/midori-view.c:2419 ../midori/midori-view.c:2738 +#: ../midori/midori-view.c:2313 ../midori/midori-view.c:2624 msgid "Inspect _Element" -msgstr "ח_קירת רכיב" +msgstr "" -#: ../midori/midori-view.c:2471 +#: ../midori/midori-view.c:2363 msgid "Open Link in New _Tab" msgstr "פתח קישור ב_לשונית חדשה" -#: ../midori/midori-view.c:2475 +#: ../midori/midori-view.c:2367 msgid "Open Link in _Foreground Tab" msgstr "פתח קישור בלשונית ש_בחזית" -#: ../midori/midori-view.c:2476 +#: ../midori/midori-view.c:2368 msgid "Open Link in _Background Tab" msgstr "פתח קישור בלשונית ש_ברקע" -#: ../midori/midori-view.c:2479 +#: ../midori/midori-view.c:2371 msgid "Open Link in New _Window" msgstr "פתח קישור ב_חלון חדש" -#: ../midori/midori-view.c:2482 +#: ../midori/midori-view.c:2374 +#, fuzzy msgid "Open Link as Web A_pplication" -msgstr "פתיחת קישור כיישום _רשת" +msgstr "הפעל כיישום _רשת" -#: ../midori/midori-view.c:2487 +#: ../midori/midori-view.c:2377 +#, fuzzy msgid "Copy Link de_stination" -msgstr "העתקת יעד ה_קישור" +msgstr "_העתק את יעד הקישור" -#: ../midori/midori-view.c:2503 +#: ../midori/midori-view.c:2389 msgid "Open _Image in New Tab" msgstr "פתח את ה_תמונה בלשונית חדשה" -#: ../midori/midori-view.c:2506 +#: ../midori/midori-view.c:2392 msgid "Copy Image _Address" msgstr "העתק _כתובת תמונה" -#: ../midori/midori-view.c:2509 +#: ../midori/midori-view.c:2395 msgid "Save I_mage" msgstr "שמור ת_מונה" -#: ../midori/midori-view.c:2512 -msgid "Open in Image _Viewer" -msgstr "פתיחה במ_ציג תמונות" - -#: ../midori/midori-view.c:2519 +#: ../midori/midori-view.c:2402 msgid "Copy Video _Address" msgstr "העתק _כתובת וידאו" -#: ../midori/midori-view.c:2522 +#: ../midori/midori-view.c:2405 msgid "Save _Video" msgstr "שמור _וידאו" -#: ../midori/midori-view.c:2522 +#: ../midori/midori-view.c:2405 msgid "Download _Video" msgstr "הורד _וידאו" -#: ../midori/midori-view.c:2548 +#: ../midori/midori-view.c:2431 msgid "Search _with" msgstr "חיפוש _בעזרת" -#: ../midori/midori-view.c:2580 +#: ../midori/midori-view.c:2463 msgid "_Search the Web" msgstr "_חיפוש ברשת" -#: ../midori/midori-view.c:2597 +#: ../midori/midori-view.c:2479 msgid "Open Address in New _Tab" msgstr "פתח את הכתובות ב_לשונית חדשה" -#: ../midori/midori-view.c:2886 +#: ../midori/midori-view.c:2775 msgid "Open or download file" msgstr "פתח או הורד קובץ" -#: ../midori/midori-view.c:2905 +#: ../midori/midori-view.c:2794 #, c-format msgid "File Type: '%s'" msgstr "סוג הקובץ: '%s'" -#: ../midori/midori-view.c:2907 +#: ../midori/midori-view.c:2796 #, 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:2930 +#: ../midori/midori-view.c:2813 #, c-format msgid "Open %s" msgstr "פתח את %s" -#: ../midori/midori-view.c:3575 +#: ../midori/midori-view.c:3401 #, c-format msgid "Inspect page - %s" msgstr "בדיקת עמוד - %s" -#: ../midori/midori-view.c:3906 +#: ../midori/midori-view.c:3688 msgid "Speed Dial" msgstr "חיוג מהיר" -#: ../midori/midori-view.c:3907 ../midori/midori-view.c:4003 +#: ../midori/midori-view.c:3689 ../midori/midori-view.c:3785 msgid "Click to add a shortcut" msgstr "לחץ כאן כדי להוסיף קיצור דרך" -#: ../midori/midori-view.c:3908 +#: ../midori/midori-view.c:3690 msgid "Enter shortcut address" msgstr "הזן כתובת לקיצור" -#: ../midori/midori-view.c:3909 +#: ../midori/midori-view.c:3691 msgid "Enter shortcut title" msgstr "הזן כותרת לקיצור" -#: ../midori/midori-view.c:3910 +#: ../midori/midori-view.c:3692 msgid "Are you sure you want to delete this shortcut?" msgstr "אתה בטוח שברצונך למחוק את קיצור הדרך?" -#: ../midori/midori-view.c:4072 +#: ../midori/midori-view.c:3856 #, c-format msgid "No documentation installed" msgstr "אין תיעוד מותקן" -#: ../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 +#: ../midori/midori-view.c:3906 msgid "Version numbers in brackets show the version used at runtime." msgstr "" -#: ../midori/midori-view.c:4252 +#: ../midori/midori-view.c:3951 msgid "Page loading delayed" msgstr "" -#: ../midori/midori-view.c:4253 +#: ../midori/midori-view.c:3952 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "" -#: ../midori/midori-view.c:4254 +#: ../midori/midori-view.c:3953 msgid "Load Page" -msgstr "טעינת העמוד" +msgstr "" -#: ../midori/midori-view.c:4420 +#: ../midori/midori-view.c:4093 msgid "Blank page" msgstr "דף ריק" -#: ../midori/midori-view.c:4682 +#: ../midori/midori-view.c:4357 msgid "_Duplicate Tab" -msgstr "ש_כפול לשונית" +msgstr "_שכפל לשונית" -#: ../midori/midori-view.c:4687 +#: ../midori/midori-view.c:4362 +#, fuzzy msgid "Show Tab _Label" -msgstr "הצגת תווית בל_שונית" +msgstr "הצג סרגל" -#: ../midori/midori-view.c:4687 +#: ../midori/midori-view.c:4362 msgid "Show Tab _Icon Only" -msgstr " הצגת סמל הל_שונית בלבד" +msgstr "" -#: ../midori/midori-view.c:4693 +#: ../midori/midori-view.c:4368 +#, fuzzy msgid "Close ot_her Tabs" -msgstr "סגירת _שאר הלשוניות" +msgstr "לשוניות _שנסגרו" #. i18n: word stem of "previous page" type links, case is not important -#: ../midori/midori-view.c:5506 +#: ../midori/midori-view.c:4985 +#, fuzzy msgid "previous" msgstr "הקודם" #. i18n: word stem of "next page" type links, case is not important -#: ../midori/midori-view.c:5525 +#: ../midori/midori-view.c:5004 msgid "next" -msgstr "הבא" +msgstr "" -#: ../midori/midori-view.c:5538 +#: ../midori/midori-view.c:5017 msgid "Print background images" msgstr "הדפס תמונות רקע" -#: ../midori/midori-view.c:5539 +#: ../midori/midori-view.c:5018 msgid "Whether background images should be printed" msgstr "האם להדפיס תמונות רקע" -#: ../midori/midori-view.c:5571 +#: ../midori/midori-view.c:5050 msgid "Features" -msgstr "תכונות" +msgstr "תוכונות" #: ../midori/midori-preferences.c:297 msgid "Startup" msgstr "הפעלה" #: ../midori/midori-preferences.c:310 +#, fuzzy msgid "Use _current page" -msgstr "שימוש בעמוד ה_נוכחי" +msgstr "הדפס את הדף הנוכחי" #: ../midori/midori-preferences.c:314 msgid "Use current page as homepage" -msgstr "שימוש בדף הנוכחי כדף הבית" +msgstr "השתמש בדף הנוכחי כדף הבית" #. Page "Appearance" #: ../midori/midori-preferences.c:323 msgid "Fonts" -msgstr "גופנים" +msgstr "" #: ../midori/midori-preferences.c:326 +#, fuzzy msgid "Proportional Font Family" -msgstr "משפחת גופנים בעלת יחס" +msgstr "משפחת גופנים ברירת מחדל" #: ../midori/midori-preferences.c:330 msgid "The default font family used to display text" @@ -1933,142 +1911,145 @@ msgstr "התנהגות" #: ../midori/midori-preferences.c:385 msgid "Allow scripts to open popups" -msgstr "מתן אפשרות לסקריפטים לפתוח דפים קופצים" +msgstr "" #: ../midori/midori-preferences.c:386 +#, fuzzy msgid "Whether scripts are allowed to open popup windows automatically" -msgstr "האם מותר לסקריפטים לפתוח חלונות קופצים אוטומטית" +msgstr "האם לפתוח חלונות קופצים בלשוניות" #. Page "Interface" -#: ../midori/midori-preferences.c:416 +#: ../midori/midori-preferences.c:409 msgid "Browsing" msgstr "גלישה" #. Page "Network" -#: ../midori/midori-preferences.c:456 +#: ../midori/midori-preferences.c:447 msgid "Network" msgstr "רשת" -#: ../midori/midori-preferences.c:463 +#: ../midori/midori-preferences.c:454 +#, fuzzy msgid "Hostname" -msgstr "שם מארח" +msgstr "שם משתמש" -#: ../midori/midori-preferences.c:487 +#: ../midori/midori-preferences.c:478 msgid "MB" -msgstr "מ״ב" +msgstr "" -#: ../midori/midori-searchaction.c:902 +#: ../midori/midori-searchaction.c:907 msgid "Add search engine" msgstr "הוסף מנוע חיפוש" -#: ../midori/midori-searchaction.c:902 +#: ../midori/midori-searchaction.c:907 msgid "Edit search engine" msgstr "ערוך מנוע חיפוש" -#: ../midori/midori-searchaction.c:931 +#: ../midori/midori-searchaction.c:936 msgid "_Name:" msgstr "_שם:" -#: ../midori/midori-searchaction.c:947 +#: ../midori/midori-searchaction.c:952 msgid "_Description:" msgstr "_תיאור:" -#: ../midori/midori-searchaction.c:981 +#: ../midori/midori-searchaction.c:985 msgid "_Icon:" msgstr "_סמל:" -#: ../midori/midori-searchaction.c:995 +#: ../midori/midori-searchaction.c:999 msgid "_Token:" msgstr "_אות:" -#: ../midori/midori-searchaction.c:1295 +#: ../midori/midori-searchaction.c:1299 msgid "Manage Search Engines" -msgstr "ניהול מנועי החיפוש" +msgstr "ניהול מנועי חיפוש" -#: ../midori/midori-searchaction.c:1395 +#: ../midori/midori-searchaction.c:1399 msgid "Use as _default" -msgstr "שימוש כ_בררת מחדל" +msgstr "קבע כברירת מחדל" -#: ../midori/sokoke.c:412 +#: ../midori/sokoke.c:406 +#, fuzzy msgid "Open with" -msgstr "פתיחה באמצעות" +msgstr "פתח קובץ" -#: ../midori/sokoke.c:420 +#: ../midori/sokoke.c:414 #, c-format msgid "Choose an application or command to open \"%s\":" -msgstr "נא לבחור ביישום או בפקודה לפתיחת \"%s\":" +msgstr "" -#: ../midori/sokoke.c:461 ../midori/sokoke.c:471 ../midori/sokoke.c:499 -#: ../midori/sokoke.c:528 ../midori/sokoke.c:542 +#: ../midori/sokoke.c:455 ../midori/sokoke.c:465 ../midori/sokoke.c:493 +#: ../midori/sokoke.c:522 ../midori/sokoke.c:536 msgid "Could not run external program." msgstr "לא ניתן להריץ תוכנה חיצונית." -#: ../midori/sokoke.c:1653 +#: ../midori/sokoke.c:1673 #, c-format msgid "%d hour" msgid_plural "%d hours" -msgstr[0] "שעה אחת" -msgstr[1] "%d שעות" +msgstr[0] "" +msgstr[1] "" -#: ../midori/sokoke.c:1654 +#: ../midori/sokoke.c:1674 #, c-format msgid "%d minute" msgid_plural "%d minutes" -msgstr[0] "דקה אחת" -msgstr[1] "%s דקות" +msgstr[0] "" +msgstr[1] "" -#: ../midori/sokoke.c:1655 +#: ../midori/sokoke.c:1675 #, c-format msgid "%d second" msgid_plural "%d seconds" -msgstr[0] "שנייה אחת" -msgstr[1] "%d שניות" +msgstr[0] "" +msgstr[1] "" #. i18n: Download tooltip (size): 4KB of 43MB -#: ../midori/sokoke.c:1663 ../panels/midori-transfers.c:267 +#: ../midori/sokoke.c:1683 ../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 +#: ../midori/sokoke.c:1692 msgid "?B" msgstr "" #. i18n: Download tooltip (transfer rate): (130KB/s) -#: ../midori/sokoke.c:1675 +#: ../midori/sokoke.c:1695 #, c-format msgid " (%s/s)" msgstr "" #. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning -#: ../midori/sokoke.c:1692 +#: ../midori/sokoke.c:1712 #, c-format msgid " - %s remaining" msgstr "" #. i18n: A panel at the bottom, to search text in pages -#: ../toolbars/midori-findbar.c:291 +#: ../toolbars/midori-findbar.c:264 msgid "_Inline Find:" msgstr "חיפוש _פנימי:" -#: ../toolbars/midori-findbar.c:317 +#: ../toolbars/midori-findbar.c:291 msgid "Previous" msgstr "הקודם" -#: ../toolbars/midori-findbar.c:323 +#: ../toolbars/midori-findbar.c:297 msgid "Next" msgstr "הבא" -#: ../toolbars/midori-findbar.c:327 +#: ../toolbars/midori-findbar.c:301 msgid "Match Case" msgstr "התאם רישיות" -#: ../toolbars/midori-findbar.c:336 +#: ../toolbars/midori-findbar.c:310 msgid "Highlight Matches" msgstr "הדגש התאמות" -#: ../toolbars/midori-findbar.c:347 +#: ../toolbars/midori-findbar.c:321 msgid "Close Findbar" msgstr "סגור סרגל חיפוש" @@ -2082,8 +2063,9 @@ msgid "Transfer completed" msgstr "ההעברה הושלמה" #: ../toolbars/midori-transferbar.c:193 +#, fuzzy msgid "The downloaded file is erroneous." -msgstr "הקובץ שהתקבל פגום." +msgstr "שמור קבצים שהורדו אל:" #: ../toolbars/midori-transferbar.c:194 msgid "" @@ -2093,81 +2075,83 @@ msgstr "" #: ../toolbars/midori-transferbar.c:331 ../panels/midori-transfers.c:141 msgid "Clear All" -msgstr "ניקוי הכול" +msgstr "נקה הכל" #: ../toolbars/midori-transferbar.c:368 ../toolbars/midori-transferbar.c:370 +#, fuzzy msgid "Some files are being downloaded" -msgstr "ישנם קבצים הנמצאים כרגע בהליכי הורדה" +msgstr "לא ניתן להוריד את הקובץ '%s'." #: ../toolbars/midori-transferbar.c:374 +#, fuzzy msgid "_Quit Midori" -msgstr "י_ציאה מ־Midori" +msgstr "Midori" #: ../toolbars/midori-transferbar.c:376 msgid "The transfers will be cancelled if Midori quits." -msgstr "הקבצים המועברים יבוטלו עם היציאה מ־Midori." +msgstr "" -#: ../panels/midori-bookmarks.c:114 +#: ../panels/midori-bookmarks.c:113 msgid "Bookmarks" msgstr "סימניות" -#: ../panels/midori-bookmarks.c:257 -#, c-format +#: ../panels/midori-bookmarks.c:291 +#, fuzzy, c-format msgid "Failed to add bookmark item: %s\n" -msgstr "הוספת פריט הסימנייה נכשלה: %s\n" +msgstr "נכשל בהוספת פריט היסטוריה: %s\n" -#: ../panels/midori-bookmarks.c:435 +#: ../panels/midori-bookmarks.c:471 msgid "Edit the selected bookmark" msgstr "ערוך את הסימנייה הנבחרת" -#: ../panels/midori-bookmarks.c:443 +#: ../panels/midori-bookmarks.c:479 msgid "Delete the selected bookmark" msgstr "מחק את הסימנייה הנבחרת" -#: ../panels/midori-bookmarks.c:458 +#: ../panels/midori-bookmarks.c:494 msgid "Add a new folder" -msgstr "הוספת תיקייה חדשה" +msgstr "הוסף תיקייה חדשה" -#: ../panels/midori-bookmarks.c:592 ../panels/midori-history.c:633 +#: ../panels/midori-bookmarks.c:628 ../panels/midori-history.c:579 msgid "Separator" -msgstr "מפריד" +msgstr "מפריד" -#: ../panels/midori-history.c:111 +#: ../panels/midori-history.c:110 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:142 +msgid "A week ago" +msgstr "לפני שבוע" -#: ../panels/midori-history.c:162 ../panels/midori-history.c:186 +#: ../panels/midori-history.c:144 #, 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:147 +msgid "Today" +msgstr "היום" -#: ../panels/midori-history.c:360 +#: ../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:407 +#: ../panels/midori-history.c:363 msgid "Bookmark the selected history item" msgstr "הוסף לסימניות את פריט ההיסטוריה הנבחר" -#: ../panels/midori-history.c:416 +#: ../panels/midori-history.c:372 msgid "Delete the selected history item" msgstr "מחק את פריט ההיסטוריה הנבחר" -#: ../panels/midori-history.c:424 +#: ../panels/midori-history.c:380 msgid "Clear the entire history" msgstr "נקה את כל ההיסטוריה" @@ -2181,7 +2165,7 @@ msgstr "פתח _תיקיית יעד" #: ../panels/midori-transfers.c:470 msgid "Copy Link Loc_ation" -msgstr "העתקת כתו_בת הקישור" +msgstr "העתק את כתו_בת הקישור" #: ../katze/katze-http-auth.c:210 msgid "Authentication Required" @@ -2207,19 +2191,19 @@ msgstr "סיסמה" msgid "_Remember password" msgstr "_זכור סיסמה" -#: ../katze/katze-throbber.c:949 +#: ../katze/katze-throbber.c:942 #, c-format msgid "Named icon '%s' couldn't be loaded" msgstr "" -#: ../katze/katze-throbber.c:962 +#: ../katze/katze-throbber.c:955 #, c-format msgid "Stock icon '%s' couldn't be loaded" msgstr "" -#: ../katze/katze-throbber.c:1042 +#: ../katze/katze-throbber.c:1035 msgid "Animation frames are broken" -msgstr "שקופיות ההנפשה פגומות" +msgstr "" #: ../katze/katze-utils.c:439 ../katze/katze-utils.c:873 #, c-format @@ -2229,7 +2213,7 @@ msgstr "" #: ../katze/katze-utils.c:485 ../katze/katze-utils.c:514 #: ../extensions/addons.c:308 msgid "Choose file" -msgstr "בחירת קובץ" +msgstr "בחר קובץ" #: ../katze/katze-utils.c:500 msgid "Choose folder" @@ -2241,91 +2225,96 @@ msgstr "כלום" #: ../katze/katze-utils.c:719 msgid "1 hour" -msgstr "שעה אחת" +msgstr "" #: ../katze/katze-utils.c:720 msgid "1 day" -msgstr "יום אחד" +msgstr "" #: ../katze/katze-utils.c:721 +#, fuzzy msgid "1 week" -msgstr "שבוע אחד" +msgstr "לפני שבוע" #: ../katze/katze-utils.c:722 msgid "1 month" -msgstr "חודש אחד" +msgstr "" #: ../katze/katze-utils.c:723 msgid "1 year" -msgstr "שנה אחת" +msgstr "" #: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235 #, c-format msgid "Preferences for %s" msgstr "מאפיינים עבור %s" -#: ../extensions/adblock.c:467 +#: ../extensions/adblock.c:433 msgid "Configure Advertisement filters" msgstr "הגדרת מסנני פרסומות" -#: ../extensions/adblock.c:498 +#: ../extensions/adblock.c:464 #, 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 +#: ../extensions/adblock.c:828 +#, fuzzy msgid "Edit rule" -msgstr "עריכת הכלל" +msgstr "ערוך תיקייה" -#: ../extensions/adblock.c:860 +#: ../extensions/adblock.c:842 +#, fuzzy msgid "_Rule:" -msgstr "_כלל:" +msgstr "_כותרת:" -#: ../extensions/adblock.c:914 +#: ../extensions/adblock.c:896 +#, fuzzy msgid "Bl_ock image" -msgstr "ח_סימת תמונה" +msgstr "דף ריק" -#: ../extensions/adblock.c:919 +#: ../extensions/adblock.c:901 msgid "Bl_ock link" -msgstr "חסימת _קישור" +msgstr "" -#: ../extensions/adblock.c:1620 +#: ../extensions/adblock.c:1492 msgid "Advertisement blocker" msgstr "חוסם פרסומות" -#: ../extensions/adblock.c:1621 +#: ../extensions/adblock.c:1493 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 "מסתבר כי דף זה מכיל סקריפט משתמש. האם ברצונך להתקין אותו?" +msgstr "" #: ../extensions/addons.c:222 +#, fuzzy msgid "_Install user script" -msgstr "הת_קנת סקריפט משתמש" +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 "מסתבר כי דף זה מכיל סגנון משתמש. האם ברצונך להתקין אותו?" +msgstr "" #: ../extensions/addons.c:228 msgid "_Install user style" -msgstr "הת_קנת סגנון משתמש" +msgstr "" #: ../extensions/addons.c:236 msgid "Don't install" -msgstr "לא להתקין" +msgstr "" #: ../extensions/addons.c:319 ../extensions/addons.c:681 msgid "Userscripts" -msgstr "סקריפטים מצד המשתמש" +msgstr "תסריטי משתמש" #: ../extensions/addons.c:324 ../extensions/addons.c:683 msgid "Userstyles" @@ -2337,100 +2326,105 @@ msgid "Error" msgstr "שגיאה" #: ../extensions/addons.c:421 -#, c-format +#, fuzzy, c-format msgid "Do you want to delete '%s'?" -msgstr "האם ברצונך למחוק את '%s'?" +msgstr "האם באמת ברצונך למחוק את כל העוגיות?" #: ../extensions/addons.c:427 +#, fuzzy msgid "Delete user script" -msgstr "מחיקת סקריפט מצד המשתמש" +msgstr "תסריטי משתמש" #: ../extensions/addons.c:428 +#, fuzzy msgid "Delete user style" -msgstr "מחיקת סגנון המשתמש" +msgstr "מחק הזנה" #: ../extensions/addons.c:431 -#, c-format +#, fuzzy, c-format msgid "The file %s will be permanently deleted." -msgstr "הקובץ %s יימחק לצמיתות." +msgstr "לא ניתן להוריד את הקובץ '%s'." #: ../extensions/addons.c:570 ../extensions/addons.c:647 +#, fuzzy msgid "Open in Text Editor" -msgstr "פתיחה בעורך טקסט" +msgstr "עורך טקסט" #: ../extensions/addons.c:572 ../extensions/addons.c:656 +#, fuzzy msgid "Open Target Folder" -msgstr "פתיחת תיקיית יעד" +msgstr "פתח _תיקיית יעד" #: ../extensions/addons.c:638 +#, fuzzy msgid "Add new addon" -msgstr "הוספת תוספת חדשה" +msgstr "הוסף הזנה חדשה" #: ../extensions/addons.c:664 msgid "Remove selected addon" -msgstr "הסרת התוספת הנבחרת" +msgstr "" -#: ../extensions/addons.c:1696 ../extensions/addons.c:1914 +#: ../extensions/addons.c:1691 ../extensions/addons.c:1909 msgid "User addons" -msgstr "תוספי המשתמש" +msgstr "" -#: ../extensions/addons.c:1826 +#: ../extensions/addons.c:1821 #, c-format msgid "Can't monitor folder '%s': %s" msgstr "לא ניתן לנתר אחר התיקייה '%s': ‏%s" -#: ../extensions/addons.c:1915 +#: ../extensions/addons.c:1910 msgid "Support for userscripts and userstyles" -msgstr "תמיכה בסקריפטים וערכות עיצוב מצד המשתמש" +msgstr "" -#: ../extensions/colorful-tabs.c:201 +#: ../extensions/colorful-tabs.c:202 msgid "Colorful Tabs" msgstr "לשוניות צבעוניות" -#: ../extensions/colorful-tabs.c:202 +#: ../extensions/colorful-tabs.c:203 msgid "Tint each tab distinctly" msgstr "צבע לשוניות בצבעים שונים" -#: ../extensions/cookie-manager/cookie-manager-page.c:73 +#: ../extensions/cookie-manager/cookie-manager-page.c:80 #: ../extensions/cookie-manager/main.c:35 msgid "Cookie Manager" msgstr "מנהל עוגיות" -#: ../extensions/cookie-manager/cookie-manager-page.c:103 +#: ../extensions/cookie-manager/cookie-manager-page.c:110 msgid "Delete All" msgstr "מחק הכל" -#: ../extensions/cookie-manager/cookie-manager-page.c:105 +#: ../extensions/cookie-manager/cookie-manager-page.c:112 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 +#: ../extensions/cookie-manager/cookie-manager-page.c:127 msgid "Expand All" -msgstr "הרחבת הכול" +msgstr "הרחב הכל" -#: ../extensions/cookie-manager/cookie-manager-page.c:127 +#: ../extensions/cookie-manager/cookie-manager-page.c:134 msgid "Collapse All" -msgstr "כיווץ הכול" +msgstr "כווץ הכל" -#: ../extensions/cookie-manager/cookie-manager-page.c:572 +#: ../extensions/cookie-manager/cookie-manager-page.c:576 msgid "Do you really want to delete all cookies?" msgstr "האם באמת ברצונך למחוק את כל העוגיות?" -#: ../extensions/cookie-manager/cookie-manager-page.c:574 +#: ../extensions/cookie-manager/cookie-manager-page.c:578 msgid "Question" msgstr "שאלה" -#: ../extensions/cookie-manager/cookie-manager-page.c:583 +#: ../extensions/cookie-manager/cookie-manager-page.c:587 msgid "Only cookies which match the filter will be deleted." msgstr "רק עוגיות שיתאימו למסנן ימחקו." -#: ../extensions/cookie-manager/cookie-manager-page.c:671 +#: ../extensions/cookie-manager/cookie-manager-page.c:675 msgid "At the end of the session" msgstr "בסיום ההפעלה" -#: ../extensions/cookie-manager/cookie-manager-page.c:674 +#: ../extensions/cookie-manager/cookie-manager-page.c:678 #, c-format msgid "" "Host: %s\n" @@ -2447,40 +2441,38 @@ msgstr "" "מאובטח: %s\n" "תפוגה: %s" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:684 msgid "Yes" msgstr "כן" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:684 msgid "No" msgstr "לא" -#: ../extensions/cookie-manager/cookie-manager-page.c:694 +#: ../extensions/cookie-manager/cookie-manager-page.c:698 #, c-format msgid "" "Domain: %s\n" "Cookies: %d" msgstr "" -"שם מתחם: %s\n" -"עוגיות: %d" -#: ../extensions/cookie-manager/cookie-manager-page.c:1024 +#: ../extensions/cookie-manager/cookie-manager-page.c:1028 msgid "Name" msgstr "שם" -#: ../extensions/cookie-manager/cookie-manager-page.c:1077 +#: ../extensions/cookie-manager/cookie-manager-page.c:1081 msgid "_Expand All" -msgstr "_הרחבת הכול" +msgstr "_הרחב הכל" -#: ../extensions/cookie-manager/cookie-manager-page.c:1085 +#: ../extensions/cookie-manager/cookie-manager-page.c:1089 msgid "_Collapse All" -msgstr "_כיווץ הכול" +msgstr "_כווץ הכל" -#: ../extensions/cookie-manager/cookie-manager-page.c:1139 +#: ../extensions/cookie-manager/cookie-manager-page.c:1142 msgid "Filter:" msgstr "מסנן:" -#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +#: ../extensions/cookie-manager/cookie-manager-page.c:1147 msgid "" "Enter a filter string to show only cookies whose name or domain field match " "the entered filter" @@ -2489,19 +2481,21 @@ msgstr "" #: ../extensions/cookie-manager/main.c:36 msgid "List, view and delete cookies" -msgstr "מיון, הצגה ומחיקה עוגיות" +msgstr "מיין, הצג ומחק עוגיות" #: ../extensions/copy-tabs.c:38 +#, fuzzy msgid "Copy Tab _Addresses" -msgstr "העתקת _כתובות הלשוניות" +msgstr "העתק _כתובת תמונה" #: ../extensions/copy-tabs.c:95 +#, fuzzy msgid "Copy Addresses of Tabs" -msgstr "העתקת הכתובות שמופעלות בלשוניות" +msgstr "פתח את הכתובות ב_לשונית חדשה" #: ../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." @@ -2583,130 +2577,106 @@ msgstr "סרגל ההזנות" msgid "Read Atom/ RSS feeds" msgstr "קריאת הזנות Atom/RSS" -#: ../extensions/formhistory/formhistory.c:39 +#: ../extensions/formhistory.c:143 #, 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 -#, 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 +#: ../extensions/formhistory.c:295 msgid "Toggle form history state" msgstr "" -#: ../extensions/formhistory/formhistory.c:438 +#: ../extensions/formhistory.c:296 msgid "Activate or deactivate form history for the current tab." msgstr "" -#: ../extensions/formhistory/formhistory.c:549 -#: ../extensions/formhistory/formhistory.c:553 +#: ../extensions/formhistory.c:432 ../extensions/formhistory.c:436 #, 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" +#: ../extensions/formhistory.c:511 +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 +#: ../extensions/formhistory.c:570 msgid "Stores history of entered form data" msgstr "מאחסון היסטוריה של נתונים שהוכנסו בטפסים" -#: ../extensions/formhistory/formhistory-gdom-frontend.c:225 -#: ../extensions/formhistory/formhistory-js-frontend.c:106 +#: ../extensions/formhistory.c:574 #, c-format -msgid "Failed to select suggestions\n" -msgstr "בחירת ההצעות נכשלה\n" +msgid "Not available: %s" +msgstr "לא זמין: %s" + +#: ../extensions/formhistory.c:575 +msgid "Resource files not installed" +msgstr "קבצי משאבים לא הותקנו" + +#: ../extensions/formhistory.c:581 +msgid "Form history filler" +msgstr "ממלא היסטוריית טפסים" #: ../extensions/history-list.vala:197 msgid "There are no unvisited tabs" -msgstr "ישנן לשוניות שלא ביקרת בהן" +msgstr "" #: ../extensions/history-list.vala:235 -#, c-format +#, fuzzy, c-format msgid "History-List" -msgstr "רשימת ההיסטוריה" +msgstr "רשימת היסטוריית לשוניות" #: ../extensions/history-list.vala:275 msgid "Tab closing behavior" -msgstr "התנהגות סגירת הלשוניות" +msgstr "" #: ../extensions/history-list.vala:283 msgid "Do nothing" -msgstr "לא לעשות דבר" +msgstr "" #: ../extensions/history-list.vala:289 +#, fuzzy msgid "Switch to last viewed tab" -msgstr "מעבר ללשונית האחרונה בה צפית" +msgstr "עבור אל הלשונית הבאה" #: ../extensions/history-list.vala:295 +#, fuzzy msgid "Switch to newest tab" -msgstr "מעבר ללשונית החדשה ביותר" +msgstr "עבור אל הלשונית הבאה" #: ../extensions/history-list.vala:423 +#, fuzzy msgid "Next new Tab (History List)" -msgstr "הלשונית החדשה הבאה (רשימת ההיסטוריה)" +msgstr "רשימת היסטוריית לשוניות" #: ../extensions/history-list.vala:424 msgid "Next new tab from history" -msgstr "הלשונית החדשה הבאה מההיסטוריה" +msgstr "" #: ../extensions/history-list.vala:433 +#, fuzzy msgid "Previous new Tab (History List)" -msgstr "הלשונית החדשה הקודמת (רשימת ההיסטוריה)" +msgstr "רשימת היסטוריית לשוניות" #: ../extensions/history-list.vala:434 msgid "Previous new tab from history" -msgstr "הלשונית החדשה הקודמת מההיסטוריה" +msgstr "" #: ../extensions/history-list.vala:443 msgid "Display tab in background (History List)" -msgstr "הצגת לשונית ברקע (רשימת היסטוריה)" +msgstr "" #: ../extensions/history-list.vala:444 msgid "Display the current selected tab in background" -msgstr "הצגת הלשונית הנבחרת ברקע" +msgstr "" #: ../extensions/history-list.vala:569 +#, fuzzy msgid "History List" -msgstr "רשימת ההיסטוריה" +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" @@ -2718,103 +2688,105 @@ msgstr "שליטה ב־Midori בעזרת העכבר" #: ../extensions/shortcuts.c:109 msgid "Reload page or stop loading" -msgstr "רענון או עצירת טעינת העמוד" +msgstr "" #: ../extensions/shortcuts.c:176 msgid "Customize Keyboard shortcuts" msgstr "התאמת קיצורי מקלדת" -#: ../extensions/shortcuts.c:283 -msgid "Customize Sh_ortcuts…" -msgstr "התאמת קי_צורים…" +#: ../extensions/shortcuts.c:285 +msgid "Customize Sh_ortcuts..." +msgstr "התאמת קי_צורים..." -#: ../extensions/shortcuts.c:320 +#: ../extensions/shortcuts.c:322 msgid "Shortcuts" msgstr "קיצורים" -#: ../extensions/shortcuts.c:321 +#: ../extensions/shortcuts.c:323 msgid "View and edit keyboard shortcuts" msgstr "הצגה ועריכה של קיצורי מקלדת" #: ../extensions/status-clock.c:174 +#, fuzzy msgid "Statusbar Clock" -msgstr "שעון בשורת המצב" +msgstr "_שורת מצב" #: ../extensions/status-clock.c:175 msgid "Display date and time in the statusbar" -msgstr "הצגת התאריך והשעה בשורת המצב" +msgstr "" -#: ../extensions/statusbar-features.c:131 +#: ../extensions/statusbar-features.c:128 msgid "Images" msgstr "תמונות" -#: ../extensions/statusbar-features.c:140 +#: ../extensions/statusbar-features.c:137 msgid "Scripts" -msgstr "סקריפטים" +msgstr "תסריטים" -#: ../extensions/statusbar-features.c:151 +#: ../extensions/statusbar-features.c:146 msgid "Netscape plugins" msgstr "תוספי Netscape" -#: ../extensions/statusbar-features.c:199 +#: ../extensions/statusbar-features.c:192 msgid "Statusbar Features" msgstr "תכונות שורת מצב" -#: ../extensions/statusbar-features.c:200 +#: ../extensions/statusbar-features.c:193 msgid "Easily toggle features on web pages on and off" msgstr "הפעל או כבה בקלות תכונות של דפי אינטרנט" -#: ../extensions/tab-panel.c:593 ../extensions/tab-panel.c:680 +#: ../extensions/tab-panel.c:596 ../extensions/tab-panel.c:683 msgid "Tab Panel" msgstr "סרגל לשוניות" -#: ../extensions/tab-panel.c:663 +#: ../extensions/tab-panel.c:666 msgid "T_ab Panel" msgstr "סרגל ל_שוניות" -#: ../extensions/tab-panel.c:681 +#: ../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 "רק את הסמלים שעל הלשוניות כבררת מחדל" +msgstr "" #: ../extensions/tabs-minimized.c:77 msgid "New tabs have no label by default" -msgstr "ללשוניות חדשות אין תווית כבררת מחדל" +msgstr "" #: ../extensions/toolbar-editor.c:393 msgid "Customize Toolbar" msgstr "התאמת סרגל הכלים" -#: ../extensions/toolbar-editor.c:409 +#: ../extensions/toolbar-editor.c:413 msgid "" -"Select items to be displayed on the toolbar. Items can be reordered by drag " +"Select items to be displayed on the toolbar. Items can be reodered by drag " "and drop." msgstr "בחר פריטים להצגה בסרגל הכלים. ניתן לסדר פריטים מחדש על ידי גרירתם." -#: ../extensions/toolbar-editor.c:425 +#: ../extensions/toolbar-editor.c:429 msgid "Available Items" msgstr "פריטים זמינים" -#: ../extensions/toolbar-editor.c:446 +#: ../extensions/toolbar-editor.c:450 msgid "Displayed Items" msgstr "פריטים מוצגים" -#: ../extensions/toolbar-editor.c:581 -msgid "Customize _Toolbar…" -msgstr "התאמת _סרגל הכלים…" +#: ../extensions/toolbar-editor.c:585 +msgid "Customize _Toolbar..." +msgstr "התאמת _סרגל הכלים..." -#: ../extensions/toolbar-editor.c:597 -msgid "_Customize…" -msgstr "התאמה _אישית…" +#: ../extensions/toolbar-editor.c:601 +#, fuzzy +msgid "_Customize..." +msgstr "מותאם..." -#: ../extensions/toolbar-editor.c:627 +#: ../extensions/toolbar-editor.c:631 msgid "Toolbar Editor" -msgstr "עורך סרגלי הכלים" +msgstr "עורך סרגל כלים" -#: ../extensions/toolbar-editor.c:628 +#: ../extensions/toolbar-editor.c:632 msgid "Easily edit the toolbar layout" msgstr "ערוך בקלות את מבנה סגרל הכלים" @@ -2822,30 +2794,6 @@ msgstr "ערוך בקלות את מבנה סגרל הכלים" 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 "שחזר ל_הפעלה האחרונה" @@ -2921,11 +2869,11 @@ msgstr "אגירת נתוני תקשורת HTTP על הכונן" #~ msgid "Add a new bookmark folder" #~ msgstr "הוסף תיקיית סימניות חדשה" -#~ msgid "Add, edit and remove search engines…" -#~ msgstr "הוסף, ערוך והסר מנועי חיפוש…" +#~ msgid "Add, edit and remove search engines..." +#~ msgstr "הוסף, ערוך והסר מנועי חיפוש..." -#~ msgid "Clear private data…" -#~ msgstr "נקה נתונים אישיים…" +#~ msgid "Clear private data..." +#~ msgstr "נקה נתונים אישיים..." #~ msgid "Switch to the previous tab" #~ msgstr "עבור אל הלשונית הקודמת" @@ -3107,8 +3055,11 @@ msgstr "אגירת נתוני תקשורת HTTP על הכונן" #~ msgid "days" #~ msgstr "ימים" -#~ msgid "Configure _Advertisement filters…" -#~ msgstr "הגדרת מסנני _פרסומות…" +#~ msgid "Configure _Advertisement filters..." +#~ msgstr "הגדרת מסנני _פרסומות..." + +#~ msgid "_Form History" +#~ msgstr "_היסטוריה" #~ msgid "Next Tab (History List)" #~ msgstr "רשימת היסטוריית לשוניות" @@ -3227,6 +3178,9 @@ msgstr "אגירת נתוני תקשורת HTTP על הכונן" #~ msgid "_Cookie Manager" #~ msgstr "מנהל _עוגיות" +#~ msgid "DNS prefetching" +#~ msgstr "‏DNS מסודר מראש" + #~ msgid "Prefetch IP addresses of hovered links" #~ msgstr "קבל מראש כתובות IP של קישורים במעבר עכבר" diff --git a/po/hr.po b/po/hr.po index 5a3bf9d8..cd156bcf 100644 --- a/po/hr.po +++ b/po/hr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Midori\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-23 23:06+0000\n" +"POT-Creation-Date: 2011-11-30 16:42+0000\n" "PO-Revision-Date: 2010-12-22 21:45+0100\n" "Last-Translator: Ivica Kolić \n" "Language-Team: Croatian <>\n" @@ -19,127 +19,122 @@ msgstr "" "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 "Browse the Web" -msgstr "Pretraži web" +msgid "Internet;WWW;Explorer" +msgstr "" #: ../data/midori.desktop.in.h:2 -msgid "Internet;WWW;Explorer" -msgstr "Internet;WWW;Explorer" +msgid "Lightweight web browser" +msgstr "Lagani web preglednik" -#: ../data/midori.desktop.in.h:3 ../midori/main.c:2009 ../midori/main.c:2033 -#: ../midori/main.c:2047 ../midori/midori-websettings.c:316 +#: ../data/midori.desktop.in.h:3 ../midori/main.c:2005 ../midori/main.c:2025 +#: ../midori/main.c:2036 ../midori/midori-websettings.c:303 msgid "Midori" msgstr "Midori" #: ../data/midori.desktop.in.h:4 -msgid "Midori Web Browser" -msgstr "Midori web preglednik" - -#: ../data/midori.desktop.in.h:5 -msgid "New Private Browsing Window" -msgstr "Novi prozor privatnog pretraživanja" - -#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1491 -msgid "New Tab" -msgstr "Nova kartica" - -#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1488 -msgid "New Window" -msgstr "Novi prozor" - -#: ../data/midori.desktop.in.h:8 msgid "Web Browser" msgstr "Web preglednik" #: ../data/midori-private.desktop.in.h:1 +#, fuzzy msgid "Midori Private Browsing" -msgstr "Midori privatno pretraživanje" +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:4505 +#: ../data/midori-private.desktop.in.h:3 msgid "Private Browsing" msgstr " (Privatno pretraživanje)" -#: ../midori/main.c:91 ../midori/main.c:97 +#: ../midori/main.c:96 ../midori/main.c:102 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Konfiguracija ne može biti učitana: %s\n" -#: ../midori/main.c:145 +#: ../midori/main.c:150 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Vrijednost '%s' nije valjana za %s" -#: ../midori/main.c:150 ../midori/main.c:254 +#: ../midori/main.c:155 ../midori/main.c:261 #, c-format msgid "Invalid configuration value '%s'" msgstr "Neispravna konfiguracijska vrijednost '%s'" -#: ../midori/main.c:375 +#: ../midori/main.c:366 #, 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:429 +#: ../midori/main.c:420 #, c-format msgid "Failed to clear history: %s\n" msgstr "Neuspjelo uklanjanje povijesti: %s\n" -#: ../midori/main.c:451 ../extensions/formhistory/formhistory.c:531 +#: ../midori/main.c:440 ../midori/main.c:561 ../extensions/formhistory.c:417 #, 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:523 +#: ../midori/main.c:504 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Neuspjelo uklanjanje starih stavki povijesti: %s\n" -#: ../midori/main.c:545 +#: ../midori/main.c:544 ../panels/midori-history.c:189 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "Neuspjelo uklanjanje stavke povijesti: %s\n" + +#: ../midori/main.c:591 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "ZabiljeÅ¡ke ne mogu biti spremljene. %s" + +#: ../midori/main.c:624 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Konfiguracija ne može biti spremljena. %s" -#: ../midori/main.c:571 +#: ../midori/main.c:659 #, 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:608 +#: ../midori/main.c:685 ../midori/main.c:705 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Smeće ne može biti spremljeno. %s" -#: ../midori/main.c:681 ../panels/midori-extensions.c:90 +#: ../midori/main.c:739 ../panels/midori-extensions.c:91 msgid "Extensions" msgstr "ProÅ¡irenja" -#: ../midori/main.c:695 +#: ../midori/main.c:753 msgid "Privacy" msgstr "Privatnost" -#: ../midori/main.c:707 +#: ../midori/main.c:765 msgid "" "Cookies store login data, saved games, or user profiles for advertisement " "purposes." msgstr "" -#: ../midori/main.c:763 +#: ../midori/main.c:821 #, c-format msgid "The session couldn't be saved. %s" msgstr "Sesija ne može biti spremljena. %s" -#: ../midori/main.c:985 +#: ../midori/main.c:1031 msgid "" "No root certificate file is available. SSL certificates cannot be verified." msgstr "" -#: ../midori/main.c:1077 +#: ../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." @@ -147,225 +142,243 @@ 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:1096 +#: ../midori/main.c:1118 msgid "Modify _preferences" msgstr "Izmjeni _osobitosti" -#: ../midori/main.c:1100 +#: ../midori/main.c:1122 msgid "Disable all _extensions" msgstr "Onemogući sva _proÅ¡irenja" -#: ../midori/main.c:1113 +#: ../midori/main.c:1135 msgid "Discard old tabs" msgstr "" -#: ../midori/main.c:1114 ../midori/midori-websettings.c:224 +#: ../midori/main.c:1136 ../midori/midori-websettings.c:212 msgid "Show last tabs without loading" msgstr "Pokaži zadnje kartice bez učitavanja" -#: ../midori/main.c:1115 ../midori/midori-websettings.c:223 +#: ../midori/main.c:1137 ../midori/midori-websettings.c:211 msgid "Show last open tabs" msgstr "Pokaži zadnje otvorene kartice" -#: ../midori/main.c:1363 ../midori/main.c:2417 +#: ../midori/main.c:1345 ../midori/main.c:2408 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Sesija ne može biti učitana: %s\n" -#: ../midori/main.c:1501 +#: ../midori/main.c:1484 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Snimak spremljen u:%s\n" -#: ../midori/main.c:1917 +#: ../midori/main.c:1908 msgid "Run ADDRESS as a web application" msgstr "Pokreni Adresu kao web aplikaciju" -#: ../midori/main.c:1917 +#: ../midori/main.c:1908 msgid "ADDRESS" msgstr "ADRESA" -#: ../midori/main.c:1920 +#: ../midori/main.c:1911 msgid "Use FOLDER as configuration folder" msgstr "Koristi MAPU kao konfiguracijsku mapu" -#: ../midori/main.c:1920 +#: ../midori/main.c:1911 msgid "FOLDER" msgstr "MAPA" -#: ../midori/main.c:1923 +#: ../midori/main.c:1914 msgid "Private browsing, no changes are saved" msgstr "Privatno pregledavanje, promjene nisu spremljene" -#: ../midori/main.c:1925 +#: ../midori/main.c:1916 msgid "Show a diagnostic dialog" msgstr "Pokaži dijagnostički dijalog" -#: ../midori/main.c:1927 +#: ../midori/main.c:1918 msgid "Run the specified filename as javascript" msgstr "Pokreni naznačeno ime datoteke kao javascript" -#: ../midori/main.c:1929 +#: ../midori/main.c:1920 msgid "Take a snapshot of the specified URI" msgstr "" -#: ../midori/main.c:1931 +#: ../midori/main.c:1922 msgid "Execute the specified command" msgstr "IzvrÅ¡i naznačenu naredbu" -#: ../midori/main.c:1933 +#: ../midori/main.c:1924 msgid "List available commands to execute with -e/ --execute" msgstr "Listaj dostupne naredbe za izvrÅ¡avanje pomoću -e/ --execute" -#: ../midori/main.c:1935 +#: ../midori/main.c:1926 msgid "Display program version" msgstr "Prikaži verziju programa" -#: ../midori/main.c:1937 +#: ../midori/main.c:1928 msgid "Addresses" msgstr "Adrese" -#: ../midori/main.c:1939 +#: ../midori/main.c:1930 msgid "Block URIs according to regular expression PATTERN" msgstr "" -#: ../midori/main.c:1939 +#: ../midori/main.c:1930 msgid "PATTERN" msgstr "UZORAK" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1943 +#: ../midori/main.c:1934 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "" -#: ../midori/main.c:1943 +#: ../midori/main.c:1934 msgid "SECONDS" msgstr "SEKUNDE" -#: ../midori/main.c:1946 +#: ../midori/main.c:1937 msgid "Redirects console warnings to the specified FILENAME" msgstr "" -#: ../midori/main.c:1946 +#: ../midori/main.c:1937 msgid "FILENAME" msgstr "DATOTEKA" -#: ../midori/main.c:2048 +#: ../midori/main.c:2002 +msgid "[Addresses]" +msgstr "[Adrese]" + +#: ../midori/main.c:2012 +msgid "The specified configuration folder is invalid." +msgstr "Određena konfiguracijaka mapa nije valjana" + +#: ../midori/main.c:2037 msgid "Please report comments, suggestions and bugs to:" msgstr "Prijavite komentare,sugestije i probleme u:" -#: ../midori/main.c:2050 +#: ../midori/main.c:2039 msgid "Check for new versions at:" msgstr "Provjeri za nove verzije na:" +#: ../midori/main.c:2122 +msgid "Website icons" +msgstr "Website ikone" + #. i18n: Logins and passwords in websites and web forms -#: ../midori/main.c:2145 +#: ../midori/main.c:2125 msgid "Saved logins and _passwords" msgstr "Spremljene prijave i _lozinke" -#: ../midori/main.c:2147 -msgid "Cookies and Website data" -msgstr "" +#: ../midori/main.c:2127 +msgid "Cookies" +msgstr "Kolačići" + +#: ../midori/main.c:2130 +msgid "'Flash' Cookies" +msgstr "'Flash' kolačići" + +#: ../midori/main.c:2133 +msgid "HTML5 _Databases" +msgstr "Omogući _podrÅ¡ku za HTML5 bazu podataka" -#. TODO: Preserve page icons of search engines and merge privacy items -#: ../midori/main.c:2151 ../midori/midori-websettings.c:1021 +#: ../midori/main.c:2136 ../midori/midori-websettings.c:936 #: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471 msgid "Web Cache" msgstr "" -#: ../midori/main.c:2154 -msgid "Website icons" -msgstr "Website ikone" +#: ../midori/main.c:2138 +msgid "Offline Application Cache" +msgstr "" -#: ../midori/main.c:2258 +#: ../midori/main.c:2241 msgid "An unknown error occured" msgstr "Nepoznata greÅ¡ka" -#: ../midori/main.c:2365 +#: ../midori/main.c:2339 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:2399 +#: ../midori/main.c:2375 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "ZabiljeÅ¡ke ne mogu biti učitane: %s\n" -#: ../midori/main.c:2432 +#: ../midori/main.c:2423 #, 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:2445 +#: ../midori/main.c:2436 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Povijest ne može biti učitana: %s\n" -#: ../midori/main.c:2460 +#: ../midori/main.c:2452 msgid "The following errors occured:" msgstr "DoÅ¡lo je do slijedeće greÅ¡ke:" -#: ../midori/main.c:2476 +#: ../midori/main.c:2468 msgid "_Ignore" msgstr "_Ignoriraj" -#: ../midori/midori-app.c:1155 ../midori/midori-browser.c:557 -#, c-format -msgid "Unexpected action '%s'." -msgstr "Neočekivana radnja '%s'." +#: ../midori/midori-app.c:1335 +msgid "_Bookmark" +msgstr "_ZabiljeÅ¡ka" -#: ../midori/midori-app.c:1459 ../midori/midori-browser.c:6452 +#: ../midori/midori-app.c:1336 ../midori/midori-browser.c:5982 msgid "_Bookmarks" msgstr "_ZabiljeÅ¡ke" -#: ../midori/midori-app.c:1460 +#: ../midori/midori-app.c:1337 msgid "Add Boo_kmark" msgstr "Dodaj za_biljeÅ¡ku" -#: ../midori/midori-app.c:1461 +#: ../midori/midori-app.c:1338 +msgid "_Console" +msgstr "" + +#: ../midori/midori-app.c:1339 msgid "_Extensions" msgstr "_ProÅ¡irenja" #. i18n: Browsing history, visited web pages, closed tabs -#: ../midori/midori-app.c:1462 ../midori/midori-browser.c:4905 +#: ../midori/midori-app.c:1340 ../midori/midori-browser.c:4577 msgid "_History" msgstr "_Povijest" -#: ../midori/midori-app.c:1463 +#: ../midori/midori-app.c:1341 +msgid "_Homepage" +msgstr "_Početna stranica" + +#: ../midori/midori-app.c:1342 msgid "_Userscripts" msgstr "_Korisničke skripte" -#: ../midori/midori-app.c:1464 -msgid "User_styles" -msgstr "Korisnički_stilovi" - -#: ../midori/midori-app.c:1465 +#: ../midori/midori-app.c:1343 msgid "New _Tab" msgstr "Nova _kartica" -#: ../midori/midori-app.c:1466 +#: ../midori/midori-app.c:1344 msgid "_Transfers" msgstr "_Prijenosi" -#: ../midori/midori-app.c:1467 +#: ../midori/midori-app.c:1345 msgid "Netscape p_lugins" msgstr "Netscape p_riključci" -#: ../midori/midori-app.c:1468 +#: ../midori/midori-app.c:1346 msgid "_Closed Tabs" msgstr "_Zatvorene kartice" -#: ../midori/midori-app.c:1469 ../midori/midori-browser.c:5588 +#: ../midori/midori-app.c:1347 ../midori/midori-browser.c:5165 msgid "New _Window" msgstr "Novi _prozor" -#: ../midori/midori-app.c:1470 +#: ../midori/midori-app.c:1348 msgid "New _Folder" msgstr "Nova _mapa" -#: ../midori/midori-app.c:1499 -msgid "[Addresses]" -msgstr "[Adrese]" - #: ../midori/midori-array.c:522 msgid "File not found." msgstr "Datoteka nije pronađena." @@ -383,133 +396,124 @@ msgstr "Neprepoznati format zabiljeÅ¡ke." msgid "Writing failed." msgstr "Neuspjelo pisanje." -#: ../midori/midori-browser.c:359 ../midori/midori-browser.c:5676 -#: ../midori/midori-browser.c:5685 +#: ../midori/midori-browser.c:329 ../midori/midori-browser.c:5247 +#: ../midori/midori-browser.c:5256 msgid "Reload the current page" msgstr "Učitaj ponovo trenutnu stranicu" -#: ../midori/midori-browser.c:368 ../midori/midori-browser.c:5682 +#: ../midori/midori-browser.c:337 ../midori/midori-browser.c:5253 msgid "Stop loading the current page" msgstr "Prestani učitavati trenutnu stranicu" -#: ../midori/midori-browser.c:376 ../midori/midori-browser.c:5727 -msgid "Go forward to the next page" -msgstr "Naprijed na idući stranicu" - -#. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:383 ../midori/midori-browser.c:5735 -#: ../midori/midori-browser.c:5738 -msgid "Go to the next sub-page" -msgstr "Idi na iduću podstranicu" - -#: ../midori/midori-browser.c:542 +#: ../midori/midori-browser.c:462 #, c-format msgid "Failed to update title: %s\n" msgstr "Neuspjeh u ažuriranju naslova: %s\n" -#: ../midori/midori-browser.c:637 +#: ../midori/midori-browser.c:475 +#, c-format +msgid "Unexpected action '%s'." +msgstr "Neočekivana radnja '%s'." + +#: ../midori/midori-browser.c:576 #, c-format msgid "%s (Private Browsing)" msgstr "%s (Privatno pretraživanje)" -#: ../midori/midori-browser.c:747 ../midori/midori-browser.c:789 -#: ../panels/midori-bookmarks.c:114 -msgid "Bookmarks" -msgstr "ZabiljeÅ¡ke" +#: ../midori/midori-browser.c:687 ../midori/midori-browser.c:720 +msgid "Toplevel folder" +msgstr "" -#: ../midori/midori-browser.c:849 +#: ../midori/midori-browser.c:777 msgid "New folder" msgstr "Nova mapa" -#: ../midori/midori-browser.c:849 +#: ../midori/midori-browser.c:777 msgid "Edit folder" msgstr "Uredi mapu" -#: ../midori/midori-browser.c:851 +#: ../midori/midori-browser.c:779 msgid "New bookmark" msgstr "Nova zabiljeÅ¡ka" -#: ../midori/midori-browser.c:851 +#: ../midori/midori-browser.c:779 msgid "Edit bookmark" msgstr "Uredi zabiljeÅ¡ku" -#: ../midori/midori-browser.c:885 -msgid "Type a name for this bookmark and choose where to keep it." -msgstr "" +#: ../midori/midori-browser.c:810 +msgid "_Title:" +msgstr "_Naslov:" + +#: ../midori/midori-browser.c:830 ../midori/midori-searchaction.c:966 +#: ../extensions/feed-panel/main.c:377 +msgid "_Address:" +msgstr "_Adresa:" + +#: ../midori/midori-browser.c:853 ../midori/midori-browser.c:4312 +msgid "_Folder:" +msgstr "_Mapa:" -#: ../midori/midori-browser.c:946 +#: ../midori/midori-browser.c:869 msgid "Add to _Speed Dial" msgstr "Dodaj u _brzo biranje" -#: ../midori/midori-browser.c:952 +#: ../midori/midori-browser.c:882 msgid "Show in the tool_bar" msgstr "Prikaži u alatnoj_traci" -#: ../midori/midori-browser.c:960 +#: ../midori/midori-browser.c:897 msgid "Run as _web application" msgstr "Pokreni kao _web aplikaciju" -#: ../midori/midori-browser.c:1031 +#: ../midori/midori-browser.c:968 #, 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:1033 +#: ../midori/midori-browser.c:970 #, 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:1040 +#: ../midori/midori-browser.c:977 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Nema dovoljno slobodnog prostora za preuzimanje \"%s\"." -#: ../midori/midori-browser.c:1043 +#: ../midori/midori-browser.c:980 #, c-format msgid "The file needs %s but only %s are left." msgstr "Datoteci je potrebno %s ali samo %s je preostalo." -#: ../midori/midori-browser.c:1179 ../midori/midori-browser.c:4709 +#: ../midori/midori-browser.c:1024 ../midori/midori-browser.c:4382 msgid "Save file as" msgstr "Spremi datoteku kao" -#: ../midori/midori-browser.c:1185 -msgid "Save associated _resources" -msgstr "" +#: ../midori/midori-browser.c:1333 +msgid "New Window" +msgstr "Novi prozor" -#: ../midori/midori-browser.c:1488 +#: ../midori/midori-browser.c:1333 msgid "A new window has been opened" msgstr "Otvoren je novi prozor" -#: ../midori/midori-browser.c:1491 +#: ../midori/midori-browser.c:1336 +msgid "New Tab" +msgstr "Nova kartica" + +#: ../midori/midori-browser.c:1336 msgid "A new tab has been opened" msgstr "Otvorena je nova kartica" -#: ../midori/midori-browser.c:1508 -msgid "Error opening the image!" -msgstr "GreÅ¡ka pri otvaranju slike!" - -#: ../midori/midori-browser.c:1509 -msgid "Can not open selected image in a default viewer." -msgstr "Ne mogu otvoriti odabranu sliku u zadanom pregledniku." - -#: ../midori/midori-browser.c:1515 -msgid "Error downloading the image!" -msgstr "GreÅ¡ka pri preuzimanju slike!" - -#: ../midori/midori-browser.c:1516 -msgid "Can not download selected image." -msgstr "Ne mogu preuzeti odabranu sliku." - -#: ../midori/midori-browser.c:1637 +#: ../midori/midori-browser.c:1373 msgid "Save file" msgstr "Spremi datoteku" -#: ../midori/midori-browser.c:2540 +#: ../midori/midori-browser.c:2265 msgid "Open file" msgstr "Otvori datoteku" -#: ../midori/midori-browser.c:2672 +#: ../midori/midori-browser.c:2396 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" @@ -518,153 +522,139 @@ msgid "" "automatically." msgstr "" -#: ../midori/midori-browser.c:2678 ../extensions/feed-panel/main.c:365 +#: ../midori/midori-browser.c:2402 ../extensions/feed-panel/main.c:365 msgid "New feed" msgstr "" -#: ../midori/midori-browser.c:2721 ../midori/midori-browser.c:5751 -#: ../panels/midori-bookmarks.c:527 +#: ../midori/midori-browser.c:2445 ../midori/midori-browser.c:5316 +#: ../panels/midori-bookmarks.c:432 msgid "Add a new bookmark" msgstr "Dodaj novu zabiljeÅ¡ku" -#: ../midori/midori-browser.c:3265 ../midori/midori-searchaction.c:487 +#: ../midori/midori-browser.c:2971 ../midori/midori-searchaction.c:487 msgid "Empty" msgstr "Prazno" -#: ../midori/midori-browser.c:3711 ../midori/midori-browser.c:3712 +#: ../midori/midori-browser.c:3461 msgid "Toggle text cursor navigation" msgstr "" -#: ../midori/midori-browser.c:3714 -msgid "" -"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in " -"all websites." -msgstr "" - -#: ../midori/midori-browser.c:3717 -msgid "_Enable Caret Browsing" -msgstr "" - -#: ../midori/midori-browser.c:4109 ../midori/midori-browser.c:6145 +#: ../midori/midori-browser.c:3773 ../midori/midori-browser.c:5723 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Nespjelo dodavanje nove stavke povijesti: %s\n" -#: ../midori/midori-browser.c:4435 ../panels/midori-bookmarks.c:850 -#: ../panels/midori-history.c:806 +#: ../midori/midori-browser.c:4109 ../panels/midori-bookmarks.c:748 +#: ../panels/midori-history.c:747 msgid "Open all in _Tabs" msgstr "Otvori sve u _karticama" -#: ../midori/midori-browser.c:4442 ../panels/midori-bookmarks.c:856 -#: ../panels/midori-history.c:812 ../extensions/feed-panel/feed-panel.c:528 +#: ../midori/midori-browser.c:4116 ../panels/midori-bookmarks.c:754 +#: ../panels/midori-history.c:753 ../extensions/feed-panel/feed-panel.c:528 msgid "Open in New _Tab" msgstr "Otvori u novoj _kartici" -#: ../midori/midori-browser.c:4445 ../midori/midori-view.c:2944 -#: ../midori/midori-view.c:5082 ../panels/midori-bookmarks.c:858 -#: ../panels/midori-history.c:814 ../extensions/feed-panel/feed-panel.c:530 +#: ../midori/midori-browser.c:4119 ../midori/midori-view.c:2530 +#: ../midori/midori-view.c:4357 ../panels/midori-bookmarks.c:756 +#: ../panels/midori-history.c:755 ../extensions/feed-panel/feed-panel.c:530 msgid "Open in New _Window" msgstr "Otvori u novom _prozoru" -#: ../midori/midori-browser.c:4534 +#: ../midori/midori-browser.c:4199 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4535 +#: ../midori/midori-browser.c:4200 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4536 +#: ../midori/midori-browser.c:4201 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4537 +#: ../midori/midori-browser.c:4202 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4538 +#: ../midori/midori-browser.c:4203 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4539 +#: ../midori/midori-browser.c:4204 #, c-format msgid "Firefox (%s)" msgstr "Firefox (%s)" -#: ../midori/midori-browser.c:4540 -msgid "Midori 0.2.6" -msgstr "Midori 0.2.6" - -#: ../midori/midori-browser.c:4561 -msgid "Import bookmarks…" +#: ../midori/midori-browser.c:4225 +msgid "Import bookmarks..." msgstr "Uvezi zabiljeÅ¡ke..." -#: ../midori/midori-browser.c:4564 ../midori/midori-browser.c:5756 +#: ../midori/midori-browser.c:4228 ../midori/midori-browser.c:5321 msgid "_Import bookmarks" msgstr "_Uvezi zabiljeÅ¡ke" -#: ../midori/midori-browser.c:4575 +#: ../midori/midori-browser.c:4239 msgid "_Application:" msgstr "_Program:" -#: ../midori/midori-browser.c:4640 +#: ../midori/midori-browser.c:4304 msgid "Import from XBEL or HTML file" msgstr "Uvezi iz XBEL ili HTML datoteke" -#: ../midori/midori-browser.c:4668 +#: ../midori/midori-browser.c:4339 msgid "Import from a file" msgstr "Uvezi iz datoteke" -#: ../midori/midori-browser.c:4680 +#: ../midori/midori-browser.c:4351 msgid "Failed to import bookmarks" msgstr "Neuspjeli uvoz zabiljeÅ¡ki" -#: ../midori/midori-browser.c:4714 +#: ../midori/midori-browser.c:4387 msgid "XBEL Bookmarks" msgstr "XBEL zabiljeÅ¡ke" -#: ../midori/midori-browser.c:4719 +#: ../midori/midori-browser.c:4392 msgid "Netscape Bookmarks" msgstr "Netscape zabiljeÅ¡ke" -#: ../midori/midori-browser.c:4733 +#: ../midori/midori-browser.c:4406 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:4748 +#: ../midori/midori-browser.c:4422 msgid "Failed to export bookmarks" msgstr "Neuspjeli izvoz zabiljeÅ¡ki" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4870 +#: ../midori/midori-browser.c:4544 msgid "Clear Private Data" msgstr "Očisti privatne podatke" -#: ../midori/midori-browser.c:4874 +#: ../midori/midori-browser.c:4548 msgid "_Clear private data" msgstr "_Očisti privatne podatke" -#: ../midori/midori-browser.c:4889 +#: ../midori/midori-browser.c:4561 msgid "Clear the following data:" msgstr "Očisti slijedeće podatke:" -#: ../midori/midori-browser.c:4899 +#: ../midori/midori-browser.c:4571 msgid "Last open _tabs" msgstr "Zadnje otvorene _kartice" -#: ../midori/midori-browser.c:4925 +#: ../midori/midori-browser.c:4597 msgid "Clear private data when _quitting Midori" msgstr "Očisti privatne podatke kad _isključujeÅ¡ Midori" -#: ../midori/midori-browser.c:5140 +#: ../midori/midori-browser.c:4773 msgid "A lightweight web browser." msgstr "Lagani web preglednik" -#: ../midori/midori-browser.c:5141 +#: ../midori/midori-browser.c:4774 msgid "See about:version for version info." msgstr "Vidi about:version za informacije o verziji" -#: ../midori/midori-browser.c:5143 +#: ../midori/midori-browser.c:4776 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 " @@ -672,1431 +662,1283 @@ msgid "" "option) any later version." msgstr "" -#: ../midori/midori-browser.c:5173 +#: ../midori/midori-browser.c:4797 msgid "translator-credits" msgstr "Ivica Kolić " -#: ../midori/midori-browser.c:5586 +#: ../midori/midori-browser.c:5163 msgid "_File" msgstr "_Datoteka" -#: ../midori/midori-browser.c:5589 +#: ../midori/midori-browser.c:5166 msgid "Open a new window" msgstr "Otvori u novom prozoru" -#: ../midori/midori-browser.c:5592 +#: ../midori/midori-browser.c:5169 msgid "Open a new tab" msgstr "Otvori novu karticu" -#: ../midori/midori-browser.c:5594 +#: ../midori/midori-browser.c:5171 msgid "New P_rivate Browsing Window" msgstr "Novi p_rozor privatnog pretraživanja" -#: ../midori/midori-browser.c:5598 +#: ../midori/midori-browser.c:5175 msgid "Open a file" msgstr "Otvori datoteku" -#: ../midori/midori-browser.c:5600 -msgid "_Save Page As…" +#: ../midori/midori-browser.c:5177 +msgid "_Save Page As..." msgstr "_Spremi stranicu kao..." -#: ../midori/midori-browser.c:5601 +#: ../midori/midori-browser.c:5178 msgid "Save to a file" msgstr "Spremi u datoteku" -#: ../midori/midori-browser.c:5603 +#: ../midori/midori-browser.c:5180 msgid "Add to Speed _dial" msgstr "Dodaj u Brzo _biranje" -#: ../midori/midori-browser.c:5607 +#: ../midori/midori-browser.c:5184 msgid "Add Shortcut to the _desktop" msgstr "Dodaj prečac na _radnu povrÅ¡inu" -#: ../midori/midori-browser.c:5609 +#: ../midori/midori-browser.c:5186 msgid "Create _Launcher" msgstr "Napravi _pokretač" -#: ../midori/midori-browser.c:5613 +#: ../midori/midori-browser.c:5190 msgid "Subscribe to News _feed" msgstr "" -#: ../midori/midori-browser.c:5619 +#: ../midori/midori-browser.c:5196 msgid "_Close Tab" msgstr "_Zatvori karticu" -#: ../midori/midori-browser.c:5620 +#: ../midori/midori-browser.c:5197 msgid "Close the current tab" msgstr "Zatvori trenutnu karticu" -#: ../midori/midori-browser.c:5622 +#: ../midori/midori-browser.c:5199 msgid "C_lose Window" msgstr "Z_atvori prozor" -#: ../midori/midori-browser.c:5626 -msgid "_Share" -msgstr "" - -#: ../midori/midori-browser.c:5631 +#: ../midori/midori-browser.c:5203 msgid "Print the current page" msgstr "IspiÅ¡i trenutnu stranicu" -#: ../midori/midori-browser.c:5634 +#: ../midori/midori-browser.c:5205 msgid "Close a_ll Windows" msgstr "Zatvori s_ve prozore" -#: ../midori/midori-browser.c:5637 +#: ../midori/midori-browser.c:5208 msgid "_Edit" msgstr "_Uredi" -#: ../midori/midori-browser.c:5660 -msgid "_Find…" +#: ../midori/midori-browser.c:5231 +msgid "_Find..." msgstr "_Nađi..." -#: ../midori/midori-browser.c:5661 +#: ../midori/midori-browser.c:5232 msgid "Find a word or phrase in the page" msgstr "Nađi riječ ili frazu na stranici" -#: ../midori/midori-browser.c:5663 +#: ../midori/midori-browser.c:5234 msgid "Find _Next" msgstr "Nađi _slijedeće" -#: ../midori/midori-browser.c:5666 +#: ../midori/midori-browser.c:5237 msgid "Find _Previous" msgstr "Nađi _prethodno" -#: ../midori/midori-browser.c:5670 +#: ../midori/midori-browser.c:5241 msgid "Configure the application preferences" msgstr "Konfiguriraj postavke programa" -#: ../midori/midori-browser.c:5672 +#: ../midori/midori-browser.c:5243 msgid "_View" msgstr "_Pogled" -#: ../midori/midori-browser.c:5673 +#: ../midori/midori-browser.c:5244 msgid "_Toolbars" msgstr "_Alatne trake" -#: ../midori/midori-browser.c:5678 +#: ../midori/midori-browser.c:5249 msgid "Reload page without caching" msgstr "" -#: ../midori/midori-browser.c:5688 +#: ../midori/midori-browser.c:5259 msgid "Increase the zoom level" msgstr "Povećaj zoom razinu" -#: ../midori/midori-browser.c:5691 +#: ../midori/midori-browser.c:5262 msgid "Decrease the zoom level" msgstr "Smanji zoom razinu" -#: ../midori/midori-browser.c:5695 +#: ../midori/midori-browser.c:5266 msgid "_Encoding" msgstr "_Kodiranje" -#: ../midori/midori-browser.c:5697 +#: ../midori/midori-browser.c:5268 msgid "View So_urce" msgstr "" -#: ../midori/midori-browser.c:5700 +#: ../midori/midori-browser.c:5271 msgid "Ca_ret Browsing" msgstr "" -#: ../midori/midori-browser.c:5704 +#: ../midori/midori-browser.c:5275 msgid "Toggle fullscreen view" msgstr "" -#: ../midori/midori-browser.c:5706 +#: ../midori/midori-browser.c:5277 msgid "Scroll _Left" msgstr "Kliži _Lijevo" -#: ../midori/midori-browser.c:5709 +#: ../midori/midori-browser.c:5280 msgid "Scroll _Down" msgstr "Kliži _Dolje" -#: ../midori/midori-browser.c:5712 +#: ../midori/midori-browser.c:5283 msgid "Scroll _Up" msgstr "Kliži _Gore" -#: ../midori/midori-browser.c:5715 +#: ../midori/midori-browser.c:5286 msgid "Scroll _Right" msgstr "Kližu _Desno" -#: ../midori/midori-browser.c:5718 -msgid "_Readable" -msgstr "" - -#: ../midori/midori-browser.c:5721 +#: ../midori/midori-browser.c:5289 msgid "_Go" msgstr "_Idi" -#: ../midori/midori-browser.c:5724 +#: ../midori/midori-browser.c:5292 msgid "Go back to the previous page" msgstr "Natrag na prethodnu stranicu" +#: ../midori/midori-browser.c:5295 +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:5731 +#: ../midori/midori-browser.c:5299 msgid "Go to the previous sub-page" msgstr "Idi na prethodnu podstranicu" -#: ../midori/midori-browser.c:5740 -msgid "_Homepage" -msgstr "_Početna stranica" +#. i18n: Visit the following logical page, ie. in a forum or blog +#: ../midori/midori-browser.c:5303 +msgid "Go to the next sub-page" +msgstr "Idi na iduću podstranicu" -#: ../midori/midori-browser.c:5741 +#: ../midori/midori-browser.c:5306 msgid "Go to your homepage" msgstr "Idi na svoju početnu stranicu" -#: ../midori/midori-browser.c:5743 +#: ../midori/midori-browser.c:5308 msgid "Empty Trash" msgstr "Isprazni smeće" -#: ../midori/midori-browser.c:5746 +#: ../midori/midori-browser.c:5311 msgid "Undo _Close Tab" msgstr "PoniÅ¡ti _zatvori karticu" -#: ../midori/midori-browser.c:5753 +#: ../midori/midori-browser.c:5318 msgid "Add a new _folder" msgstr "Dodaj novu _mapu" -#: ../midori/midori-browser.c:5759 +#: ../midori/midori-browser.c:5324 msgid "_Export bookmarks" msgstr "_Izvezi zabiljeÅ¡ke" -#: ../midori/midori-browser.c:5762 ../midori/midori-searchaction.c:496 +#: ../midori/midori-browser.c:5327 ../midori/midori-searchaction.c:496 msgid "_Manage Search Engines" msgstr "_Upravljaj tražilicama" -#: ../midori/midori-browser.c:5765 +#: ../midori/midori-browser.c:5330 msgid "_Clear Private Data" msgstr "_Očisti privatne podatke" -#: ../midori/midori-browser.c:5768 +#: ../midori/midori-browser.c:5333 msgid "_Inspect Page" msgstr "" -#: ../midori/midori-browser.c:5772 +#: ../midori/midori-browser.c:5337 msgid "_Previous Tab" msgstr "_Prethodna kartica" -#: ../midori/midori-browser.c:5775 +#: ../midori/midori-browser.c:5340 msgid "_Next Tab" msgstr "_Slijedeća kartica" -#: ../midori/midori-browser.c:5777 +#: ../midori/midori-browser.c:5342 msgid "Move Tab _Backward" msgstr "_Premjesti karticu unazad" -#: ../midori/midori-browser.c:5779 +#: ../midori/midori-browser.c:5344 msgid "_Move Tab Forward" msgstr "_Premjesti karticu naprijed" -#: ../midori/midori-browser.c:5782 +#: ../midori/midori-browser.c:5347 msgid "Focus _Current Tab" msgstr "" -#: ../midori/midori-browser.c:5785 +#: ../midori/midori-browser.c:5350 msgid "Focus _Next view" msgstr "" -#: ../midori/midori-browser.c:5788 +#: ../midori/midori-browser.c:5353 msgid "Only show the Icon of the _Current Tab" msgstr "Pokaži samo ikonu _trenutne kartice" -#: ../midori/midori-browser.c:5791 +#: ../midori/midori-browser.c:5356 msgid "_Duplicate Current Tab" msgstr "_Udvostruči trenutnu karticu" -#: ../midori/midori-browser.c:5794 +#: ../midori/midori-browser.c:5359 msgid "Close Ot_her Tabs" msgstr "Zatvori dr_uge kartice" -#: ../midori/midori-browser.c:5797 +#: ../midori/midori-browser.c:5362 msgid "Open last _session" msgstr "Otvori posljednju _sesiju" -#: ../midori/midori-browser.c:5800 +#: ../midori/midori-browser.c:5365 msgid "_Help" msgstr "_Pomoć" -#: ../midori/midori-browser.c:5802 +#: ../midori/midori-browser.c:5367 msgid "_Frequent Questions" msgstr "_Česta pitanja" -#: ../midori/midori-browser.c:5805 -msgid "_Report a Problem…" +#: ../midori/midori-browser.c:5370 +msgid "_Report a Problem..." msgstr "_Prijavite problem..." -#: ../midori/midori-browser.c:5810 ../midori/midori-browser.c:6471 -msgid "_Tools" -msgstr "_Alati" - -#: ../midori/midori-browser.c:5817 +#: ../midori/midori-browser.c:5382 msgid "_Menubar" msgstr "_Traka izbornika" -#: ../midori/midori-browser.c:5821 +#: ../midori/midori-browser.c:5386 msgid "_Navigationbar" msgstr "_Navigacijska traka" -#: ../midori/midori-browser.c:5825 +#: ../midori/midori-browser.c:5390 msgid "Side_panel" msgstr "Bočni_stupac" -#: ../midori/midori-browser.c:5826 +#: ../midori/midori-browser.c:5391 msgid "Sidepanel" msgstr "Bočni stupac" -#: ../midori/midori-browser.c:5829 +#: ../midori/midori-browser.c:5394 msgid "_Bookmarkbar" msgstr "_Traka zabiljeÅ¡ki" -#: ../midori/midori-browser.c:5833 +#: ../midori/midori-browser.c:5398 msgid "_Statusbar" msgstr "_Statusna traka" -#: ../midori/midori-browser.c:5842 ../midori/midori-websettings.c:315 +#: ../midori/midori-browser.c:5407 ../midori/midori-websettings.c:302 msgid "_Automatic" msgstr "_Automatski" -#: ../midori/midori-browser.c:5845 ../midori/midori-websettings.c:239 -msgid "Chinese Traditional (BIG5)" -msgstr "Tradicionalni kineski (BIG5)" - -#: ../midori/midori-browser.c:5848 ../midori/midori-websettings.c:240 -msgid "Chinese Simplified (GB18030)" -msgstr "Pojednostavljeni kineski (GB18030)" +#: ../midori/midori-browser.c:5410 ../midori/midori-websettings.c:227 +msgid "Chinese (BIG5)" +msgstr "Kineski (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5852 +#: ../midori/midori-browser.c:5414 msgid "Japanese (SHIFT__JIS)" msgstr "Japanski (SHIFT__JIS)" -#: ../midori/midori-browser.c:5855 ../midori/midori-websettings.c:242 +#: ../midori/midori-browser.c:5417 ../midori/midori-websettings.c:229 msgid "Korean (EUC-KR)" msgstr "Korejski (EUC-KR)" -#: ../midori/midori-browser.c:5858 ../midori/midori-websettings.c:243 +#: ../midori/midori-browser.c:5420 ../midori/midori-websettings.c:230 msgid "Russian (KOI8-R)" msgstr "Ruski (KOI8-R)" -#: ../midori/midori-browser.c:5861 ../midori/midori-websettings.c:244 +#: ../midori/midori-browser.c:5423 ../midori/midori-websettings.c:231 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5864 ../midori/midori-websettings.c:245 +#: ../midori/midori-browser.c:5426 ../midori/midori-websettings.c:232 msgid "Western (ISO-8859-1)" msgstr "Zapadni (ISO-8859-1)" -#: ../midori/midori-browser.c:5867 -msgid "Custom…" +#: ../midori/midori-browser.c:5429 ../midori/midori-websettings.c:233 +#: ../midori/midori-websettings.c:308 ../katze/katze-utils.c:635 +msgid "Custom..." msgstr "Prilagođeno..." -#: ../midori/midori-browser.c:6377 +#: ../midori/midori-browser.c:5909 msgid "_Separator" msgstr "_Razdjelnik" -#: ../midori/midori-browser.c:6384 -msgid "_Location…" +#: ../midori/midori-browser.c:5916 +msgid "_Location..." msgstr "_Lokacija..." -#: ../midori/midori-browser.c:6386 +#: ../midori/midori-browser.c:5918 msgid "Open a particular location" msgstr "Otvori određenu lokaciju" -#: ../midori/midori-browser.c:6408 -msgid "_Web Search…" +#: ../midori/midori-browser.c:5940 +msgid "_Web Search..." msgstr "_Web pretraživanje..." -#: ../midori/midori-browser.c:6410 +#: ../midori/midori-browser.c:5942 msgid "Run a web search" msgstr "Pokreni web pretraživanje" -#: ../midori/midori-browser.c:6437 +#: ../midori/midori-browser.c:5969 msgid "Reopen a previously closed tab or window" msgstr "Ponovno otvori prethodno zatvorenu karticu ili prozor" -#: ../midori/midori-browser.c:6454 +#: ../midori/midori-browser.c:5984 msgid "Show the saved bookmarks" msgstr "Pokaži spremljene zabiljeÅ¡ke" -#: ../midori/midori-browser.c:6487 +#: ../midori/midori-browser.c:5998 +msgid "_Tools" +msgstr "_Alati" + +#: ../midori/midori-browser.c:6013 msgid "_Window" msgstr "_Prozor" -#: ../midori/midori-browser.c:6489 +#: ../midori/midori-browser.c:6015 msgid "Show a list of all open tabs" msgstr "Pokaži listu svih otvorenih kartica" -#: ../midori/midori-browser.c:6503 +#: ../midori/midori-browser.c:6029 msgid "_Menu" msgstr "_Izbornik" -#: ../midori/midori-browser.c:6505 +#: ../midori/midori-browser.c:6031 msgid "Menu" msgstr "Izbornik" -#: ../midori/midori-browser.c:7330 +#: ../midori/midori-browser.c:6679 #, c-format msgid "Unexpected setting '%s'" msgstr "Neočekivana postavka '%s'" -#: ../midori/midori-extension.c:329 +#: ../midori/midori-extension.c:310 #, c-format 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-extension.c:747 ../midori/midori-extension.c:844 -#: ../midori/midori-extension.c:941 ../midori/midori-extension.c:1053 -#: ../extensions/addons.c:1688 +#: ../midori/midori-extension.c:721 ../midori/midori-extension.c:818 +#: ../midori/midori-extension.c:915 ../midori/midori-extension.c:1027 +#: ../extensions/addons.c:1690 #, c-format 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:398 -#, c-format -msgid "Search with %s" -msgstr "Traži pomoću %s" - -#: ../midori/midori-locationaction.c:418 -msgid "Search with…" -msgstr "Traži pomoću..." - -#: ../midori/midori-locationaction.c:545 +#: ../midori/midori-locationaction.c:425 #, c-format msgid "Failed to select from history\n" msgstr "Neuspjeli odabir iz povijesti\n" -#: ../midori/midori-locationaction.c:632 +#: ../midori/midori-locationaction.c:509 #, c-format msgid "Search for %s" msgstr "Traži %s" -#: ../midori/midori-locationaction.c:1227 -msgid "Export certificate" -msgstr "" - -#: ../midori/midori-locationaction.c:1259 -msgid "The signing certificate authority is not known." -msgstr "" - -#: ../midori/midori-locationaction.c:1261 -msgid "" -"The certificate does not match the expected identity of the site that it was " -"retrieved from." -msgstr "" - -#: ../midori/midori-locationaction.c:1263 -msgid "The certificate's activation time is still in the future." -msgstr "" - -#: ../midori/midori-locationaction.c:1265 -msgid "The certificate has expired" -msgstr "" - -#: ../midori/midori-locationaction.c:1267 -msgid "" -"The certificate has been revoked according to the GTlsConnection's " -"certificate revocation list." -msgstr "" - -#: ../midori/midori-locationaction.c:1269 -msgid "The certificate's algorithm is considered insecure." -msgstr "" - -#: ../midori/midori-locationaction.c:1271 -msgid "Some other error occurred validating the certificate." -msgstr "" - -#: ../midori/midori-locationaction.c:1318 -msgid "_Export certificate" -msgstr "" - -#: ../midori/midori-locationaction.c:1333 -msgid "Self-signed" -msgstr "" - -#: ../midori/midori-locationaction.c:1367 -msgid "Security details" -msgstr "" +#: ../midori/midori-locationaction.c:535 +#, c-format +msgid "Search with %s" +msgstr "Traži pomoću %s" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1650 +#: ../midori/midori-locationaction.c:1287 msgid "Paste and p_roceed" msgstr "Zalijepi i n_astavi" -#: ../midori/midori-locationaction.c:1974 +#: ../midori/midori-locationaction.c:1656 msgid "Not verified" msgstr "Nije provjereno" -#: ../midori/midori-locationaction.c:1982 +#: ../midori/midori-locationaction.c:1671 msgid "Verified and encrypted connection" msgstr "Provjerena i Å¡ifrirana veza" -#: ../midori/midori-locationaction.c:1989 -msgid "Open, unencrypted connection" -msgstr "" - -#: ../midori/midori-panel.c:317 ../midori/midori-panel.c:319 -#: ../midori/midori-panel.c:483 ../midori/midori-panel.c:486 +#: ../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:329 ../midori/midori-panel.c:330 +#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410 msgid "Close panel" msgstr "Zatvori panel" -#: ../midori/midori-panel.c:484 ../midori/midori-panel.c:487 +#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566 msgid "Align sidepanel to the left" msgstr "Poravnaj bočni stupac lijevo" -#: ../midori/midori-websettings.c:221 +#: ../midori/midori-websettings.c:209 msgid "Show Speed Dial" msgstr "Pokaži brzo biranje" -#: ../midori/midori-websettings.c:222 +#: ../midori/midori-websettings.c:210 msgid "Show Homepage" msgstr "Pokaži početnu stranicu" -#: ../midori/midori-websettings.c:241 +#: ../midori/midori-websettings.c:228 msgid "Japanese (SHIFT_JIS)" msgstr "Japanski (SHIFT_JIS)" -#: ../midori/midori-websettings.c:246 ../midori/midori-websettings.c:322 -#: ../katze/katze-utils.c:633 -msgid "Custom..." -msgstr "Prilagođeno..." - -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:248 msgid "New tab" msgstr "Nova kartica" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:249 msgid "New window" msgstr "Novi prozor" -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:250 msgid "Current tab" msgstr "Trenutna kartica" -#: ../midori/midori-websettings.c:278 +#: ../midori/midori-websettings.c:265 msgid "Default" msgstr "Zadano" -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-websettings.c:266 msgid "Icons" msgstr "Ikone" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:267 msgid "Small icons" msgstr "Male ikone" -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:268 msgid "Text" msgstr "Tekst" -#: ../midori/midori-websettings.c:282 +#: ../midori/midori-websettings.c:269 msgid "Icons and text" msgstr "Ikone i tekst" -#: ../midori/midori-websettings.c:283 +#: ../midori/midori-websettings.c:270 msgid "Text beside icons" msgstr "Tekst pored ikona" -#: ../midori/midori-websettings.c:298 +#: ../midori/midori-websettings.c:285 msgid "Automatic (GNOME or environment)" msgstr "Automatski (GNOME ili okruženje)" -#: ../midori/midori-websettings.c:299 +#: ../midori/midori-websettings.c:286 msgid "HTTP proxy server" msgstr "HTTP proxy poslužitelj" -#: ../midori/midori-websettings.c:300 +#: ../midori/midori-websettings.c:287 msgid "No proxy server" msgstr "Nema proxy poslužitelja" -#: ../midori/midori-websettings.c:317 -msgid "Chrome" -msgstr "" - -#: ../midori/midori-websettings.c:318 +#: ../midori/midori-websettings.c:304 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:319 +#: ../midori/midori-websettings.c:305 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:320 +#: ../midori/midori-websettings.c:306 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:321 +#: ../midori/midori-websettings.c:307 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:405 +#: ../midori/midori-websettings.c:360 msgid "Remember last window size" msgstr "Zapamti zadnu veličinu prozora" -#: ../midori/midori-websettings.c:406 +#: ../midori/midori-websettings.c:361 msgid "Whether to save the last window size" msgstr "Da li spremiti zadnju veličinu prozora" -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:369 msgid "Last window width" msgstr "Zadnja Å¡irina prozora" -#: ../midori/midori-websettings.c:415 +#: ../midori/midori-websettings.c:370 msgid "The last saved window width" msgstr "Zadnja sačuvana Å¡irina prozora" -#: ../midori/midori-websettings.c:423 +#: ../midori/midori-websettings.c:378 msgid "Last window height" msgstr "zadnja visina prozora" -#: ../midori/midori-websettings.c:424 +#: ../midori/midori-websettings.c:379 msgid "The last saved window height" msgstr "Zadnja sačuvana visina prozora" -#: ../midori/midori-websettings.c:449 +#: ../midori/midori-websettings.c:404 msgid "Last panel position" msgstr "Zadnja pozicija ploče" -#: ../midori/midori-websettings.c:450 +#: ../midori/midori-websettings.c:405 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:459 +#: ../midori/midori-websettings.c:414 msgid "Last panel page" msgstr "Zadnja stranica ploče" -#: ../midori/midori-websettings.c:460 +#: ../midori/midori-websettings.c:415 msgid "The last saved panel page" msgstr "Zadnja spremljena stranica ploče" -#: ../midori/midori-websettings.c:468 +#: ../midori/midori-websettings.c:423 msgid "Last Web search" msgstr "Zadnje Web pretraživanje" -#: ../midori/midori-websettings.c:469 +#: ../midori/midori-websettings.c:424 msgid "The last saved Web search" msgstr "Zadnje sačuvano Web pretraživanje" -#: ../midori/midori-websettings.c:493 +#: ../midori/midori-websettings.c:433 msgid "Show Menubar" msgstr "Pokaži traku izbornika" -#: ../midori/midori-websettings.c:494 +#: ../midori/midori-websettings.c:434 msgid "Whether to show the menubar" msgstr "Da li pokazati izbornik" -#: ../midori/midori-websettings.c:502 +#: ../midori/midori-websettings.c:442 msgid "Show Navigationbar" msgstr "Pokaži navigacijsku traku" -#: ../midori/midori-websettings.c:503 +#: ../midori/midori-websettings.c:443 msgid "Whether to show the navigationbar" msgstr "Da li pokazati navigacijsku traku" -#: ../midori/midori-websettings.c:511 +#: ../midori/midori-websettings.c:451 msgid "Show Bookmarkbar" msgstr "Pokaži traku zabiljeÅ¡ki" -#: ../midori/midori-websettings.c:512 +#: ../midori/midori-websettings.c:452 msgid "Whether to show the bookmarkbar" msgstr "Da li pokazati traku zabiljeÅ¡ki" -#: ../midori/midori-websettings.c:520 +#: ../midori/midori-websettings.c:460 msgid "Show Panel" msgstr "Pokaži ploču" -#: ../midori/midori-websettings.c:521 +#: ../midori/midori-websettings.c:461 msgid "Whether to show the panel" msgstr "Da li pokazati ploču" -#: ../midori/midori-websettings.c:529 +#: ../midori/midori-websettings.c:469 msgid "Show Statusbar" msgstr "Pokaži statusnu traku" -#: ../midori/midori-websettings.c:530 +#: ../midori/midori-websettings.c:470 msgid "Whether to show the statusbar" msgstr "Da li pokazati statusnu traku" -#: ../midori/midori-websettings.c:539 +#: ../midori/midori-websettings.c:479 msgid "Toolbar Style:" msgstr "Stil alatne trake" -#: ../midori/midori-websettings.c:540 +#: ../midori/midori-websettings.c:480 msgid "The style of the toolbar" msgstr "Stil alatne trake" -#: ../midori/midori-websettings.c:549 +#: ../midori/midori-websettings.c:489 msgid "Toolbar Items" msgstr "Stavke alatne trake" -#: ../midori/midori-websettings.c:550 +#: ../midori/midori-websettings.c:490 msgid "The items to show on the toolbar" msgstr "Stavke za prikazivanje u alatnoj traci" -#: ../midori/midori-websettings.c:558 +#: ../midori/midori-websettings.c:498 msgid "Compact Sidepanel" msgstr "Zbijeni bočni stupac" -#: ../midori/midori-websettings.c:559 +#: ../midori/midori-websettings.c:499 msgid "Whether to make the sidepanel compact" msgstr "Da li bočni stupac učiniti zbijenim" -#: ../midori/midori-websettings.c:574 +#: ../midori/midori-websettings.c:514 msgid "Align sidepanel on the right" msgstr "Poravnaj bočni stupac desno" -#: ../midori/midori-websettings.c:575 +#: ../midori/midori-websettings.c:515 msgid "Whether to align the sidepanel on the right" msgstr "Da li poravnati bočni stupac lijevo" -#: ../midori/midori-websettings.c:590 +#: ../midori/midori-websettings.c:530 msgid "Open panels in separate windows" msgstr "Otvori ploče u zasebnim prozorima" -#: ../midori/midori-websettings.c:591 +#: ../midori/midori-websettings.c:531 msgid "Whether to always open panels in separate windows" msgstr "Da li uvijek otvarati ploče u odvojenim prozorima" -#: ../midori/midori-websettings.c:600 +#: ../midori/midori-websettings.c:540 msgid "When Midori starts:" msgstr "Kad se Midori pokrene:" -#: ../midori/midori-websettings.c:601 +#: ../midori/midori-websettings.c:541 msgid "What to do when Midori starts" msgstr "Å to učiniti kad se Midori pokrene" -#: ../midori/midori-websettings.c:610 +#: ../midori/midori-websettings.c:550 msgid "Homepage:" msgstr "Početna stranica:" -#: ../midori/midori-websettings.c:611 +#: ../midori/midori-websettings.c:551 msgid "The homepage" msgstr "početna stranica" -#: ../midori/midori-websettings.c:626 +#: ../midori/midori-websettings.c:566 msgid "Show crash dialog" msgstr "Pokaži dijalog ruÅ¡enja" -#: ../midori/midori-websettings.c:627 +#: ../midori/midori-websettings.c:567 msgid "Show a dialog after Midori crashed" msgstr "Pokaži dijalog nakon Å¡to se Midori sruÅ¡i" -#: ../midori/midori-websettings.c:635 +#: ../midori/midori-websettings.c:575 msgid "Save downloaded files to:" msgstr "Spremi preuzimanja u" -#: ../midori/midori-websettings.c:636 +#: ../midori/midori-websettings.c:576 msgid "The folder downloaded files are saved to" msgstr "Mapa preuzetih datoteka je spremljena u" -#: ../midori/midori-websettings.c:644 +#: ../midori/midori-websettings.c:584 msgid "Text Editor" msgstr "Uređivač teksta" -#: ../midori/midori-websettings.c:645 +#: ../midori/midori-websettings.c:585 msgid "An external text editor" msgstr "Vanjski uređivač teksta" -#: ../midori/midori-websettings.c:660 +#: ../midori/midori-websettings.c:600 msgid "News Aggregator" msgstr "" -#: ../midori/midori-websettings.c:661 +#: ../midori/midori-websettings.c:601 msgid "An external news aggregator" msgstr "" -#: ../midori/midori-websettings.c:669 +#: ../midori/midori-websettings.c:609 msgid "Location entry Search" msgstr "" -#: ../midori/midori-websettings.c:670 +#: ../midori/midori-websettings.c:610 msgid "The search to perform inside the location entry" msgstr "" -#: ../midori/midori-websettings.c:678 +#: ../midori/midori-websettings.c:618 msgid "Preferred Encoding" msgstr "Željeno kodiranje" -#: ../midori/midori-websettings.c:679 +#: ../midori/midori-websettings.c:619 msgid "The preferred character encoding" msgstr "Željeno kodiranje znakova" -#: ../midori/midori-websettings.c:689 +#: ../midori/midori-websettings.c:629 msgid "Always Show Tabbar" msgstr "Uvijek pokaži Traku kartica" -#: ../midori/midori-websettings.c:690 +#: ../midori/midori-websettings.c:630 msgid "Always show the tabbar" msgstr "Uvijek pokaži traku kartica" -#: ../midori/midori-websettings.c:703 +#: ../midori/midori-websettings.c:638 msgid "Close Buttons on Tabs" msgstr "Zatvori dugmad na karticama" -#: ../midori/midori-websettings.c:704 +#: ../midori/midori-websettings.c:639 msgid "Whether tabs have close buttons" msgstr "" -#: ../midori/midori-websettings.c:729 +#: ../midori/midori-websettings.c:664 msgid "Open new pages in:" msgstr "Otvori nove stranice u:" -#: ../midori/midori-websettings.c:730 +#: ../midori/midori-websettings.c:665 msgid "Where to open new pages" msgstr "Gdje otvoriti nove stranice" -#: ../midori/midori-websettings.c:739 +#: ../midori/midori-websettings.c:674 msgid "Middle click opens Selection" msgstr "Srednji klik otvara odabir" -#: ../midori/midori-websettings.c:740 +#: ../midori/midori-websettings.c:675 msgid "Load an address from the selection via middle click" msgstr "Učitaj adresu iz odabira pomoću srednjeg klika" -#: ../midori/midori-websettings.c:748 +#: ../midori/midori-websettings.c:683 msgid "Open tabs in the background" msgstr "Otvori kartice u pozadini" -#: ../midori/midori-websettings.c:749 +#: ../midori/midori-websettings.c:684 msgid "Whether to open new tabs in the background" msgstr "Da li otvoriti nove kartice u pozadini" -#: ../midori/midori-websettings.c:757 +#: ../midori/midori-websettings.c:692 msgid "Open Tabs next to Current" msgstr "Otvori kartice do trenutne" -#: ../midori/midori-websettings.c:758 +#: ../midori/midori-websettings.c:693 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "" -#: ../midori/midori-websettings.c:766 +#: ../midori/midori-websettings.c:701 msgid "Open popups in tabs" msgstr "" -#: ../midori/midori-websettings.c:767 +#: ../midori/midori-websettings.c:702 msgid "Whether to open popup windows in tabs" msgstr "" -#: ../midori/midori-websettings.c:777 ../extensions/statusbar-features.c:155 +#: ../midori/midori-websettings.c:712 ../extensions/statusbar-features.c:131 msgid "Load images automatically" msgstr "Učitaj slike automatski" -#: ../midori/midori-websettings.c:778 +#: ../midori/midori-websettings.c:713 msgid "Load and display images automatically" msgstr "Učitaj i prikaži slike automatski" -#: ../midori/midori-websettings.c:785 ../extensions/statusbar-features.c:165 +#: ../midori/midori-websettings.c:720 ../extensions/statusbar-features.c:140 msgid "Enable scripts" msgstr "Omogući skripte" -#: ../midori/midori-websettings.c:786 +#: ../midori/midori-websettings.c:721 msgid "Enable embedded scripting languages" msgstr "" -#: ../midori/midori-websettings.c:793 ../extensions/statusbar-features.c:177 +#: ../midori/midori-websettings.c:728 ../extensions/statusbar-features.c:149 msgid "Enable Netscape plugins" msgstr "Omogući Netscape priključke" -#: ../midori/midori-websettings.c:794 +#: ../midori/midori-websettings.c:729 msgid "Enable embedded Netscape plugin objects" msgstr "" -#: ../midori/midori-websettings.c:809 +#: ../midori/midori-websettings.c:749 msgid "Enable Spell Checking" msgstr "Omogući provjeru pravopisa" -#: ../midori/midori-websettings.c:810 +#: ../midori/midori-websettings.c:750 msgid "Enable spell checking while typing" msgstr "Omogući provjeru pravopisa dok piÅ¡em" -#: ../midori/midori-websettings.c:816 +#: ../midori/midori-websettings.c:756 msgid "Enable HTML5 database support" msgstr "Omogući podrÅ¡ku za HTML5 bazu podataka" -#: ../midori/midori-websettings.c:817 +#: ../midori/midori-websettings.c:757 msgid "Whether to enable HTML5 database support" msgstr "Da li omogućiti podrÅ¡ku za HTML bazu podataka" -#: ../midori/midori-websettings.c:823 +#: ../midori/midori-websettings.c:763 msgid "Enable HTML5 local storage support" msgstr "Omogući podrÅ¡ku za HTML5 lokalnu pohranu" -#: ../midori/midori-websettings.c:824 +#: ../midori/midori-websettings.c:764 msgid "Whether to enable HTML5 local storage support" msgstr "Da li omogućiti podrÅ¡ku za HTML5 lokalnu pohranu" -#: ../midori/midori-websettings.c:830 +#: ../midori/midori-websettings.c:770 msgid "Enable offline web application cache" msgstr "" -#: ../midori/midori-websettings.c:831 +#: ../midori/midori-websettings.c:771 msgid "Whether to enable offline web application cache" msgstr "" -#: ../midori/midori-websettings.c:852 +#: ../midori/midori-websettings.c:787 msgid "Flash window on background tabs" msgstr "" -#: ../midori/midori-websettings.c:853 +#: ../midori/midori-websettings.c:788 msgid "Flash the browser window if a new tab was opened in the background" msgstr "" -#: ../midori/midori-websettings.c:861 -msgid "Enable WebGL support" -msgstr "Omogući WebGL podrÅ¡ku " - -#: ../midori/midori-websettings.c:862 -msgid "Allow websites to use OpenGL rendering" -msgstr "" - -#: ../midori/midori-websettings.c:888 +#: ../midori/midori-websettings.c:803 msgid "Zoom Text and Images" msgstr "Zumiraj tekst i slike" -#: ../midori/midori-websettings.c:889 +#: ../midori/midori-websettings.c:804 msgid "Whether to zoom text and images" msgstr "Da li zumirati tekst i slike" -#: ../midori/midori-websettings.c:904 +#: ../midori/midori-websettings.c:819 msgid "Find inline while typing" msgstr "" -#: ../midori/midori-websettings.c:905 +#: ../midori/midori-websettings.c:820 msgid "Whether to automatically find inline while typing" msgstr "" -#: ../midori/midori-websettings.c:920 +#: ../midori/midori-websettings.c:835 msgid "Kinetic scrolling" msgstr "" -#: ../midori/midori-websettings.c:921 +#: ../midori/midori-websettings.c:836 msgid "Whether scrolling should kinetically move according to speed" msgstr "" -#: ../midori/midori-websettings.c:929 +#: ../midori/midori-websettings.c:844 msgid "Delete old Cookies after:" msgstr "ObriÅ¡i stare kolačiće nakon:" -#: ../midori/midori-websettings.c:930 +#: ../midori/midori-websettings.c:845 msgid "The maximum number of days to save cookies for" msgstr "Maksimalni broj dana za spremanje kolačića" -#: ../midori/midori-websettings.c:946 +#: ../midori/midori-websettings.c:861 msgid "Only accept Cookies from sites you visit" msgstr "Prihvati kolačiće samo sa stranica koje ste posjetili" -#: ../midori/midori-websettings.c:947 +#: ../midori/midori-websettings.c:862 msgid "Block cookies sent by third-party websites" msgstr "" -#: ../midori/midori-websettings.c:961 +#: ../midori/midori-websettings.c:876 msgid "Delete pages from history after:" msgstr "ObriÅ¡i stranice iz povijesti nakon:" -#: ../midori/midori-websettings.c:962 +#: ../midori/midori-websettings.c:877 msgid "The maximum number of days to save the history for" msgstr "Maksimalni broj dana za spremanje povijesti" -#: ../midori/midori-websettings.c:977 +#: ../midori/midori-websettings.c:892 msgid "Proxy server" msgstr "Proxy poslužitelj" -#: ../midori/midori-websettings.c:978 +#: ../midori/midori-websettings.c:893 msgid "The type of proxy server to use" msgstr "Tip proxy poslužitelja za uporabu" -#: ../midori/midori-websettings.c:987 +#: ../midori/midori-websettings.c:902 msgid "HTTP Proxy Server" msgstr "HTTP Proxy poslužitelj" -#: ../midori/midori-websettings.c:988 +#: ../midori/midori-websettings.c:903 msgid "The proxy server used for HTTP connections" msgstr "Proxy poslužitelj koriÅ¡ten za HTTP spajanja" -#: ../midori/midori-websettings.c:1003 +#: ../midori/midori-websettings.c:918 msgid "Port" -msgstr "Port" +msgstr "" -#: ../midori/midori-websettings.c:1004 +#: ../midori/midori-websettings.c:919 msgid "The proxy server port used for HTTP connections" msgstr "Proxy poslužitelj koriÅ¡ten za HTTP spajanja" -#: ../midori/midori-websettings.c:1022 +#: ../midori/midori-websettings.c:937 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:954 msgid "Identify as" msgstr "Predstavi se kao" -#: ../midori/midori-websettings.c:1040 +#: ../midori/midori-websettings.c:955 msgid "What to identify as to web pages" msgstr "Kako se predstaviti na web stranicama" -#: ../midori/midori-websettings.c:1056 +#: ../midori/midori-websettings.c:971 msgid "Identification string" msgstr "" -#: ../midori/midori-websettings.c:1057 +#: ../midori/midori-websettings.c:972 msgid "The application identification string" msgstr "" -#: ../midori/midori-websettings.c:1073 +#: ../midori/midori-websettings.c:988 msgid "Preferred languages" msgstr "Željeni jezici" -#: ../midori/midori-websettings.c:1074 +#: ../midori/midori-websettings.c:989 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:1004 msgid "Clear private data" msgstr "Očisti privatne podatke" -#: ../midori/midori-websettings.c:1090 +#: ../midori/midori-websettings.c:1005 msgid "The private data selected for deletion" msgstr "Privatni podaci odabrani za brisanje" -#: ../midori/midori-websettings.c:1105 +#: ../midori/midori-websettings.c:1020 msgid "Clear data" msgstr "Očisti podatke" -#: ../midori/midori-websettings.c:1106 +#: ../midori/midori-websettings.c:1021 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:1155 +#: ../midori/midori-websettings.c:1054 msgid "Strip referrer details sent to websites" msgstr "" #. i18n: Referer here is not a typo but a technical term -#: ../midori/midori-websettings.c:1157 +#: ../midori/midori-websettings.c:1056 msgid "Whether the \"Referer\" header should be shortened to the hostname" msgstr "" -#: ../midori/midori-websettings.c:1171 +#: ../midori/midori-websettings.c:1070 msgid "Always use my font choices" -msgstr "Uvijek koristi moj izbor fonta" - -#: ../midori/midori-websettings.c:1172 -msgid "Override fonts picked by websites with user preferences" msgstr "" -#: ../midori/midori-view.c:1002 ../midori/midori-view.c:1140 -msgid "Trust this website" -msgstr "" - -#: ../midori/midori-view.c:1138 -msgid "Security unknown" +#: ../midori/midori-websettings.c:1071 +msgid "Override fonts picked by websites with user preferences" msgstr "" -#: ../midori/midori-view.c:1436 +#: ../midori/midori-view.c:1343 #, c-format msgid "%s wants to save an HTML5 database." msgstr "%s želi spremiti HTML5 bazu podataka." -#: ../midori/midori-view.c:1440 ../midori/midori-view.c:1474 +#: ../midori/midori-view.c:1347 ../midori/midori-view.c:1377 msgid "_Deny" msgstr "_Uskrati" -#: ../midori/midori-view.c:1440 ../midori/midori-view.c:1474 +#: ../midori/midori-view.c:1347 ../midori/midori-view.c:1377 msgid "_Allow" msgstr "_Dopusti" -#: ../midori/midori-view.c:1469 +#: ../midori/midori-view.c:1373 #, c-format msgid "%s wants to know your location." msgstr "%s želi znati vaÅ¡u lokaciju." -#: ../midori/midori-view.c:1565 +#: ../midori/midori-view.c:1461 #, c-format msgid "Error - %s" msgstr "GreÅ¡ka - %s" -#: ../midori/midori-view.c:1566 +#: ../midori/midori-view.c:1462 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "Stranica '%s' ne može biti učitana" -#: ../midori/midori-view.c:1568 +#: ../midori/midori-view.c:1464 msgid "Try again" msgstr "PokuÅ¡aj ponovo" -#: ../midori/midori-view.c:1766 ../midori/midori-view.c:2879 +#: ../midori/midori-view.c:1626 ../midori/midori-view.c:2471 #, c-format msgid "Send a message to %s" msgstr "PoÅ¡alji poruku %s" -#: ../midori/midori-view.c:2665 -msgid "Add _search engine..." -msgstr "Dodaj _tražilicu..." - -#: ../midori/midori-view.c:2709 ../midori/midori-view.c:3035 +#: ../midori/midori-view.c:2313 ../midori/midori-view.c:2624 msgid "Inspect _Element" msgstr "" -#: ../midori/midori-view.c:2761 +#: ../midori/midori-view.c:2363 msgid "Open Link in New _Tab" msgstr "Otvori poveznicu u novoj _kartici" -#: ../midori/midori-view.c:2765 +#: ../midori/midori-view.c:2367 msgid "Open Link in _Foreground Tab" msgstr "Otvori poveznicu u _prednjoj kartici" -#: ../midori/midori-view.c:2766 +#: ../midori/midori-view.c:2368 msgid "Open Link in _Background Tab" msgstr "Otvori poveznicu u _pozadinskoj kartici" -#: ../midori/midori-view.c:2769 +#: ../midori/midori-view.c:2371 msgid "Open Link in New _Window" msgstr "Otvori poveznicu u novom _prozoru" -#: ../midori/midori-view.c:2772 +#: ../midori/midori-view.c:2374 msgid "Open Link as Web A_pplication" msgstr "Otvori poveznicu kao web p_rogram" -#: ../midori/midori-view.c:2777 +#: ../midori/midori-view.c:2377 msgid "Copy Link de_stination" msgstr "Kopiraj odrediÅ¡te po_veznice" -#: ../midori/midori-view.c:2793 +#: ../midori/midori-view.c:2389 msgid "Open _Image in New Tab" msgstr "Otvori _sliku u novoj kartici" -#: ../midori/midori-view.c:2796 +#: ../midori/midori-view.c:2392 msgid "Copy Image _Address" msgstr "Kopiraj adresu _slike" -#: ../midori/midori-view.c:2799 +#: ../midori/midori-view.c:2395 msgid "Save I_mage" msgstr "Sačuvaj s_liku" -#: ../midori/midori-view.c:2802 -msgid "Open in Image _Viewer" -msgstr "Otvori u pregledniku _slika" - -#: ../midori/midori-view.c:2809 +#: ../midori/midori-view.c:2402 msgid "Copy Video _Address" msgstr "Kopiraj video _adresu" -#: ../midori/midori-view.c:2812 +#: ../midori/midori-view.c:2405 msgid "Save _Video" msgstr "Spremi _video" -#: ../midori/midori-view.c:2812 +#: ../midori/midori-view.c:2405 msgid "Download _Video" msgstr "Preuzmi _video" -#: ../midori/midori-view.c:2838 +#: ../midori/midori-view.c:2431 msgid "Search _with" msgstr "Traži _pomoću" -#: ../midori/midori-view.c:2870 +#: ../midori/midori-view.c:2463 msgid "_Search the Web" msgstr "_Pretraži web" -#: ../midori/midori-view.c:2887 +#: ../midori/midori-view.c:2479 msgid "Open Address in New _Tab" msgstr "Otvori adresu u novoj _kartici" -#: ../midori/midori-view.c:2940 -msgid "Open _Frame in New Tab" -msgstr "Otvori _okvir u novoj kartici" - -#: ../midori/midori-view.c:3201 -#, c-format -msgid "Open or download file from %s" -msgstr "Otvori ili preuzmi datoteku sa %s" - -#: ../midori/midori-view.c:3225 -#, c-format -msgid "File Name: %s" -msgstr "Ime datoteke: %s" +#: ../midori/midori-view.c:2775 +msgid "Open or download file" +msgstr "Otvori ili preuzmi datoteku" -#: ../midori/midori-view.c:3230 +#: ../midori/midori-view.c:2794 #, c-format msgid "File Type: '%s'" msgstr "Tip datoteke: '%s'" -#: ../midori/midori-view.c:3232 +#: ../midori/midori-view.c:2796 #, c-format msgid "File Type: %s ('%s')" msgstr "Tip datoteke: %s ('%s')" -#: ../midori/midori-view.c:3267 -#, c-format -msgid "Size: %s" -msgstr "" - #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:3278 +#: ../midori/midori-view.c:2813 #, c-format msgid "Open %s" msgstr "Otvori %s" -#: ../midori/midori-view.c:3897 +#: ../midori/midori-view.c:3405 #, c-format msgid "Inspect page - %s" msgstr "" -#: ../midori/midori-view.c:4252 +#: ../midori/midori-view.c:3692 msgid "Speed Dial" msgstr "Brzo biranje" -#: ../midori/midori-view.c:4253 ../midori/midori-view.c:4359 +#: ../midori/midori-view.c:3693 ../midori/midori-view.c:3789 msgid "Click to add a shortcut" msgstr "Klik za dodavanje prečaca" -#: ../midori/midori-view.c:4254 +#: ../midori/midori-view.c:3694 msgid "Enter shortcut address" msgstr "Unesi adresu prečaca" -#: ../midori/midori-view.c:4255 +#: ../midori/midori-view.c:3695 msgid "Enter shortcut title" msgstr "Unesi naslov prečaca" -#: ../midori/midori-view.c:4256 +#: ../midori/midori-view.c:3696 msgid "Are you sure you want to delete this shortcut?" msgstr "jeste li sigurni da želite izbrisati ovaj prečac?" -#: ../midori/midori-view.c:4429 +#: ../midori/midori-view.c:3860 #, c-format msgid "No documentation installed" msgstr "Dokumentacija nije instalirana" -#: ../midori/midori-view.c:4506 -msgid "Midori doesn't store any personal data:" -msgstr "Midori ne pohranjuje osobne podatke" - -#: ../midori/midori-view.c:4507 -msgid "No history or web cookies are being saved." -msgstr "Ni povijest ni kolačići nisu spremljeni." - -#: ../midori/midori-view.c:4508 -msgid "Extensions are disabled." -msgstr "ProÅ¡irenja su onemogućena." - -#: ../midori/midori-view.c:4509 -msgid "HTML5 storage, local database and application caches are disabled." -msgstr "" - -#: ../midori/midori-view.c:4510 -msgid "Midori prevents websites from tracking the user:" -msgstr "Midovi sprečava web stranice da prate korisnika:" - -#: ../midori/midori-view.c:4511 -msgid "Referrer URLs are stripped down to the hostname." -msgstr "" - -#: ../midori/midori-view.c:4512 -msgid "DNS prefetching is disabled." -msgstr "" - -#: ../midori/midori-view.c:4513 -msgid "The language and timezone are not revealed to websites." -msgstr "Jezik i vremenska zona se ne otkrivaju web stranicama." - -#: ../midori/midori-view.c:4514 -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:4603 +#: ../midori/midori-view.c:3910 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:4653 +#: ../midori/midori-view.c:3955 msgid "Page loading delayed" msgstr "Odgođeno učitavanje stranice" -#: ../midori/midori-view.c:4654 +#: ../midori/midori-view.c:3956 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "" -#: ../midori/midori-view.c:4655 +#: ../midori/midori-view.c:3957 msgid "Load Page" msgstr "Učitaj stranicu" -#: ../midori/midori-view.c:4822 +#: ../midori/midori-view.c:4097 msgid "Blank page" msgstr "Prazna stranica" -#: ../midori/midori-view.c:5086 +#: ../midori/midori-view.c:4361 msgid "_Duplicate Tab" msgstr "_Udvostruči karticu" -#: ../midori/midori-view.c:5091 +#: ../midori/midori-view.c:4366 msgid "Show Tab _Label" msgstr "Pokaži oznaku _kartice" -#: ../midori/midori-view.c:5091 +#: ../midori/midori-view.c:4366 msgid "Show Tab _Icon Only" msgstr "Prikaži samo _ikone kartice" -#: ../midori/midori-view.c:5098 -msgid "Close Ot_her Tab" -msgid_plural "Close Ot_her Tabs" -msgstr[0] "Zatvori dr_ugu karticu" -msgstr[1] "Zatvori dr_uge kartice" -msgstr[2] "Zatvori dr_uge kartice" +#: ../midori/midori-view.c:4372 +msgid "Close ot_her Tabs" +msgstr "Zatvori dr_uge kartice" #. i18n: word stem of "previous page" type links, case is not important -#: ../midori/midori-view.c:5934 +#: ../midori/midori-view.c:4989 msgid "previous" msgstr "prethodno" #. i18n: word stem of "next page" type links, case is not important -#: ../midori/midori-view.c:5953 +#: ../midori/midori-view.c:5008 msgid "next" -msgstr "slijedeće" +msgstr "" -#: ../midori/midori-view.c:5966 +#: ../midori/midori-view.c:5021 msgid "Print background images" msgstr "Ispis pozadinskih slika" -#: ../midori/midori-view.c:5967 +#: ../midori/midori-view.c:5022 msgid "Whether background images should be printed" msgstr "" -#: ../midori/midori-view.c:5999 +#: ../midori/midori-view.c:5054 msgid "Features" msgstr "Obilježja" -#: ../midori/midori-preferences.c:298 +#: ../midori/midori-preferences.c:297 msgid "Startup" msgstr "Pokretanje" -#: ../midori/midori-preferences.c:311 +#: ../midori/midori-preferences.c:310 msgid "Use _current page" msgstr "Koristi _trenutnu stranicu" -#: ../midori/midori-preferences.c:315 +#: ../midori/midori-preferences.c:314 msgid "Use current page as homepage" msgstr "Koristi trenutnu stranicu kao početnu stranicu" #. Page "Appearance" -#: ../midori/midori-preferences.c:324 +#: ../midori/midori-preferences.c:323 msgid "Fonts" msgstr "Fontovi" -#: ../midori/midori-preferences.c:327 +#: ../midori/midori-preferences.c:326 msgid "Proportional Font Family" msgstr "Zadana obitelj fonta" -#: ../midori/midori-preferences.c:331 +#: ../midori/midori-preferences.c:330 msgid "The default font family used to display text" msgstr "Zadana obitelj fonta koje se koristi za prikaz teksta" -#: ../midori/midori-preferences.c:334 +#: ../midori/midori-preferences.c:333 msgid "The default font size used to display text" msgstr "Zadana veličina fonta za prikaz teksta" -#: ../midori/midori-preferences.c:336 +#: ../midori/midori-preferences.c:335 msgid "Fixed-width Font Family" msgstr "" -#: ../midori/midori-preferences.c:340 +#: ../midori/midori-preferences.c:339 msgid "The font family used to display fixed-width text" msgstr "" -#: ../midori/midori-preferences.c:343 +#: ../midori/midori-preferences.c:342 msgid "The font size used to display fixed-width text" msgstr "" -#: ../midori/midori-preferences.c:345 +#: ../midori/midori-preferences.c:344 msgid "Minimum Font Size" msgstr "Najmanja veličina fonta" -#: ../midori/midori-preferences.c:349 +#: ../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:360 +#: ../midori/midori-preferences.c:359 msgid "Behavior" msgstr "PonaÅ¡anje" -#: ../midori/midori-preferences.c:386 +#: ../midori/midori-preferences.c:385 msgid "Allow scripts to open popups" msgstr "" -#: ../midori/midori-preferences.c:387 +#: ../midori/midori-preferences.c:386 msgid "Whether scripts are allowed to open popup windows automatically" msgstr "" #. Page "Interface" -#: ../midori/midori-preferences.c:418 +#: ../midori/midori-preferences.c:409 msgid "Browsing" msgstr "Pretraživanje" #. Page "Network" -#: ../midori/midori-preferences.c:458 +#: ../midori/midori-preferences.c:447 msgid "Network" msgstr "Mreža" -#: ../midori/midori-preferences.c:465 +#: ../midori/midori-preferences.c:454 msgid "Hostname" msgstr "Ime računala" -#: ../midori/midori-preferences.c:489 +#: ../midori/midori-preferences.c:478 msgid "MB" msgstr "MB" -#: ../midori/midori-searchaction.c:957 +#: ../midori/midori-searchaction.c:907 msgid "Add search engine" msgstr "Dodaj tražilicu" -#: ../midori/midori-searchaction.c:957 +#: ../midori/midori-searchaction.c:907 msgid "Edit search engine" msgstr "Uredi tražilicu" -#: ../midori/midori-searchaction.c:985 +#: ../midori/midori-searchaction.c:936 msgid "_Name:" msgstr "_Ime:" -#: ../midori/midori-searchaction.c:1000 +#: ../midori/midori-searchaction.c:952 msgid "_Description:" msgstr "_Opis:" -#: ../midori/midori-searchaction.c:1013 ../extensions/feed-panel/main.c:377 -msgid "_Address:" -msgstr "_Adresa:" +#: ../midori/midori-searchaction.c:985 +msgid "_Icon:" +msgstr "_Ikona:" -#: ../midori/midori-searchaction.c:1032 +#: ../midori/midori-searchaction.c:999 msgid "_Token:" msgstr "" -#: ../midori/midori-searchaction.c:1330 +#: ../midori/midori-searchaction.c:1299 msgid "Manage Search Engines" msgstr "Upravljaj tražilicama" -#: ../midori/midori-searchaction.c:1432 +#: ../midori/midori-searchaction.c:1399 msgid "Use as _default" msgstr "Koristi kao _zadano" -#: ../midori/sokoke.c:346 +#: ../midori/sokoke.c:410 msgid "Open with" msgstr "Otvori pomoću" -#: ../midori/sokoke.c:354 +#: ../midori/sokoke.c:418 #, c-format msgid "Choose an application or command to open \"%s\":" msgstr "Izaberite program ili naredbu za otvaranje \"%s\":" -#: ../midori/sokoke.c:468 ../midori/sokoke.c:482 +#: ../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 "Ne mogu pokrenuti vanjski program" -#: ../midori/sokoke.c:1443 +#: ../midori/sokoke.c:1677 #, c-format msgid "%d hour" msgid_plural "%d hours" @@ -2104,7 +1946,7 @@ msgstr[0] "%d sat" msgstr[1] "%d sati" msgstr[2] "%d sata" -#: ../midori/sokoke.c:1444 +#: ../midori/sokoke.c:1678 #, c-format msgid "%d minute" msgid_plural "%d minutes" @@ -2112,7 +1954,7 @@ msgstr[0] "%d minuta" msgstr[1] "%d minute" msgstr[2] "%d minuta" -#: ../midori/sokoke.c:1445 +#: ../midori/sokoke.c:1679 #, c-format msgid "%d second" msgid_plural "%d seconds" @@ -2121,132 +1963,122 @@ msgstr[1] "%d sekunde" msgstr[2] "%d sekundi" #. i18n: Download tooltip (size): 4KB of 43MB -#: ../midori/sokoke.c:1453 ../panels/midori-transfers.c:268 +#: ../midori/sokoke.c:1687 ../panels/midori-transfers.c:267 #, c-format msgid "%s of %s" msgstr "%s od %s" #. i18n: Unknown number of bytes, used for transfer rate like ?B/s -#: ../midori/sokoke.c:1462 +#: ../midori/sokoke.c:1696 msgid "?B" msgstr "?B" #. i18n: Download tooltip (transfer rate): (130KB/s) -#: ../midori/sokoke.c:1465 +#: ../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:1482 +#: ../midori/sokoke.c:1716 #, c-format msgid " - %s remaining" msgstr "- %s preostalo" #. i18n: A panel at the bottom, to search text in pages -#: ../toolbars/midori-findbar.c:265 +#: ../toolbars/midori-findbar.c:264 msgid "_Inline Find:" msgstr "" -#: ../toolbars/midori-findbar.c:287 +#: ../toolbars/midori-findbar.c:291 msgid "Previous" msgstr "Prethodno" -#: ../toolbars/midori-findbar.c:293 +#: ../toolbars/midori-findbar.c:297 msgid "Next" msgstr "Slijedeće" -#: ../toolbars/midori-findbar.c:297 +#: ../toolbars/midori-findbar.c:301 msgid "Match Case" msgstr "" -#: ../toolbars/midori-findbar.c:306 +#: ../toolbars/midori-findbar.c:310 msgid "Highlight Matches" msgstr "" -#: ../toolbars/midori-findbar.c:317 +#: ../toolbars/midori-findbar.c:321 msgid "Close Findbar" msgstr "" -#: ../toolbars/midori-transferbar.c:124 +#: ../toolbars/midori-transferbar.c:122 #, c-format msgid "The file '%s' has been downloaded." msgstr "Datoteka '%s' je preuzeta." -#: ../toolbars/midori-transferbar.c:129 +#: ../toolbars/midori-transferbar.c:125 msgid "Transfer completed" msgstr "Prijenos zavrÅ¡en" -#: ../toolbars/midori-transferbar.c:201 +#: ../toolbars/midori-transferbar.c:193 msgid "The downloaded file is erroneous." msgstr "Preuzeta datoteka je pogreÅ¡na." -#: ../toolbars/midori-transferbar.c:202 +#: ../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:345 ../panels/midori-transfers.c:142 +#: ../toolbars/midori-transferbar.c:331 ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "Očisti sve" -#: ../toolbars/midori-transferbar.c:382 ../toolbars/midori-transferbar.c:384 +#: ../toolbars/midori-transferbar.c:368 ../toolbars/midori-transferbar.c:370 msgid "Some files are being downloaded" msgstr "Neke datoteke su preuzete" -#: ../toolbars/midori-transferbar.c:388 +#: ../toolbars/midori-transferbar.c:374 msgid "_Quit Midori" msgstr "_Isključi Midori" -#: ../toolbars/midori-transferbar.c:390 +#: ../toolbars/midori-transferbar.c:376 msgid "The transfers will be cancelled if Midori quits." msgstr "Prijenosi će biti odgođeni ako se Midori isključi" -#: ../panels/midori-bookmarks.c:308 +#: ../panels/midori-bookmarks.c:113 +msgid "Bookmarks" +msgstr "ZabiljeÅ¡ke" + +#: ../panels/midori-bookmarks.c:260 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "Neuspjeh u dodavanju stavki zabiljeÅ¡ki: %s\n" -#: ../panels/midori-bookmarks.c:475 -#, c-format -msgid "Failed to update bookmark : %s\n" -msgstr "Neuspjeh u dopuni zabiljeÅ¡ki : %s\n" - -#: ../panels/midori-bookmarks.c:535 +#: ../panels/midori-bookmarks.c:440 msgid "Edit the selected bookmark" msgstr "Uredi odabrane zabiljeÅ¡ke" -#: ../panels/midori-bookmarks.c:543 +#: ../panels/midori-bookmarks.c:448 msgid "Delete the selected bookmark" msgstr "IzbriÅ¡i odabrane zabiljeÅ¡ke" -#: ../panels/midori-bookmarks.c:558 +#: ../panels/midori-bookmarks.c:463 msgid "Add a new folder" msgstr "Dodaj novu mapu" -#: ../panels/midori-bookmarks.c:697 ../panels/midori-history.c:638 +#: ../panels/midori-bookmarks.c:597 ../panels/midori-history.c:579 msgid "Separator" msgstr "Razdjelnik" -#. Create the filter entry -#: ../panels/midori-bookmarks.c:1027 -msgid "Search Bookmarks" -msgstr "Pretraži zabiljeÅ¡ke" - -#: ../panels/midori-history.c:111 +#: ../panels/midori-history.c:110 msgid "History" msgstr "Povijest" -#: ../panels/midori-history.c:158 ../panels/midori-history.c:189 -msgid "Today" -msgstr "Danas" - -#: ../panels/midori-history.c:160 ../panels/midori-history.c:191 -msgid "Yesterday" -msgstr "Jučer" +#: ../panels/midori-history.c:142 +msgid "A week ago" +msgstr "Prije tjedan dana" -#: ../panels/midori-history.c:162 ../panels/midori-history.c:186 +#: ../panels/midori-history.c:144 #, c-format msgid "%d day ago" msgid_plural "%d days ago" @@ -2254,45 +2086,39 @@ msgstr[0] "% d dan prije" msgstr[1] "% d dana prije" msgstr[2] "% d dana prije" -#: ../panels/midori-history.c:165 ../panels/midori-history.c:184 -msgid "A week ago" -msgstr "Prije tjedan dana" +#: ../panels/midori-history.c:147 +msgid "Today" +msgstr "Danas" -#: ../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:149 +msgid "Yesterday" +msgstr "Jučer" -#: ../panels/midori-history.c:360 +#: ../panels/midori-history.c:317 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:407 +#: ../panels/midori-history.c:363 msgid "Bookmark the selected history item" msgstr "Zabilježi odabranu stavku povijesti" -#: ../panels/midori-history.c:416 +#: ../panels/midori-history.c:372 msgid "Delete the selected history item" msgstr "IzbriÅ¡i odabranu stavku povijesti" -#: ../panels/midori-history.c:424 +#: ../panels/midori-history.c:380 msgid "Clear the entire history" msgstr "ObriÅ¡i cijelu povijest" -#. Create the filter entry -#: ../panels/midori-history.c:997 -msgid "Search History" -msgstr "Pretraži povijest" - -#: ../panels/midori-transfers.c:87 +#: ../panels/midori-transfers.c:86 msgid "Transfers" msgstr "Prijenosi" -#: ../panels/midori-transfers.c:470 +#: ../panels/midori-transfers.c:467 msgid "Open Destination _Folder" msgstr "Otvori odrediÅ¡ni _direktorij" -#: ../panels/midori-transfers.c:473 +#: ../panels/midori-transfers.c:470 msgid "Copy Link Loc_ation" msgstr "Kopiraj lokaciju po_veznice" @@ -2320,95 +2146,95 @@ msgstr "Lozinka" msgid "_Remember password" msgstr "_Zapamti lozinku" -#: ../katze/katze-throbber.c:949 +#: ../katze/katze-throbber.c:942 #, c-format msgid "Named icon '%s' couldn't be loaded" msgstr "Imenovana ikona '%s ne može biti učitana" -#: ../katze/katze-throbber.c:962 +#: ../katze/katze-throbber.c:955 #, c-format msgid "Stock icon '%s' couldn't be loaded" msgstr "" -#: ../katze/katze-throbber.c:1042 +#: ../katze/katze-throbber.c:1035 msgid "Animation frames are broken" msgstr "" -#: ../katze/katze-utils.c:443 ../katze/katze-utils.c:867 +#: ../katze/katze-utils.c:439 ../katze/katze-utils.c:873 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Svojstvo '%s' nije valjano za %s" -#: ../katze/katze-utils.c:489 ../katze/katze-utils.c:518 +#: ../katze/katze-utils.c:485 ../katze/katze-utils.c:514 #: ../extensions/addons.c:308 msgid "Choose file" msgstr "Izaberi datoteku" -#: ../katze/katze-utils.c:504 +#: ../katze/katze-utils.c:500 msgid "Choose folder" msgstr "Izaberi mapu" -#: ../katze/katze-utils.c:602 +#: ../katze/katze-utils.c:604 msgid "None" msgstr "Nijedan" -#: ../katze/katze-utils.c:717 +#: ../katze/katze-utils.c:719 msgid "1 hour" msgstr "1 sat" -#: ../katze/katze-utils.c:718 +#: ../katze/katze-utils.c:720 msgid "1 day" msgstr "1 dan" -#: ../katze/katze-utils.c:719 +#: ../katze/katze-utils.c:721 msgid "1 week" msgstr "1 tjedan" -#: ../katze/katze-utils.c:720 +#: ../katze/katze-utils.c:722 msgid "1 month" msgstr "1 mjesec" -#: ../katze/katze-utils.c:721 +#: ../katze/katze-utils.c:723 msgid "1 year" msgstr "1 godina" -#: ../katze/katze-preferences.c:98 ../extensions/history-list.vala:235 +#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235 #, c-format msgid "Preferences for %s" msgstr "Osobitosti za %s" -#: ../extensions/adblock.c:470 +#: ../extensions/adblock.c:434 msgid "Configure Advertisement filters" msgstr "Konfiguriraj filtere oglaÅ¡avanja" -#: ../extensions/adblock.c:503 +#: ../extensions/adblock.c:465 #, 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:917 +#: ../extensions/adblock.c:816 msgid "Edit rule" msgstr "Uredi pravilo" -#: ../extensions/adblock.c:931 +#: ../extensions/adblock.c:830 msgid "_Rule:" msgstr "_Pravilo:" -#: ../extensions/adblock.c:985 +#: ../extensions/adblock.c:884 msgid "Bl_ock image" msgstr "Bl_okiraj sliku" -#: ../extensions/adblock.c:990 +#: ../extensions/adblock.c:889 msgid "Bl_ock link" msgstr "Bl_okiraj poveznicu" -#: ../extensions/adblock.c:1689 +#: ../extensions/adblock.c:1483 msgid "Advertisement blocker" msgstr "" -#: ../extensions/adblock.c:1690 +#: ../extensions/adblock.c:1484 msgid "Block advertisements according to a filter list" msgstr "Blokiraj oglaÅ¡avanj sukladno sa listom filtera" @@ -2436,84 +2262,84 @@ msgstr "_Instaliraj korisnički stil" msgid "Don't install" msgstr "Nemoj instalirati" -#: ../extensions/addons.c:319 ../extensions/addons.c:677 +#: ../extensions/addons.c:319 ../extensions/addons.c:681 msgid "Userscripts" msgstr "Korisničke skripte" -#: ../extensions/addons.c:324 ../extensions/addons.c:679 +#: ../extensions/addons.c:324 ../extensions/addons.c:683 msgid "Userstyles" msgstr "Korisnički stilovi" -#: ../extensions/addons.c:370 ../extensions/addons.c:449 +#: ../extensions/addons.c:380 ../extensions/addons.c:459 #: ../extensions/feed-panel/main.c:129 msgid "Error" msgstr "GreÅ¡ka" -#: ../extensions/addons.c:411 +#: ../extensions/addons.c:421 #, c-format msgid "Do you want to delete '%s'?" msgstr "Želite li izbrisati '%s'?" -#: ../extensions/addons.c:417 +#: ../extensions/addons.c:427 msgid "Delete user script" msgstr "IzbriÅ¡i korisničke skripte" -#: ../extensions/addons.c:418 +#: ../extensions/addons.c:428 msgid "Delete user style" msgstr "IzbriÅ¡i korisnički stil" -#: ../extensions/addons.c:421 +#: ../extensions/addons.c:431 #, c-format msgid "The file %s will be permanently deleted." msgstr "Datoteka %sće biti trajno uklonjena" -#: ../extensions/addons.c:566 ../extensions/addons.c:643 +#: ../extensions/addons.c:570 ../extensions/addons.c:647 msgid "Open in Text Editor" msgstr "Otvori u uređivaču teksta" -#: ../extensions/addons.c:568 ../extensions/addons.c:652 +#: ../extensions/addons.c:572 ../extensions/addons.c:656 msgid "Open Target Folder" msgstr "Otvori odrediÅ¡ni direktorij" -#: ../extensions/addons.c:634 +#: ../extensions/addons.c:638 msgid "Add new addon" msgstr "Dodaj novu dodatak" -#: ../extensions/addons.c:660 +#: ../extensions/addons.c:664 msgid "Remove selected addon" msgstr "Ukloni odabrani dodatak" -#: ../extensions/addons.c:1689 ../extensions/addons.c:1907 +#: ../extensions/addons.c:1691 ../extensions/addons.c:1909 msgid "User addons" msgstr "Korisnički dodaci" -#: ../extensions/addons.c:1819 +#: ../extensions/addons.c:1821 #, c-format msgid "Can't monitor folder '%s': %s" msgstr "" -#: ../extensions/addons.c:1908 +#: ../extensions/addons.c:1910 msgid "Support for userscripts and userstyles" msgstr "PodrÅ¡ka za korisničke skripte i stilove" -#: ../extensions/colorful-tabs.c:201 +#: ../extensions/colorful-tabs.c:202 msgid "Colorful Tabs" msgstr "Obojane kartice" -#: ../extensions/colorful-tabs.c:202 +#: ../extensions/colorful-tabs.c:203 msgid "Tint each tab distinctly" msgstr "" -#: ../extensions/cookie-manager/cookie-manager-page.c:73 +#: ../extensions/cookie-manager/cookie-manager-page.c:80 #: ../extensions/cookie-manager/main.c:35 msgid "Cookie Manager" msgstr "Upravitelj kolačićima" -#: ../extensions/cookie-manager/cookie-manager-page.c:103 +#: ../extensions/cookie-manager/cookie-manager-page.c:110 msgid "Delete All" msgstr "IzbriÅ¡i sve" -#: ../extensions/cookie-manager/cookie-manager-page.c:105 +#: ../extensions/cookie-manager/cookie-manager-page.c:112 msgid "" "Deletes all shown cookies. If a filter is set, only those cookies are " "deleted which match the filter." @@ -2521,31 +2347,31 @@ 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:120 +#: ../extensions/cookie-manager/cookie-manager-page.c:127 msgid "Expand All" msgstr "ProÅ¡iri sve" -#: ../extensions/cookie-manager/cookie-manager-page.c:127 +#: ../extensions/cookie-manager/cookie-manager-page.c:134 msgid "Collapse All" msgstr "Skupi sve" -#: ../extensions/cookie-manager/cookie-manager-page.c:572 +#: ../extensions/cookie-manager/cookie-manager-page.c:576 msgid "Do you really want to delete all cookies?" msgstr "Želite li izbrisati sve kolačiće?" -#: ../extensions/cookie-manager/cookie-manager-page.c:574 +#: ../extensions/cookie-manager/cookie-manager-page.c:578 msgid "Question" msgstr "Pitanje" -#: ../extensions/cookie-manager/cookie-manager-page.c:583 +#: ../extensions/cookie-manager/cookie-manager-page.c:587 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:671 +#: ../extensions/cookie-manager/cookie-manager-page.c:675 msgid "At the end of the session" msgstr "Na kraju sesije" -#: ../extensions/cookie-manager/cookie-manager-page.c:674 +#: ../extensions/cookie-manager/cookie-manager-page.c:678 #, c-format msgid "" "Host: %s\n" @@ -2562,15 +2388,15 @@ msgstr "" "Sigurno: %s\n" "Ističe: %s" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:684 msgid "Yes" msgstr "Da" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:684 msgid "No" msgstr "Ne" -#: ../extensions/cookie-manager/cookie-manager-page.c:694 +#: ../extensions/cookie-manager/cookie-manager-page.c:698 #, c-format msgid "" "Domain: %s\n" @@ -2579,20 +2405,26 @@ msgstr "" "Domena: %s\n" "Kolačići: %d" -#: ../extensions/cookie-manager/cookie-manager-page.c:1017 +#: ../extensions/cookie-manager/cookie-manager-page.c:1028 msgid "Name" msgstr "Ime" -#: ../extensions/cookie-manager/cookie-manager-page.c:1069 +#: ../extensions/cookie-manager/cookie-manager-page.c:1081 msgid "_Expand All" msgstr "_ProÅ¡iri sve" -#: ../extensions/cookie-manager/cookie-manager-page.c:1077 +#: ../extensions/cookie-manager/cookie-manager-page.c:1089 msgid "_Collapse All" msgstr "_Skupi sve" -#: ../extensions/cookie-manager/cookie-manager-page.c:1129 -msgid "Search Cookies by Name or Domain" +#: ../extensions/cookie-manager/cookie-manager-page.c:1142 +msgid "Filter:" +msgstr "Filter:" + +#: ../extensions/cookie-manager/cookie-manager-page.c:1147 +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 @@ -2691,70 +2523,44 @@ msgstr "" msgid "Read Atom/ RSS feeds" msgstr "" -#: ../extensions/formhistory/formhistory.c:39 +#: ../extensions/formhistory.c:143 #, 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 "" -"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 +#: ../extensions/formhistory.c:295 msgid "Toggle form history state" msgstr "" -#: ../extensions/formhistory/formhistory.c:438 +#: ../extensions/formhistory.c:296 msgid "Activate or deactivate form history for the current tab." msgstr "" -#: ../extensions/formhistory/formhistory.c:549 -#: ../extensions/formhistory/formhistory.c:553 +#: ../extensions/formhistory.c:432 ../extensions/formhistory.c:436 #, 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" +#: ../extensions/formhistory.c:511 +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 +#: ../extensions/formhistory.c:570 msgid "Stores history of entered form data" msgstr "" -#: ../extensions/formhistory/formhistory-gdom-frontend.c:225 -#: ../extensions/formhistory/formhistory-js-frontend.c:106 +#: ../extensions/formhistory.c:574 #, c-format -msgid "Failed to select suggestions\n" -msgstr "Neuspjeli odabir prijedloga\n" +msgid "Not available: %s" +msgstr "Nije dostupno: %s" + +#: ../extensions/formhistory.c:575 +msgid "Resource files not installed" +msgstr "" + +#: ../extensions/formhistory.c:581 +msgid "Form history filler" +msgstr "" #: ../extensions/history-list.vala:197 msgid "There are no unvisited tabs" @@ -2767,11 +2573,11 @@ msgstr "Lista povijesti" #: ../extensions/history-list.vala:275 msgid "Tab closing behavior" -msgstr "PonaÅ¡anje zatvaranja kartica" +msgstr "" #: ../extensions/history-list.vala:283 msgid "Do nothing" -msgstr "Ne čini niÅ¡ta" +msgstr "" #: ../extensions/history-list.vala:289 msgid "Switch to last viewed tab" @@ -2829,15 +2635,15 @@ msgstr "Učitaj ponovno stranicu ili zaustavi učitavanje" msgid "Customize Keyboard shortcuts" msgstr "Prilagodi kratice tipkovnice" -#: ../extensions/shortcuts.c:283 +#: ../extensions/shortcuts.c:285 msgid "Customize Sh_ortcuts..." msgstr "Prilagodi kr_atice..." -#: ../extensions/shortcuts.c:320 +#: ../extensions/shortcuts.c:322 msgid "Shortcuts" msgstr "Kratice" -#: ../extensions/shortcuts.c:321 +#: ../extensions/shortcuts.c:323 msgid "View and edit keyboard shortcuts" msgstr "Pogledaj i uredi kratice tipkovnice" @@ -2849,73 +2655,77 @@ msgstr "Sat statusne trake" msgid "Display date and time in the statusbar" msgstr "Prikaži datum i vrijeme u statusnoj traci" -#: ../extensions/statusbar-features.c:152 +#: ../extensions/statusbar-features.c:128 msgid "Images" msgstr "Slike" -#: ../extensions/statusbar-features.c:162 +#: ../extensions/statusbar-features.c:137 msgid "Scripts" msgstr "Skripte" -#: ../extensions/statusbar-features.c:174 +#: ../extensions/statusbar-features.c:146 msgid "Netscape plugins" msgstr "Netscape priključci" -#: ../extensions/statusbar-features.c:259 +#: ../extensions/statusbar-features.c:192 msgid "Statusbar Features" msgstr "Obilježja statusne trake" -#: ../extensions/statusbar-features.c:260 +#: ../extensions/statusbar-features.c:193 msgid "Easily toggle features on web pages on and off" msgstr "" -#: ../extensions/tab-panel.c:589 ../extensions/tab-panel.c:676 +#: ../extensions/tab-panel.c:596 ../extensions/tab-panel.c:683 msgid "Tab Panel" msgstr "Kartica ploče" -#: ../extensions/tab-panel.c:659 +#: ../extensions/tab-panel.c:666 msgid "T_ab Panel" msgstr "K_artica ploče" -#: ../extensions/tab-panel.c:677 +#: ../extensions/tab-panel.c:684 msgid "Show tabs in a vertical panel" msgstr "Pokaži kartice u okomitoj ploči" #: ../extensions/tabs-minimized.c:76 msgid "Only Icons on Tabs by default" -msgstr "Kao zadano samo ikone na karticama" +msgstr "" #: ../extensions/tabs-minimized.c:77 msgid "New tabs have no label by default" msgstr "" -#: ../extensions/toolbar-editor.c:395 +#: ../extensions/toolbar-editor.c:393 msgid "Customize Toolbar" msgstr "Prilagodi alatnu traku" -#: ../extensions/toolbar-editor.c:411 +#: ../extensions/toolbar-editor.c:413 msgid "" -"Select items to be displayed on the toolbar. Items can be reordered by drag " +"Select items to be displayed on the toolbar. Items can be reodered by drag " "and drop." msgstr "" -#: ../extensions/toolbar-editor.c:427 +#: ../extensions/toolbar-editor.c:429 msgid "Available Items" msgstr "Dostupne stavke" -#: ../extensions/toolbar-editor.c:448 +#: ../extensions/toolbar-editor.c:450 msgid "Displayed Items" msgstr "Prikazane stavke" -#: ../extensions/toolbar-editor.c:588 -msgid "_Customize Toolbar…" -msgstr "_Prilagodi alatnu traku" +#: ../extensions/toolbar-editor.c:585 +msgid "Customize _Toolbar..." +msgstr "Prilagodi_Alatnu traku..." -#: ../extensions/toolbar-editor.c:617 +#: ../extensions/toolbar-editor.c:601 +msgid "_Customize..." +msgstr "Prilagodi..." + +#: ../extensions/toolbar-editor.c:631 msgid "Toolbar Editor" msgstr "Uređivač alatne trake" -#: ../extensions/toolbar-editor.c:618 +#: ../extensions/toolbar-editor.c:632 msgid "Easily edit the toolbar layout" msgstr "Jednostavno uređivanje izgleda alatnih traka" @@ -2923,60 +2733,6 @@ msgstr "Jednostavno uređivanje izgleda alatnih traka" msgid "Cache HTTP communication on disk" msgstr "" -#~ msgid "Close ot_her Tabs" -#~ msgstr "Zatvori dr_uge kartice" - -#~ msgid "_Icon:" -#~ msgstr "_Ikona:" - -#~ msgid "Filter:" -#~ msgstr "Filter:" - -#~ msgid "_Bookmark" -#~ msgstr "_ZabiljeÅ¡ka" - -#~ msgid "_Console" -#~ msgstr "_Konzola" - -#~ msgid "Import bookmarks..." -#~ msgstr "Uvezi zabiljeÅ¡ke..." - -#~ msgid "Search with..." -#~ msgstr "Traži pomoću..." - -#~ msgid "Customize _Toolbar..." -#~ msgstr "Prilagodi_Alatnu traku..." - -#~ msgid "_Customize..." -#~ msgstr "Prilagodi..." - -#~ msgid "_Title:" -#~ msgstr "_Naslov:" - -#~ msgid "_Folder:" -#~ msgstr "_Mapa:" - -#~ 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Å¡" diff --git a/po/hu.po b/po/hu.po index d6dd4f08..bed3bac2 100644 --- a/po/hu.po +++ b/po/hu.po @@ -1,2217 +1,2281 @@ # 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, 2012. +# +# Gabor Kelemen , 2010. msgid "" msgstr "" "Project-Id-Version: midori master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-04-20 22:03+0000\n" -"PO-Revision-Date: 2012-04-21 05:15+0200\n" +"POT-Creation-Date: 2010-12-24 05:14+0000\n" +"PO-Revision-Date: 2010-11-24 23:26+0100\n" "Last-Translator: Gabor Kelemen \n" -"Language-Team: Magyar \n" -"Language: \n" +"Language-Team: Hungarian \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: Lokalize 1.0\n" +"X-Generator: KBabel 1.11.4\n" #: ../data/midori.desktop.in.h:1 -msgid "Browse the Web" -msgstr "A világháló böngészése" +msgid "Lightweight web browser" +msgstr "Könnyűsúlyú webböngésző" -#: ../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 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1356 ../midori/main.c:1752 +#: ../midori/main.c:1760 ../midori/main.c:1776 +#: ../midori/midori-websettings.c:315 msgid "Midori" msgstr "Midori" -#: ../data/midori.desktop.in.h:4 +#: ../data/midori.desktop.in.h:3 msgid "Web Browser" msgstr "Webböngésző" -#: ../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 +#: ../midori/main.c:94 #, 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:150 +#: ../midori/main.c:142 #, c-format msgid "Value '%s' is invalid for %s" msgstr "A(z) „%s” érték érvénytelen ehhez: %s" -#: ../midori/main.c:155 ../midori/main.c:259 +#: ../midori/main.c:147 ../midori/main.c:240 #, c-format msgid "Invalid configuration value '%s'" msgstr "Érvénytelen beállításérték: „%s”" -#: ../midori/main.c:380 +#: ../midori/main.c:345 #, 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 +#: ../midori/main.c:399 #, 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 +#: ../midori/main.c:421 ../midori/main.c:578 ../extensions/formhistory.c:443 #, 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:524 +#: ../midori/main.c:485 #, 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:564 ../panels/midori-history.c:232 +#: ../midori/main.c:530 +#, c-format +msgid "Failed to add bookmark item: %s\n" +msgstr "A könyvjelzőelem hozzáadása meghiúsult: %s\n" + +#: ../midori/main.c:561 ../panels/midori-history.c:180 #, 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 +#: ../midori/main.c:608 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "A könyvjelzők nem menthetők. %s" -#: ../midori/main.c:633 +#: ../midori/main.c:632 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "A beállítások nem menthetők. %s" -#: ../midori/main.c:668 +#: ../midori/main.c:667 #, 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:705 +#: ../midori/main.c:684 ../midori/main.c:704 #, c-format msgid "The trash couldn't be saved. %s" msgstr "A Kuka nem menthető. %s" -#: ../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 +#: ../midori/main.c:755 ../midori/main.c:993 #, c-format msgid "The session couldn't be saved. %s" msgstr "A munkamenet nem menthető. %s" -#: ../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:940 +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:1028 +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:1134 +#: ../midori/main.c:1044 msgid "Modify _preferences" msgstr "Beállítások _módosítása" -#: ../midori/main.c:1138 +#: ../midori/main.c:1048 +msgid "Reset the last _session" +msgstr "_Utolsó munkamenet visszaállítása" + +#: ../midori/main.c:1053 msgid "Disable all _extensions" msgstr "Minden _kiterjesztés letiltása" -#: ../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 +#: ../midori/main.c:1236 ../midori/main.c:2040 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "A munkamenet nem tölthető be: %s\n" -#: ../midori/main.c:1538 +#: ../midori/main.c:1356 +msgid "No filename specified" +msgstr "Nincs megadva fájlnév" + +#: ../midori/main.c:1375 +msgid "An unknown error occured." +msgstr "Ismeretlen hiba történt." + +#: ../midori/main.c:1406 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Pillanatkép mentve ide: %s\n" -#: ../midori/main.c:1951 +#: ../midori/main.c:1642 msgid "Run ADDRESS as a web application" msgstr "A CÍM futtatása webalkalmazásként" -#: ../midori/main.c:1951 +#: ../midori/main.c:1642 msgid "ADDRESS" msgstr "CÍM" -#: ../midori/main.c:1954 +#: ../midori/main.c:1645 msgid "Use FOLDER as configuration folder" msgstr "A MAPPA használata konfigurációs mappaként" -#: ../midori/main.c:1954 +#: ../midori/main.c:1645 msgid "FOLDER" msgstr "MAPPA" -#: ../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 +#: ../midori/main.c:1648 msgid "Show a diagnostic dialog" msgstr "Diagnosztikai ablak megjelenítése" -#: ../midori/main.c:1961 +#: ../midori/main.c:1650 msgid "Run the specified filename as javascript" msgstr "A megadott fájl futtatása javascriptként" -#: ../midori/main.c:1963 +#: ../midori/main.c:1653 msgid "Take a snapshot of the specified URI" msgstr "Pillanatkép készítése a megadott URI-ről" -#: ../midori/main.c:1965 +#: ../midori/main.c:1656 msgid "Execute the specified command" msgstr "A megadott parancs futtatása" -#: ../midori/main.c:1967 +#: ../midori/main.c:1658 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 +#: ../midori/main.c:1660 msgid "Display program version" msgstr "A program verziójának megjelenítése" -#: ../midori/main.c:1971 +#: ../midori/main.c:1662 msgid "Addresses" msgstr "Címek" -#: ../midori/main.c:1973 +#: ../midori/main.c:1664 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:1973 +#: ../midori/main.c:1664 msgid "PATTERN" msgstr "MINTA" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1977 +#: ../midori/main.c:1668 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:1977 +#: ../midori/main.c:1668 msgid "SECONDS" msgstr "MÁSODPERC" -#: ../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 +#: ../midori/main.c:1749 msgid "[Addresses]" msgstr "[Címek]" -#: ../midori/main.c:2087 +#: ../midori/main.c:1777 msgid "Please report comments, suggestions and bugs to:" msgstr "A megjegyzéseit, javaslatait és a hibákat ide küldje:" -#: ../midori/main.c:2089 +#: ../midori/main.c:1779 msgid "Check for new versions at:" msgstr "Új verziókért lásd:" -#. 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:1840 +msgid "Website icons" +msgstr "Weboldalikonok" -#: ../midori/main.c:2175 -msgid "Cookies and Website data" -msgstr "Sütik és weboldaladatok" +#: ../midori/main.c:1842 +msgid "Cookies" +msgstr "Sütik" -#. 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:1845 +msgid "'Flash' Cookies" +msgstr "„Flash” sütik" -#: ../midori/main.c:2182 -msgid "Website icons" -msgstr "Weboldalikonok" +#: ../midori/main.c:1849 +msgid "HTML5 _Databases" +msgstr "HTML5 a_datbázisok" -#: ../midori/main.c:2288 -msgid "An unknown error occured" -msgstr "Ismeretlen hiba történt" +#: ../midori/main.c:1923 +msgid "The specified configuration folder is invalid." +msgstr "A megadott konfigurációs mappa érvénytelen." -#: ../midori/main.c:2395 +#: ../midori/main.c:1971 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:2431 +#: ../midori/main.c:2008 #, 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:2479 +#: ../midori/main.c:2055 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "A Kuka nem tölthető be: %s\n" -#: ../midori/main.c:2492 +#: ../midori/main.c:2068 #, 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:2508 +#: ../midori/main.c:2081 msgid "The following errors occured:" msgstr "A következő hibák történtek:" -#: ../midori/main.c:2524 +#: ../midori/main.c:2097 msgid "_Ignore" msgstr "_Kihagyás" -#: ../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 +#: ../midori/midori-array.c:429 msgid "File not found." msgstr "A fájl nem található." -#: ../midori/midori-array.c:547 ../midori/midori-array.c:586 -#: ../midori/midori-array.c:609 ../midori/midori-array.c:619 +#: ../midori/midori-array.c:463 ../midori/midori-array.c:486 +#: ../midori/midori-array.c:496 msgid "Malformed document." msgstr "Rosszul formált dokumentum." -#: ../midori/midori-array.c:628 +#: ../midori/midori-array.c:505 msgid "Unrecognized bookmark format." msgstr "Ismeretlen könyvjelzőformátum." -#: ../midori/midori-array.c:915 +#: ../midori/midori-array.c:716 msgid "Writing failed." msgstr "Az írás meghiúsult." -#: ../midori/midori-browser.c:331 ../midori/midori-browser.c:5311 -#: ../midori/midori-browser.c:5320 +#: ../midori/midori-browser.c:331 ../midori/midori-browser.c:4882 +#: ../midori/midori-browser.c:4888 msgid "Reload the current page" msgstr "Az aktuális oldal újratöltése" -#: ../midori/midori-browser.c:340 ../midori/midori-browser.c:5317 +#: ../midori/midori-browser.c:341 ../midori/midori-browser.c:4885 msgid "Stop loading the current page" msgstr "Az aktuális oldal betöltésének leállítása" -#: ../midori/midori-browser.c:476 +#: ../midori/midori-browser.c:448 +#, c-format +msgid "%d%% loaded" +msgstr "%d%% betöltve" + +#: ../midori/midori-browser.c:486 #, c-format msgid "Failed to update title: %s\n" msgstr "A cím frissítése meghiúsult: %s\n" -#: ../midori/midori-browser.c:489 +#: ../midori/midori-browser.c:499 #, c-format msgid "Unexpected action '%s'." msgstr "Váratlan művelet: „%s”." -#: ../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 +#: ../midori/midori-browser.c:724 msgid "New folder" msgstr "Új mappa" -#: ../midori/midori-browser.c:784 +#: ../midori/midori-browser.c:724 msgid "Edit folder" msgstr "Mappa szerkesztése" -#: ../midori/midori-browser.c:786 +#: ../midori/midori-browser.c:726 msgid "New bookmark" msgstr "Új könyvjelző" -#: ../midori/midori-browser.c:786 +#: ../midori/midori-browser.c:726 msgid "Edit bookmark" msgstr "Könyvjelző szerkesztése" -#: ../midori/midori-browser.c:828 +#: ../midori/midori-browser.c:757 msgid "_Title:" msgstr "_Cím:" -#: ../midori/midori-browser.c:848 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:774 ../midori/midori-searchaction.c:960 +msgid "_Description:" +msgstr "_Leírás:" + +#: ../midori/midori-browser.c:793 ../midori/midori-searchaction.c:974 #: ../extensions/feed-panel/main.c:377 msgid "_Address:" msgstr "_Webcím:" -#: ../midori/midori-browser.c:871 ../midori/midori-browser.c:4337 +#: ../midori/midori-browser.c:825 ../midori/midori-browser.c:4063 msgid "_Folder:" msgstr "_Mappa:" -#: ../midori/midori-browser.c:887 +#: ../midori/midori-browser.c:835 ../midori/midori-browser.c:926 +#: ../midori/midori-browser.c:4068 ../midori/midori-browser.c:4096 +msgid "Toplevel folder" +msgstr "Felső szintű mappa" + +#: ../midori/midori-browser.c:867 msgid "Add to _Speed Dial" msgstr "Felvétel a _gyorstárcsázásba" -#: ../midori/midori-browser.c:900 +#: ../midori/midori-browser.c:880 msgid "Show in the tool_bar" msgstr "M_egjelenítés az eszköztáron" -#: ../midori/midori-browser.c:915 +#: ../midori/midori-browser.c:895 msgid "Run as _web application" msgstr "_Futtatás webalkalmazásként" -#: ../midori/midori-browser.c:986 +#: ../midori/midori-browser.c:971 #, 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 +#: ../midori/midori-browser.c:973 #, 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 +#: ../midori/midori-browser.c:980 #, 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." -#: ../midori/midori-browser.c:998 +#: ../midori/midori-browser.c:983 #, c-format 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:1036 ../midori/midori-browser.c:4406 +#: ../midori/midori-browser.c:1049 ../midori/midori-browser.c:4139 msgid "Save file as" msgstr "Fájl mentése másként" -#: ../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 +#: ../midori/midori-browser.c:1447 msgid "Save file" msgstr "Fájl mentése" -#: ../midori/midori-browser.c:2377 +#: ../midori/midori-browser.c:2146 msgid "Open file" msgstr "Fájl megnyitása" -#: ../midori/midori-browser.c:2509 +#: ../midori/midori-browser.c:2256 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." - -#: ../midori/midori-browser.c:2515 ../extensions/feed-panel/main.c:365 +"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:2262 ../extensions/feed-panel/main.c:365 msgid "New feed" msgstr "Új hírforrás" -#: ../midori/midori-browser.c:2558 ../midori/midori-browser.c:5380 -#: ../panels/midori-bookmarks.c:427 +#: ../midori/midori-browser.c:2305 ../midori/midori-browser.c:4947 +#: ../panels/midori-bookmarks.c:377 msgid "Add a new bookmark" msgstr "Új könyvjelző hozzáadása" -#: ../midori/midori-browser.c:3057 ../midori/midori-searchaction.c:488 +#: ../midori/midori-browser.c:2860 ../midori/midori-searchaction.c:481 msgid "Empty" msgstr "Üres" -#: ../midori/midori-browser.c:3477 -msgid "Toggle text cursor navigation" -msgstr "Kurzoros szövegnavigáció átváltása" +#: ../midori/midori-browser.c:3327 ../midori/sokoke.c:435 +#: ../midori/sokoke.c:445 ../midori/sokoke.c:473 ../midori/sokoke.c:502 +#: ../midori/sokoke.c:516 +msgid "Could not run external program." +msgstr "A külső program nem futtatható." -#: ../midori/midori-browser.c:3793 ../midori/midori-browser.c:5766 +#: ../midori/midori-browser.c:3570 ../midori/midori-browser.c:5343 #, 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:4125 ../panels/midori-bookmarks.c:743 -#: ../panels/midori-history.c:801 +#: ../midori/midori-browser.c:3897 ../panels/midori-bookmarks.c:690 +#: ../panels/midori-history.c:729 msgid "Open all in _Tabs" msgstr "Összes _megnyitása lapokon" -#: ../midori/midori-browser.c:4132 ../panels/midori-bookmarks.c:749 -#: ../panels/midori-history.c:807 ../extensions/feed-panel/feed-panel.c:528 +#: ../midori/midori-browser.c:3904 ../panels/midori-bookmarks.c:696 +#: ../panels/midori-history.c:735 ../extensions/feed-panel/feed-panel.c:536 msgid "Open in New _Tab" msgstr "Megnyi_tás új lapon" -#: ../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 +#: ../midori/midori-browser.c:3907 ../midori/midori-view.c:2625 +#: ../midori/midori-view.c:4331 ../panels/midori-bookmarks.c:698 +#: ../panels/midori-history.c:737 ../extensions/feed-panel/feed-panel.c:538 msgid "Open in New _Window" msgstr "Megnyitás új _ablakban" -#: ../midori/midori-browser.c:4224 +#: ../midori/midori-browser.c:3986 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4225 +#: ../midori/midori-browser.c:3987 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4226 +#: ../midori/midori-browser.c:3988 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4227 +#: ../midori/midori-browser.c:3989 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4228 +#: ../midori/midori-browser.c:3990 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4229 -#, c-format -msgid "Firefox (%s)" -msgstr "Firefox (%s)" - -#: ../midori/midori-browser.c:4250 -msgid "Import bookmarks…" +#: ../midori/midori-browser.c:4014 +msgid "Import bookmarks..." msgstr "Könyvjelzők importálása…" -#: ../midori/midori-browser.c:4253 ../midori/midori-browser.c:5385 +#: ../midori/midori-browser.c:4017 ../midori/midori-browser.c:4952 msgid "_Import bookmarks" msgstr "_Könyvjelzők importálása" -#: ../midori/midori-browser.c:4264 +#: ../midori/midori-browser.c:4028 msgid "_Application:" msgstr "_Alkalmazás:" -#: ../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 +#: ../midori/midori-browser.c:4055 ../midori/midori-browser.c:4104 msgid "Import from a file" msgstr "Importálás fájlból" -#: ../midori/midori-browser.c:4376 +#: ../midori/midori-browser.c:4115 msgid "Failed to import bookmarks" msgstr "A könyvjelzők importálása sikertelen" -#: ../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 +#: ../midori/midori-browser.c:4156 msgid "Failed to export bookmarks" msgstr "A könyvjelzők exportálása sikertelen" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4567 +#: ../midori/midori-browser.c:4273 msgid "Clear Private Data" msgstr "Privát adatok törlése" -#: ../midori/midori-browser.c:4571 +#: ../midori/midori-browser.c:4277 msgid "_Clear private data" msgstr "_Privát adatok törlése" -#: ../midori/midori-browser.c:4584 +#: ../midori/midori-browser.c:4291 msgid "Clear the following data:" msgstr "A következő adatok törlése:" -#: ../midori/midori-browser.c:4594 -msgid "Last open _tabs" -msgstr "_Legutóbb nyitott lapok" +#. i18n: Browsing history, visited web pages +#: ../midori/midori-browser.c:4302 ../midori/sokoke.c:1397 +msgid "_History" +msgstr "_Előzmények" + +#: ../midori/midori-browser.c:4307 ../midori/sokoke.c:1403 +msgid "_Closed Tabs" +msgstr "_Bezárt lapok" -#: ../midori/midori-browser.c:4620 +#: ../midori/midori-browser.c:4327 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:4815 +#: ../midori/midori-browser.c:4467 msgid "A lightweight web browser." msgstr "Könnyűsúlyú webböngésző." -#: ../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:4469 +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:4839 +#: ../midori/midori-browser.c:4488 msgid "translator-credits" -msgstr "Kelemen Gábor " +msgstr "Kelemen Gábor " -#: ../midori/midori-browser.c:5227 +#: ../midori/midori-browser.c:4795 msgid "_File" msgstr "_Fájl" -#: ../midori/midori-browser.c:5230 +#: ../midori/midori-browser.c:4797 ../midori/sokoke.c:1404 +msgid "New _Window" +msgstr "Új _ablak" + +#: ../midori/midori-browser.c:4798 msgid "Open a new window" msgstr "Új ablak megnyitása" -#: ../midori/midori-browser.c:5233 +#: ../midori/midori-browser.c:4801 msgid "Open a new tab" msgstr "Új lap megnyitása" -#: ../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:4803 +msgid "P_rivate Browsing" +msgstr "_Privát böngészés" -#: ../midori/midori-browser.c:5239 +#: ../midori/midori-browser.c:4804 +msgid "Don't save any private data while browsing" +msgstr "Ne mentsen privát adatokat böngészéskor" + +#: ../midori/midori-browser.c:4808 msgid "Open a file" msgstr "Fájl megnyitása" -#: ../midori/midori-browser.c:5241 -msgid "_Save Page As…" -msgstr "Oldal _mentése másként…" - -#: ../midori/midori-browser.c:5242 +#: ../midori/midori-browser.c:4811 msgid "Save to a file" msgstr "Mentés fájlba" -#: ../midori/midori-browser.c:5244 +#: ../midori/midori-browser.c:4813 msgid "Add to Speed _dial" msgstr "Hozzáadás _gyorstárcsázáshoz" -#: ../midori/midori-browser.c:5248 +#: ../midori/midori-browser.c:4814 +msgid "Add shortcut to speed dial" +msgstr "Indítóikon hozzáadása a gyorstárcsázáshoz" + +#: ../midori/midori-browser.c:4816 msgid "Add Shortcut to the _desktop" -msgstr "Parancsikon hozzáadása az _asztalhoz" +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:4817 +msgid "Add shortcut to the desktop" +msgstr "Indítóikon hozzáadása az asztalhoz" -#: ../midori/midori-browser.c:5254 +#: ../midori/midori-browser.c:4819 msgid "Subscribe to News _feed" msgstr "_Feliratkozás hírforrásra" -#: ../midori/midori-browser.c:5260 +#: ../midori/midori-browser.c:4820 +msgid "Subscribe to this news feed" +msgstr "Feliratkozás erre a hírforrásra" + +#: ../midori/midori-browser.c:4825 msgid "_Close Tab" msgstr "Lap _bezárása" -#: ../midori/midori-browser.c:5261 +#: ../midori/midori-browser.c:4826 msgid "Close the current tab" msgstr "A jelenlegi lap bezárása" -#: ../midori/midori-browser.c:5263 +#: ../midori/midori-browser.c:4828 msgid "C_lose Window" msgstr "_Ablak bezárása" -#: ../midori/midori-browser.c:5267 +#: ../midori/midori-browser.c:4829 +msgid "Close this window" +msgstr "A jelenlegi ablak bezárása" + +#: ../midori/midori-browser.c:4832 msgid "Print the current page" msgstr "A jelenlegi oldal nyomtatása" -#: ../midori/midori-browser.c:5269 -msgid "Close a_ll Windows" -msgstr "Minden _ablak bezárása" +#: ../midori/midori-browser.c:4835 +msgid "Quit the application" +msgstr "Kilépés az alkalmazásból" -#: ../midori/midori-browser.c:5272 +#: ../midori/midori-browser.c:4837 msgid "_Edit" msgstr "S_zerkesztés" -#: ../midori/midori-browser.c:5295 -msgid "_Find…" -msgstr "_Keresés…" +#: ../midori/midori-browser.c:4841 +msgid "Undo the last modification" +msgstr "Az utolsó módosítás visszavonása" -#: ../midori/midori-browser.c:5296 +#: ../midori/midori-browser.c:4844 +msgid "Redo the last modification" +msgstr "Az utolsó módosítás újra végrehajtása" + +#: ../midori/midori-browser.c:4848 +msgid "Cut the selected text" +msgstr "A kijelölt szöveg kivágása" + +#: ../midori/midori-browser.c:4851 ../midori/midori-browser.c:4854 +msgid "Copy the selected text" +msgstr "A kijelölt szöveg másolása" + +#: ../midori/midori-browser.c:4857 +msgid "Paste text from the clipboard" +msgstr "Beillesztés a vágólapról" + +#: ../midori/midori-browser.c:4860 +msgid "Delete the selected text" +msgstr "A kijelölt szöveg törlése" + +#: ../midori/midori-browser.c:4863 +msgid "Select all text" +msgstr "A teljes szöveg kijelölése" + +#: ../midori/midori-browser.c:4866 msgid "Find a word or phrase in the page" msgstr "Szó vagy kifejezés keresése az oldalon" -#: ../midori/midori-browser.c:5298 +#: ../midori/midori-browser.c:4868 msgid "Find _Next" msgstr "_Következő találat" -#: ../midori/midori-browser.c:5301 +#: ../midori/midori-browser.c:4869 +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:4871 msgid "Find _Previous" msgstr "_Előző találat" -#: ../midori/midori-browser.c:5305 +#: ../midori/midori-browser.c:4872 +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:4876 msgid "Configure the application preferences" msgstr "Az alkalmazás beállításainak megadása" -#: ../midori/midori-browser.c:5307 +#: ../midori/midori-browser.c:4878 msgid "_View" msgstr "_Nézet" -#: ../midori/midori-browser.c:5308 +#: ../midori/midori-browser.c:4879 msgid "_Toolbars" msgstr "_Eszköztárak" -#: ../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 +#: ../midori/midori-browser.c:4891 msgid "Increase the zoom level" msgstr "Nagyítási szint növelése" -#: ../midori/midori-browser.c:5326 +#: ../midori/midori-browser.c:4894 msgid "Decrease the zoom level" msgstr "Nagyítási szint csökkentése" -#: ../midori/midori-browser.c:5330 +#: ../midori/midori-browser.c:4897 +msgid "Reset the zoom level" +msgstr "Nagyítási szint visszaállítása" + +#: ../midori/midori-browser.c:4898 msgid "_Encoding" msgstr "_Kódolás" -#: ../midori/midori-browser.c:5332 +#: ../midori/midori-browser.c:4900 msgid "View So_urce" msgstr "_Forrás megjelenítése" -#: ../midori/midori-browser.c:5335 -msgid "Ca_ret Browsing" -msgstr "_Kurzoros böngészés" +#: ../midori/midori-browser.c:4901 +msgid "View the source code of the page" +msgstr "Az oldal forráskódjának megtekintése" -#: ../midori/midori-browser.c:5339 +#: ../midori/midori-browser.c:4904 msgid "Toggle fullscreen view" msgstr "Teljes képernyős nézet be- illetve kikapcsolása" -#: ../midori/midori-browser.c:5341 +#: ../midori/midori-browser.c:4907 msgid "Scroll _Left" msgstr "Görgetés _balra" -#: ../midori/midori-browser.c:5344 +#: ../midori/midori-browser.c:4908 +msgid "Scroll to the left" +msgstr "Görgetés balra" + +#: ../midori/midori-browser.c:4910 msgid "Scroll _Down" msgstr "Görgetés l_e" -#: ../midori/midori-browser.c:5347 +#: ../midori/midori-browser.c:4911 +msgid "Scroll down" +msgstr "Görgetés le" + +#: ../midori/midori-browser.c:4913 msgid "Scroll _Up" msgstr "Görgetés _fel" -#: ../midori/midori-browser.c:5350 +#: ../midori/midori-browser.c:4914 +msgid "Scroll up" +msgstr "Görgetés fel" + +#: ../midori/midori-browser.c:4916 msgid "Scroll _Right" msgstr "Görgetés j_obbra" -#: ../midori/midori-browser.c:5353 +#: ../midori/midori-browser.c:4917 +msgid "Scroll to the right" +msgstr "Görgetés jobbra" + +#: ../midori/midori-browser.c:4920 msgid "_Go" msgstr "_Ugrás" -#: ../midori/midori-browser.c:5356 +#: ../midori/midori-browser.c:4923 msgid "Go back to the previous page" msgstr "Ugrás az előző oldalra" -#: ../midori/midori-browser.c:5359 +#: ../midori/midori-browser.c:4926 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:5363 +#: ../midori/midori-browser.c:4930 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:5367 +#: ../midori/midori-browser.c:4934 msgid "Go to the next sub-page" msgstr "Ugrás a következő aloldalra" -#: ../midori/midori-browser.c:5370 +#: ../midori/midori-browser.c:4937 msgid "Go to your homepage" msgstr "Ugrás a kezdőlapra" -#: ../midori/midori-browser.c:5372 +#: ../midori/midori-browser.c:4939 msgid "Empty Trash" msgstr "Kuka ürítése" -#: ../midori/midori-browser.c:5375 +#: ../midori/midori-browser.c:4940 +msgid "Delete the contents of the trash" +msgstr "A Kuka tartalmának törlése" + +#: ../midori/midori-browser.c:4942 msgid "Undo _Close Tab" msgstr "Lapbezárás _visszavonása" -#: ../midori/midori-browser.c:5382 +#: ../midori/midori-browser.c:4943 +msgid "Open the last closed tab" +msgstr "Az utoljára bezárt lap megnyitása" + +#: ../midori/midori-browser.c:4949 msgid "Add a new _folder" msgstr "Új mappa _hozzáadása" -#: ../midori/midori-browser.c:5388 +#: ../midori/midori-browser.c:4950 +msgid "Add a new bookmark folder" +msgstr "Új könyvjelzőmappa hozzáadása" + +#: ../midori/midori-browser.c:4955 msgid "_Export bookmarks" msgstr "Könyvjelzők e_xportálása" -#: ../midori/midori-browser.c:5391 ../midori/midori-searchaction.c:497 +#: ../midori/midori-browser.c:4958 ../midori/midori-searchaction.c:490 msgid "_Manage Search Engines" msgstr "_Keresőszolgáltatások kezelése" -#: ../midori/midori-browser.c:5394 +#: ../midori/midori-browser.c:4959 +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:4962 msgid "_Clear Private Data" msgstr "_Privát adatok törlése" -#: ../midori/midori-browser.c:5397 +#: ../midori/midori-browser.c:4963 +msgid "Clear private data..." +msgstr "Privát adatok törlése…" + +#: ../midori/midori-browser.c:4967 msgid "_Inspect Page" msgstr "_Oldal vizsgálata" -#: ../midori/midori-browser.c:5401 +#: ../midori/midori-browser.c:4968 +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:4973 msgid "_Previous Tab" msgstr "_Előző lap" -#: ../midori/midori-browser.c:5404 +#: ../midori/midori-browser.c:4974 +msgid "Switch to the previous tab" +msgstr "Váltás az előző lapra" + +#: ../midori/midori-browser.c:4976 msgid "_Next Tab" msgstr "_Következő lap" -#: ../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:4977 +msgid "Switch to the next tab" +msgstr "Váltás a következő lapra" -#: ../midori/midori-browser.c:5411 +#: ../midori/midori-browser.c:4979 msgid "Focus _Current Tab" msgstr "_Aktuális lap előtérbe" -#: ../midori/midori-browser.c:5414 -msgid "Focus _Next view" -msgstr "_Következő nézet előtérbe" +#: ../midori/midori-browser.c:4980 +msgid "Focus the current tab" +msgstr "Aktuális lap előtérbe hozása" -#: ../midori/midori-browser.c:5417 +#: ../midori/midori-browser.c:4982 msgid "Only show the Icon of the _Current Tab" msgstr "Csak _a jelenlegi lap ikonjának megjelenítése" -#: ../midori/midori-browser.c:5420 +#: ../midori/midori-browser.c:4983 +msgid "Only show the icon of the current tab" +msgstr "Csak a jelenlegi lap ikonjának megjelenítése" + +#: ../midori/midori-browser.c:4985 msgid "_Duplicate Current Tab" msgstr "Jelenlegi lap _kettőzése" -#: ../midori/midori-browser.c:5423 +#: ../midori/midori-browser.c:4986 +msgid "Duplicate the current tab" +msgstr "A jelenlegi lap megkettőzése" + +#: ../midori/midori-browser.c:4988 msgid "Close Ot_her Tabs" msgstr "_Többi lap bezárása" -#: ../midori/midori-browser.c:5426 +#: ../midori/midori-browser.c:4989 +msgid "Close all tabs except the current tab" +msgstr "Minden lap bezárása a jelenlegin kívül" + +#: ../midori/midori-browser.c:4991 msgid "Open last _session" msgstr "_Utolsó munkamenet megnyitása" -#: ../midori/midori-browser.c:5429 +#: ../midori/midori-browser.c:4992 +msgid "Open the tabs saved in the last session" +msgstr "Az utolsó munkamenetben mentett lapok megnyitása" + +#: ../midori/midori-browser.c:4994 msgid "_Help" msgstr "_Súgó" -#: ../midori/midori-browser.c:5431 +#: ../midori/midori-browser.c:4996 +msgid "_Contents" +msgstr "_Tartalom" + +#: ../midori/midori-browser.c:4997 +msgid "Show the documentation" +msgstr "A dokumentáció megjelenítése" + +#: ../midori/midori-browser.c:4999 msgid "_Frequent Questions" msgstr "_Gyakori kérdések" -#: ../midori/midori-browser.c:5434 -msgid "_Report a Problem…" -msgstr "_Hiba jelentése…" +#: ../midori/midori-browser.c:5000 +msgid "Show the Frequently Asked Questions" +msgstr "A gyakran ismételt kérdések megjelenítése" -#: ../midori/midori-browser.c:5446 +#: ../midori/midori-browser.c:5002 +msgid "_Report a Bug" +msgstr "_Hiba jelentése" + +#: ../midori/midori-browser.c:5003 +msgid "Open Midori's bug tracker" +msgstr "A Midori hibakövetőjének megnyitása" + +#: ../midori/midori-browser.c:5006 +msgid "Show information about the program" +msgstr "Információk megjelenítése a programról" + +#: ../midori/midori-browser.c:5014 msgid "_Menubar" msgstr "_Menüsáv" -#: ../midori/midori-browser.c:5450 +#: ../midori/midori-browser.c:5015 +msgid "Show menubar" +msgstr "A menüsáv megjelenítése" + +#: ../midori/midori-browser.c:5018 msgid "_Navigationbar" msgstr "_Navigációs sáv" -#: ../midori/midori-browser.c:5454 +#: ../midori/midori-browser.c:5019 +msgid "Show navigationbar" +msgstr "A navigációs sáv megjelenítése" + +#: ../midori/midori-browser.c:5022 msgid "Side_panel" msgstr "_Oldalsáv" -#: ../midori/midori-browser.c:5455 -msgid "Sidepanel" -msgstr "Oldalsáv" +#: ../midori/midori-browser.c:5023 +msgid "Show sidepanel" +msgstr "Az oldalsáv megjelenítése" -#: ../midori/midori-browser.c:5458 +#: ../midori/midori-browser.c:5026 msgid "_Bookmarkbar" msgstr "_Könyvjelzősáv" -#: ../midori/midori-browser.c:5462 +#: ../midori/midori-browser.c:5027 +msgid "Show bookmarkbar" +msgstr "A könyvjelzősáv megjelenítése" + +#: ../midori/midori-browser.c:5030 +msgid "_Transferbar" +msgstr "Át_vitelsáv" + +#: ../midori/midori-browser.c:5031 +msgid "Show transferbar" +msgstr "Az átvitelsáv megjelenítése" + +#: ../midori/midori-browser.c:5034 msgid "_Statusbar" msgstr "Á_llapotsor" -#: ../midori/midori-browser.c:5471 ../midori/midori-websettings.c:311 +#: ../midori/midori-browser.c:5035 +msgid "Show statusbar" +msgstr "Az állapotsor megjelenítése" + +#: ../midori/midori-browser.c:5043 msgid "_Automatic" msgstr "_Automatikus" -#: ../midori/midori-browser.c:5474 ../midori/midori-websettings.c:236 +#: ../midori/midori-browser.c:5046 ../midori/midori-websettings.c:223 msgid "Chinese (BIG5)" msgstr "Kínai (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5478 +#: ../midori/midori-browser.c:5050 msgid "Japanese (SHIFT__JIS)" msgstr "Japán (SHIFT__JIS)" -#: ../midori/midori-browser.c:5481 ../midori/midori-websettings.c:238 +#: ../midori/midori-browser.c:5053 ../midori/midori-websettings.c:225 msgid "Korean (EUC-KR)" msgstr "Koreai (EUC-KR)" -#: ../midori/midori-browser.c:5484 ../midori/midori-websettings.c:239 +#: ../midori/midori-browser.c:5056 ../midori/midori-websettings.c:226 msgid "Russian (KOI8-R)" msgstr "Orosz (KOI8-R)" -#: ../midori/midori-browser.c:5487 ../midori/midori-websettings.c:240 +#: ../midori/midori-browser.c:5059 ../midori/midori-websettings.c:227 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5490 ../midori/midori-websettings.c:241 +#: ../midori/midori-browser.c:5062 ../midori/midori-websettings.c:228 msgid "Western (ISO-8859-1)" msgstr "Nyugati (ISO-8859-1)" -#: ../midori/midori-browser.c:5493 ../midori/midori-websettings.c:242 -#: ../midori/midori-websettings.c:317 ../katze/katze-utils.c:641 -msgid "Custom…" +#: ../midori/midori-browser.c:5065 ../midori/midori-websettings.c:229 +#: ../midori/midori-websettings.c:320 ../katze/katze-utils.c:706 +msgid "Custom..." msgstr "Egyéni…" -#: ../midori/midori-browser.c:5998 +#: ../midori/midori-browser.c:5585 msgid "_Separator" msgstr "_Elválasztó" -#: ../midori/midori-browser.c:6005 -msgid "_Location…" +#: ../midori/midori-browser.c:5592 +msgid "_Location..." msgstr "He_ly…" -#: ../midori/midori-browser.c:6007 +#: ../midori/midori-browser.c:5594 msgid "Open a particular location" msgstr "Adott hely megnyitása" -#: ../midori/midori-browser.c:6029 -msgid "_Web Search…" +#: ../midori/midori-browser.c:5618 +msgid "_Web Search..." msgstr "_Webkeresés…" -#: ../midori/midori-browser.c:6031 +#: ../midori/midori-browser.c:5620 msgid "Run a web search" msgstr "Webkeresés futtatása " -#: ../midori/midori-browser.c:6058 +#: ../midori/midori-browser.c:5641 msgid "Reopen a previously closed tab or window" msgstr "Korábban bezárt lap vagy ablak ismételt megnyitása" -#: ../midori/midori-browser.c:6075 +#: ../midori/midori-browser.c:5654 ../midori/sokoke.c:1393 +msgid "_Bookmarks" +msgstr "_Könyvjelzők" + +#: ../midori/midori-browser.c:5656 msgid "Show the saved bookmarks" msgstr "A mentett könyvjelzők megjelenítése" -#: ../midori/midori-browser.c:6092 +#: ../midori/midori-browser.c:5670 msgid "_Tools" msgstr "_Eszközök" -#: ../midori/midori-browser.c:6108 +#: ../midori/midori-browser.c:5685 msgid "_Window" msgstr "_Ablak" -#: ../midori/midori-browser.c:6110 +#: ../midori/midori-browser.c:5687 msgid "Show a list of all open tabs" msgstr "Az összes megnyitott lap listájának megjelenítése" -#: ../midori/midori-browser.c:6124 +#: ../midori/midori-browser.c:5701 msgid "_Menu" msgstr "_Menü" -#: ../midori/midori-browser.c:6126 +#: ../midori/midori-browser.c:5703 msgid "Menu" msgstr "Menü" -#: ../midori/midori-browser.c:6940 +#: ../midori/midori-browser.c:6283 #, c-format msgid "Unexpected setting '%s'" msgstr "Váratlan beállítás: „%s”" -#: ../midori/midori-extension.c:329 +#: ../midori/midori-extension.c:286 #, c-format 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-extension.c:747 ../midori/midori-extension.c:844 -#: ../midori/midori-extension.c:941 ../midori/midori-extension.c:1053 -#: ../extensions/addons.c:1695 +#: ../midori/midori-extension.c:667 ../midori/midori-extension.c:764 +#: ../midori/midori-extension.c:861 ../midori/midori-extension.c:973 +#: ../extensions/addons.c:1637 #, 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" -#: ../midori/midori-locationaction.c:394 -#, c-format -msgid "Search with %s" -msgstr "Keresés ezzel: %s" - -#: ../midori/midori-locationaction.c:412 -msgid "Search with…" -msgstr "Keresés ezzel…" - -#: ../midori/midori-locationaction.c:537 +#: ../midori/midori-locationaction.c:393 #, c-format msgid "Failed to select from history\n" msgstr "Az előzményekből választás meghiúsult\n" -#: ../midori/midori-locationaction.c:624 +#: ../midori/midori-locationaction.c:477 #, c-format msgid "Search for %s" msgstr "%s keresése" +#: ../midori/midori-locationaction.c:500 +#, c-format +msgid "Search with %s" +msgstr "Keresés ezzel: %s" + +#: ../midori/midori-locationaction.c:1311 +#, c-format +msgid "Failed to execute database statement\n" +msgstr "Az adatbázis-utasítás végrehajtása meghiúsult\n" + #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1400 +#: ../midori/midori-locationaction.c:1367 msgid "Paste and p_roceed" msgstr "Beillesztés és _folytatás" -#: ../midori/midori-locationaction.c:1768 +#: ../midori/midori-locationaction.c:1819 msgid "Not verified" msgstr "Nem ellenőrzött" -#: ../midori/midori-locationaction.c:1788 +#: ../midori/midori-locationaction.c:1830 msgid "Verified and encrypted connection" msgstr "Ellenőrzött és titkosított kapcsolat" -#: ../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:409 ../midori/midori-panel.c:410 +#: ../midori/midori-panel.c:390 ../midori/midori-panel.c:391 msgid "Close panel" msgstr "Panel bezárása" -#: ../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-websettings.c:218 -msgid "Show Speed Dial" -msgstr "Gyorstárcsázó megjelenítése" +#: ../midori/midori-websettings.c:203 +msgid "Show Blank page" +msgstr "Üres oldal megjelenítése" -#: ../midori/midori-websettings.c:219 +#: ../midori/midori-websettings.c:204 msgid "Show Homepage" msgstr "Kezdőlap megjelenítése" -#: ../midori/midori-websettings.c:237 +#: ../midori/midori-websettings.c:205 +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:224 msgid "Japanese (SHIFT_JIS)" msgstr "Japán (SHIFT_JIS)" -#: ../midori/midori-websettings.c:257 +#: ../midori/midori-websettings.c:244 msgid "New tab" msgstr "Új lap" -#: ../midori/midori-websettings.c:258 +#: ../midori/midori-websettings.c:245 msgid "New window" msgstr "Új ablak" -#: ../midori/midori-websettings.c:259 +#: ../midori/midori-websettings.c:246 msgid "Current tab" msgstr "Aktuális lap" -#: ../midori/midori-websettings.c:274 +#: ../midori/midori-websettings.c:261 msgid "Default" msgstr "Alapértelmezett" -#: ../midori/midori-websettings.c:275 +#: ../midori/midori-websettings.c:262 msgid "Icons" msgstr "Ikonok" -#: ../midori/midori-websettings.c:276 +#: ../midori/midori-websettings.c:263 msgid "Small icons" msgstr "Kis ikonok" -#: ../midori/midori-websettings.c:277 +#: ../midori/midori-websettings.c:264 msgid "Text" msgstr "Szöveg" -#: ../midori/midori-websettings.c:278 +#: ../midori/midori-websettings.c:265 msgid "Icons and text" msgstr "Ikonok és szöveg" -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-websettings.c:266 msgid "Text beside icons" msgstr "Szöveg az ikonok mellett" -#: ../midori/midori-websettings.c:294 +#: ../midori/midori-websettings.c:281 msgid "Automatic (GNOME or environment)" msgstr "Automatikus (GNOME vagy környezet)" -#: ../midori/midori-websettings.c:295 +#: ../midori/midori-websettings.c:282 msgid "HTTP proxy server" msgstr "HTTP proxykiszolgáló" -#: ../midori/midori-websettings.c:296 +#: ../midori/midori-websettings.c:283 msgid "No proxy server" msgstr "Nincs proxykiszolgáló" -#: ../midori/midori-websettings.c:313 +#: ../midori/midori-websettings.c:298 +msgid "All cookies" +msgstr "Minden süti" + +#: ../midori/midori-websettings.c:299 +msgid "Session cookies" +msgstr "Munkamenetsütik" + +#: ../midori/midori-websettings.c:300 ../katze/katze-utils.c:675 +msgid "None" +msgstr "Nincs" + +#: ../midori/midori-websettings.c:316 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:314 +#: ../midori/midori-websettings.c:317 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:315 +#: ../midori/midori-websettings.c:318 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:316 +#: ../midori/midori-websettings.c:319 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:400 +#: ../midori/midori-websettings.c:372 msgid "Remember last window size" msgstr "Utolsó ablakméret megjegyzése" -#: ../midori/midori-websettings.c:401 +#: ../midori/midori-websettings.c:373 msgid "Whether to save the last window size" msgstr "Az utolsó ablakméret megjegyzendő-e" -#: ../midori/midori-websettings.c:409 +#: ../midori/midori-websettings.c:381 msgid "Last window width" msgstr "Utolsó ablakszélesség" -#: ../midori/midori-websettings.c:410 +#: ../midori/midori-websettings.c:382 msgid "The last saved window width" msgstr "Az utoljára mentett ablakszélesség" -#: ../midori/midori-websettings.c:418 +#: ../midori/midori-websettings.c:390 msgid "Last window height" msgstr "Utolsó ablakmagasság" -#: ../midori/midori-websettings.c:419 +#: ../midori/midori-websettings.c:391 msgid "The last saved window height" msgstr "Az utoljára mentett ablakmagasság" -#: ../midori/midori-websettings.c:444 +#: ../midori/midori-websettings.c:416 msgid "Last panel position" msgstr "Utolsó panelpozíció" -#: ../midori/midori-websettings.c:445 +#: ../midori/midori-websettings.c:417 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:454 +#: ../midori/midori-websettings.c:426 msgid "Last panel page" msgstr "Utolsó paneloldal" -#: ../midori/midori-websettings.c:455 +#: ../midori/midori-websettings.c:427 msgid "The last saved panel page" msgstr "Az utoljára mentett paneloldal" -#: ../midori/midori-websettings.c:463 +#: ../midori/midori-websettings.c:435 msgid "Last Web search" msgstr "Utolsó webkeresés" -#: ../midori/midori-websettings.c:464 +#: ../midori/midori-websettings.c:436 msgid "The last saved Web search" msgstr "Az utoljára mentett webkeresés" -#: ../midori/midori-websettings.c:473 +#: ../midori/midori-websettings.c:445 msgid "Show Menubar" msgstr "Menüsáv megjelenítése" -#: ../midori/midori-websettings.c:474 +#: ../midori/midori-websettings.c:446 msgid "Whether to show the menubar" msgstr "A menüsáv megjelenítendő-e" -#: ../midori/midori-websettings.c:482 +#: ../midori/midori-websettings.c:454 msgid "Show Navigationbar" msgstr "Navigációs sáv megjelenítése" -#: ../midori/midori-websettings.c:483 +#: ../midori/midori-websettings.c:455 msgid "Whether to show the navigationbar" msgstr "A navigációs sáv megjelenítendő-e" -#: ../midori/midori-websettings.c:491 +#: ../midori/midori-websettings.c:463 msgid "Show Bookmarkbar" msgstr "Könyvjelzősáv megjelenítése" -#: ../midori/midori-websettings.c:492 +#: ../midori/midori-websettings.c:464 msgid "Whether to show the bookmarkbar" msgstr "A könyvjelzősáv megjelenítendő-e" -#: ../midori/midori-websettings.c:500 +#: ../midori/midori-websettings.c:472 msgid "Show Panel" msgstr "Panel megjelenítése" -#: ../midori/midori-websettings.c:501 +#: ../midori/midori-websettings.c:473 msgid "Whether to show the panel" msgstr "A panel megjelenítendő-e" -#: ../midori/midori-websettings.c:509 +#: ../midori/midori-websettings.c:488 +msgid "Show Transferbar" +msgstr "Átvitelsáv megjelenítése" + +#: ../midori/midori-websettings.c:489 +msgid "Whether to show the transferbar" +msgstr "Az átvitelsáv megjelenítendő-e" + +#: ../midori/midori-websettings.c:497 msgid "Show Statusbar" msgstr "Állapotsor megjelenítése" -#: ../midori/midori-websettings.c:510 +#: ../midori/midori-websettings.c:498 msgid "Whether to show the statusbar" msgstr "Az állapotsor megjelenítendő-e" -#: ../midori/midori-websettings.c:519 +#: ../midori/midori-websettings.c:507 msgid "Toolbar Style:" msgstr "Eszköztár stílusa:" -#: ../midori/midori-websettings.c:520 +#: ../midori/midori-websettings.c:508 msgid "The style of the toolbar" msgstr "Az eszköztár stílusa" -#: ../midori/midori-websettings.c:529 +#: ../midori/midori-websettings.c:524 +msgid "Show progress in location entry" +msgstr "Előrehaladás megjelenítése a címsávban" + +#: ../midori/midori-websettings.c:525 +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:540 +msgid "Search engines in location completion" +msgstr "Keresőszolgáltatások megjelenítése a helykiegészítésben" + +#: ../midori/midori-websettings.c:541 +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:549 msgid "Toolbar Items" msgstr "Eszköztárelemek" -#: ../midori/midori-websettings.c:530 +#: ../midori/midori-websettings.c:550 msgid "The items to show on the toolbar" msgstr "Az eszköztáron megjelenítendő elemek" -#: ../midori/midori-websettings.c:538 +#: ../midori/midori-websettings.c:558 msgid "Compact Sidepanel" msgstr "Tömör oldalsáv" -#: ../midori/midori-websettings.c:539 +#: ../midori/midori-websettings.c:559 msgid "Whether to make the sidepanel compact" msgstr "Az oldalsáv tömören jelenjen-e meg" -#: ../midori/midori-websettings.c:554 +#: ../midori/midori-websettings.c:576 +msgid "Show operating controls of the panel" +msgstr "A panel vezérlőinek megjelenítése" + +#: ../midori/midori-websettings.c:577 +msgid "Whether to show the operating controls of the panel" +msgstr "Megjelenjenek-e a panel vezérlői" + +#: ../midori/midori-websettings.c:592 msgid "Align sidepanel on the right" msgstr "Az oldalsáv jobbra igazítása" -#: ../midori/midori-websettings.c:555 +#: ../midori/midori-websettings.c:593 msgid "Whether to align the sidepanel on the right" msgstr "Az oldalsáv jobbra legyen-e igazítva" -#: ../midori/midori-websettings.c:570 +#: ../midori/midori-websettings.c:608 msgid "Open panels in separate windows" msgstr "Panelek megnyitása külön ablakokban" -#: ../midori/midori-websettings.c:571 +#: ../midori/midori-websettings.c:609 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:580 +#: ../midori/midori-websettings.c:618 msgid "When Midori starts:" msgstr "A Midori indulásakor:" -#: ../midori/midori-websettings.c:581 +#: ../midori/midori-websettings.c:619 msgid "What to do when Midori starts" msgstr "Mi történjen a Midori indulásakor" -#: ../midori/midori-websettings.c:590 +#: ../midori/midori-websettings.c:628 msgid "Homepage:" msgstr "Kezdőlap:" -#: ../midori/midori-websettings.c:591 +#: ../midori/midori-websettings.c:629 msgid "The homepage" msgstr "A kezdőlap" -#: ../midori/midori-websettings.c:606 +#: ../midori/midori-websettings.c:644 msgid "Show crash dialog" msgstr "Összeomlási ablak megjelenítése" -#: ../midori/midori-websettings.c:607 +#: ../midori/midori-websettings.c:645 msgid "Show a dialog after Midori crashed" msgstr "Párbeszédablak megjelenítése a Midori összeomlása után" -#: ../midori/midori-websettings.c:615 +#. i18n: Speed dial, webpage shortcuts, named for the phone function +#: ../midori/midori-websettings.c:661 +msgid "Show speed dial in new tabs" +msgstr "Gyorstárcsázás megjelenítése új lapokon" + +#: ../midori/midori-websettings.c:662 +msgid "Show speed dial in newly opened tabs" +msgstr "Gyorstárcsázás megjelenítése az újonnan megnyitott lapokon" + +#: ../midori/midori-websettings.c:670 msgid "Save downloaded files to:" msgstr "Letöltött fájlok mentése ide:" -#: ../midori/midori-websettings.c:616 +#: ../midori/midori-websettings.c:671 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:624 +#: ../midori/midori-websettings.c:694 +msgid "Ask for the destination folder" +msgstr "Rákérdezés a célmappára" + +#: ../midori/midori-websettings.c:695 +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:716 +msgid "Notify when a transfer has been completed" +msgstr "Értesítés átvitel befejeződésekor" + +#: ../midori/midori-websettings.c:717 +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:729 +msgid "Download Manager" +msgstr "Letöltéskezelő" + +#: ../midori/midori-websettings.c:730 +msgid "An external download manager" +msgstr "Külső letöltéskezelő" + +#: ../midori/midori-websettings.c:738 msgid "Text Editor" msgstr "Szövegszerkesztő" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:739 msgid "An external text editor" msgstr "Külső szövegszerkesztő" -#: ../midori/midori-websettings.c:640 +#: ../midori/midori-websettings.c:754 msgid "News Aggregator" msgstr "Hírforrásolvasó" -#: ../midori/midori-websettings.c:641 +#: ../midori/midori-websettings.c:755 msgid "An external news aggregator" msgstr "Külső hírforrásolvasó" -#: ../midori/midori-websettings.c:649 +#: ../midori/midori-websettings.c:763 msgid "Location entry Search" msgstr "Keresés a címsávban" -#: ../midori/midori-websettings.c:650 +#: ../midori/midori-websettings.c:764 msgid "The search to perform inside the location entry" msgstr "A címsávban végrehajtandó keresés" -#: ../midori/midori-websettings.c:658 +#: ../midori/midori-websettings.c:772 msgid "Preferred Encoding" msgstr "Előnyben részesített kódolás" -#: ../midori/midori-websettings.c:659 +#: ../midori/midori-websettings.c:773 msgid "The preferred character encoding" msgstr "Az előnyben részesített karakterkódolás" -#: ../midori/midori-websettings.c:669 +#: ../midori/midori-websettings.c:783 msgid "Always Show Tabbar" msgstr "Mindig jelenjen meg a lapsáv" -#: ../midori/midori-websettings.c:670 +#: ../midori/midori-websettings.c:784 msgid "Always show the tabbar" msgstr "Mindig jelenjen meg a lapsáv" -#: ../midori/midori-websettings.c:683 +#: ../midori/midori-websettings.c:792 msgid "Close Buttons on Tabs" msgstr "Bezárás gombok a lapokon" -#: ../midori/midori-websettings.c:684 +#: ../midori/midori-websettings.c:793 msgid "Whether tabs have close buttons" msgstr "A lapokon legyenek-e bezárás gombok" -#: ../midori/midori-websettings.c:709 +#: ../midori/midori-websettings.c:801 msgid "Open new pages in:" msgstr "Új oldalak megnyitása:" -#: ../midori/midori-websettings.c:710 +#: ../midori/midori-websettings.c:802 msgid "Where to open new pages" msgstr "Hol nyíljanak meg az új oldalak" -#: ../midori/midori-websettings.c:719 +#: ../midori/midori-websettings.c:811 +msgid "Open external pages in:" +msgstr "Külső oldalak megnyitása:" + +#: ../midori/midori-websettings.c:812 +msgid "Where to open externally opened pages" +msgstr "Hol nyíljanak meg a külső programokból megnyitott oldalak" + +#: ../midori/midori-websettings.c:821 msgid "Middle click opens Selection" msgstr "A középső kattintás megnyitja a kijelölést" -#: ../midori/midori-websettings.c:720 +#: ../midori/midori-websettings.c:822 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:728 +#: ../midori/midori-websettings.c:830 msgid "Open tabs in the background" msgstr "Lapok megnyitása a háttérben" -#: ../midori/midori-websettings.c:729 +#: ../midori/midori-websettings.c:831 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:737 +#: ../midori/midori-websettings.c:839 msgid "Open Tabs next to Current" msgstr "Lapok megnyitása az aktuális mellett" -#: ../midori/midori-websettings.c:738 +#: ../midori/midori-websettings.c:840 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:746 +#: ../midori/midori-websettings.c:848 msgid "Open popups in tabs" msgstr "Felugró ablakok megnyitása lapokon" -#: ../midori/midori-websettings.c:747 +#: ../midori/midori-websettings.c:849 msgid "Whether to open popup windows in tabs" msgstr "A felugró ablakok lapokon nyíljanak-e meg" -#: ../midori/midori-websettings.c:757 ../extensions/statusbar-features.c:134 +#: ../midori/midori-websettings.c:859 ../extensions/statusbar-features.c:88 msgid "Load images automatically" msgstr "Képek automatikus betöltése" -#: ../midori/midori-websettings.c:758 +#: ../midori/midori-websettings.c:860 msgid "Load and display images automatically" msgstr "A képek automatikus letöltése és megnyitása" -#: ../midori/midori-websettings.c:765 ../extensions/statusbar-features.c:143 +#: ../midori/midori-websettings.c:867 ../extensions/statusbar-features.c:97 msgid "Enable scripts" msgstr "Parancsfájlok engedélyezése" -#: ../midori/midori-websettings.c:766 +#: ../midori/midori-websettings.c:868 msgid "Enable embedded scripting languages" msgstr "Beágyazott programnyelvek engedélyezése" -#: ../midori/midori-websettings.c:773 ../extensions/statusbar-features.c:154 +#: ../midori/midori-websettings.c:875 ../extensions/statusbar-features.c:106 msgid "Enable Netscape plugins" msgstr "Netscape bővítmények engedélyezése" -#: ../midori/midori-websettings.c:774 +#: ../midori/midori-websettings.c:876 msgid "Enable embedded Netscape plugin objects" msgstr "Beágyazott Netscape bővítményobjektumok engedélyezése" -#: ../midori/midori-websettings.c:789 +#: ../midori/midori-websettings.c:892 msgid "Enable Spell Checking" msgstr "Helyesírás-ellenőrzés engedélyezése" -#: ../midori/midori-websettings.c:790 +#: ../midori/midori-websettings.c:893 msgid "Enable spell checking while typing" msgstr "Helyesírás-ellenőrzés engedélyezése gépeléskor" -#: ../midori/midori-websettings.c:796 +#: ../midori/midori-websettings.c:901 msgid "Enable HTML5 database support" msgstr "HTML5 adatbázis-támogatás engedélyezése" -#: ../midori/midori-websettings.c:797 +#: ../midori/midori-websettings.c:902 msgid "Whether to enable HTML5 database support" msgstr "A HTML5 adatbázis-támogatás engedélyezve legyen-e" -#: ../midori/midori-websettings.c:803 +#: ../midori/midori-websettings.c:908 msgid "Enable HTML5 local storage support" msgstr "HTML5 helyi tárolás támogatásának engedélyezése" -#: ../midori/midori-websettings.c:804 +#: ../midori/midori-websettings.c:909 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:810 +#: ../midori/midori-websettings.c:917 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:811 +#: ../midori/midori-websettings.c:918 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: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 +#: ../midori/midori-websettings.c:943 msgid "Zoom Text and Images" msgstr "Szöveg és képek nagyítása" -#: ../midori/midori-websettings.c:864 +#: ../midori/midori-websettings.c:944 msgid "Whether to zoom text and images" msgstr "A szöveg és képek nagyítandók-e" -#: ../midori/midori-websettings.c:879 +#: ../midori/midori-websettings.c:959 msgid "Find inline while typing" msgstr "Beágyazott keresés gépeléskor" -#: ../midori/midori-websettings.c:880 +#: ../midori/midori-websettings.c:960 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:895 +#: ../midori/midori-websettings.c:975 msgid "Kinetic scrolling" msgstr "Kinetikus görgetés" # Fixme: ez mi? -#: ../midori/midori-websettings.c:896 +#: ../midori/midori-websettings.c:976 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:904 -msgid "Delete old Cookies after:" -msgstr "Régi sütik törlése ennyi után:" +#: ../midori/midori-websettings.c:984 +msgid "Accept cookies" +msgstr "Sütik elfogadása" -#: ../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:985 +msgid "What type of cookies to accept" +msgstr "Milyen típusú sütiket fogadjon el" -#: ../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:994 +msgid "Maximum cookie age" +msgstr "Sütik maximális kora" -#: ../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:995 +msgid "The maximum number of days to save cookies for" +msgstr "Sütik tárolása legfeljebb ennyi napig" -#: ../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:1004 +msgid "Maximum history age" +msgstr "Előzmények maximális kora" -#: ../midori/midori-websettings.c:937 +#: ../midori/midori-websettings.c:1005 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:952 +#: ../midori/midori-websettings.c:1020 +msgid "Remember last downloaded files" +msgstr "Utoljára letöltött fájlok megjegyzése" + +#: ../midori/midori-websettings.c:1021 +msgid "Whether the last downloaded files are saved" +msgstr "Az utoljára letöltött fájlok megjegyzendők-e" + +#: ../midori/midori-websettings.c:1038 msgid "Proxy server" msgstr "Proxykiszolgáló" -#: ../midori/midori-websettings.c:953 +#: ../midori/midori-websettings.c:1039 msgid "The type of proxy server to use" msgstr "A használandó proxykiszolgáló típusa" -#: ../midori/midori-websettings.c:962 +#: ../midori/midori-websettings.c:1048 msgid "HTTP Proxy Server" msgstr "HTTP proxykiszolgáló" -#: ../midori/midori-websettings.c:963 +#: ../midori/midori-websettings.c:1049 msgid "The proxy server used for HTTP connections" msgstr "A HTTP kapcsolatokhoz használt proxykiszolgá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:1014 +#: ../midori/midori-websettings.c:1065 msgid "Identify as" msgstr "Azonosítás mint" -#: ../midori/midori-websettings.c:1015 +#: ../midori/midori-websettings.c:1066 msgid "What to identify as to web pages" msgstr "Miként mutatkozzon be a weboldalaknak" -#: ../midori/midori-websettings.c:1031 +#: ../midori/midori-websettings.c:1082 msgid "Identification string" msgstr "Azonosító karakterlánc" -#: ../midori/midori-websettings.c:1032 +#: ../midori/midori-websettings.c:1083 msgid "The application identification string" msgstr "Az alkalmazást azonosító karakterlánc" -#: ../midori/midori-websettings.c:1048 +#: ../midori/midori-websettings.c:1099 msgid "Preferred languages" msgstr "Előnyben részesített nyelvek" -#: ../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: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\"" +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:1064 +#: ../midori/midori-websettings.c:1115 msgid "Clear private data" msgstr "Privát adatok törlése" -#: ../midori/midori-websettings.c:1065 +#: ../midori/midori-websettings.c:1116 msgid "The private data selected for deletion" msgstr "A törlésre kiválasztott privát adatok" -#: ../midori/midori-websettings.c:1080 +#: ../midori/midori-websettings.c:1131 msgid "Clear data" msgstr "Adatok törlése" -#: ../midori/midori-websettings.c:1081 +#: ../midori/midori-websettings.c:1132 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 +#: ../midori/midori-view.c:1264 #, 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 +#: ../midori/midori-view.c:1268 ../midori/midori-view.c:1298 msgid "_Deny" msgstr "_Megtagadás" -#: ../midori/midori-view.c:1364 ../midori/midori-view.c:1396 +#: ../midori/midori-view.c:1268 ../midori/midori-view.c:1298 msgid "_Allow" msgstr "_Engedélyezés" -#: ../midori/midori-view.c:1392 +#: ../midori/midori-view.c:1294 #, 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 +#. 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:1395 ../midori/midori-view.c:4759 +#: ../midori/midori-view.c:4763 #, c-format msgid "Error - %s" msgstr "Hiba - %s" -#: ../midori/midori-view.c:1486 +#: ../midori/midori-view.c:1396 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "A(z) „%s” oldal nem tölthető be." -#: ../midori/midori-view.c:1488 +#: ../midori/midori-view.c:1398 msgid "Try again" msgstr "Próbálja újra" -#: ../midori/midori-view.c:1685 ../midori/midori-view.c:2598 +#. i18n: The title of the 404 - Not found error page +#: ../midori/midori-view.c:1417 +#, c-format +msgid "Not found - %s" +msgstr "Nem található - %s" + +#: ../midori/midori-view.c:1603 ../midori/midori-view.c:2566 #, c-format msgid "Send a message to %s" msgstr "Üzenet küldése a következőnek: %s" -#: ../midori/midori-view.c:2428 ../midori/midori-view.c:2747 +#: ../midori/midori-view.c:2345 ../midori/midori-view.c:2733 msgid "Inspect _Element" msgstr "Elem _vizsgálata" -#: ../midori/midori-view.c:2480 +#: ../midori/midori-view.c:2397 ../midori/midori-view.c:2467 msgid "Open Link in New _Tab" msgstr "Hivatkozás megnyitása új _lapon" -#: ../midori/midori-view.c:2484 +#: ../midori/midori-view.c:2401 msgid "Open Link in _Foreground Tab" msgstr "Hi_vatkozás megnyitása az előtérben lévő lapon" -#: ../midori/midori-view.c:2485 +#: ../midori/midori-view.c:2402 msgid "Open Link in _Background Tab" msgstr "_Hivatkozás megnyitása a háttérben lévő lapon" -#: ../midori/midori-view.c:2488 +#: ../midori/midori-view.c:2405 ../midori/midori-view.c:2474 msgid "Open Link in New _Window" msgstr "Hivatkozás megnyitása új _ablakban" -#: ../midori/midori-view.c:2491 +#: ../midori/midori-view.c:2408 msgid "Open Link as Web A_pplication" msgstr "Hivatkozás megnyitása _webes alkalmazásként" -#: ../midori/midori-view.c:2496 +#: ../midori/midori-view.c:2411 msgid "Copy Link de_stination" msgstr "Hivatkozás _címének másolása" -#: ../midori/midori-view.c:2512 +#: ../midori/midori-view.c:2414 ../midori/midori-view.c:2486 +msgid "_Save Link destination" +msgstr "Hivatkozás címének me_ntése" + +#: ../midori/midori-view.c:2415 ../midori/midori-view.c:2480 +msgid "_Download Link destination" +msgstr "Hivatkozás címének l_etöltése" + +#: ../midori/midori-view.c:2419 ../midori/midori-view.c:2449 +#: ../midori/midori-view.c:2491 +msgid "Download with Download _Manager" +msgstr "_Letöltés a letöltéskezelővel" + +#: ../midori/midori-view.c:2428 msgid "Open _Image in New Tab" msgstr "Ké_p megnyitása új lapon" -#: ../midori/midori-view.c:2515 +#: ../midori/midori-view.c:2431 msgid "Copy Image _Address" msgstr "Kép _címének másolása" -#: ../midori/midori-view.c:2518 +#: ../midori/midori-view.c:2434 msgid "Save I_mage" msgstr "Kép me_ntése" -#: ../midori/midori-view.c:2521 -msgid "Open in Image _Viewer" -msgstr "Megnyitás a _képmegjelenítőben" +#: ../midori/midori-view.c:2435 +msgid "Download I_mage" +msgstr "_Kép letöltése" -#: ../midori/midori-view.c:2528 +#: ../midori/midori-view.c:2442 msgid "Copy Video _Address" msgstr "Videó _címének másolása" -#: ../midori/midori-view.c:2531 +#: ../midori/midori-view.c:2445 msgid "Save _Video" msgstr "Videó me_ntése" -#: ../midori/midori-view.c:2531 +#: ../midori/midori-view.c:2445 msgid "Download _Video" msgstr "_Videó letöltése" -#: ../midori/midori-view.c:2557 +#: ../midori/midori-view.c:2511 msgid "Search _with" msgstr "_Keresés ezzel" -#: ../midori/midori-view.c:2589 +#: ../midori/midori-view.c:2546 ../midori/midori-view.c:2553 msgid "_Search the Web" msgstr "Keresés a _weben" -#: ../midori/midori-view.c:2606 +#: ../midori/midori-view.c:2574 msgid "Open Address in New _Tab" msgstr "Cím meg_nyitása új lapon" -#: ../midori/midori-view.c:2909 +#: ../midori/midori-view.c:2876 msgid "Open or download file" msgstr "Fájl megnyitása vagy letöltése" -#: ../midori/midori-view.c:2929 +#: ../midori/midori-view.c:2895 #, c-format msgid "File Type: '%s'" msgstr "Fájltípus: „%s”" -#: ../midori/midori-view.c:2931 +#: ../midori/midori-view.c:2898 #, c-format msgid "File Type: %s ('%s')" msgstr "Fájltípus: %s („%s”)" -#: ../midori/midori-view.c:2935 -#, c-format -msgid "File Name: %s" -msgstr "Fájlnév: %s" - -#: ../midori/midori-view.c:2955 +#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" +#: ../midori/midori-view.c:2902 #, c-format msgid "Open %s" msgstr "%s megnyitása" -#: ../midori/midori-view.c:3576 +#: ../midori/midori-view.c:3478 #, c-format msgid "Inspect page - %s" msgstr "Oldal vizsgálata - %s" -#: ../midori/midori-view.c:3923 +#: ../midori/midori-view.c:3762 msgid "Speed Dial" msgstr "Gyorstárcsázó" -#: ../midori/midori-view.c:3924 ../midori/midori-view.c:4020 +#: ../midori/midori-view.c:3763 msgid "Click to add a shortcut" msgstr "Kattintson gyorsindító hozzáadásához" -#: ../midori/midori-view.c:3925 +#: ../midori/midori-view.c:3764 msgid "Enter shortcut address" msgstr "Adja meg a gyorsindító címét" -#: ../midori/midori-view.c:3926 +#: ../midori/midori-view.c:3765 msgid "Enter shortcut title" msgstr "Adja meg a gyorsindító címét" -#: ../midori/midori-view.c:3927 +#: ../midori/midori-view.c:3766 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:4089 -#, c-format -msgid "No documentation installed" -msgstr "Nincs telepítve dokumentáció" - -#: ../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:3767 +msgid "Set number of columns and rows" +msgstr "Oszlopok és sorok számának beállítása" -#: ../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:3768 +msgid "Enter number of columns and rows:" +msgstr "Adja meg az oszlopok és sorok számát:" -#: ../midori/midori-view.c:4167 -msgid "Extensions are disabled." -msgstr "Kiterjesztések letiltva." - -#: ../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:3769 +msgid "Invalid input for the size of the speed dial" +msgstr "A gyorstárcsázó megadott mérete érvénytelen" -#: ../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:3770 +msgid "Thumb size:" +msgstr "Bélyegkép mérete:" -#: ../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:3771 +msgid "Small" +msgstr "Kicsi" -#: ../midori/midori-view.c:4171 -msgid "DNS prefetching is disabled." -msgstr "A DNS-előtöltés letiltva." +#: ../midori/midori-view.c:3772 +msgid "Medium" +msgstr "Közepes" -#: ../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:3773 +msgid "Big" +msgstr "Nagy" -#: ../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:3798 +#, c-format +msgid "Document cannot be displayed" +msgstr "A dokumentum nem jeleníthető meg" -#: ../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:3821 +#, c-format +msgid "No documentation installed" +msgstr "Nincs telepítve dokumentáció" -#: ../midori/midori-view.c:4278 +#: ../midori/midori-view.c:3941 msgid "Page loading delayed" msgstr "Oldalbetöltés késleltetve" -#: ../midori/midori-view.c:4279 +#: ../midori/midori-view.c:3942 msgid "Loading delayed either due to a recent crash or startup preferences." -msgstr "" -"A betöltés késleltetve egy nem ré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:4280 +#: ../midori/midori-view.c:3943 msgid "Load Page" msgstr "Oldal betöltése" -#: ../midori/midori-view.c:4446 +#: ../midori/midori-view.c:4084 msgid "Blank page" msgstr "Üres oldal" -#: ../midori/midori-view.c:4708 +#: ../midori/midori-view.c:4335 msgid "_Duplicate Tab" msgstr "_Lap kettőzése" -#: ../midori/midori-view.c:4713 +#: ../midori/midori-view.c:4340 msgid "Show Tab _Label" msgstr "Lap_címke megjelenítése" -#: ../midori/midori-view.c:4713 +#: ../midori/midori-view.c:4340 msgid "Show Tab _Icon Only" msgstr "Csak l_apikon megjelenítése" -#: ../midori/midori-view.c:4719 +#: ../midori/midori-view.c:4346 msgid "Close ot_her Tabs" msgstr "_Többi lap bezárása" -#. 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 +#: ../midori/midori-view.c:4937 msgid "Print background images" msgstr "Háttérképek nyomtatása" -#: ../midori/midori-view.c:5565 +#: ../midori/midori-view.c:4938 msgid "Whether background images should be printed" msgstr "A háttérképeket ki kell-e nyomtatni" -#: ../midori/midori-view.c:5597 +#: ../midori/midori-view.c:4974 ../midori/midori-preferences.c:412 msgid "Features" msgstr "Szolgáltatások" -#: ../midori/midori-preferences.c:297 +#. Page "General" +#: ../midori/midori-preferences.c:329 +msgid "General" +msgstr "Általános" + +#: ../midori/midori-preferences.c:330 msgid "Startup" msgstr "Indítás" -#: ../midori/midori-preferences.c:310 -msgid "Use _current page" -msgstr "_Jelenlegi oldal használata" - -#: ../midori/midori-preferences.c:314 +#: ../midori/midori-preferences.c:345 ../midori/midori-preferences.c:352 msgid "Use current page as homepage" msgstr "Jelenlegi oldal használata kezdőlapként" +#: ../midori/midori-preferences.c:362 ../panels/midori-transfers.c:87 +msgid "Transfers" +msgstr "Átvitelek" + #. Page "Appearance" -#: ../midori/midori-preferences.c:323 -msgid "Fonts" -msgstr "Betűkészletek" +#: ../midori/midori-preferences.c:380 +msgid "Appearance" +msgstr "Megjelenés" -#: ../midori/midori-preferences.c:326 -msgid "Proportional Font Family" -msgstr "Proporcionális betűkészletcsalád" +#: ../midori/midori-preferences.c:381 +msgid "Font settings" +msgstr "Betűkészlet-beállítások" -#: ../midori/midori-preferences.c:330 +#: ../midori/midori-preferences.c:383 +msgid "Default Font Family" +msgstr "Alapértelmezett betűkészletcsalád" + +#: ../midori/midori-preferences.c:386 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:333 +#: ../midori/midori-preferences.c:389 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:335 +#: ../midori/midori-preferences.c:391 msgid "Fixed-width Font Family" msgstr "Rögzített szélességű betűkészletcsalád" -#: ../midori/midori-preferences.c:339 +#: ../midori/midori-preferences.c:394 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:342 +#: ../midori/midori-preferences.c:397 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:344 +#: ../midori/midori-preferences.c:399 msgid "Minimum Font Size" msgstr "Minimális betűméret" -#: ../midori/midori-preferences.c:348 +#: ../midori/midori-preferences.c:402 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:359 +#: ../midori/midori-preferences.c:411 msgid "Behavior" msgstr "Viselkedés" -#: ../midori/midori-preferences.c:385 +#: ../midori/midori-preferences.c:420 +msgid "Enforce 96 dots per inch" +msgstr "96 DPI kényszerítése" + +#: ../midori/midori-preferences.c:421 +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:433 msgid "Allow scripts to open popups" msgstr "A parancsfájlok megnyithatnak felugró ablakokat" -#: ../midori/midori-preferences.c:386 +#: ../midori/midori-preferences.c:434 msgid "Whether scripts are allowed to open popup windows automatically" msgstr "A parancsfájlok megnyithatnak-e automatikusan felugró ablakokat" #. Page "Interface" -#: ../midori/midori-preferences.c:416 +#: ../midori/midori-preferences.c:453 +msgid "Interface" +msgstr "Felület" + +#: ../midori/midori-preferences.c:454 +msgid "Navigationbar" +msgstr "Navigációs sáv" + +#: ../midori/midori-preferences.c:464 msgid "Browsing" msgstr "Böngészés" +#. Page "Applications" +#: ../midori/midori-preferences.c:482 +msgid "Applications" +msgstr "Alkalmazások" + +#: ../midori/midori-preferences.c:483 +msgid "External applications" +msgstr "Külső alkalmazások" + #. Page "Network" -#: ../midori/midori-preferences.c:456 +#: ../midori/midori-preferences.c:499 ../midori/midori-preferences.c:500 msgid "Network" msgstr "Hálózat" -#: ../midori/midori-preferences.c:463 +#: ../midori/midori-preferences.c:506 msgid "Hostname" msgstr "Gépnév" -#: ../midori/midori-preferences.c:487 -msgid "MB" -msgstr "MB" +#. Page "Privacy" +#: ../midori/midori-preferences.c:520 +msgid "Privacy" +msgstr "Adatvédelem" + +#: ../midori/midori-preferences.c:521 +msgid "Web Cookies" +msgstr "Webes sütik" + +#: ../midori/midori-preferences.c:522 +msgid "Delete cookies when quitting Midori" +msgstr "Sütik törlése a Midoriból kilépéskor" -#: ../midori/midori-searchaction.c:902 +#: ../midori/midori-preferences.c:529 +msgid "Delete old cookies after 1 hour" +msgstr "Régi sütik törlése 1 óra után" + +#: ../midori/midori-preferences.c:530 +msgid "Delete old cookies after 1 day" +msgstr "Régi sütik törlése 1 nap után" + +#: ../midori/midori-preferences.c:531 +msgid "Delete old cookies after 1 week" +msgstr "Régi sütik törlése 1 hét után" + +#: ../midori/midori-preferences.c:532 +msgid "Delete old cookies after 1 month" +msgstr "Régi sütik törlése 1 hónap után" + +#: ../midori/midori-preferences.c:533 +msgid "Delete old cookies after 1 year" +msgstr "Régi sütik törlése 1 év után" + +#: ../midori/midori-preferences.c:554 +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/midori-preferences.c:570 ../panels/midori-history.c:114 +msgid "History" +msgstr "Előzmények" + +#: ../midori/midori-preferences.c:575 +msgid "days" +msgstr "nap" + +#: ../midori/midori-searchaction.c:915 msgid "Add search engine" msgstr "Keresőszolgáltatás hozzáadása" -#: ../midori/midori-searchaction.c:902 +#: ../midori/midori-searchaction.c:915 msgid "Edit search engine" msgstr "Keresőszolgáltatás szerkesztése" -#: ../midori/midori-searchaction.c:931 +#: ../midori/midori-searchaction.c:944 msgid "_Name:" msgstr "_Név:" -#: ../midori/midori-searchaction.c:947 -msgid "_Description:" -msgstr "_Leírás:" - -#: ../midori/midori-searchaction.c:981 +#: ../midori/midori-searchaction.c:988 msgid "_Icon:" msgstr "_Ikon:" -#: ../midori/midori-searchaction.c:995 +#: ../midori/midori-searchaction.c:1002 msgid "_Token:" msgstr "_Jelsor:" -#: ../midori/midori-searchaction.c:1295 +#: ../midori/midori-searchaction.c:1234 msgid "Manage Search Engines" msgstr "Keresőszolgáltatások kezelése" -#: ../midori/midori-searchaction.c:1395 +#: ../midori/midori-searchaction.c:1334 msgid "Use as _default" msgstr "_Alapértelmezett" -#: ../midori/sokoke.c:354 +#: ../midori/sokoke.c:390 msgid "Open with" msgstr "Megnyitás ezzel" -#: ../midori/sokoke.c:362 +#: ../midori/sokoke.c:395 #, 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: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:1392 +msgid "_Bookmark" +msgstr "_Könyvjelző" -#: ../midori/sokoke.c:1595 -#, c-format -msgid "%d hour" -msgid_plural "%d hours" -msgstr[0] "%d óra" -msgstr[1] "%d óra" +#: ../midori/sokoke.c:1394 +msgid "Add Boo_kmark" +msgstr "Köny_vjelző hozzáadása" -#: ../midori/sokoke.c:1596 -#, c-format -msgid "%d minute" -msgid_plural "%d minutes" -msgstr[0] "%d perc" -msgstr[1] "%d perc" +#: ../midori/sokoke.c:1395 +msgid "_Console" +msgstr "_Konzol" -#: ../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:1396 +msgid "_Extensions" +msgstr "Kit_erjesztések" -#. 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:1398 +msgid "_Homepage" +msgstr "Kez_dőlap" -#. i18n: Unknown number of bytes, used for transfer rate like ?B/s -#: ../midori/sokoke.c:1614 -msgid "?B" -msgstr "?B" +#: ../midori/sokoke.c:1399 +msgid "_Userscripts" +msgstr "_Felhasználói parancsfájlok" -#. i18n: Download tooltip (transfer rate): (130KB/s) -#: ../midori/sokoke.c:1617 -#, c-format -msgid " (%s/s)" -msgstr " (%s/s)" +#: ../midori/sokoke.c:1400 +msgid "New _Tab" +msgstr "Új _lap" -#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning -#: ../midori/sokoke.c:1634 -#, c-format -msgid " - %s remaining" -msgstr " – %s van hátra" +#: ../midori/sokoke.c:1401 +msgid "_Transfers" +msgstr "Á_tvitelek" + +#: ../midori/sokoke.c:1402 +msgid "Netscape p_lugins" +msgstr "_Netscape bővítmények" + +#: ../midori/sokoke.c:1405 +msgid "New _Folder" +msgstr "Új _mappa" #. i18n: A panel at the bottom, to search text in pages -#: ../toolbars/midori-findbar.c:291 +#: ../toolbars/midori-findbar.c:228 msgid "_Inline Find:" msgstr "Beágyazott _keresés:" -#: ../toolbars/midori-findbar.c:317 +#: ../toolbars/midori-findbar.c:262 msgid "Previous" msgstr "Előző" -#: ../toolbars/midori-findbar.c:323 +#: ../toolbars/midori-findbar.c:268 msgid "Next" msgstr "Tovább" -#: ../toolbars/midori-findbar.c:327 +#: ../toolbars/midori-findbar.c:272 msgid "Match Case" msgstr "Kis- és nagybetű" -#: ../toolbars/midori-findbar.c:336 +#: ../toolbars/midori-findbar.c:281 msgid "Highlight Matches" msgstr "Találatok kiemelése" -#: ../toolbars/midori-findbar.c:347 +#: ../toolbars/midori-findbar.c:292 msgid "Close Findbar" msgstr "Keresősáv bezárása" -#: ../toolbars/midori-transferbar.c:122 +#: ../toolbars/midori-transferbar.c:88 ../panels/midori-transfers.c:273 +#, c-format +msgid "%s of %s" +msgstr "%s / %s" + +#: ../toolbars/midori-transferbar.c:123 #, c-format msgid "The file '%s' has been downloaded." msgstr "A(z) „%s” fájl letöltve." -#: ../toolbars/midori-transferbar.c:125 +#: ../toolbars/midori-transferbar.c:126 msgid "Transfer completed" msgstr "Átvitel kész" -#: ../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 +#: ../toolbars/midori-transferbar.c:257 ../panels/midori-transfers.c:144 msgid "Clear All" msgstr "Minden mező törlése" -#: ../toolbars/midori-transferbar.c:371 ../toolbars/midori-transferbar.c:373 +#: ../toolbars/midori-transferbar.c:300 ../toolbars/midori-transferbar.c:302 msgid "Some files are being downloaded" msgstr "Néhány fájl letöltése folyamatban" -#: ../toolbars/midori-transferbar.c:377 +#: ../toolbars/midori-transferbar.c:306 msgid "_Quit Midori" msgstr "_Kilépés a Midoriból" -#: ../toolbars/midori-transferbar.c:379 +#: ../toolbars/midori-transferbar.c:308 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:114 +#: ../panels/midori-bookmarks.c:116 msgid "Bookmarks" msgstr "Könyvjelzők" -#: ../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:435 +#: ../panels/midori-bookmarks.c:385 msgid "Edit the selected bookmark" msgstr "A kijelölt könyvjelző szerkesztése" -#: ../panels/midori-bookmarks.c:443 +#: ../panels/midori-bookmarks.c:393 msgid "Delete the selected bookmark" msgstr "A kijelölt könyvjelző törlése" -#: ../panels/midori-bookmarks.c:458 +#: ../panels/midori-bookmarks.c:407 msgid "Add a new folder" msgstr "Új mappa hozzáadása" -#: ../panels/midori-bookmarks.c:592 ../panels/midori-history.c:633 +#: ../panels/midori-bookmarks.c:539 ../panels/midori-history.c:565 msgid "Separator" msgstr "Elválasztó" -#: ../panels/midori-history.c:111 -msgid "History" -msgstr "Előzmények" - -#: ../panels/midori-history.c:158 ../panels/midori-history.c:189 -msgid "Today" -msgstr "Ma" +#: ../panels/midori-extensions.c:91 +msgid "Extensions" +msgstr "Kiterjesztések" -#: ../panels/midori-history.c:160 ../panels/midori-history.c:191 -msgid "Yesterday" -msgstr "Tegnap" +#: ../panels/midori-history.c:146 +msgid "A week ago" +msgstr "Egy hete" -#: ../panels/midori-history.c:162 ../panels/midori-history.c:186 +#: ../panels/midori-history.c:148 #, c-format msgid "%d day ago" msgid_plural "%d days ago" msgstr[0] "%d napja" msgstr[1] "%d napja" -#: ../panels/midori-history.c:165 ../panels/midori-history.c:184 -msgid "A week ago" -msgstr "Egy hete" +#: ../panels/midori-history.c:151 +msgid "Today" +msgstr "Ma" -#: ../panels/midori-history.c:360 +#: ../panels/midori-history.c:153 +msgid "Yesterday" +msgstr "Tegnap" + +#: ../panels/midori-history.c:305 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:407 +#: ../panels/midori-history.c:350 msgid "Bookmark the selected history item" msgstr "A kijelölt előzményelem könyvjelzőzése" -#: ../panels/midori-history.c:416 +#: ../panels/midori-history.c:359 msgid "Delete the selected history item" msgstr "A kijelölt előzményelem törlése" -#: ../panels/midori-history.c:424 +#: ../panels/midori-history.c:367 msgid "Clear the entire history" msgstr "Minden előzmény törlése" -#: ../panels/midori-transfers.c:86 -msgid "Transfers" -msgstr "Átvitelek" - -#: ../panels/midori-transfers.c:469 +#: ../panels/midori-transfers.c:481 msgid "Open Destination _Folder" msgstr "_Célmappa megnyitása" -#: ../panels/midori-transfers.c:472 +#: ../panels/midori-transfers.c:484 msgid "Copy Link Loc_ation" msgstr "Link _helyének másolása" -#: ../katze/katze-http-auth.c:210 +#: ../katze/katze-http-auth.c:213 msgid "Authentication Required" msgstr "Hitelesítés szükséges" -#: ../katze/katze-http-auth.c:226 +#: ../katze/katze-http-auth.c:229 msgid "" "A username and a password are required\n" "to open this location:" @@ -2219,244 +2283,220 @@ msgstr "" "A hely megnyitásához felhasználónév\n" "és jelszó szükséges:" -#: ../katze/katze-http-auth.c:240 +#: ../katze/katze-http-auth.c:243 msgid "Username" msgstr "Felhasználói név" -#: ../katze/katze-http-auth.c:253 +#: ../katze/katze-http-auth.c:256 msgid "Password" msgstr "Jelszó" -#: ../katze/katze-http-auth.c:267 +#: ../katze/katze-http-auth.c:270 msgid "_Remember password" msgstr "Jelszó _megjegyzése" -#: ../katze/katze-throbber.c:949 +#: ../katze/katze-throbber.c:879 #, c-format msgid "Named icon '%s' couldn't be loaded" msgstr "A(z) „%s” nevű ikon nem tölthető be" -#: ../katze/katze-throbber.c:962 +#: ../katze/katze-throbber.c:892 #, 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:1042 +#: ../katze/katze-throbber.c:964 msgid "Animation frames are broken" msgstr "Az animációs képkockák sérültek" -#: ../katze/katze-utils.c:445 ../katze/katze-utils.c:879 +#: ../katze/katze-utils.c:510 ../katze/katze-utils.c:918 #, 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:491 ../katze/katze-utils.c:520 -#: ../extensions/addons.c:308 +#: ../katze/katze-utils.c:556 ../katze/katze-utils.c:585 +#: ../extensions/addons.c:313 msgid "Choose file" msgstr "Válasszon fájlt" -#: ../katze/katze-utils.c:506 +#: ../katze/katze-utils.c:571 msgid "Choose folder" msgstr "Válasszon mappát" -#: ../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 +#: ../katze/katze-preferences.c:95 #, c-format msgid "Preferences for %s" msgstr "%s tulajdonságai" -#: ../extensions/adblock.c:473 +#: ../extensions/adblock.c:415 msgid "Configure Advertisement filters" msgstr "Reklámszűrők beállítása" -#: ../extensions/adblock.c:504 +#: ../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 "" -"Í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." +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:882 +#: ../extensions/adblock.c:587 +msgid "Configure _Advertisement filters..." +msgstr "_Reklámszűrők beállítása…" + +#: ../extensions/adblock.c:841 msgid "Edit rule" msgstr "Szabály szerkesztése" -#: ../extensions/adblock.c:896 +#: ../extensions/adblock.c:854 msgid "_Rule:" msgstr "S_zabály:" -#: ../extensions/adblock.c:950 +#: ../extensions/adblock.c:908 msgid "Bl_ock image" msgstr "Kép _blokkolása" -#: ../extensions/adblock.c:955 +#: ../extensions/adblock.c:913 msgid "Bl_ock link" msgstr "_Hivatkozás blokkolása" -#: ../extensions/adblock.c:1670 +#: ../extensions/adblock.c:1492 msgid "Advertisement blocker" msgstr "Reklámblokkoló" -#: ../extensions/adblock.c:1671 +#: ../extensions/adblock.c:1493 msgid "Block advertisements according to a filter list" msgstr "Reklámok blokkolása szűrőlista alapján" #. i18n: An infobar shows up when viewing a script on userscripts.org -#: ../extensions/addons.c:221 +#: ../extensions/addons.c:223 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 +#: ../extensions/addons.c:224 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 +#: ../extensions/addons.c:229 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 +#: ../extensions/addons.c:230 msgid "_Install user style" msgstr "Felhasználói _stílus telepítése" -#: ../extensions/addons.c:236 +#: ../extensions/addons.c:238 msgid "Don't install" msgstr "Ne telepítse" -#: ../extensions/addons.c:319 ../extensions/addons.c:681 +#: ../extensions/addons.c:324 ../extensions/addons.c:685 msgid "Userscripts" msgstr "Felhasználói parancsfájlok" -#: ../extensions/addons.c:324 ../extensions/addons.c:683 +#: ../extensions/addons.c:329 ../extensions/addons.c:687 msgid "Userstyles" msgstr "Felhasználói stílusok" -#: ../extensions/addons.c:380 ../extensions/addons.c:459 +#: ../extensions/addons.c:385 ../extensions/addons.c:461 #: ../extensions/feed-panel/main.c:129 msgid "Error" msgstr "Hiba" -#: ../extensions/addons.c:421 +#: ../extensions/addons.c:425 #, c-format msgid "Do you want to delete '%s'?" msgstr "Biztos, hogy törölni akarja a következőt: „%s”?" -#: ../extensions/addons.c:427 +#: ../extensions/addons.c:431 msgid "Delete user script" msgstr "Felhasználói parancsfájl törlése" -#: ../extensions/addons.c:428 +#: ../extensions/addons.c:432 msgid "Delete user style" msgstr "Felhasználói stílus törlése" -#: ../extensions/addons.c:431 +#: ../extensions/addons.c:436 #, 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 +#: ../extensions/addons.c:572 ../extensions/addons.c:649 msgid "Open in Text Editor" msgstr "Megnyitás szövegszerkesztőben" -#: ../extensions/addons.c:572 ../extensions/addons.c:656 +#: ../extensions/addons.c:574 ../extensions/addons.c:658 msgid "Open Target Folder" msgstr "Célmappa megnyitása" -#: ../extensions/addons.c:638 +#: ../extensions/addons.c:640 msgid "Add new addon" msgstr "Új bővítmény hozzáadása" -#: ../extensions/addons.c:664 +#: ../extensions/addons.c:667 +msgid "Open target folder for selected addon" +msgstr "Kijelölt bővítmény célmappájának megnyitása" + +#: ../extensions/addons.c:668 msgid "Remove selected addon" msgstr "Kijelölt bővítmény eltávolítása" -#: ../extensions/addons.c:1696 ../extensions/addons.c:1914 +#: ../extensions/addons.c:1638 ../extensions/addons.c:1800 msgid "User addons" msgstr "Felhasználói bővítmények" -#: ../extensions/addons.c:1826 +#: ../extensions/addons.c:1759 #, c-format msgid "Can't monitor folder '%s': %s" msgstr "„%s” mappa nem figyelhető meg: %s" -#: ../extensions/addons.c:1915 +#: ../extensions/addons.c:1801 msgid "Support for userscripts and userstyles" msgstr "Felhasználói parancsfájlok és stílusok támogatása" -#: ../extensions/colorful-tabs.c:201 +#: ../extensions/colorful-tabs.c:202 msgid "Colorful Tabs" msgstr "Színes lapok" -#: ../extensions/colorful-tabs.c:202 +#: ../extensions/colorful-tabs.c:203 msgid "Tint each tab distinctly" msgstr "Eltérő szín adása minden lapnak" -#: ../extensions/cookie-manager/cookie-manager-page.c:73 +#: ../extensions/cookie-manager/cookie-manager-page.c:82 #: ../extensions/cookie-manager/main.c:35 msgid "Cookie Manager" msgstr "Sütikezelő" -#: ../extensions/cookie-manager/cookie-manager-page.c:103 +#: ../extensions/cookie-manager/cookie-manager-page.c:112 msgid "Delete All" msgstr "Összes törlése" -#: ../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: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:120 +#: ../extensions/cookie-manager/cookie-manager-page.c:129 msgid "Expand All" msgstr "Összes kibontása" -#: ../extensions/cookie-manager/cookie-manager-page.c:127 +#: ../extensions/cookie-manager/cookie-manager-page.c:136 msgid "Collapse All" msgstr "Összes összecsukása" -#: ../extensions/cookie-manager/cookie-manager-page.c:572 +#: ../extensions/cookie-manager/cookie-manager-page.c:578 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:574 +#: ../extensions/cookie-manager/cookie-manager-page.c:580 msgid "Question" msgstr "Kérdés" -#: ../extensions/cookie-manager/cookie-manager-page.c:583 +#: ../extensions/cookie-manager/cookie-manager-page.c:589 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:671 +#: ../extensions/cookie-manager/cookie-manager-page.c:677 msgid "At the end of the session" msgstr "A munkamenet végén" -#: ../extensions/cookie-manager/cookie-manager-page.c:674 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 #, c-format msgid "" "Host: %s\n" @@ -2473,15 +2513,15 @@ msgstr "" "Biztonságos: %s\n" "Lejár: %s" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:686 msgid "Yes" msgstr "Igen" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:686 msgid "No" msgstr "Nem" -#: ../extensions/cookie-manager/cookie-manager-page.c:694 +#: ../extensions/cookie-manager/cookie-manager-page.c:700 #, c-format msgid "" "Domain: %s\n" @@ -2490,42 +2530,39 @@ msgstr "" "Tartomány: %s\n" "Sütik: %d" -#: ../extensions/cookie-manager/cookie-manager-page.c:1024 +#: ../extensions/cookie-manager/cookie-manager-page.c:1030 msgid "Name" msgstr "Név" -#: ../extensions/cookie-manager/cookie-manager-page.c:1077 +#: ../extensions/cookie-manager/cookie-manager-page.c:1083 msgid "_Expand All" msgstr "Összes _kibontása" -#: ../extensions/cookie-manager/cookie-manager-page.c:1085 +#: ../extensions/cookie-manager/cookie-manager-page.c:1091 msgid "_Collapse All" msgstr "Összes össze_csukása" -#: ../extensions/cookie-manager/cookie-manager-page.c:1139 +#: ../extensions/cookie-manager/cookie-manager-page.c:1144 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/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:36 msgid "List, view and delete cookies" msgstr "Sütik felsorolása, megjelenítése és törlése" -#: ../extensions/copy-tabs.c:38 +#: ../extensions/copy-tabs.c:39 msgid "Copy Tab _Addresses" msgstr "Lap_címek másolása" -#: ../extensions/copy-tabs.c:95 +#: ../extensions/copy-tabs.c:96 msgid "Copy Addresses of Tabs" msgstr "Lapok címeinek másolása" -#: ../extensions/copy-tabs.c:96 +#: ../extensions/copy-tabs.c:97 msgid "Copy the addresses of all tabs to the clipboard" msgstr "Az összes lap címeinek vágólapra másolása" @@ -2538,25 +2575,25 @@ msgid "Failed to find required Atom \"feed\" elements in XML data." 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:387 +#: ../extensions/feed-panel/feed-panel.c:392 #, c-format msgctxt "Feed" msgid "Last updated: %s." msgstr "Utolsó frissítés: %s." -#: ../extensions/feed-panel/feed-panel.c:653 +#: ../extensions/feed-panel/feed-panel.c:661 msgid "Feeds" msgstr "Hírforrások" -#: ../extensions/feed-panel/feed-panel.c:706 +#: ../extensions/feed-panel/feed-panel.c:714 msgid "Add new feed" msgstr "Új hírforrás hozzáadása" -#: ../extensions/feed-panel/feed-panel.c:713 +#: ../extensions/feed-panel/feed-panel.c:721 msgid "Delete feed" msgstr "Hírforrás törlése" -#: ../extensions/feed-panel/feed-panel.c:795 +#: ../extensions/feed-panel/feed-panel.c:803 msgid "_Feeds" msgstr "_Hírforrások" @@ -2609,129 +2646,81 @@ msgstr "Hírforráspanel" msgid "Read Atom/ RSS feeds" msgstr "Atom/ RSS hírforrások olvasása" -#: ../extensions/formhistory/formhistory.c:39 +#: ../extensions/formhistory.c:146 #, c-format msgid "Failed to add form value: %s\n" msgstr "Az űrlapérték hozzáadása meghiúsult: %s\n" -#: ../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/formhistory.c:549 -#: ../extensions/formhistory/formhistory.c:553 +#: ../extensions/formhistory.c:458 ../extensions/formhistory.c:462 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Az adatbázis-utasítás végrehajtása meghiúsult: %s\n" -#: ../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/formhistory.c:668 -msgid "Form history filler" -msgstr "Űrlap-előzmények kitöltése" - -#: ../extensions/formhistory/formhistory.c:669 +#: ../extensions/formhistory.c:520 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 +#: ../extensions/formhistory.c:524 #, c-format -msgid "Failed to select suggestions\n" -msgstr "A javaslatok kiválasztása meghiúsult\n" +msgid "Not available: %s" +msgstr "Nem érhető el: %s" + +#: ../extensions/formhistory.c:525 +msgid "Resource files not installed" +msgstr "Az erőforrásfájlok nincsenek telepítve" + +#: ../extensions/formhistory.c:531 +msgid "Form history filler" +msgstr "Űrlap-előzmények kitöltése" -#: ../extensions/history-list.vala:197 +#. i18n: Data entered into web forms by the user +#: ../extensions/formhistory.c:543 +msgid "_Form History" +msgstr "Ű_rlapelőzmények" + +#: ../extensions/history-list.vala:149 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:231 +msgid "Next Tab (History List)" +msgstr "Következő lap (előzménylista)" -#: ../extensions/history-list.vala:283 -msgid "Do nothing" -msgstr "Ne tegyen semmit" +#: ../extensions/history-list.vala:232 +msgid "Next tab from history" +msgstr "Következő lap az előzményekből" -#: ../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:241 +msgid "Previous Tab (History List)" +msgstr "Előző lap (előzménylista)" -#: ../extensions/history-list.vala:295 -msgid "Switch to newest tab" -msgstr "Váltás a legújabb lapra" +#: ../extensions/history-list.vala:242 +msgid "Previous tab from history" +msgstr "Előző lap az előzményekből" -#: ../extensions/history-list.vala:423 +#: ../extensions/history-list.vala:251 msgid "Next new Tab (History List)" msgstr "Következő új lap (előzménylista)" -#: ../extensions/history-list.vala:424 +#: ../extensions/history-list.vala:252 msgid "Next new tab from history" msgstr "Következő új lap az előzményekből" -#: ../extensions/history-list.vala:433 +#: ../extensions/history-list.vala:261 msgid "Previous new Tab (History List)" msgstr "Előző új lap (előzménylista)" -#: ../extensions/history-list.vala:434 +#: ../extensions/history-list.vala:262 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 +#: ../extensions/history-list.vala:347 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/history-list.vala:348 +msgid "Switch tabs with Ctrl+Tab sorted by last usage" +msgstr "Lapváltás Ctrl+Tab-bal, az utolsó használat szerinti sorrendben" #: ../extensions/mouse-gestures.c:301 msgid "Mouse Gestures" @@ -2741,23 +2730,32 @@ msgstr "Egérgesztusok" msgid "Control Midori by moving the mouse" msgstr "A Midori irányítása az egér mozgatásával" -#: ../extensions/shortcuts.c:109 -msgid "Reload page or stop loading" -msgstr "Oldal újratöltése, vagy betöltés leállítása" +#. i18n: A panel showing a user specified web page +#: ../extensions/page-holder.c:128 ../extensions/page-holder.c:174 +msgid "Pageholder" +msgstr "Oldaltároló" -#: ../extensions/shortcuts.c:176 +#: ../extensions/page-holder.c:158 +msgid "_Pageholder" +msgstr "_Oldaltároló" + +#: ../extensions/page-holder.c:175 +msgid "Keep one or multiple pages open in parallel to your tabs" +msgstr "Oldalak nyitva tartása a lapokkal párhuzamosan" + +#: ../extensions/shortcuts.c:170 msgid "Customize Keyboard shortcuts" msgstr "Gyorsbillentyűk személyre szabása" -#: ../extensions/shortcuts.c:283 -msgid "Customize Sh_ortcuts…" +#: ../extensions/shortcuts.c:276 +msgid "Customize Sh_ortcuts..." msgstr "_Gyorsbillentyűk személyre szabása…" -#: ../extensions/shortcuts.c:320 +#: ../extensions/shortcuts.c:313 msgid "Shortcuts" msgstr "Gyorsbillentyűk" -#: ../extensions/shortcuts.c:321 +#: ../extensions/shortcuts.c:314 msgid "View and edit keyboard shortcuts" msgstr "Gyorsbillentyűk megjelenítése és szerkesztése" @@ -2769,464 +2767,99 @@ msgstr "Állapotsoróra" msgid "Display date and time in the statusbar" msgstr "Dátum és idő megjelenítése az állapotsorban" -#: ../extensions/statusbar-features.c:131 +#: ../extensions/statusbar-features.c:85 msgid "Images" msgstr "Képek" -#: ../extensions/statusbar-features.c:140 +#: ../extensions/statusbar-features.c:94 msgid "Scripts" msgstr "Parancsfájlok" -#: ../extensions/statusbar-features.c:151 +#: ../extensions/statusbar-features.c:103 msgid "Netscape plugins" msgstr "Netscape bővítmények" -#: ../extensions/statusbar-features.c:199 +#: ../extensions/statusbar-features.c:140 msgid "Statusbar Features" msgstr "Állapotsor-összetevők" -#: ../extensions/statusbar-features.c:200 +#: ../extensions/statusbar-features.c:141 msgid "Easily toggle features on web pages on and off" msgstr "Weboldalak összetevőinek egyszerű be- és kikapcsolása" -#: ../extensions/tab-panel.c:593 ../extensions/tab-panel.c:680 +#: ../extensions/tab-panel.c:585 ../extensions/tab-panel.c:643 msgid "Tab Panel" msgstr "Lappanel" -#: ../extensions/tab-panel.c:663 +#: ../extensions/tab-panel.c:626 msgid "T_ab Panel" msgstr "_Lappanel" -#: ../extensions/tab-panel.c:681 +#: ../extensions/tab-panel.c:644 msgid "Show tabs in a vertical panel" msgstr "Lapok megjelenítése függőleges panelen" -#: ../extensions/tabs-minimized.c:76 +#: ../extensions/tabs-minimized.c:77 msgid "Only Icons on Tabs by default" msgstr "Csak ikonok a lapokon alapértelmezésben" -#: ../extensions/tabs-minimized.c:77 +#: ../extensions/tabs-minimized.c:78 msgid "New tabs have no label by default" msgstr "Az új lapokon alapértelmezésben nincs felirat" -#: ../extensions/toolbar-editor.c:393 +#: ../extensions/toolbar-editor.c:387 msgid "Customize Toolbar" msgstr "Eszköztár testreszabása" -#: ../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:403 +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:425 +#: ../extensions/toolbar-editor.c:419 msgid "Available Items" msgstr "Elérhető elemek" -#: ../extensions/toolbar-editor.c:446 +#: ../extensions/toolbar-editor.c:440 msgid "Displayed Items" msgstr "Megjelenített elemek" -#: ../extensions/toolbar-editor.c:581 -msgid "Customize _Toolbar…" +#: ../extensions/toolbar-editor.c:575 +msgid "Customize _Toolbar..." msgstr "_Eszköztár személyre szabása…" -#: ../extensions/toolbar-editor.c:597 -msgid "_Customize…" -msgstr "_Testreszabás…" - -#: ../extensions/toolbar-editor.c:627 +#: ../extensions/toolbar-editor.c:604 msgid "Toolbar Editor" msgstr "Eszköztárszerkesztő" -#: ../extensions/toolbar-editor.c:628 +#: ../extensions/toolbar-editor.c:605 msgid "Easily edit the toolbar layout" msgstr "Az eszköztár elrendezésének egyszerű szerkesztése" -#: ../extensions/web-cache.c:463 +#: ../extensions/web-cache.c:472 ../extensions/web-cache.c:481 +msgid "Web Cache" +msgstr "Webes gyorsítótár" + +#: ../extensions/web-cache.c:473 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 "Align sidepanel to the right" +msgstr "Az oldalsáv jobbra igazítása" + +msgid "Align sidepanel to the left" +msgstr "Az oldalsáv balra igazítása" + #~ 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 "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 --git a/po/id.po b/po/id.po index 7dc703a4..8252fe88 100644 --- a/po/id.po +++ b/po/id.po @@ -7,423 +7,300 @@ msgid "" msgstr "" "Project-Id-Version: midori\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-15 00:45+0000\n" +"POT-Creation-Date: 2011-08-27 22:19+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 "Browse the Web" -msgstr "Ramban Web" +msgid "Lightweight web browser" +msgstr "Peramban web ringan" -#: ../data/midori.desktop.in.h:2 -msgid "Internet;WWW;Explorer" -msgstr "Internet;WWW;Explorer" - -#: ../data/midori.desktop.in.h:3 ../midori/main.c:1922 ../midori/main.c:1946 -#: ../midori/main.c:1960 ../midori/midori-websettings.c:200 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1431 ../midori/main.c:2005 +#: ../midori/main.c:2029 ../midori/main.c:2045 +#: ../midori/midori-websettings.c:293 msgid "Midori" msgstr "Midori" -#: ../data/midori.desktop.in.h:4 -msgid "Midori Web Browser" -msgstr "Peramban Web Midori" - -#: ../data/midori.desktop.in.h:5 -msgid "New Private Browsing Window" -msgstr "Jendela Peramban Privat Baru" - -#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1326 -msgid "New Tab" -msgstr "Tab Baru" - -#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1323 -msgid "New Window" -msgstr "Jendela Baru" - -#: ../data/midori.desktop.in.h:8 +#: ../data/midori.desktop.in.h:3 msgid "Web Browser" msgstr "Peramban Web" -#: ../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:4355 -msgid "Private Browsing" -msgstr "Meramban Privat" - -#: ../midori/main.c:91 ../midori/main.c:97 +#: ../midori/main.c:106 ../midori/main.c:112 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Konfigurasi tak dapat dimuat: %s\n" -#: ../midori/main.c:145 +#: ../midori/main.c:160 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Nilai '%s' hanya sah untuk %s" -#: ../midori/main.c:150 ../midori/main.c:254 +#: ../midori/main.c:165 ../midori/main.c:258 #, c-format msgid "Invalid configuration value '%s'" msgstr "Nilai konfigurasi '%s' tidak sah" -#: ../midori/main.c:365 +#: ../midori/main.c:363 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Mesin pencari tak dapat dimuat. %s\n" -#: ../midori/main.c:419 +#: ../midori/main.c:417 #, c-format msgid "Failed to clear history: %s\n" msgstr "Gagal membersihkan riwayat: %s\n" -#: ../midori/main.c:441 ../extensions/formhistory/formhistory.c:531 +#: ../midori/main.c:437 ../midori/main.c:558 ../extensions/formhistory.c:423 #, c-format 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:513 +#: ../midori/main.c:501 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Gagal menghapus item riwayat lama: %s\n" -#: ../midori/main.c:535 +#: ../midori/main.c:541 ../panels/midori-history.c:193 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "Gagal menghapus item riwayat: %s\n" + +#: ../midori/main.c:588 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "Bookmark tak dapat disimpan. %s" + +#: ../midori/main.c:622 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Konfigurasi tak dapat disimpan. %s" -#: ../midori/main.c:561 +#: ../midori/main.c:657 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Mesin pencari tak dapat disimpan. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:598 +#: ../midori/main.c:683 ../midori/main.c:703 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Kotak sampah tak dapat disimpan. %s" -#: ../midori/main.c:671 ../panels/midori-extensions.c:90 +#: ../midori/main.c:737 ../panels/midori-extensions.c:93 msgid "Extensions" msgstr "Ekstensi" -#: ../midori/main.c:685 +#: ../midori/main.c:751 msgid "Privacy" msgstr "Privasi" -#: ../midori/main.c:687 -msgid "Delete old Cookies after:" -msgstr "Hapus kuki lama setelah:" - -#: ../midori/main.c:689 ../midori/main.c:692 -msgid "The maximum number of days to save cookies for" -msgstr "Jumlah maksimum hari untuk menyimpan kuki" - -#: ../midori/main.c:696 -msgid "Only accept Cookies from sites you visit" -msgstr "Hanya terima kuki dari situs yang anda kunjungi" - -#: ../midori/main.c:697 -msgid "Block cookies sent by third-party websites" -msgstr "Blok kuki yang dikirim dari situs web pihak ketiga" - -#: ../midori/main.c:702 -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:709 -msgid "Enable offline web application cache" -msgstr "Aktifkan tembolok aplikasi web luring" - -#: ../midori/main.c:712 -msgid "Enable HTML5 local storage support" -msgstr "Aktifkan dukungan penyimpanan lokal HTML5" - -#. i18n: Reworded: Shorten details propagated when going to another page -#: ../midori/main.c:716 -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/main.c:718 -msgid "Whether the \"Referer\" header should be shortened to the hostname" -msgstr "Apakah tajuk \"Rujukan\" harus dipendekkan ke nama host" - -#: ../midori/main.c:721 -msgid "Delete pages from history after:" -msgstr "Hapus halaman dari riwayat setelah:" - -#: ../midori/main.c:723 ../midori/main.c:726 -msgid "The maximum number of days to save the history for" -msgstr "Jumlah maksimum hari untuk tetap menyimpan riwayat" +#: ../midori/main.c:759 +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:767 +#: ../midori/main.c:823 #, c-format msgid "The session couldn't be saved. %s" msgstr "Sesi tak dapat disimpan. %s" -#: ../midori/main.c:989 -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:1017 +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:1084 -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." +#: ../midori/main.c:1079 +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." -#: ../midori/main.c:1103 +#: ../midori/main.c:1098 msgid "Modify _preferences" msgstr "Ubah _pengaturan" -#: ../midori/main.c:1107 +#: ../midori/main.c:1102 msgid "Disable all _extensions" msgstr "Nonaktifkan semua _ekstensi" -#: ../midori/main.c:1116 -msgid "Show a dialog after Midori crashed" -msgstr "Tampilkan sebuah dialog setelah Midori macet" - -#: ../midori/main.c:1121 +#: ../midori/main.c:1115 msgid "Discard old tabs" msgstr "Abaikan tab lama" -#: ../midori/main.c:1122 ../midori/midori-websettings.c:108 +#: ../midori/main.c:1116 ../midori/midori-websettings.c:203 msgid "Show last tabs without loading" msgstr "Tampilkan tab terakhir tanpa memuat" -#: ../midori/main.c:1123 ../midori/midori-websettings.c:107 +#: ../midori/main.c:1117 ../midori/midori-websettings.c:202 msgid "Show last open tabs" msgstr "Tampilkan tab yang terakhir terbuka" -#: ../midori/main.c:1370 ../midori/main.c:2382 +#: ../midori/main.c:1310 ../midori/main.c:2366 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Sesi tak dapat dimuat: %s\n" -#: ../midori/main.c:1508 +#: ../midori/main.c:1431 +msgid "No filename specified" +msgstr "Tak ada nama berkas yang ditentukan" + +#: ../midori/main.c:1450 +msgid "An unknown error occured." +msgstr "Galat tak diketahui terjadi." + +#: ../midori/main.c:1479 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Cuplikan layar disimpan ke: %s\n" -#: ../midori/main.c:1837 +#: ../midori/main.c:1889 msgid "Run ADDRESS as a web application" msgstr "Jalankan ALAMAT sebagai sebuah aplikasi web" -#: ../midori/main.c:1837 +#: ../midori/main.c:1889 msgid "ADDRESS" msgstr "ALAMAT" -#: ../midori/main.c:1840 +#: ../midori/main.c:1892 msgid "Use FOLDER as configuration folder" msgstr "Gunakan FOLDER sebagai folder konfigurasi" -#: ../midori/main.c:1840 +#: ../midori/main.c:1892 msgid "FOLDER" msgstr "FOLDER" -#: ../midori/main.c:1843 +#: ../midori/main.c:1895 msgid "Private browsing, no changes are saved" msgstr "Meramban privat, tak ada perubahan yang disimpan" -#: ../midori/main.c:1846 -msgid "Portable mode, all runtime files are stored in one place" -msgstr "" -"Dalam mode portabel, semua berkas proses akan disimpan dalam satu tempat" - -#: ../midori/main.c:1849 -msgid "Plain GTK+ window with WebKit, akin to GtkLauncher" -msgstr "Jendela GTK+ biasa dengan WebKit, mirip dengan GtkLauncher" - -#: ../midori/main.c:1851 +#: ../midori/main.c:1897 msgid "Show a diagnostic dialog" msgstr "Tampilkan dialog diagnosis" -#: ../midori/main.c:1853 +#: ../midori/main.c:1899 msgid "Run the specified filename as javascript" msgstr "Jalankan nama berkas yang ditentukan sebagai javascript" -#: ../midori/main.c:1855 +#: ../midori/main.c:1901 msgid "Take a snapshot of the specified URI" msgstr "Ambil cuplikan layar dari URI yang ditentukan" -#: ../midori/main.c:1857 +#: ../midori/main.c:1903 msgid "Execute the specified command" msgstr "Eksekusi perintah yang ditentukan" -#: ../midori/main.c:1859 +#: ../midori/main.c:1905 msgid "List available commands to execute with -e/ --execute" msgstr "Senarai perintah tersedia yang dijalankan dengan -e/ --execute" -#: ../midori/main.c:1861 +#: ../midori/main.c:1907 msgid "Display program version" msgstr "Tampilkan versi program" -#: ../midori/main.c:1863 +#: ../midori/main.c:1909 msgid "Addresses" msgstr "Alamat" -#: ../midori/main.c:1865 +#: ../midori/main.c:1911 msgid "Block URIs according to regular expression PATTERN" msgstr "Blok URI berdasarkan POLA ekspresi reguler" -#: ../midori/main.c:1865 +#: ../midori/main.c:1911 msgid "PATTERN" msgstr "POLA" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1869 +#: ../midori/main.c:1915 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "Atur ulang Midori setelah DETIK detik tidak aktif" -#: ../midori/main.c:1869 +#: ../midori/main.c:1915 msgid "SECONDS" msgstr "DETIK" -#: ../midori/main.c:1872 +#: ../midori/main.c:1918 msgid "Redirects console warnings to the specified FILENAME" msgstr "Mengalihkan peringatan konsol ke NAMABERKAS yang ditentukan" -#: ../midori/main.c:1872 +#: ../midori/main.c:1918 msgid "FILENAME" msgstr "NAMABERKAS" -#: ../midori/main.c:1961 +#: ../midori/main.c:2002 +msgid "[Addresses]" +msgstr "[Alamat]" + +#: ../midori/main.c:2016 +msgid "The specified configuration folder is invalid." +msgstr "Folder konfigurasi yang ditentukan tidak valid." + +#: ../midori/main.c:2046 msgid "Please report comments, suggestions and bugs to:" msgstr "Silakan laporkan komentar, saran dan kutu ke:" -#: ../midori/main.c:1963 +#: ../midori/main.c:2048 msgid "Check for new versions at:" msgstr "Cek versi baru di:" +#: ../midori/main.c:2115 +msgid "Website icons" +msgstr "Ikon situs web" + #. i18n: Logins and passwords in websites and web forms -#: ../midori/main.c:2102 +#: ../midori/main.c:2118 msgid "Saved logins and _passwords" msgstr "Log masuk dan _sandi tersimpan" -#: ../midori/main.c:2104 -msgid "Cookies and Website data" -msgstr "Data Kuki dan Situs Web" +#: ../midori/main.c:2120 +msgid "Cookies" +msgstr "Kuki" + +#: ../midori/main.c:2123 +msgid "'Flash' Cookies" +msgstr "Kuki 'Flash'" -#. TODO: Preserve page icons of search engines and merge privacy items -#: ../midori/main.c:2108 ../midori/midori-preferences.c:505 -#: ../extensions/web-cache.c:461 ../extensions/web-cache.c:470 +#: ../midori/main.c:2126 +msgid "HTML5 _Databases" +msgstr "Basis _Data HTML5" + +#: ../midori/main.c:2129 ../midori/midori-websettings.c:887 +#: ../extensions/web-cache.c:470 ../extensions/web-cache.c:479 msgid "Web Cache" msgstr "Tembolok Web" -#: ../midori/main.c:2111 -msgid "Website icons" -msgstr "Ikon situs web" - -#: ../midori/main.c:2215 -msgid "An unknown error occured" -msgstr "Galat tak diketahui terjadi" +#: ../midori/main.c:2133 +msgid "Offline Application Cache" +msgstr "Tembolok Aplikasi Luring" -#: ../midori/main.c:2330 +#: ../midori/main.c:2297 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:2364 +#: ../midori/main.c:2333 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Penanda tak dapat dimuat: %s\n" -#: ../midori/main.c:2397 +#: ../midori/main.c:2381 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Kotak sampah tak dapat dimuat: %s\n" -#: ../midori/main.c:2410 +#: ../midori/main.c:2394 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Riwayat tak dapat dimuat: %s\n" -#: ../midori/main.c:2425 +#: ../midori/main.c:2410 msgid "The following errors occured:" msgstr "Galat berikut terjadi:" -#: ../midori/main.c:2441 +#: ../midori/main.c:2426 msgid "_Ignore" msgstr "_Abaikan" -#: ../midori/midori-app.c:1156 ../midori/midori-browser.c:534 -#, c-format -msgid "Unexpected action '%s'." -msgstr "Aksi tak diharapkan '%s'." - -#: ../midori/midori-app.c:1372 ../midori/midori-browser.c:6251 -msgid "_Bookmarks" -msgstr "B_ookmark" - -#: ../midori/midori-app.c:1373 -msgid "Add Boo_kmark" -msgstr "Tambah P_enanda" - -#: ../midori/midori-app.c:1374 -msgid "_Extensions" -msgstr "_Ekstensi" - -#. i18n: Browsing history, visited web pages, closed tabs -#: ../midori/midori-app.c:1375 ../midori/midori-browser.c:4700 -msgid "_History" -msgstr "_Riwayat" - -#: ../midori/midori-app.c:1376 -msgid "_Userscripts" -msgstr "_Skrip pengguna" - -#: ../midori/midori-app.c:1377 -msgid "User_styles" -msgstr "Ga_ya pengguna" - -#: ../midori/midori-app.c:1378 -msgid "New _Tab" -msgstr "Tab _Baru" - -#: ../midori/midori-app.c:1379 -msgid "_Transfers" -msgstr "_Transfer" - -#: ../midori/midori-app.c:1380 -msgid "Netscape p_lugins" -msgstr "P_lugin Netscape" - -#: ../midori/midori-app.c:1381 -msgid "_Closed Tabs" -msgstr "_Tab Tertutup" - -#: ../midori/midori-app.c:1382 ../midori/midori-browser.c:5387 -msgid "New _Window" -msgstr "Jendela _Baru" - -#: ../midori/midori-app.c:1383 -msgid "New _Folder" -msgstr "_Folder Baru" - -#: ../midori/midori-app.c:1437 -msgid "[Addresses]" -msgstr "[Alamat]" - #: ../midori/midori-array.c:522 msgid "File not found." msgstr "Berkas tak ditemukan." @@ -437,1619 +314,1958 @@ msgstr "Dokumen salah bentuk." msgid "Unrecognized bookmark format." msgstr "Format penanda tak dikenal." -#: ../midori/midori-array.c:915 +#: ../midori/midori-array.c:916 msgid "Writing failed." msgstr "Penulisan gagal." -#: ../midori/midori-browser.c:347 ../midori/midori-browser.c:5526 -msgid "Go forward to the next page" -msgstr "Maju ke halaman berikutnya" - -#. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:354 ../midori/midori-browser.c:5534 -#: ../midori/midori-browser.c:5537 -msgid "Go to the next sub-page" -msgstr "Maju ke sub-halaman berikutnya" - -#: ../midori/midori-browser.c:441 ../midori/midori-browser.c:5475 -#: ../midori/midori-browser.c:5484 +#: ../midori/midori-browser.c:329 ../midori/midori-browser.c:5219 +#: ../midori/midori-browser.c:5228 msgid "Reload the current page" msgstr "Muat ulang halaman ini" -#: ../midori/midori-browser.c:449 ../midori/midori-browser.c:5481 +#: ../midori/midori-browser.c:340 ../midori/midori-browser.c:5225 msgid "Stop loading the current page" msgstr "Stop memuat halaman ini" -#: ../midori/midori-browser.c:519 +#: ../midori/midori-browser.c:467 #, c-format msgid "Failed to update title: %s\n" msgstr "Gagal memutakhirkan judul: %s\n" -#: ../midori/midori-browser.c:614 +#: ../midori/midori-browser.c:480 +#, c-format +msgid "Unexpected action '%s'." +msgstr "Aksi tak diharapkan '%s'." + +#: ../midori/midori-browser.c:581 #, c-format msgid "%s (Private Browsing)" msgstr "%s (Meramban Privat)" -#: ../midori/midori-browser.c:724 ../midori/midori-browser.c:766 -#: ../panels/midori-bookmarks.c:114 -msgid "Bookmarks" -msgstr "Penanda" - -#: ../midori/midori-browser.c:826 +#: ../midori/midori-browser.c:721 msgid "New folder" msgstr "Folder baru" -#: ../midori/midori-browser.c:826 +#: ../midori/midori-browser.c:721 msgid "Edit folder" msgstr "Sunting folder" -#: ../midori/midori-browser.c:828 +#: ../midori/midori-browser.c:723 msgid "New bookmark" msgstr "Penanda baru" -#: ../midori/midori-browser.c:828 +#: ../midori/midori-browser.c:723 msgid "Edit bookmark" msgstr "Sunting penanda" -#: ../midori/midori-browser.c:862 -msgid "Type a name for this bookmark and choose where to keep it." -msgstr "Ketik nama untuk penanda ini dan pilih tempat untuk menyimpannya." +#: ../midori/midori-browser.c:754 +msgid "_Title:" +msgstr "_Judul:" + +#: ../midori/midori-browser.c:774 ../midori/midori-searchaction.c:967 +#: ../extensions/feed-panel/main.c:377 +msgid "_Address:" +msgstr "_Alamat" + +#: ../midori/midori-browser.c:807 ../midori/midori-browser.c:4264 +msgid "_Folder:" +msgstr "_Folder:" + +#: ../midori/midori-browser.c:817 ../midori/midori-browser.c:905 +#: ../midori/midori-browser.c:4269 ../midori/midori-browser.c:4297 +msgid "Toplevel folder" +msgstr "Folder level atas" -#: ../midori/midori-browser.c:923 +#: ../midori/midori-browser.c:848 msgid "Add to _Speed Dial" msgstr "Tambah ke Panggil _Cepat" -#: ../midori/midori-browser.c:929 +#: ../midori/midori-browser.c:861 msgid "Show in the tool_bar" msgstr "Tampilkan di _batang alat" -#: ../midori/midori-browser.c:937 +#: ../midori/midori-browser.c:876 msgid "Run as _web application" msgstr "Jalankan sebagai aplikasi _web" -#: ../midori/midori-browser.c:1055 ../midori/midori-browser.c:4504 +#: ../midori/midori-browser.c:949 +#, c-format +msgid "The file \"%s\" can't be saved in this folder." +msgstr "Berkas \"%s\" tak dapat disimpan di folder ini." + +#: ../midori/midori-browser.c:951 +#, 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:958 +#, c-format +msgid "There is not enough free space to download \"%s\"." +msgstr "Tidak cukup ruang kosong untuk mengunduh \"%s\"." + +#: ../midori/midori-browser.c:961 +#, 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:1003 ../midori/midori-browser.c:4348 msgid "Save file as" msgstr "Simpan berkas sebagai" -#: ../midori/midori-browser.c:1065 -msgid "Save associated _resources" -msgstr "Simpan sumbe_r terkait" +#: ../midori/midori-browser.c:1322 +msgid "New Window" +msgstr "Jendela Baru" -#: ../midori/midori-browser.c:1323 +#: ../midori/midori-browser.c:1322 msgid "A new window has been opened" msgstr "Sebuah jendela baru telah dibuka" -#: ../midori/midori-browser.c:1326 +#: ../midori/midori-browser.c:1325 +msgid "New Tab" +msgstr "Tab Baru" + +#: ../midori/midori-browser.c:1325 msgid "A new tab has been opened" msgstr "Sebuah tab baru telah dibuka" -#: ../midori/midori-browser.c:1343 -msgid "Error opening the image!" -msgstr "Galat membuka gambar!" - -#: ../midori/midori-browser.c:1344 -msgid "Can not open selected image in a default viewer." -msgstr "Tak dapat membuka gambar terpilih di penampil standar." - -#: ../midori/midori-browser.c:1350 -msgid "Error downloading the image!" -msgstr "Gagal mengunduh gambar!" - -#: ../midori/midori-browser.c:1351 -msgid "Can not download selected image." -msgstr "Tak dapat mengunduh gambar terpilih." - -#: ../midori/midori-browser.c:1408 +#: ../midori/midori-browser.c:1362 msgid "Save file" msgstr "Simpan berkas" -#: ../midori/midori-browser.c:2335 +#: ../midori/midori-browser.c:2243 msgid "Open file" msgstr "Buka berkas" -#: ../midori/midori-browser.c:2467 +#: ../midori/midori-browser.c:2370 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 "" -"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." +"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 +#: ../midori/midori-browser.c:2376 ../extensions/feed-panel/main.c:365 msgid "New feed" msgstr "Umpan baru" -#: ../midori/midori-browser.c:2516 ../midori/midori-browser.c:5550 -#: ../panels/midori-bookmarks.c:527 +#: ../midori/midori-browser.c:2419 ../midori/midori-browser.c:5288 +#: ../panels/midori-bookmarks.c:466 msgid "Add a new bookmark" msgstr "Tambah penanda baru" -#: ../midori/midori-browser.c:3060 ../midori/midori-searchaction.c:487 +#: ../midori/midori-browser.c:2978 ../midori/midori-searchaction.c:488 msgid "Empty" msgstr "Kosong" -#: ../midori/midori-browser.c:3506 ../midori/midori-browser.c:3507 -msgid "Toggle text cursor navigation" -msgstr "Ubah navigasi kursor teks" - -#: ../midori/midori-browser.c:3509 -msgid "" -"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in " -"all websites." -msgstr "" -"Menekan tombol F7 akan mengalihkan mode Ramban Caret. Bila aktif, kursor " -"teks akan muncul di semua situs web." - -#: ../midori/midori-browser.c:3512 -msgid "_Enable Caret Browsing" -msgstr "Aktifkan Mode Ramban Ca_ret" - -#: ../midori/midori-browser.c:3904 ../midori/midori-browser.c:5944 +#: ../midori/midori-browser.c:3766 ../midori/midori-browser.c:5698 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Gagal memasukkan item riwayat baru: %s\n" -#: ../midori/midori-browser.c:4230 ../panels/midori-bookmarks.c:850 -#: ../panels/midori-history.c:806 +#: ../midori/midori-browser.c:4096 ../panels/midori-bookmarks.c:782 +#: ../panels/midori-history.c:751 msgid "Open all in _Tabs" msgstr "Buka semua di _Tab" -#: ../midori/midori-browser.c:4237 ../panels/midori-bookmarks.c:856 -#: ../panels/midori-history.c:812 ../extensions/feed-panel/feed-panel.c:528 +#: ../midori/midori-browser.c:4103 ../panels/midori-bookmarks.c:788 +#: ../panels/midori-history.c:757 ../extensions/feed-panel/feed-panel.c:533 msgid "Open in New _Tab" msgstr "Buka di _Tab Baru" -#: ../midori/midori-browser.c:4240 ../midori/midori-view.c:2952 -#: ../midori/midori-view.c:4928 ../panels/midori-bookmarks.c:858 -#: ../panels/midori-history.c:814 ../extensions/feed-panel/feed-panel.c:530 +#: ../midori/midori-browser.c:4106 ../midori/midori-view.c:2523 +#: ../midori/midori-view.c:4371 ../panels/midori-bookmarks.c:790 +#: ../panels/midori-history.c:759 ../extensions/feed-panel/feed-panel.c:535 msgid "Open in New _Window" msgstr "Buka di _Jendela Baru" -#: ../midori/midori-browser.c:4329 +#: ../midori/midori-browser.c:4186 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4330 +#: ../midori/midori-browser.c:4187 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4331 +#: ../midori/midori-browser.c:4188 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4332 +#: ../midori/midori-browser.c:4189 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4333 +#: ../midori/midori-browser.c:4190 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4334 -#, c-format -msgid "Firefox (%s)" -msgstr "Firefox (%s)" - -#: ../midori/midori-browser.c:4335 -msgid "Midori 0.2.6" -msgstr "Midori 0.2.6" +#: ../midori/midori-browser.c:4215 +msgid "Import bookmarks..." +msgstr "Impor penanda..." -#: ../midori/midori-browser.c:4356 -msgid "Import bookmarks…" -msgstr "Impor penanda…" - -#: ../midori/midori-browser.c:4359 ../midori/midori-browser.c:5555 +#: ../midori/midori-browser.c:4218 ../midori/midori-browser.c:5293 msgid "_Import bookmarks" msgstr "_Impor penanda" -#: ../midori/midori-browser.c:4370 +#: ../midori/midori-browser.c:4229 msgid "_Application:" msgstr "_Aplikasi:" -#: ../midori/midori-browser.c:4435 +#: ../midori/midori-browser.c:4256 msgid "Import from XBEL or HTML file" msgstr "Impor dari berkas XBEL atau HTML" -#: ../midori/midori-browser.c:4463 +#: ../midori/midori-browser.c:4305 msgid "Import from a file" msgstr "Impor dari berkas" -#: ../midori/midori-browser.c:4475 +#: ../midori/midori-browser.c:4317 msgid "Failed to import bookmarks" msgstr "Gagal mengimpor penanda" -#: ../midori/midori-browser.c:4509 +#: ../midori/midori-browser.c:4353 msgid "XBEL Bookmarks" msgstr "Penanda XBEL" -#: ../midori/midori-browser.c:4514 +#: ../midori/midori-browser.c:4358 msgid "Netscape Bookmarks" msgstr "Penanda Netscape" -#: ../midori/midori-browser.c:4528 +#: ../midori/midori-browser.c:4372 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:4543 +#: ../midori/midori-browser.c:4388 msgid "Failed to export bookmarks" msgstr "Gagal mengekspor penanda" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4665 +#: ../midori/midori-browser.c:4514 msgid "Clear Private Data" msgstr "Hapus Data Pribadi" -#: ../midori/midori-browser.c:4669 +#: ../midori/midori-browser.c:4518 msgid "_Clear private data" msgstr "_Hapus data pribadi" -#: ../midori/midori-browser.c:4684 +#: ../midori/midori-browser.c:4531 msgid "Clear the following data:" msgstr "Hapus data berikut:" -#: ../midori/midori-browser.c:4694 +#: ../midori/midori-browser.c:4541 msgid "Last open _tabs" msgstr "Tab terakhir dibuka" -#: ../midori/midori-browser.c:4720 +#. i18n: Browsing history, visited web pages +#: ../midori/midori-browser.c:4547 ../midori/sokoke.c:1520 +msgid "_History" +msgstr "_Riwayat" + +#: ../midori/midori-browser.c:4552 ../midori/sokoke.c:1526 +msgid "_Closed Tabs" +msgstr "_Tab Tertutup" + +#: ../midori/midori-browser.c:4572 msgid "Clear private data when _quitting Midori" msgstr "Hapus data pribadi ketika _keluar Midori" -#: ../midori/midori-browser.c:4935 +#: ../midori/midori-browser.c:4746 msgid "A lightweight web browser." msgstr "Peramban web ringan." -#: ../midori/midori-browser.c:4936 +#: ../midori/midori-browser.c:4747 msgid "See about:version for version info." msgstr "Lihaat tentang:versi untuk info versi." -#: ../midori/midori-browser.c:4938 -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:4749 +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:4968 +#: ../midori/midori-browser.c:4768 msgid "translator-credits" msgstr "Andhika Padmawan " -#: ../midori/midori-browser.c:5385 +#: ../midori/midori-browser.c:5132 msgid "_File" msgstr "_Berkas" -#: ../midori/midori-browser.c:5388 +#: ../midori/midori-browser.c:5134 ../midori/sokoke.c:1527 +msgid "New _Window" +msgstr "Jendela _Baru" + +#: ../midori/midori-browser.c:5135 msgid "Open a new window" msgstr "Buka di jendela baru" -#: ../midori/midori-browser.c:5391 +#: ../midori/midori-browser.c:5138 msgid "Open a new tab" msgstr "Buka di tab baru" -#: ../midori/midori-browser.c:5393 +#: ../midori/midori-browser.c:5140 msgid "New P_rivate Browsing Window" msgstr "Jendela Meramban P_rivat Baru" -#: ../midori/midori-browser.c:5397 +#: ../midori/midori-browser.c:5141 +msgid "Don't save any private data while browsing" +msgstr "Jangan simpan data privat ketika meramban" + +#: ../midori/midori-browser.c:5145 msgid "Open a file" msgstr "Buka berkas" -#: ../midori/midori-browser.c:5399 -msgid "_Save Page As…" -msgstr "_Simpan Halaman Sebagai…" +#: ../midori/midori-browser.c:5147 +msgid "_Save Page As..." +msgstr "_Simpan Halaman Sebagai..." -#: ../midori/midori-browser.c:5400 +#: ../midori/midori-browser.c:5148 msgid "Save to a file" msgstr "Simpan ke berkas" -#: ../midori/midori-browser.c:5402 +#: ../midori/midori-browser.c:5150 msgid "Add to Speed _dial" msgstr "Tambah ke Panggil _cepat" -#: ../midori/midori-browser.c:5406 +#: ../midori/midori-browser.c:5151 +msgid "Add shortcut to speed dial" +msgstr "Tambah jalan pintas ke panggil cepat" + +#: ../midori/midori-browser.c:5154 msgid "Add Shortcut to the _desktop" msgstr "Tambah jalan pintas ke _desktop" -#: ../midori/midori-browser.c:5408 +#: ../midori/midori-browser.c:5155 +msgid "Add shortcut to the desktop" +msgstr "Tambah jalan pintas ke desktop" + +#: ../midori/midori-browser.c:5157 msgid "Create _Launcher" msgstr "Buat _Peluncur" -#: ../midori/midori-browser.c:5412 +#: ../midori/midori-browser.c:5158 +msgid "Create a launcher" +msgstr "Buat sebuah peluncur" + +#: ../midori/midori-browser.c:5161 msgid "Subscribe to News _feed" msgstr "Berlangganan ke umpan _berita" -#: ../midori/midori-browser.c:5418 +#: ../midori/midori-browser.c:5162 +msgid "Subscribe to this news feed" +msgstr "Berlangganan ke umpan berita ini" + +#: ../midori/midori-browser.c:5167 msgid "_Close Tab" msgstr "_Tutup Tab" -#: ../midori/midori-browser.c:5419 +#: ../midori/midori-browser.c:5168 msgid "Close the current tab" msgstr "Tutup tab saat ini" -#: ../midori/midori-browser.c:5421 +#: ../midori/midori-browser.c:5170 msgid "C_lose Window" msgstr "T_utup Jendela" -#: ../midori/midori-browser.c:5425 -msgid "_Share" -msgstr "Ba_gikan" +#: ../midori/midori-browser.c:5171 +msgid "Close this window" +msgstr "Tutup jendela ini" -#: ../midori/midori-browser.c:5430 +#: ../midori/midori-browser.c:5174 msgid "Print the current page" msgstr "Cetak halaman saat ini" -#: ../midori/midori-browser.c:5433 +#: ../midori/midori-browser.c:5176 msgid "Close a_ll Windows" msgstr "T_utup semua Jendela" -#: ../midori/midori-browser.c:5436 +#: ../midori/midori-browser.c:5177 +msgid "Close all open windows" +msgstr "Tutup semua jendela yang terbuka" + +#: ../midori/midori-browser.c:5179 msgid "_Edit" msgstr "_Sunting" -#: ../midori/midori-browser.c:5459 -msgid "_Find…" -msgstr "_Cari…" +#: ../midori/midori-browser.c:5182 +msgid "Undo the last modification" +msgstr "Tak jadi modifikasi terakhir" + +#: ../midori/midori-browser.c:5185 +msgid "Redo the last modification" +msgstr "Jadi lagi modifikasi terakhir" + +#: ../midori/midori-browser.c:5188 +msgid "Cut the selected text" +msgstr "Potong teks terpilih" + +#: ../midori/midori-browser.c:5191 +msgid "Copy the selected text" +msgstr "Salin teks terpilih" + +#: ../midori/midori-browser.c:5194 +msgid "Paste text from the clipboard" +msgstr "Tempel teks dari papan klip" -#: ../midori/midori-browser.c:5460 +#: ../midori/midori-browser.c:5197 +msgid "Delete the selected text" +msgstr "Hapus teks terpilih" + +#: ../midori/midori-browser.c:5200 +msgid "Select all text" +msgstr "Pilih semua teks" + +#: ../midori/midori-browser.c:5202 +msgid "_Find..." +msgstr "_Cari..." + +#: ../midori/midori-browser.c:5203 msgid "Find a word or phrase in the page" msgstr "Cari kata atau frasa di halaman" -#: ../midori/midori-browser.c:5462 +#: ../midori/midori-browser.c:5205 msgid "Find _Next" msgstr "Cari _Berikutnya" -#: ../midori/midori-browser.c:5465 +#: ../midori/midori-browser.c:5206 +msgid "Find the next occurrence of a word or phrase" +msgstr "Cari kejadian berikutnya dari kata atau frasa" + +#: ../midori/midori-browser.c:5208 msgid "Find _Previous" msgstr "Cari _Sebelumnya" -#: ../midori/midori-browser.c:5469 +#: ../midori/midori-browser.c:5209 +msgid "Find the previous occurrence of a word or phrase" +msgstr "Cari kejadian sebelumnya dari kata atau frasa" + +#: ../midori/midori-browser.c:5213 msgid "Configure the application preferences" msgstr "Konfigurasi pilihan aplikasi" -#: ../midori/midori-browser.c:5471 +#: ../midori/midori-browser.c:5215 msgid "_View" msgstr "_Tampilan" -#: ../midori/midori-browser.c:5472 +#: ../midori/midori-browser.c:5216 msgid "_Toolbars" msgstr "_Batang Alat" -#: ../midori/midori-browser.c:5477 +#: ../midori/midori-browser.c:5221 ../midori/midori-browser.c:5222 msgid "Reload page without caching" msgstr "Muat ulang halaman tanpa menyimpan tembolok" -#: ../midori/midori-browser.c:5487 +#: ../midori/midori-browser.c:5231 msgid "Increase the zoom level" msgstr "Naikkan level pembesaran" -#: ../midori/midori-browser.c:5490 +#: ../midori/midori-browser.c:5234 msgid "Decrease the zoom level" msgstr "Turunkan level pembesaran" -#: ../midori/midori-browser.c:5494 +#: ../midori/midori-browser.c:5237 +msgid "Reset the zoom level" +msgstr "Reset level pembesaran" + +#: ../midori/midori-browser.c:5238 msgid "_Encoding" msgstr "_Penyandian" -#: ../midori/midori-browser.c:5496 +#: ../midori/midori-browser.c:5240 msgid "View So_urce" msgstr "Tampilkan S_umber" -#: ../midori/midori-browser.c:5499 +#: ../midori/midori-browser.c:5241 +msgid "View the source code of the page" +msgstr "Tampilkan kode program dari halaman" + +#: ../midori/midori-browser.c:5243 msgid "Ca_ret Browsing" msgstr "Meramban Ca_ret" -#: ../midori/midori-browser.c:5503 +#: ../midori/midori-browser.c:5244 +msgid "Toggle text cursor navigation" +msgstr "Ubah navigasi kursor teks" + +#: ../midori/midori-browser.c:5247 msgid "Toggle fullscreen view" msgstr "Aktifkan tampilan layar penuh" -#: ../midori/midori-browser.c:5505 +#: ../midori/midori-browser.c:5249 msgid "Scroll _Left" msgstr "Gulung _Kiri" -#: ../midori/midori-browser.c:5508 +#: ../midori/midori-browser.c:5250 +msgid "Scroll to the left" +msgstr "Gulung ke kiri" + +#: ../midori/midori-browser.c:5252 msgid "Scroll _Down" msgstr "Gulung _Bawah" -#: ../midori/midori-browser.c:5511 +#: ../midori/midori-browser.c:5253 +msgid "Scroll down" +msgstr "Gulung bawah" + +#: ../midori/midori-browser.c:5255 msgid "Scroll _Up" msgstr "Gulung _Atas" -#: ../midori/midori-browser.c:5514 +#: ../midori/midori-browser.c:5256 +msgid "Scroll up" +msgstr "Gulung atas" + +#: ../midori/midori-browser.c:5258 msgid "Scroll _Right" msgstr "_Gulung Kanan" -#: ../midori/midori-browser.c:5517 -msgid "_Readable" -msgstr "_Dapat Dibaca" +#: ../midori/midori-browser.c:5259 +msgid "Scroll to the right" +msgstr "Gulung ke kanan" -#: ../midori/midori-browser.c:5520 +#: ../midori/midori-browser.c:5261 msgid "_Go" msgstr "_Ke" -#: ../midori/midori-browser.c:5523 +#: ../midori/midori-browser.c:5264 msgid "Go back to the previous page" msgstr "Mundur ke halaman sebelumnya" +#: ../midori/midori-browser.c:5267 +msgid "Go forward to the next page" +msgstr "Maju ke halaman berikutnya" + #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5530 +#: ../midori/midori-browser.c:5271 msgid "Go to the previous sub-page" msgstr "Maju ke sub-halaman sebelumnya" -#: ../midori/midori-browser.c:5539 -msgid "_Homepage" -msgstr "_Beranda" +#. i18n: Visit the following logical page, ie. in a forum or blog +#: ../midori/midori-browser.c:5275 +msgid "Go to the next sub-page" +msgstr "Maju ke sub-halaman berikutnya" -#: ../midori/midori-browser.c:5540 +#: ../midori/midori-browser.c:5278 msgid "Go to your homepage" msgstr "Ke laman anda" -#: ../midori/midori-browser.c:5542 +#: ../midori/midori-browser.c:5280 msgid "Empty Trash" msgstr "Kosongkan Tempat Sampah" -#: ../midori/midori-browser.c:5545 +#: ../midori/midori-browser.c:5281 +msgid "Delete the contents of the trash" +msgstr "Hapus isi tempat sampah" + +#: ../midori/midori-browser.c:5283 msgid "Undo _Close Tab" msgstr "Tak _Jadi Tutup Tab" -#: ../midori/midori-browser.c:5552 +#: ../midori/midori-browser.c:5284 +msgid "Open the last closed tab" +msgstr "Buka tab yang terakhir ditutup" + +#: ../midori/midori-browser.c:5290 msgid "Add a new _folder" msgstr "Tambah sebuah _folder baru" -#: ../midori/midori-browser.c:5558 +#: ../midori/midori-browser.c:5291 +msgid "Add a new bookmark folder" +msgstr "Tambah sebuah folder penanda baru" + +#: ../midori/midori-browser.c:5296 msgid "_Export bookmarks" msgstr "_Ekspor penanda" -#: ../midori/midori-browser.c:5561 ../midori/midori-searchaction.c:496 +#: ../midori/midori-browser.c:5299 ../midori/midori-searchaction.c:497 msgid "_Manage Search Engines" msgstr "_Atur Mesin Pencari" -#: ../midori/midori-browser.c:5564 +#: ../midori/midori-browser.c:5300 +msgid "Add, edit and remove search engines..." +msgstr "Tambah, sunting dan hapus mesin pencari..." + +#: ../midori/midori-browser.c:5303 msgid "_Clear Private Data" msgstr "_Hapus Data Pribadi" -#: ../midori/midori-browser.c:5567 +#: ../midori/midori-browser.c:5304 +msgid "Clear private data..." +msgstr "Hapus data pribadi..." + +#: ../midori/midori-browser.c:5307 msgid "_Inspect Page" msgstr "_Inspeksi Halaman" -#: ../midori/midori-browser.c:5571 +#: ../midori/midori-browser.c:5308 +msgid "Inspect page details and access developer tools..." +msgstr "Inspeksi detail halaman dan akses alat pengembang..." + +#: ../midori/midori-browser.c:5312 msgid "_Previous Tab" msgstr "_Tab Sebelumnya" -#: ../midori/midori-browser.c:5574 +#: ../midori/midori-browser.c:5313 +msgid "Switch to the previous tab" +msgstr "Pindah ke tab sebelumnya" + +#: ../midori/midori-browser.c:5315 msgid "_Next Tab" msgstr "Tab _Berikutnya" -#: ../midori/midori-browser.c:5576 +#: ../midori/midori-browser.c:5316 +msgid "Switch to the next tab" +msgstr "Pindah ke tab berikutnya" + +#: ../midori/midori-browser.c:5317 msgid "Move Tab _Backward" msgstr "_Geser Tab ke Belakang" -#: ../midori/midori-browser.c:5578 +#: ../midori/midori-browser.c:5318 +msgid "Move tab behind the previous tab" +msgstr "Pindah tab ke belakang tab sebelumnya" + +#: ../midori/midori-browser.c:5319 msgid "_Move Tab Forward" msgstr "_Geser Tab ke Depan" -#: ../midori/midori-browser.c:5581 +#: ../midori/midori-browser.c:5320 +msgid "Move tab in front of the next tab" +msgstr "Pindah tab ke depan tab berikutnya" + +#: ../midori/midori-browser.c:5322 msgid "Focus _Current Tab" msgstr "Fokus _Tab Saat Ini" -#: ../midori/midori-browser.c:5584 +#: ../midori/midori-browser.c:5323 +msgid "Focus the current tab" +msgstr "Fokus tab saat ini" + +#: ../midori/midori-browser.c:5325 msgid "Focus _Next view" msgstr "Tampilan Fokus _Berikutnya" -#: ../midori/midori-browser.c:5587 +#: ../midori/midori-browser.c:5326 +msgid "Cycle focus between views" +msgstr "Daur fokus di antara tampilan" + +#: ../midori/midori-browser.c:5328 msgid "Only show the Icon of the _Current Tab" msgstr "Hanya tampilkan Ikon dari Tab _Terkini" -#: ../midori/midori-browser.c:5590 +#: ../midori/midori-browser.c:5329 +msgid "Only show the icon of the current tab" +msgstr "Hanya tampilkan ikon dari tab saat ini" + +#: ../midori/midori-browser.c:5331 msgid "_Duplicate Current Tab" msgstr "_Duplikasi Tab Saat Ini" -#: ../midori/midori-browser.c:5593 +#: ../midori/midori-browser.c:5332 +msgid "Duplicate the current tab" +msgstr "Duplikasi tab saat ini" + +#: ../midori/midori-browser.c:5334 msgid "Close Ot_her Tabs" msgstr "_Tutup Tab Lainnya" -#: ../midori/midori-browser.c:5596 +#: ../midori/midori-browser.c:5335 +msgid "Close all tabs except the current tab" +msgstr "Tutup semua tab kecuali tab saat ini" + +#: ../midori/midori-browser.c:5337 msgid "Open last _session" msgstr "Buka _sesi terakhir" -#: ../midori/midori-browser.c:5599 +#: ../midori/midori-browser.c:5338 +msgid "Open the tabs saved in the last session" +msgstr "Buka tab yang tersimpan di sesi terakhir" + +#: ../midori/midori-browser.c:5340 msgid "_Help" msgstr "Ba_ntuan" -#: ../midori/midori-browser.c:5601 +#: ../midori/midori-browser.c:5342 msgid "_Frequent Questions" msgstr "_Pertanyaan Sering Ditanyakan" -#: ../midori/midori-browser.c:5604 -msgid "_Report a Problem…" -msgstr "_Laporkan Masalah…" +#: ../midori/midori-browser.c:5343 +msgid "Show the Frequently Asked Questions" +msgstr "Tampilkan Pertanyaan Acapkali Diajukan" -#: ../midori/midori-browser.c:5609 ../midori/midori-browser.c:6270 -msgid "_Tools" -msgstr "_Alat" +#: ../midori/midori-browser.c:5345 +msgid "_Report a Problem..." +msgstr "_Laporkan Masalah..." + +#: ../midori/midori-browser.c:5346 +msgid "Open Midori's bug tracker" +msgstr "Buka pelacak kutu Midori" -#: ../midori/midori-browser.c:5616 +#: ../midori/midori-browser.c:5349 +msgid "Show information about the program" +msgstr "Tampilkan informasi tentang program" + +#: ../midori/midori-browser.c:5357 msgid "_Menubar" msgstr "_Batang menu" -#: ../midori/midori-browser.c:5620 +#: ../midori/midori-browser.c:5358 +msgid "Show menubar" +msgstr "Tampilkan batang menu" + +#: ../midori/midori-browser.c:5361 msgid "_Navigationbar" msgstr "Batang _navigasi" -#: ../midori/midori-browser.c:5624 +#: ../midori/midori-browser.c:5362 +msgid "Show navigationbar" +msgstr "Tampilkan batang navigasi" + +#: ../midori/midori-browser.c:5365 msgid "Side_panel" msgstr "Panel _sisi" -#: ../midori/midori-browser.c:5625 -msgid "Sidepanel" -msgstr "Panel sisi" +#: ../midori/midori-browser.c:5366 +msgid "Show sidepanel" +msgstr "Tampilkan panel sisi" -#: ../midori/midori-browser.c:5628 +#: ../midori/midori-browser.c:5369 msgid "_Bookmarkbar" msgstr "Batang _penanda" -#: ../midori/midori-browser.c:5632 +#: ../midori/midori-browser.c:5370 +msgid "Show bookmarkbar" +msgstr "Tampilkan batang penanda" + +#: ../midori/midori-browser.c:5373 msgid "_Statusbar" msgstr "Batang stat_us" -#: ../midori/midori-browser.c:5641 ../midori/midori-websettings.c:199 +#: ../midori/midori-browser.c:5374 +msgid "Show statusbar" +msgstr "Tampilkan batang status" + +#: ../midori/midori-browser.c:5382 msgid "_Automatic" msgstr "_Otomatis" -#: ../midori/midori-browser.c:5644 ../midori/midori-websettings.c:123 -msgid "Chinese Traditional (BIG5)" -msgstr "Mandarin Tradisional (BIG5)" - -#: ../midori/midori-browser.c:5647 ../midori/midori-websettings.c:124 -msgid "Chinese Simplified (GB18030)" -msgstr "Mandarin Sederhana (GB18030)" +#: ../midori/midori-browser.c:5385 ../midori/midori-websettings.c:218 +msgid "Chinese (BIG5)" +msgstr "China (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5651 +#: ../midori/midori-browser.c:5389 msgid "Japanese (SHIFT__JIS)" msgstr "Jepang (SHIFT__JIS)" -#: ../midori/midori-browser.c:5654 ../midori/midori-websettings.c:126 +#: ../midori/midori-browser.c:5392 ../midori/midori-websettings.c:220 msgid "Korean (EUC-KR)" msgstr "Korea (EUC-KR)" -#: ../midori/midori-browser.c:5657 ../midori/midori-websettings.c:127 +#: ../midori/midori-browser.c:5395 ../midori/midori-websettings.c:221 msgid "Russian (KOI8-R)" msgstr "Rusia (KOI8-R)" -#: ../midori/midori-browser.c:5660 ../midori/midori-websettings.c:128 +#: ../midori/midori-browser.c:5398 ../midori/midori-websettings.c:222 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5663 ../midori/midori-websettings.c:129 +#: ../midori/midori-browser.c:5401 ../midori/midori-websettings.c:223 msgid "Western (ISO-8859-1)" msgstr "Barat (ISO-8859-1)" -#: ../midori/midori-browser.c:5666 -msgid "Custom…" -msgstr "Suai…" +#: ../midori/midori-browser.c:5404 ../midori/midori-websettings.c:224 +#: ../midori/midori-websettings.c:298 ../katze/katze-utils.c:732 +msgid "Custom..." +msgstr "Suai..." -#: ../midori/midori-browser.c:6176 +#: ../midori/midori-browser.c:5934 msgid "_Separator" msgstr "_Pemisah" -#: ../midori/midori-browser.c:6183 -msgid "_Location…" -msgstr "_Lokasi…" +#: ../midori/midori-browser.c:5941 +msgid "_Location..." +msgstr "_Lokasi..." -#: ../midori/midori-browser.c:6185 +#: ../midori/midori-browser.c:5943 msgid "Open a particular location" msgstr "Buka lokasi khusus" -#: ../midori/midori-browser.c:6207 -msgid "_Web Search…" -msgstr "Penelusuran _Web…" +#: ../midori/midori-browser.c:5965 +msgid "_Web Search..." +msgstr "Penelusuran _Web..." -#: ../midori/midori-browser.c:6209 +#: ../midori/midori-browser.c:5967 msgid "Run a web search" msgstr "Jalankan penelusuran web" -#: ../midori/midori-browser.c:6236 +#: ../midori/midori-browser.c:5988 msgid "Reopen a previously closed tab or window" msgstr "Buka kembali tab atau jendela yang sebelumnya tertutup" -#: ../midori/midori-browser.c:6253 +#: ../midori/midori-browser.c:6001 ../midori/sokoke.c:1516 +msgid "_Bookmarks" +msgstr "B_ookmark" + +#: ../midori/midori-browser.c:6003 msgid "Show the saved bookmarks" msgstr "Tampilkan penanda tersimpan" -#: ../midori/midori-browser.c:6286 +#: ../midori/midori-browser.c:6017 +msgid "_Tools" +msgstr "_Alat" + +#: ../midori/midori-browser.c:6032 msgid "_Window" msgstr "_Jendela" -#: ../midori/midori-browser.c:6288 +#: ../midori/midori-browser.c:6034 msgid "Show a list of all open tabs" msgstr "Tampilkan senarai semua tab yang terbuka" -#: ../midori/midori-browser.c:6302 +#: ../midori/midori-browser.c:6048 msgid "_Menu" msgstr "_Menu" -#: ../midori/midori-browser.c:6304 +#: ../midori/midori-browser.c:6050 msgid "Menu" msgstr "Menu" -#: ../midori/midori-browser.c:7134 +#: ../midori/midori-browser.c:6602 #, c-format msgid "Unexpected setting '%s'" msgstr "Pengaturan tak diharapkan '%s'" -#: ../midori/midori-extension.c:330 +#: ../midori/midori-extension.c:305 #, 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-extension.c:752 ../midori/midori-extension.c:849 -#: ../midori/midori-extension.c:946 ../midori/midori-extension.c:1058 -#: ../extensions/addons.c:1686 +#: ../midori/midori-extension.c:703 ../midori/midori-extension.c:800 +#: ../midori/midori-extension.c:897 ../midori/midori-extension.c:1009 +#: ../extensions/addons.c:1640 #, 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-locationaction.c:398 -#, c-format -msgid "Search with %s" -msgstr "Cari %s" - -#: ../midori/midori-locationaction.c:418 -msgid "Search with…" -msgstr "Cari dengan…" - -#: ../midori/midori-locationaction.c:545 +#: ../midori/midori-locationaction.c:400 #, c-format msgid "Failed to select from history\n" msgstr "Gagal memilih dari riwayat\n" -#: ../midori/midori-locationaction.c:632 +#: ../midori/midori-locationaction.c:484 #, c-format msgid "Search for %s" msgstr "Mencari %s" -#: ../midori/midori-locationaction.c:1227 -msgid "Export certificate" -msgstr "Ekspor sertifikat" +#: ../midori/midori-locationaction.c:510 +#, c-format +msgid "Search with %s" +msgstr "Cari %s" -#: ../midori/midori-locationaction.c:1259 -msgid "The signing certificate authority is not known." -msgstr "Otoritas penanda validitas sertifikat; tidak dikenal." +#. i18n: Right-click on Location, Open an URL from the clipboard +#: ../midori/midori-locationaction.c:1258 +msgid "Paste and p_roceed" +msgstr "Tempel dan l_anjutkan" -#: ../midori/midori-locationaction.c:1261 -msgid "" -"The certificate does not match the expected identity of the site that it was " -"retrieved from." -msgstr "" -"Sertifikat tidak sesuai dengan identitas yang dimiliki situs yang dikunjungi." - -#: ../midori/midori-locationaction.c:1263 -msgid "The certificate's activation time is still in the future." -msgstr "Waktu aktivasi sertifikat masih dalam masa tunggu." - -#: ../midori/midori-locationaction.c:1265 -msgid "The certificate has expired" -msgstr "Masa berlaku sertifikat telah kadaluarsa" - -#: ../midori/midori-locationaction.c:1267 -msgid "" -"The certificate has been revoked according to the GTlsConnection's " -"certificate revocation list." -msgstr "Sertifikat telah dicabut berdasarkan daftar GTlsConnection." - -#: ../midori/midori-locationaction.c:1269 -msgid "The certificate's algorithm is considered insecure." -msgstr "Algoritma sertifikat dinilai tidak aman." - -#: ../midori/midori-locationaction.c:1271 -msgid "Some other error occurred validating the certificate." -msgstr "Beberapa galat terjadi saat memvallidasi sertifikat." - -#: ../midori/midori-locationaction.c:1318 -msgid "_Export certificate" -msgstr "_Ekspor sertifikat" - -#: ../midori/midori-locationaction.c:1333 -msgid "Self-signed" -msgstr "Tandatangan mandiri" - -#: ../midori/midori-locationaction.c:1367 -msgid "Security details" -msgstr "Rincian keamanan" - -#. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1650 -msgid "Paste and p_roceed" -msgstr "Tempel dan l_anjutkan" - -#: ../midori/midori-locationaction.c:1974 +#: ../midori/midori-locationaction.c:1653 msgid "Not verified" msgstr "Tidak diverifikasi" -#: ../midori/midori-locationaction.c:1982 +#: ../midori/midori-locationaction.c:1668 msgid "Verified and encrypted connection" msgstr "Koneksi terverifikasi dan terenkripsi" -#: ../midori/midori-locationaction.c:1989 -msgid "Open, unencrypted connection" -msgstr "Terbuka, koneksi tanpa enkripsi" - -#: ../midori/midori-panel.c:317 ../midori/midori-panel.c:319 -#: ../midori/midori-panel.c:483 ../midori/midori-panel.c:486 +#: ../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:329 ../midori/midori-panel.c:330 +#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410 msgid "Close panel" msgstr "Tutup panel" -#: ../midori/midori-panel.c:484 ../midori/midori-panel.c:487 +#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566 msgid "Align sidepanel to the left" msgstr "Ratakan panel sisi ke kiri" -#: ../midori/midori-websettings.c:105 +#: ../midori/midori-websettings.c:200 msgid "Show Speed Dial" msgstr "Tampilkan Panggil cepat" -#: ../midori/midori-websettings.c:106 +#: ../midori/midori-websettings.c:201 msgid "Show Homepage" msgstr "Tampilkan Beranda" -#: ../midori/midori-websettings.c:125 +#: ../midori/midori-websettings.c:219 msgid "Japanese (SHIFT_JIS)" msgstr "Jepang (SHIFT_JIS)" -#: ../midori/midori-websettings.c:130 ../midori/midori-websettings.c:206 -#: ../katze/katze-utils.c:633 -msgid "Custom..." -msgstr "Suai…" - -#: ../midori/midori-websettings.c:145 +#: ../midori/midori-websettings.c:239 msgid "New tab" msgstr "Tab baru" -#: ../midori/midori-websettings.c:146 +#: ../midori/midori-websettings.c:240 msgid "New window" msgstr "Jendela baru" -#: ../midori/midori-websettings.c:147 +#: ../midori/midori-websettings.c:241 msgid "Current tab" msgstr "Tab saat ini" -#: ../midori/midori-websettings.c:162 +#: ../midori/midori-websettings.c:256 msgid "Default" msgstr "Standar" -#: ../midori/midori-websettings.c:163 +#: ../midori/midori-websettings.c:257 msgid "Icons" msgstr "Ikon" -#: ../midori/midori-websettings.c:164 +#: ../midori/midori-websettings.c:258 msgid "Small icons" msgstr "Ikon kecil" -#: ../midori/midori-websettings.c:165 +#: ../midori/midori-websettings.c:259 msgid "Text" msgstr "Teks" -#: ../midori/midori-websettings.c:166 +#: ../midori/midori-websettings.c:260 msgid "Icons and text" msgstr "Ikon dan teks" -#: ../midori/midori-websettings.c:167 +#: ../midori/midori-websettings.c:261 msgid "Text beside icons" msgstr "Teks di samping ikon" -#: ../midori/midori-websettings.c:182 +#: ../midori/midori-websettings.c:276 msgid "Automatic (GNOME or environment)" msgstr "Otomatis (GNOME atau lingkungan)" -#: ../midori/midori-websettings.c:183 +#: ../midori/midori-websettings.c:277 msgid "HTTP proxy server" msgstr "Server proxy HTTP" -#: ../midori/midori-websettings.c:184 +#: ../midori/midori-websettings.c:278 msgid "No proxy server" msgstr "Tak ada server proxy" -#: ../midori/midori-websettings.c:201 -msgid "Chrome" -msgstr "Chrome" - -#: ../midori/midori-websettings.c:202 +#: ../midori/midori-websettings.c:294 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:203 +#: ../midori/midori-websettings.c:295 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:296 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:297 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:278 +#: ../midori/midori-websettings.c:350 +msgid "Remember last window size" +msgstr "Ingat ukuran jendela terakhir" + +#: ../midori/midori-websettings.c:351 +msgid "Whether to save the last window size" +msgstr "Apakah ingin menyimpan ukuran jendela yang terakhir tersimpan" + +#: ../midori/midori-websettings.c:359 +msgid "Last window width" +msgstr "Lebar jendela terakhir" + +#: ../midori/midori-websettings.c:360 +msgid "The last saved window width" +msgstr "Lebar jendela terakhir tersimpan" + +#: ../midori/midori-websettings.c:368 +msgid "Last window height" +msgstr "Tinggi jendela terakhir" + +#: ../midori/midori-websettings.c:369 +msgid "The last saved window height" +msgstr "Tinggi jendela terakhir tersimpan" + +#: ../midori/midori-websettings.c:394 +msgid "Last panel position" +msgstr "Posisi panel terakhir" + +#: ../midori/midori-websettings.c:395 +msgid "The last saved panel position" +msgstr "Posisi panel terakhir tersimpan" + +#. i18n: The internal index of the last opened panel +#: ../midori/midori-websettings.c:404 +msgid "Last panel page" +msgstr "Halaman panel terakhir" + +#: ../midori/midori-websettings.c:405 +msgid "The last saved panel page" +msgstr "Halaman panel terakhir tersimpan" + +#: ../midori/midori-websettings.c:413 +msgid "Last Web search" +msgstr "Penelusuran Web terakhir" + +#: ../midori/midori-websettings.c:414 +msgid "The last saved Web search" +msgstr "Penelusuran Web terakhir tersimpan" + +#: ../midori/midori-websettings.c:423 +msgid "Show Menubar" +msgstr "Tampilkan Batang Menu" + +#: ../midori/midori-websettings.c:424 +msgid "Whether to show the menubar" +msgstr "Apakah ingin menampilkan batang menu" + +#: ../midori/midori-websettings.c:432 +msgid "Show Navigationbar" +msgstr "Tampilkan Batang Navigasi" + +#: ../midori/midori-websettings.c:433 +msgid "Whether to show the navigationbar" +msgstr "Apakah ingin menampilkan batang navigasi" + +#: ../midori/midori-websettings.c:441 +msgid "Show Bookmarkbar" +msgstr "Tampilkan Batang Penanda" + +#: ../midori/midori-websettings.c:442 +msgid "Whether to show the bookmarkbar" +msgstr "Apakah ingin menampilkan batang penanda" + +#: ../midori/midori-websettings.c:450 +msgid "Show Panel" +msgstr "Tampilkan Panel" + +#: ../midori/midori-websettings.c:451 +msgid "Whether to show the panel" +msgstr "Apakah ingin menampilkan panel" + +#: ../midori/midori-websettings.c:459 +msgid "Show Statusbar" +msgstr "Tampilkan Batang Status" + +#: ../midori/midori-websettings.c:460 +msgid "Whether to show the statusbar" +msgstr "Apakah ingin menampilkan batang status" + +#: ../midori/midori-websettings.c:469 msgid "Toolbar Style:" msgstr "Gaya Batang Alat:" -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-websettings.c:470 msgid "The style of the toolbar" msgstr "Gaya dari batang alat" -#: ../midori/midori-websettings.c:288 +#: ../midori/midori-websettings.c:479 +msgid "Toolbar Items" +msgstr "Item Batang Alat" + +#: ../midori/midori-websettings.c:480 +msgid "The items to show on the toolbar" +msgstr "Item yang akan ditampilkan di batang alat" + +#: ../midori/midori-websettings.c:488 +msgid "Compact Sidepanel" +msgstr "Panel Sisi Kompak" + +#: ../midori/midori-websettings.c:489 +msgid "Whether to make the sidepanel compact" +msgstr "Apakah ingin membuat panel sisi kompak" + +#: ../midori/midori-websettings.c:504 +msgid "Align sidepanel on the right" +msgstr "Ratakan panel sisi di kanan" + +#: ../midori/midori-websettings.c:505 +msgid "Whether to align the sidepanel on the right" +msgstr "Apakah ingin meratakan panel sisi di sebelah kanan" + +#: ../midori/midori-websettings.c:520 +msgid "Open panels in separate windows" +msgstr "Buka panel di jendela yang terpisah" + +#: ../midori/midori-websettings.c:521 +msgid "Whether to always open panels in separate windows" +msgstr "Apakah ingin selalu membuka panel jendela yang terpisah" + +#: ../midori/midori-websettings.c:530 msgid "When Midori starts:" msgstr "Jika Midori dijalankan:" -#: ../midori/midori-websettings.c:298 +#: ../midori/midori-websettings.c:531 +msgid "What to do when Midori starts" +msgstr "Apa yang akan dilakukan saat Midori dijalankan" + +#: ../midori/midori-websettings.c:540 +msgid "Homepage:" +msgstr "Beranda:" + +#: ../midori/midori-websettings.c:541 +msgid "The homepage" +msgstr "Laman" + +#: ../midori/midori-websettings.c:556 +msgid "Show crash dialog" +msgstr "Tampilkan dialog macet" + +#: ../midori/midori-websettings.c:557 +msgid "Show a dialog after Midori crashed" +msgstr "Tampilkan sebuah dialog setelah Midori macet" + +#: ../midori/midori-websettings.c:565 +msgid "Save downloaded files to:" +msgstr "Simpan berkas yang diunduh ke:" + +#: ../midori/midori-websettings.c:566 +msgid "The folder downloaded files are saved to" +msgstr "Folder berkas terunduh disimpan di" + +#: ../midori/midori-websettings.c:574 +msgid "Text Editor" +msgstr "Penyunting Teks" + +#: ../midori/midori-websettings.c:575 +msgid "An external text editor" +msgstr "Penyunting teks eksternal" + +#: ../midori/midori-websettings.c:590 +msgid "News Aggregator" +msgstr "Agregator Berita" + +#: ../midori/midori-websettings.c:591 +msgid "An external news aggregator" +msgstr "Sebuah agregator berita eksternal" + +#: ../midori/midori-websettings.c:599 +msgid "Location entry Search" +msgstr "Pencari entri lokasi" + +#: ../midori/midori-websettings.c:600 +msgid "The search to perform inside the location entry" +msgstr "Pencarian yang dilakukan di dalam entri lokasi" + +#: ../midori/midori-websettings.c:608 msgid "Preferred Encoding" msgstr "Penyandian Kesukaan" -#: ../midori/midori-websettings.c:325 +#: ../midori/midori-websettings.c:609 +msgid "The preferred character encoding" +msgstr "Penyandian karakter kesukaan" + +#: ../midori/midori-websettings.c:619 +msgid "Always Show Tabbar" +msgstr "Selalu Tampilkan Batang Tab" + +#: ../midori/midori-websettings.c:620 +msgid "Always show the tabbar" +msgstr "Selalu tampilkan batang tab" + +#: ../midori/midori-websettings.c:628 +msgid "Close Buttons on Tabs" +msgstr "Tutup Tombol di Tab" + +#: ../midori/midori-websettings.c:629 +msgid "Whether tabs have close buttons" +msgstr "Apakah tab memiliki tombol tutup" + +#: ../midori/midori-websettings.c:654 msgid "Open new pages in:" msgstr "Buka halaman baru di:" +#: ../midori/midori-websettings.c:655 +msgid "Where to open new pages" +msgstr "Dimana membuka halaman baru" + +#: ../midori/midori-websettings.c:664 +msgid "Middle click opens Selection" +msgstr "Klik Tengah Membuka Pilihan" + +#: ../midori/midori-websettings.c:665 +msgid "Load an address from the selection via middle click" +msgstr "Muat sebuah alamat dari pilihan via klik tengah" + +#: ../midori/midori-websettings.c:673 +msgid "Open tabs in the background" +msgstr "Buka Tab di Latar Belakang" + +#: ../midori/midori-websettings.c:674 +msgid "Whether to open new tabs in the background" +msgstr "Apakah ingin membuka tab baru di latar belakang" + +#: ../midori/midori-websettings.c:682 +msgid "Open Tabs next to Current" +msgstr "Buka Tab di Samping Saat Ini" + +#: ../midori/midori-websettings.c:683 +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:691 +msgid "Open popups in tabs" +msgstr "Buka popup di tab" + +#: ../midori/midori-websettings.c:692 +msgid "Whether to open popup windows in tabs" +msgstr "Apakah ingin membuka jendela popup di tab" + +#: ../midori/midori-websettings.c:702 ../extensions/statusbar-features.c:132 +msgid "Load images automatically" +msgstr "Muat gambar secara otomatis" + +#: ../midori/midori-websettings.c:703 +msgid "Load and display images automatically" +msgstr "Muat dan tampilkan gambar secara otomatis" + +#: ../midori/midori-websettings.c:710 ../extensions/statusbar-features.c:141 +msgid "Enable scripts" +msgstr "Aktifkan skrip" + +#: ../midori/midori-websettings.c:711 +msgid "Enable embedded scripting languages" +msgstr "Aktifkan bahasa skrip terbenam" + +#: ../midori/midori-websettings.c:718 ../extensions/statusbar-features.c:150 +msgid "Enable Netscape plugins" +msgstr "Aktifkan plugin Netscape" + +#: ../midori/midori-websettings.c:719 +msgid "Enable embedded Netscape plugin objects" +msgstr "Aktifkan objek plugin Netscape terbenam" + +#: ../midori/midori-websettings.c:739 +msgid "Enable Spell Checking" +msgstr "Aktifkan Pemeriksa Ejaan" + +#: ../midori/midori-websettings.c:740 +msgid "Enable spell checking while typing" +msgstr "Aktifkan pemeriksa ejaan ketika mengetik" + +#: ../midori/midori-websettings.c:746 +msgid "Enable HTML5 database support" +msgstr "Aktifkan dukungan basis data HTML5" + +#: ../midori/midori-websettings.c:747 +msgid "Whether to enable HTML5 database support" +msgstr "Apakah akan mengaktifkan dukungan basis data HTML5" + +#: ../midori/midori-websettings.c:753 +msgid "Enable HTML5 local storage support" +msgstr "Aktifkan dukungan penyimpanan lokal HTML5" + +#: ../midori/midori-websettings.c:754 +msgid "Whether to enable HTML5 local storage support" +msgstr "Apakah akan mengaktifkan dukungan penyimpanan lokal HTML5" + +#: ../midori/midori-websettings.c:760 +msgid "Enable offline web application cache" +msgstr "Aktifkan tembolok aplikasi web luring" + +#: ../midori/midori-websettings.c:761 +msgid "Whether to enable offline web application cache" +msgstr "Apakah akan mengaktifkan tembolok aplikasi web luring" + +#: ../midori/midori-websettings.c:777 +msgid "Flash window on background tabs" +msgstr "Kedipkan jendela yang membuka tab di latar belakang" + +#: ../midori/midori-websettings.c:778 +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:793 +msgid "Zoom Text and Images" +msgstr "Pembesaran Teks dan Gambar" + +#: ../midori/midori-websettings.c:794 +msgid "Whether to zoom text and images" +msgstr "Apakah ingin memperbesar teks dan gambar" + +#: ../midori/midori-websettings.c:809 +msgid "Find inline while typing" +msgstr "Cari dalam baris ketika mengetik" + +#: ../midori/midori-websettings.c:810 +msgid "Whether to automatically find inline while typing" +msgstr "Apakah akan secara otomatis mencari dalam baris ketika mengetik" + +#: ../midori/midori-websettings.c:825 +msgid "Kinetic scrolling" +msgstr "Menggulung kinetis" + +#: ../midori/midori-websettings.c:826 +msgid "Whether scrolling should kinetically move according to speed" +msgstr "Apakah menggulung harus bergeser secara kinetis tergantung kecepatan" + +#: ../midori/midori-websettings.c:834 +msgid "Delete old Cookies after:" +msgstr "Hapus kuki lama setelah:" + +#: ../midori/midori-websettings.c:835 +msgid "The maximum number of days to save cookies for" +msgstr "Jumlah maksimum hari untuk menyimpan kuki" + +#: ../midori/midori-websettings.c:844 +msgid "Delete pages from history after:" +msgstr "Hapus halaman dari riwayat setelah:" + +#: ../midori/midori-websettings.c:845 +msgid "The maximum number of days to save the history for" +msgstr "Jumlah maksimum hari untuk tetap menyimpan riwayat" + +#: ../midori/midori-websettings.c:860 +msgid "Proxy server" +msgstr "Server proxy" + +#: ../midori/midori-websettings.c:861 +msgid "The type of proxy server to use" +msgstr "Tipe server proxy yang akan digunakan" + +#: ../midori/midori-websettings.c:870 +msgid "HTTP Proxy Server" +msgstr "Server Proxy HTTP" + +#: ../midori/midori-websettings.c:871 +msgid "The proxy server used for HTTP connections" +msgstr "Proxy server yang digunakan untuk koneksi HTTP" + +#: ../midori/midori-websettings.c:888 +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:388 +#: ../midori/midori-websettings.c:905 msgid "Identify as" msgstr "Identifikasi sebagai" -#: ../midori/midori-websettings.c:389 +#: ../midori/midori-websettings.c:906 msgid "What to identify as to web pages" msgstr "Apa yang diidentifikasi sebagai halaman web" -#: ../midori/midori-websettings.c:422 +#: ../midori/midori-websettings.c:922 +msgid "Identification string" +msgstr "Tali identifikasi" + +#: ../midori/midori-websettings.c:923 +msgid "The application identification string" +msgstr "Tali identifikasi aplikasi" + +#: ../midori/midori-websettings.c:939 msgid "Preferred languages" msgstr "Penyandian kesukaan" -#: ../midori/midori-websettings.c:423 -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:940 +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:472 -msgid "Always use my font choices" -msgstr "Selalu gunakan fonta pilihan saya" +#: ../midori/midori-websettings.c:955 +msgid "Clear private data" +msgstr "Hapus data pribadi" -#: ../midori/midori-websettings.c:473 -msgid "Override fonts picked by websites with user preferences" -msgstr "Timpa fonta yang dipilih oleh situs web dengan pengaturan pengguna" +#: ../midori/midori-websettings.c:956 +msgid "The private data selected for deletion" +msgstr "Data pribadi yang dipilih untuk dihapus" -#: ../midori/midori-view.c:1012 ../midori/midori-view.c:1151 -msgid "Trust this website" -msgstr "Masukkan dalam daftar situs terpercaya" +#: ../midori/midori-websettings.c:971 +msgid "Clear data" +msgstr "Hapus data" -#: ../midori/midori-view.c:1149 -msgid "Security unknown" -msgstr "Tingkat keamanan tidak diketahui" +#: ../midori/midori-websettings.c:972 +msgid "The data selected for deletion" +msgstr "Data terpilih untuk dihapus" -#: ../midori/midori-view.c:1447 +#. i18n: Reworded: Shorten details propagated when going to another page +#: ../midori/midori-websettings.c:1005 +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:1007 +msgid "Whether the \"Referer\" header should be shortened to the hostname" +msgstr "Apakah tajuk \"Rujukan\" harus dipendekkan ke nama host" + +#: ../midori/midori-view.c:1349 #, c-format msgid "%s wants to save an HTML5 database." msgstr "%s ingin menyimpan basis data HTML5." -#: ../midori/midori-view.c:1451 ../midori/midori-view.c:1485 +#: ../midori/midori-view.c:1353 ../midori/midori-view.c:1382 msgid "_Deny" msgstr "_Tolak" -#: ../midori/midori-view.c:1451 ../midori/midori-view.c:1485 +#: ../midori/midori-view.c:1353 ../midori/midori-view.c:1382 msgid "_Allow" msgstr "_Izinkan" -#: ../midori/midori-view.c:1480 +#: ../midori/midori-view.c:1378 #, c-format msgid "%s wants to know your location." msgstr "%s ingin mengetahui lokasi anda." -#: ../midori/midori-view.c:1576 +#: ../midori/midori-view.c:1467 #, c-format msgid "Error - %s" msgstr "Galat - %s" -#: ../midori/midori-view.c:1577 +#: ../midori/midori-view.c:1468 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "Halaman bernama '%s' tak dapat dimuat" -#: ../midori/midori-view.c:1579 +#: ../midori/midori-view.c:1470 msgid "Try again" msgstr "Coba lagi" -#: ../midori/midori-view.c:1775 ../midori/midori-view.c:2887 +#: ../midori/midori-view.c:1629 ../midori/midori-view.c:2464 #, c-format msgid "Send a message to %s" msgstr "Kirim sebuah pesan ke %s" -#: ../midori/midori-view.c:2673 -msgid "Add _search engine..." -msgstr "Tambah me_sin pencari..." - -#: ../midori/midori-view.c:2717 ../midori/midori-view.c:3043 +#: ../midori/midori-view.c:2303 ../midori/midori-view.c:2617 msgid "Inspect _Element" msgstr "Inspeksi _Elemen" -#: ../midori/midori-view.c:2769 +#: ../midori/midori-view.c:2353 msgid "Open Link in New _Tab" msgstr "Buka Taut di _Tab Baru" -#: ../midori/midori-view.c:2773 +#: ../midori/midori-view.c:2357 msgid "Open Link in _Foreground Tab" msgstr "Buka Tautan di _Tab Depan" -#: ../midori/midori-view.c:2774 +#: ../midori/midori-view.c:2358 msgid "Open Link in _Background Tab" msgstr "Buka Tautan di _Tab Belakang" -#: ../midori/midori-view.c:2777 +#: ../midori/midori-view.c:2361 msgid "Open Link in New _Window" msgstr "Buka Tautan di _Jendela Baru" -#: ../midori/midori-view.c:2780 +#: ../midori/midori-view.c:2364 msgid "Open Link as Web A_pplication" msgstr "Buka Tautan Sebagai A_plikasi Web" -#: ../midori/midori-view.c:2785 +#: ../midori/midori-view.c:2367 msgid "Copy Link de_stination" msgstr "Salin Tu_juan Tautan" -#: ../midori/midori-view.c:2801 +#: ../midori/midori-view.c:2379 msgid "Open _Image in New Tab" msgstr "Buka Gambar di _Tab Baru" -#: ../midori/midori-view.c:2804 +#: ../midori/midori-view.c:2382 msgid "Copy Image _Address" msgstr "Salin _Alamat Gambar" -#: ../midori/midori-view.c:2807 +#: ../midori/midori-view.c:2385 msgid "Save I_mage" msgstr "Simpan Ga_mbar" -#: ../midori/midori-view.c:2810 -msgid "Open in Image _Viewer" -msgstr "Buka di _Penampil Gambar" - -#: ../midori/midori-view.c:2817 +#: ../midori/midori-view.c:2392 msgid "Copy Video _Address" msgstr "Salin _Alamat Video" -#: ../midori/midori-view.c:2820 +#: ../midori/midori-view.c:2395 msgid "Save _Video" msgstr "Simpan _Video" -#: ../midori/midori-view.c:2820 +#: ../midori/midori-view.c:2395 msgid "Download _Video" msgstr "Unduh _Video" -#: ../midori/midori-view.c:2846 +#: ../midori/midori-view.c:2421 msgid "Search _with" msgstr "Cari _dengan" -#: ../midori/midori-view.c:2878 +#: ../midori/midori-view.c:2455 msgid "_Search the Web" msgstr "_Cari web" -#: ../midori/midori-view.c:2895 +#: ../midori/midori-view.c:2472 msgid "Open Address in New _Tab" msgstr "Buka Alamat di _Tab Baru" -#: ../midori/midori-view.c:2948 -msgid "Open _Frame in New Tab" -msgstr "Buka _Bingkai di Tab Baru" +#: ../midori/midori-view.c:2756 +msgid "Open or download file" +msgstr "Buka atau unduh berkas" -#: ../midori/midori-view.c:3203 -#, c-format -msgid "Open or download file from %s" -msgstr "Buka atau unduh berkas dari %s" - -#: ../midori/midori-view.c:3216 -#, c-format -msgid "File Name: %s" -msgstr "Nama Berkas: %s" - -#: ../midori/midori-view.c:3221 +#: ../midori/midori-view.c:2775 #, c-format msgid "File Type: '%s'" msgstr "Tipe Berkas: '%s'" -#: ../midori/midori-view.c:3223 +#: ../midori/midori-view.c:2777 #, c-format msgid "File Type: %s ('%s')" msgstr "Tipe Berkas: %s ('%s')" -#: ../midori/midori-view.c:3260 -#, c-format -msgid "Size: %s" -msgstr "Ukuran: %s" +#: ../midori/midori-view.c:2788 +msgid "MD5-Checksum:" +msgstr "MD5-Checksum:" + +#: ../midori/midori-view.c:2795 +msgid "SHA1-Checksum:" +msgstr "SHA1-Checksum:" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:3271 +#: ../midori/midori-view.c:2805 #, c-format msgid "Open %s" msgstr "Buka %s" -#: ../midori/midori-view.c:3882 +#: ../midori/midori-view.c:3386 #, c-format msgid "Inspect page - %s" msgstr "Periksa halaman - %s" -#: ../midori/midori-view.c:4279 -#, c-format -msgid "No documentation installed" -msgstr "Tak ada dokumentasi yang terinstal" +#: ../midori/midori-view.c:3675 +msgid "Speed Dial" +msgstr "Panggil cepat" -#: ../midori/midori-view.c:4356 -msgid "Midori doesn't store any personal data:" -msgstr "Midori tidak menyimpan data pribadi apapun:" +#: ../midori/midori-view.c:3676 +msgid "Click to add a shortcut" +msgstr "Klik untuk menambah jalan pintas" -#: ../midori/midori-view.c:4357 -msgid "No history or web cookies are being saved." -msgstr "Tak ada riwayat atau kuki web yang disimpan." +#: ../midori/midori-view.c:3677 +msgid "Enter shortcut address" +msgstr "Masukkan alamat jalan pintas" -#: ../midori/midori-view.c:4358 -msgid "Extensions are disabled." -msgstr "Ekstensi dinonaktifkan." +#: ../midori/midori-view.c:3678 +msgid "Enter shortcut title" +msgstr "Masukkan judul jalan pintas" -#: ../midori/midori-view.c:4359 -msgid "HTML5 storage, local database and application caches are disabled." -msgstr "" -"Penyimpanan HTML5, basis data lokal dan tembolok aplikasi dinonaktifkan." +#: ../midori/midori-view.c:3679 +msgid "Are you sure you want to delete this shortcut?" +msgstr "Anda yakin ingin menghapus jalan pintas ini?" -#: ../midori/midori-view.c:4360 -msgid "Midori prevents websites from tracking the user:" -msgstr "Midori mencegah situs web melacak pengguna:" +#: ../midori/midori-view.c:3680 +msgid "Set number of columns and rows" +msgstr "Atur jumlah kolom dan baris" -#: ../midori/midori-view.c:4361 -msgid "Referrer URLs are stripped down to the hostname." -msgstr "Perujuk URL dicopot dari nama host." +#: ../midori/midori-view.c:3681 +msgid "Enter number of columns and rows:" +msgstr "Masukkan jumlah kolom dan baris:" -#: ../midori/midori-view.c:4362 -msgid "DNS prefetching is disabled." -msgstr "Praambil DNS dinonaktifkan." +#: ../midori/midori-view.c:3682 +msgid "Invalid input for the size of the speed dial" +msgstr "Masukan tidak valid untuk ukuran panggil cepat" -#: ../midori/midori-view.c:4363 -msgid "The language and timezone are not revealed to websites." -msgstr "Bahasa dan zona waktu tidak diberikan ke situs web." +#: ../midori/midori-view.c:3683 +msgid "Thumb size:" +msgstr "Ukuran miniatur:" -#: ../midori/midori-view.c:4364 -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:3684 +msgid "Small" +msgstr "Kecil" + +#: ../midori/midori-view.c:3685 +msgid "Medium" +msgstr "Sedang" + +#: ../midori/midori-view.c:3686 +msgid "Big" +msgstr "Besar" -#: ../midori/midori-view.c:4450 +#: ../midori/midori-view.c:3875 +#, c-format +msgid "No documentation installed" +msgstr "Tak ada dokumentasi yang terinstal" + +#: ../midori/midori-view.c:3941 msgid "Version numbers in brackets show the version used at runtime." -msgstr "" -"Nomor versi dalam kurung menunjukkan versi yang digunakan dalam runtime." +msgstr "Nomor versi dalam kurung menunjukkan versi yang digunakan dalam runtime." -#: ../midori/midori-view.c:4499 +#: ../midori/midori-view.c:3990 msgid "Page loading delayed" msgstr "Memuat halaman ditunda" -#: ../midori/midori-view.c:4500 +#: ../midori/midori-view.c:3991 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:4501 +#: ../midori/midori-view.c:3992 msgid "Load Page" msgstr "Memuat Halaman" -#: ../midori/midori-view.c:4668 +#: ../midori/midori-view.c:4135 msgid "Blank page" msgstr "Halaman kosong" -#: ../midori/midori-view.c:4932 +#: ../midori/midori-view.c:4375 msgid "_Duplicate Tab" msgstr "_Duplikasi Tab" -#: ../midori/midori-view.c:4937 +#: ../midori/midori-view.c:4380 msgid "Show Tab _Label" msgstr "Tampilkan _Label Tab" -#: ../midori/midori-view.c:4937 +#: ../midori/midori-view.c:4380 msgid "Show Tab _Icon Only" msgstr "Hanya Tampilkan _Ikon Tab" -#: ../midori/midori-view.c:4944 -msgid "Close Ot_her Tab" -msgid_plural "Close Ot_her Tabs" -msgstr[0] "_Tutup Tab Lainnya" - -#. i18n: word stem of "previous page" type links, case is not important -#: ../midori/midori-view.c:5701 -msgid "previous" -msgstr "sebelumnya" +#: ../midori/midori-view.c:4386 +msgid "Close ot_her Tabs" +msgstr "Tutup Tab _Lainnya" -#. i18n: word stem of "next page" type links, case is not important -#: ../midori/midori-view.c:5720 -msgid "next" -msgstr "berikutnya" - -#: ../midori/midori-view.c:5733 +#: ../midori/midori-view.c:5006 msgid "Print background images" msgstr "Cetak gambar latar belakang" -#: ../midori/midori-view.c:5734 +#: ../midori/midori-view.c:5007 msgid "Whether background images should be printed" msgstr "Apakah gambar latar belakang harus dicetak" -#: ../midori/midori-view.c:5766 +#: ../midori/midori-view.c:5039 msgid "Features" msgstr "Fitur" -#. i18n: Download tooltip (size): 4KB of 43MB -#: ../midori/midori-download.vala:48 -#, c-format -msgid "%s of %s" -msgstr "%s dari %s" - -#: ../midori/midori-download.vala:64 -#, c-format -msgid "%d hour" -msgid_plural "%d hours" -msgstr[0] "%d jam" - -#: ../midori/midori-download.vala:65 -#, c-format -msgid "%d minute" -msgid_plural "%d minutes" -msgstr[0] "%d menit" - -#: ../midori/midori-download.vala:66 -#, c-format -msgid "%d second" -msgid_plural "%d seconds" -msgstr[0] "%d detik" - -#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning -#: ../midori/midori-download.vala:82 -#, c-format -msgid " - %s remaining" -msgstr " - %s tersisa" - -#. i18n: Unknown number of bytes, used for transfer rate like ?B/s -#: ../midori/midori-download.vala:92 -msgid "?B" -msgstr "?B" - -#. i18n: Download tooltip (transfer rate): (130KB/s) -#: ../midori/midori-download.vala:94 -#, c-format -msgid " (%s/s)" -msgstr " (%s/s)" - -#: ../midori/midori-download.vala:188 -msgid "The downloaded file is erroneous." -msgstr "Berkas yang diunduh galat." - -#: ../midori/midori-download.vala:189 -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." - -#: ../midori/midori-download.vala:300 -#, c-format -msgid "The file \"%s\" can't be saved in this folder." -msgstr "Berkas \"%s\" tak dapat disimpan di folder ini." - -#: ../midori/midori-download.vala:302 -msgid "You don't have permission to write in this location." -msgstr "Anda tidak mempunyai hak akses untuk menulis di lokasi ini." - -#: ../midori/midori-download.vala:305 -#, c-format -msgid "There is not enough free space to download \"%s\"." -msgstr "Tidak cukup ruang kosong untuk mengunduh \"%s\"." - -#: ../midori/midori-download.vala:307 -#, c-format -msgid "The file needs %s but only %s are left." -msgstr "Berkas memerlukan %s tapi hanya %s yang tersisa." - -#: ../midori/midori-speeddial.vala:180 -msgid "Speed Dial" -msgstr "Panggil cepat" - -#: ../midori/midori-speeddial.vala:181 ../midori/midori-speeddial.vala:261 -msgid "Click to add a shortcut" -msgstr "Klik untuk menambah jalan pintas" - -#: ../midori/midori-speeddial.vala:182 -msgid "Enter shortcut address" -msgstr "Masukkan alamat jalan pintas" - -#: ../midori/midori-speeddial.vala:183 -msgid "Enter shortcut title" -msgstr "Masukkan judul jalan pintas" - -#: ../midori/midori-speeddial.vala:184 -msgid "Are you sure you want to delete this shortcut?" -msgstr "Anda yakin ingin menghapus jalan pintas ini?" - -#: ../midori/midori-preferences.c:299 +#: ../midori/midori-preferences.c:301 msgid "Startup" msgstr "Mulai" -#: ../midori/midori-preferences.c:305 -msgid "Homepage:" -msgstr "Beranda:" - -#: ../midori/midori-preferences.c:313 +#: ../midori/midori-preferences.c:314 msgid "Use _current page" msgstr "Gunakan _halaman saat ini" -#: ../midori/midori-preferences.c:317 +#: ../midori/midori-preferences.c:318 msgid "Use current page as homepage" msgstr "Gunakan halaman saat ini sebagai beranda" #. Page "Appearance" -#: ../midori/midori-preferences.c:326 +#: ../midori/midori-preferences.c:327 msgid "Fonts" msgstr "Fonta" -#: ../midori/midori-preferences.c:329 +#: ../midori/midori-preferences.c:330 msgid "Proportional Font Family" msgstr "Keluarga Fonta Proporsional" -#: ../midori/midori-preferences.c:333 +#: ../midori/midori-preferences.c:334 msgid "The default font family used to display text" msgstr "Keluarga fonta standar yang digunakan untuk menampilkan teks" -#: ../midori/midori-preferences.c:336 +#: ../midori/midori-preferences.c:337 msgid "The default font size used to display text" msgstr "Ukuran fonta standar yang digunakan untuk menampilkan teks" -#: ../midori/midori-preferences.c:338 +#: ../midori/midori-preferences.c:339 msgid "Fixed-width Font Family" msgstr "Keluarga Fonta Sesuai Lebar" -#: ../midori/midori-preferences.c:342 +#: ../midori/midori-preferences.c:343 msgid "The font family used to display fixed-width text" msgstr "Keluarga fonta yang digunakan untuk menampilkan teks sesuai lebar" -#: ../midori/midori-preferences.c:345 +#: ../midori/midori-preferences.c:346 msgid "The font size used to display fixed-width text" msgstr "Ukuran fonta yang digunakan untuk menampilkan teks sesuai lebar" -#: ../midori/midori-preferences.c:347 +#: ../midori/midori-preferences.c:348 msgid "Minimum Font Size" msgstr "Ukuran Fonta Minimum" -#: ../midori/midori-preferences.c:351 +#: ../midori/midori-preferences.c:352 msgid "The minimum font size used to display text" msgstr "Ukuran fonta minimum yang digunakan untuk menampilkan teks" #. Page "Behavior" -#: ../midori/midori-preferences.c:362 +#: ../midori/midori-preferences.c:361 msgid "Behavior" msgstr "Perilaku" -#: ../midori/midori-preferences.c:366 ../extensions/statusbar-features.c:155 -msgid "Load images automatically" -msgstr "Muat gambar secara otomatis" - -#: ../midori/midori-preferences.c:369 -msgid "Enable Spell Checking" -msgstr "Aktifkan Pemeriksa Ejaan" - -#: ../midori/midori-preferences.c:383 ../extensions/statusbar-features.c:165 -msgid "Enable scripts" -msgstr "Aktifkan skrip" - -#: ../midori/midori-preferences.c:386 ../extensions/statusbar-features.c:177 -msgid "Enable Netscape plugins" -msgstr "Aktifkan plugin Netscape" - -#: ../midori/midori-preferences.c:391 -msgid "Zoom Text and Images" -msgstr "Pembesaran Teks dan Gambar" - -#: ../midori/midori-preferences.c:394 +#: ../midori/midori-preferences.c:387 msgid "Allow scripts to open popups" msgstr "Izinkan skrip untuk membuka popup" -#: ../midori/midori-preferences.c:395 +#: ../midori/midori-preferences.c:388 msgid "Whether scripts are allowed to open popup windows automatically" msgstr "Apakah skrip diizinkan untuk membuka popup jendela secara otomatis" -#: ../midori/midori-preferences.c:401 -msgid "Kinetic scrolling" -msgstr "Menggulung kinetis" - -#: ../midori/midori-preferences.c:402 -msgid "Whether scrolling should kinetically move according to speed" -msgstr "Apakah menggulung harus bergeser secara kinetis tergantung kecepatan" - -#: ../midori/midori-preferences.c:407 -msgid "Middle click opens Selection" -msgstr "Klik Tengah Membuka Pilihan" - -#: ../midori/midori-preferences.c:408 -msgid "Load an address from the selection via middle click" -msgstr "Muat sebuah alamat dari pilihan via klik tengah" - -#: ../midori/midori-preferences.c:414 -msgid "Enable WebGL support" -msgstr "Aktifkan dukungan WebGL" - -#: ../midori/midori-preferences.c:419 -msgid "Flash window on background tabs" -msgstr "Kedipkan jendela yang membuka tab di latar belakang" - -#: ../midori/midori-preferences.c:428 -msgid "Save downloaded files to:" -msgstr "Simpan berkas yang diunduh ke:" - #. Page "Interface" -#: ../midori/midori-preferences.c:435 +#: ../midori/midori-preferences.c:411 msgid "Browsing" msgstr "Meramban" -#: ../midori/midori-preferences.c:451 -msgid "Close Buttons on Tabs" -msgstr "Tutup Tombol di Tab" - -#: ../midori/midori-preferences.c:455 -msgid "Always Show Tabbar" -msgstr "Selalu Tampilkan Batang Tab" - -#: ../midori/midori-preferences.c:459 -msgid "Open Tabs next to Current" -msgstr "Buka Tab di Samping Saat Ini" - -#: ../midori/midori-preferences.c:460 -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-preferences.c:463 -msgid "Open tabs in the background" -msgstr "Buka Tab di Latar Belakang" - -#: ../midori/midori-preferences.c:467 -msgid "Text Editor" -msgstr "Penyunting Teks" - -#: ../midori/midori-preferences.c:472 -msgid "News Aggregator" -msgstr "Agregator Berita" - #. Page "Network" -#: ../midori/midori-preferences.c:479 +#: ../midori/midori-preferences.c:449 msgid "Network" msgstr "Jaringan" -#: ../midori/midori-preferences.c:481 -msgid "Proxy server" -msgstr "Server proxy" - -#: ../midori/midori-preferences.c:486 +#: ../midori/midori-preferences.c:456 msgid "Hostname" msgstr "Nama Host" -#: ../midori/midori-preferences.c:494 -msgid "Port" -msgstr "Pangkalan" - -#: ../midori/midori-preferences.c:506 ../midori/midori-preferences.c:509 -msgid "The maximum size of cached pages on disk" -msgstr "Ukuran maksimum dari halaman tembolok di cakram" - -#: ../midori/midori-preferences.c:511 +#: ../midori/midori-preferences.c:472 msgid "MB" msgstr "MB" -#: ../midori/midori-searchaction.c:957 +#: ../midori/midori-searchaction.c:908 msgid "Add search engine" msgstr "Tambah mesin pencari" -#: ../midori/midori-searchaction.c:957 +#: ../midori/midori-searchaction.c:908 msgid "Edit search engine" msgstr "Sunting mesin pencari" -#: ../midori/midori-searchaction.c:985 +#: ../midori/midori-searchaction.c:937 msgid "_Name:" msgstr "_Nama:" -#: ../midori/midori-searchaction.c:1000 +#: ../midori/midori-searchaction.c:953 msgid "_Description:" msgstr "_Keterangan:" -#: ../midori/midori-searchaction.c:1013 ../extensions/feed-panel/main.c:377 -msgid "_Address:" -msgstr "_Alamat" +#: ../midori/midori-searchaction.c:986 +msgid "_Icon:" +msgstr "_Ikon:" + +#: ../midori/midori-searchaction.c:1000 +msgid "_Token:" +msgstr "_Token:" + +#: ../midori/midori-searchaction.c:1300 +msgid "Manage Search Engines" +msgstr "Atur Mesin Pencari" + +#: ../midori/midori-searchaction.c:1400 +msgid "Use as _default" +msgstr "Gunakan sebagai stan_dar" + +#: ../midori/sokoke.c:452 +msgid "Open with" +msgstr "Buka dengan" + +#: ../midori/sokoke.c:460 +#, c-format +msgid "Choose an application or command to open \"%s\":" +msgstr "Pilih sebuah aplikasi atau perintah untuk membuka \"%s\":" + +#: ../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 "Tak dapat menjalankan program eksternal." + +#: ../midori/sokoke.c:1515 +msgid "_Bookmark" +msgstr "B_ookmark" + +#: ../midori/sokoke.c:1517 +msgid "Add Boo_kmark" +msgstr "Tambah P_enanda" + +#: ../midori/sokoke.c:1518 +msgid "_Console" +msgstr "_Konsol" + +#: ../midori/sokoke.c:1519 +msgid "_Extensions" +msgstr "_Ekstensi" + +#: ../midori/sokoke.c:1521 +msgid "_Homepage" +msgstr "_Beranda" + +#: ../midori/sokoke.c:1522 +msgid "_Userscripts" +msgstr "_Skrip pengguna" + +#: ../midori/sokoke.c:1523 +msgid "New _Tab" +msgstr "Tab _Baru" + +#: ../midori/sokoke.c:1524 +msgid "_Transfers" +msgstr "_Transfer" + +#: ../midori/sokoke.c:1525 +msgid "Netscape p_lugins" +msgstr "P_lugin Netscape" + +#: ../midori/sokoke.c:1528 +msgid "New _Folder" +msgstr "_Folder Baru" + +#: ../midori/sokoke.c:2214 +#, c-format +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "%d jam" -#: ../midori/midori-searchaction.c:1032 -msgid "_Token:" -msgstr "_Token:" +#: ../midori/sokoke.c:2215 +#, c-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "%d menit" -#: ../midori/midori-searchaction.c:1330 -msgid "Manage Search Engines" -msgstr "Atur Mesin Pencari" +#: ../midori/sokoke.c:2216 +#, c-format +msgid "%d second" +msgid_plural "%d seconds" +msgstr[0] "%d detik" -#: ../midori/midori-searchaction.c:1432 -msgid "Use as _default" -msgstr "Gunakan sebagai stan_dar" +#. i18n: Download tooltip (size): 4KB of 43MB +#: ../midori/sokoke.c:2224 ../panels/midori-transfers.c:268 +#, c-format +msgid "%s of %s" +msgstr "%s dari %s" -#: ../midori/sokoke.c:353 -msgid "Open with" -msgstr "Buka dengan" +#. i18n: Unknown number of bytes, used for transfer rate like ?B/s +#: ../midori/sokoke.c:2233 +msgid "?B" +msgstr "?B" -#: ../midori/sokoke.c:361 +#. i18n: Download tooltip (transfer rate): (130KB/s) +#: ../midori/sokoke.c:2236 #, c-format -msgid "Choose an application or command to open \"%s\":" -msgstr "Pilih sebuah aplikasi atau perintah untuk membuka \"%s\":" +msgid " (%s/s)" +msgstr " (%s/s)" -#: ../midori/sokoke.c:476 ../midori/sokoke.c:490 -msgid "Could not run external program." -msgstr "Tak dapat menjalankan program eksternal." +#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning +#: ../midori/sokoke.c:2253 +#, c-format +msgid " - %s remaining" +msgstr " - %s tersisa" #. i18n: A panel at the bottom, to search text in pages -#: ../toolbars/midori-findbar.c:265 +#: ../toolbars/midori-findbar.c:230 msgid "_Inline Find:" msgstr "_Cari Dalam Baris:" -#: ../toolbars/midori-findbar.c:287 +#: ../toolbars/midori-findbar.c:264 msgid "Previous" msgstr "Sebelumnya" -#: ../toolbars/midori-findbar.c:293 +#: ../toolbars/midori-findbar.c:270 msgid "Next" msgstr "Berikutnya" -#: ../toolbars/midori-findbar.c:297 +#: ../toolbars/midori-findbar.c:274 msgid "Match Case" msgstr "Cocokkan Huruf" -#: ../toolbars/midori-findbar.c:306 +#: ../toolbars/midori-findbar.c:283 msgid "Highlight Matches" msgstr "Sorot Kecocokan" -#: ../toolbars/midori-findbar.c:317 +#: ../toolbars/midori-findbar.c:294 msgid "Close Findbar" msgstr "Tutup batang cari" -#: ../toolbars/midori-transferbar.c:109 +#: ../toolbars/midori-transferbar.c:129 #, c-format msgid "The file '%s' has been downloaded." msgstr "Berkas '%s' telah diunduh." -#: ../toolbars/midori-transferbar.c:114 +#: ../toolbars/midori-transferbar.c:132 msgid "Transfer completed" msgstr "Transfer selesai" -#: ../toolbars/midori-transferbar.c:239 ../panels/midori-transfers.c:139 +#: ../toolbars/midori-transferbar.c:214 +msgid "The downloaded file is erroneous." +msgstr "Berkas yang diunduh galat." + +#: ../toolbars/midori-transferbar.c:215 +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:323 ../panels/midori-transfers.c:142 msgid "Clear All" msgstr "Bersihkan Semua" -#: ../toolbars/midori-transferbar.c:272 ../toolbars/midori-transferbar.c:274 +#: ../toolbars/midori-transferbar.c:360 ../toolbars/midori-transferbar.c:362 msgid "Some files are being downloaded" msgstr "Beberapa berkas sedang diunduh" -#: ../toolbars/midori-transferbar.c:278 +#: ../toolbars/midori-transferbar.c:366 msgid "_Quit Midori" msgstr "_Keluar Midori" -#: ../toolbars/midori-transferbar.c:280 +#: ../toolbars/midori-transferbar.c:368 msgid "The transfers will be cancelled if Midori quits." msgstr "Transfer akan dibatalkan jika Midori keluar." -#: ../panels/midori-bookmarks.c:308 +#: ../panels/midori-bookmarks.c:116 +msgid "Bookmarks" +msgstr "Penanda" + +#: ../panels/midori-bookmarks.c:294 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "Gagal menambah item penanda: %s\n" -#: ../panels/midori-bookmarks.c:475 -#, c-format -msgid "Failed to update bookmark : %s\n" -msgstr "Gagal memutakhirkan penanda : %s\n" - -#: ../panels/midori-bookmarks.c:535 +#: ../panels/midori-bookmarks.c:474 msgid "Edit the selected bookmark" msgstr "Sunting penanda terpilih" -#: ../panels/midori-bookmarks.c:543 +#: ../panels/midori-bookmarks.c:482 msgid "Delete the selected bookmark" msgstr "Hapus penanda terpilih" -#: ../panels/midori-bookmarks.c:558 +#: ../panels/midori-bookmarks.c:497 msgid "Add a new folder" msgstr "Tambah folder baru" -#: ../panels/midori-bookmarks.c:697 ../panels/midori-history.c:638 +#: ../panels/midori-bookmarks.c:631 ../panels/midori-history.c:583 msgid "Separator" msgstr "Pemisah" -#. Create the filter entry -#: ../panels/midori-bookmarks.c:1027 -msgid "Search Bookmarks" -msgstr "Cari dalam Penanda" - -#: ../panels/midori-history.c:111 +#: ../panels/midori-history.c:114 msgid "History" msgstr "Riwayat" -#: ../panels/midori-history.c:158 ../panels/midori-history.c:189 -msgid "Today" -msgstr "Hari Ini" - -#: ../panels/midori-history.c:160 ../panels/midori-history.c:191 -msgid "Yesterday" -msgstr "Kemarin" +#: ../panels/midori-history.c:146 +msgid "A week ago" +msgstr "Seminggu yang lalu" -#: ../panels/midori-history.c:162 ../panels/midori-history.c:186 +#: ../panels/midori-history.c:148 #, 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:151 +msgid "Today" +msgstr "Hari Ini" -#: ../panels/midori-history.c:232 -#, c-format -msgid "Failed to remove history item: %s\n" -msgstr "Gagal menghapus item riwayat: %s\n" +#: ../panels/midori-history.c:153 +msgid "Yesterday" +msgstr "Kemarin" -#: ../panels/midori-history.c:360 +#: ../panels/midori-history.c:321 msgid "Are you sure you want to remove all history items?" msgstr "Anda yakin ingin menghapus semua item riwayat?" -#: ../panels/midori-history.c:407 +#: ../panels/midori-history.c:367 msgid "Bookmark the selected history item" msgstr "Bookmark item riwayat terpilih" -#: ../panels/midori-history.c:416 +#: ../panels/midori-history.c:376 msgid "Delete the selected history item" msgstr "Hapus item riwayat terpilih" -#: ../panels/midori-history.c:424 +#: ../panels/midori-history.c:384 msgid "Clear the entire history" msgstr "Bersihkan seluruh riwayat" -#. Create the filter entry -#: ../panels/midori-history.c:997 -msgid "Search History" -msgstr "Cari dalam Riwayat" - #: ../panels/midori-transfers.c:87 msgid "Transfers" msgstr "Transfer" -#: ../panels/midori-transfers.c:435 +#: ../panels/midori-transfers.c:468 msgid "Open Destination _Folder" msgstr "Buka _Folder Tujuan" -#: ../panels/midori-transfers.c:438 +#: ../panels/midori-transfers.c:471 msgid "Copy Link Loc_ation" msgstr "Salin Tautan Lok_asi" -#: ../katze/katze-http-auth.c:210 +#: ../katze/katze-http-auth.c:213 msgid "Authentication Required" msgstr "Otentikasi Diperlukan" -#: ../katze/katze-http-auth.c:226 +#: ../katze/katze-http-auth.c:229 msgid "" "A username and a password are required\n" "to open this location:" @@ -2057,203 +2273,187 @@ msgstr "" "Sebuah nama pengguna dan sebuah sandi diperlukan\n" "untuk membuka lokasi ini:" -#: ../katze/katze-http-auth.c:240 +#: ../katze/katze-http-auth.c:243 msgid "Username" msgstr "Nama Pengguna" -#: ../katze/katze-http-auth.c:253 +#: ../katze/katze-http-auth.c:256 msgid "Password" msgstr "Sandi" -#: ../katze/katze-http-auth.c:267 +#: ../katze/katze-http-auth.c:270 msgid "_Remember password" msgstr "_Ingat sandi" -#: ../katze/katze-throbber.c:949 +#: ../katze/katze-throbber.c:879 #, c-format msgid "Named icon '%s' couldn't be loaded" msgstr "Ikon bernama '%s' tak dapat dimuat" -#: ../katze/katze-throbber.c:962 +#: ../katze/katze-throbber.c:892 #, c-format msgid "Stock icon '%s' couldn't be loaded" msgstr "Stok ikon '%s' tak dapat dimuat" -#: ../katze/katze-throbber.c:1042 +#: ../katze/katze-throbber.c:964 msgid "Animation frames are broken" msgstr "Bingkai animasi rusak" -#: ../katze/katze-utils.c:443 ../katze/katze-utils.c:866 +#: ../katze/katze-utils.c:536 ../katze/katze-utils.c:971 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Properti '%s' tidak sah untuk %s" -#: ../katze/katze-utils.c:489 ../katze/katze-utils.c:518 -#: ../extensions/addons.c:309 +#: ../katze/katze-utils.c:582 ../katze/katze-utils.c:611 +#: ../extensions/addons.c:306 msgid "Choose file" msgstr "Pilih berkas" -#: ../katze/katze-utils.c:504 +#: ../katze/katze-utils.c:597 msgid "Choose folder" msgstr "Pilih folder" -#: ../katze/katze-utils.c:602 +#: ../katze/katze-utils.c:701 msgid "None" msgstr "Tak ada" -#: ../katze/katze-utils.c:717 +#: ../katze/katze-utils.c:819 msgid "1 hour" msgstr "1 jam" -#: ../katze/katze-utils.c:718 +#: ../katze/katze-utils.c:820 msgid "1 day" msgstr "1 hari" -#: ../katze/katze-utils.c:719 +#: ../katze/katze-utils.c:821 msgid "1 week" msgstr "1 minggu" -#: ../katze/katze-utils.c:720 +#: ../katze/katze-utils.c:822 msgid "1 month" msgstr "1 bulan" -#: ../katze/katze-utils.c:721 +#: ../katze/katze-utils.c:823 msgid "1 year" msgstr "1 tahun" -#: ../katze/katze-preferences.c:98 ../extensions/history-list.vala:235 +#: ../katze/katze-preferences.c:95 ../extensions/history-list.vala:228 #, c-format msgid "Preferences for %s" msgstr "Pengaturan untuk %s" -#: ../katze/midori-uri.vala:173 -msgid "MD5-Checksum:" -msgstr "MD5-Checksum:" - -#: ../katze/midori-uri.vala:180 -msgid "SHA1-Checksum:" -msgstr "SHA1-Checksum:" - -#: ../extensions/adblock.c:495 +#: ../extensions/adblock.c:418 msgid "Configure Advertisement filters" msgstr "Atur filter Iklan" -#: ../extensions/adblock.c:528 +#: ../extensions/adblock.c:450 #, 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." +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:944 +#: ../extensions/adblock.c:813 msgid "Edit rule" msgstr "Sunting aturan" -#: ../extensions/adblock.c:958 +#: ../extensions/adblock.c:826 msgid "_Rule:" msgstr "_Aturan:" -#: ../extensions/adblock.c:1012 +#: ../extensions/adblock.c:880 msgid "Bl_ock image" msgstr "Bl_ok gambar" -#: ../extensions/adblock.c:1017 +#: ../extensions/adblock.c:885 msgid "Bl_ock link" msgstr "Bl_ok tautan" -#: ../extensions/adblock.c:1915 +#: ../extensions/adblock.c:1453 msgid "Advertisement blocker" msgstr "Pemblokir Iklan" -#: ../extensions/adblock.c:1916 +#: ../extensions/adblock.c:1454 msgid "Block advertisements according to a filter list" msgstr "Blok iklan berdasarkan sebuah senarai filter" #. i18n: An infobar shows up when viewing a script on userscripts.org -#: ../extensions/addons.c:222 +#: ../extensions/addons.c:218 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?" +msgstr "Halaman ini sepertinya berisi sebuah skrip pengguna. Anda ingin menginstalnya?" -#: ../extensions/addons.c:223 +#: ../extensions/addons.c:219 msgid "_Install user script" msgstr "_Instal skrip pengguna" #. i18n: An infobar shows up when viewing a style on userstyles.org -#: ../extensions/addons.c:228 +#: ../extensions/addons.c:224 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?" +msgstr "Halaman ini sepertinya berisi sebuah gaya pengguna. Anda ingin menginstalnya?" -#: ../extensions/addons.c:229 +#: ../extensions/addons.c:225 msgid "_Install user style" msgstr "_Instal gaya pengguna" -#: ../extensions/addons.c:237 +#: ../extensions/addons.c:233 msgid "Don't install" msgstr "Jangan instal" -#: ../extensions/addons.c:320 ../extensions/addons.c:675 +#: ../extensions/addons.c:317 ../extensions/addons.c:679 msgid "Userscripts" msgstr "Skrip pengguna" -#: ../extensions/addons.c:325 ../extensions/addons.c:677 +#: ../extensions/addons.c:322 ../extensions/addons.c:681 msgid "Userstyles" msgstr "Gaya pengguna" -#: ../extensions/addons.c:371 ../extensions/addons.c:450 +#: ../extensions/addons.c:378 ../extensions/addons.c:457 #: ../extensions/feed-panel/main.c:129 msgid "Error" msgstr "Galat" -#: ../extensions/addons.c:412 +#: ../extensions/addons.c:419 #, c-format msgid "Do you want to delete '%s'?" msgstr "Anda ingin menghapus '%s'?" -#: ../extensions/addons.c:418 +#: ../extensions/addons.c:425 msgid "Delete user script" msgstr "Hapys skrip pengguna" -#: ../extensions/addons.c:419 +#: ../extensions/addons.c:426 msgid "Delete user style" msgstr "Hapus gaya pengguna" -#: ../extensions/addons.c:422 +#: ../extensions/addons.c:429 #, c-format msgid "The file %s will be permanently deleted." msgstr "Berkas '%s' akan secara permanen dihapus." -#: ../extensions/addons.c:564 ../extensions/addons.c:641 +#: ../extensions/addons.c:568 ../extensions/addons.c:645 msgid "Open in Text Editor" msgstr "Buka di Penyunting Teks" -#: ../extensions/addons.c:566 ../extensions/addons.c:650 +#: ../extensions/addons.c:570 ../extensions/addons.c:654 msgid "Open Target Folder" msgstr "Buka Folder Tujuan" -#: ../extensions/addons.c:632 +#: ../extensions/addons.c:636 msgid "Add new addon" msgstr "Tambah pengaya baru" -#: ../extensions/addons.c:658 +#: ../extensions/addons.c:662 msgid "Remove selected addon" msgstr "Hapus pengaya terpilih" -#: ../extensions/addons.c:1687 ../extensions/addons.c:1905 +#: ../extensions/addons.c:1641 ../extensions/addons.c:1803 msgid "User addons" msgstr "Pengaya pengguna" -#: ../extensions/addons.c:1817 +#: ../extensions/addons.c:1762 #, c-format msgid "Can't monitor folder '%s': %s" msgstr "Tak dapat memonitor folder '%s': %s" -#: ../extensions/addons.c:1906 +#: ../extensions/addons.c:1804 msgid "Support for userscripts and userstyles" msgstr "Dukungan untuk skrip pengguna dan gaya pengguna" @@ -2265,48 +2465,44 @@ msgstr "Tab Penuh Warna" msgid "Tint each tab distinctly" msgstr "Warnai tiap tab dengan jelas" -#: ../extensions/cookie-manager/cookie-manager-page.c:73 +#: ../extensions/cookie-manager/cookie-manager-page.c:82 #: ../extensions/cookie-manager/main.c:35 msgid "Cookie Manager" msgstr "Manajer Kuki" -#: ../extensions/cookie-manager/cookie-manager-page.c:103 +#: ../extensions/cookie-manager/cookie-manager-page.c:112 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." -msgstr "" -"Hapus semua kuki yang ditampilkan. Jika sebuah filter diatur, hanya kuki " -"yang cocok dengan filter yang dihapus." +#: ../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 "Hapus semua kuki yang ditampilkan. Jika sebuah filter diatur, hanya kuki yang cocok dengan filter yang dihapus." -#: ../extensions/cookie-manager/cookie-manager-page.c:120 +#: ../extensions/cookie-manager/cookie-manager-page.c:129 msgid "Expand All" msgstr "Perluas Semua" -#: ../extensions/cookie-manager/cookie-manager-page.c:127 +#: ../extensions/cookie-manager/cookie-manager-page.c:136 msgid "Collapse All" msgstr "Perkecil Semua" -#: ../extensions/cookie-manager/cookie-manager-page.c:572 +#: ../extensions/cookie-manager/cookie-manager-page.c:578 msgid "Do you really want to delete all cookies?" msgstr "Anda yakin ingin menghapus semua kuki?" -#: ../extensions/cookie-manager/cookie-manager-page.c:574 +#: ../extensions/cookie-manager/cookie-manager-page.c:580 msgid "Question" msgstr "Pertanyaan" -#: ../extensions/cookie-manager/cookie-manager-page.c:583 +#: ../extensions/cookie-manager/cookie-manager-page.c:589 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:671 +#: ../extensions/cookie-manager/cookie-manager-page.c:677 msgid "At the end of the session" msgstr "Di akhir sesi" -#: ../extensions/cookie-manager/cookie-manager-page.c:674 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 #, c-format msgid "" "Host: %s\n" @@ -2323,15 +2519,15 @@ msgstr "" "Keamanan: %s\n" "Kadaluwarsa: %s" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:686 msgid "Yes" msgstr "Ya" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:686 msgid "No" msgstr "Tidak" -#: ../extensions/cookie-manager/cookie-manager-page.c:694 +#: ../extensions/cookie-manager/cookie-manager-page.c:700 #, c-format msgid "" "Domain: %s\n" @@ -2340,35 +2536,39 @@ msgstr "" "Ranah: %s\n" "Kuki: %d" -#: ../extensions/cookie-manager/cookie-manager-page.c:1017 +#: ../extensions/cookie-manager/cookie-manager-page.c:1030 msgid "Name" msgstr "Nama" -#: ../extensions/cookie-manager/cookie-manager-page.c:1069 +#: ../extensions/cookie-manager/cookie-manager-page.c:1083 msgid "_Expand All" msgstr "_Perluas Semua" -#: ../extensions/cookie-manager/cookie-manager-page.c:1077 +#: ../extensions/cookie-manager/cookie-manager-page.c:1091 msgid "_Collapse All" msgstr "P_erkecil Semua" -#: ../extensions/cookie-manager/cookie-manager-page.c:1129 -msgid "Search Cookies by Name or Domain" -msgstr "Cari Kuki berdasarkan Nama atau Domain" +#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +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 "Masukkan sebuah tali filter untuk menampilkan hanya kuki yang nama atau daerah ranahnya cocok dengan filter yang dimasukkan" #: ../extensions/cookie-manager/main.c:36 msgid "List, view and delete cookies" msgstr "Senarai, tampilan dan hapus kuki" -#: ../extensions/copy-tabs.c:38 +#: ../extensions/copy-tabs.c:39 msgid "Copy Tab _Addresses" msgstr "Salin _Alamat Tab" -#: ../extensions/copy-tabs.c:95 +#: ../extensions/copy-tabs.c:96 msgid "Copy Addresses of Tabs" msgstr "Salin Alamat Tab" -#: ../extensions/copy-tabs.c:96 +#: ../extensions/copy-tabs.c:97 msgid "Copy the addresses of all tabs to the clipboard" msgstr "Salin alamat semua tab ke papan klip" @@ -2381,25 +2581,25 @@ 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:387 +#: ../extensions/feed-panel/feed-panel.c:392 #, c-format msgctxt "Feed" msgid "Last updated: %s." msgstr "Terakhir dimutakhirkan: %s." -#: ../extensions/feed-panel/feed-panel.c:653 +#: ../extensions/feed-panel/feed-panel.c:658 msgid "Feeds" msgstr "Umpan" -#: ../extensions/feed-panel/feed-panel.c:706 +#: ../extensions/feed-panel/feed-panel.c:711 msgid "Add new feed" msgstr "Tambah umpan baru" -#: ../extensions/feed-panel/feed-panel.c:713 +#: ../extensions/feed-panel/feed-panel.c:718 msgid "Delete feed" msgstr "Hapus umpan" -#: ../extensions/feed-panel/feed-panel.c:795 +#: ../extensions/feed-panel/feed-panel.c:800 msgid "_Feeds" msgstr "_Umpan" @@ -2452,127 +2652,99 @@ msgstr "Panel Umpan" msgid "Read Atom/ RSS feeds" msgstr "Baca umpan Atom/ RSS" -#: ../extensions/formhistory/formhistory.c:39 +#: ../extensions/formhistory.c:151 #, 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 +#: ../extensions/formhistory.c:303 msgid "Toggle form history state" msgstr "Ubah status formulir riwayat" -#: ../extensions/formhistory/formhistory.c:438 +#: ../extensions/formhistory.c:304 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 +#: ../extensions/formhistory.c:438 ../extensions/formhistory.c:442 #, 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.c:517 +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:669 +#: ../extensions/formhistory.c:576 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 +#: ../extensions/formhistory.c:580 #, c-format -msgid "Failed to select suggestions\n" -msgstr "Gagal memilih saran\n" +msgid "Not available: %s" +msgstr "Tidak tersedia: %s" + +#: ../extensions/formhistory.c:581 +msgid "Resource files not installed" +msgstr "Berkas sumber daya tak terinstal" + +#: ../extensions/formhistory.c:587 +msgid "Form history filler" +msgstr "Formulir pengisi riwayat" -#: ../extensions/history-list.vala:197 +#: ../extensions/history-list.vala:190 msgid "There are no unvisited tabs" msgstr "Tidak ada tab yang belum dikunjungi" -#: ../extensions/history-list.vala:235 +#: ../extensions/history-list.vala:228 #, c-format msgid "History-List" msgstr "Senarai-Riwayat" -#: ../extensions/history-list.vala:275 +#: ../extensions/history-list.vala:267 msgid "Tab closing behavior" msgstr "Perilaku menutup tab" -#: ../extensions/history-list.vala:283 +#: ../extensions/history-list.vala:275 msgid "Do nothing" msgstr "Jangan lakukan apapun" -#: ../extensions/history-list.vala:289 +#: ../extensions/history-list.vala:281 msgid "Switch to last viewed tab" msgstr "Pindah ke tab terakhir yang ditampilkan" -#: ../extensions/history-list.vala:295 +#: ../extensions/history-list.vala:287 msgid "Switch to newest tab" msgstr "Pindah ke tab terbaru" -#: ../extensions/history-list.vala:423 +#: ../extensions/history-list.vala:411 msgid "Next new Tab (History List)" msgstr "Tab baru Berikutnya (Senarai Riwayat)" -#: ../extensions/history-list.vala:424 +#: ../extensions/history-list.vala:412 msgid "Next new tab from history" msgstr "Tab baru berikutnya dari riwayat" -#: ../extensions/history-list.vala:433 +#: ../extensions/history-list.vala:421 msgid "Previous new Tab (History List)" msgstr "Tab baru Sebelumnya (Senarai Riwayat)" -#: ../extensions/history-list.vala:434 +#: ../extensions/history-list.vala:422 msgid "Previous new tab from history" msgstr "Tab baru sebelumnya dari riwayat" -#: ../extensions/history-list.vala:443 +#: ../extensions/history-list.vala:431 msgid "Display tab in background (History List)" msgstr "Tampilkan tab di latar belakang (Senarai Riwayat)" -#: ../extensions/history-list.vala:444 +#: ../extensions/history-list.vala:432 msgid "Display the current selected tab in background" msgstr "Tampilkan tab terpilih saat ini di latar belakang" -#: ../extensions/history-list.vala:566 +#: ../extensions/history-list.vala:557 msgid "History List" msgstr "Senarai Riwayat" -#: ../extensions/history-list.vala:567 +#: ../extensions/history-list.vala:558 msgid "Move to the last used tab when switching or closing tabs" msgstr "Pindah ke tab terakhir digunakan ketika berpindah atau menutup tab" @@ -2584,7 +2756,7 @@ msgstr "Gerak Tetikus" msgid "Control Midori by moving the mouse" msgstr "Kendalikan Midori dengan menggerakkan tetikus" -#: ../extensions/shortcuts.c:109 +#: ../extensions/shortcuts.c:110 msgid "Reload page or stop loading" msgstr "Muat ulang halamat atau stop memuat" @@ -2592,15 +2764,15 @@ msgstr "Muat ulang halamat atau stop memuat" msgid "Customize Keyboard shortcuts" msgstr "Sesuaikan jalan pintas Papan Ketik" -#: ../extensions/shortcuts.c:283 +#: ../extensions/shortcuts.c:282 msgid "Customize Sh_ortcuts..." -msgstr "Sesuaikan J_alan Pintas…" +msgstr "Sesuaikan J_alan Pintas..." -#: ../extensions/shortcuts.c:320 +#: ../extensions/shortcuts.c:319 msgid "Shortcuts" msgstr "Jalan Pintas" -#: ../extensions/shortcuts.c:321 +#: ../extensions/shortcuts.c:320 msgid "View and edit keyboard shortcuts" msgstr "Tampilkan dan sunting jalan pintas papan ketik" @@ -2612,509 +2784,82 @@ msgstr "Jam Batang Status" msgid "Display date and time in the statusbar" msgstr "Tampilkan tanggal dan waktu di batang status" -#: ../extensions/statusbar-features.c:152 +#: ../extensions/statusbar-features.c:129 msgid "Images" msgstr "Gambar" -#: ../extensions/statusbar-features.c:162 +#: ../extensions/statusbar-features.c:138 msgid "Scripts" msgstr "Skrip" -#: ../extensions/statusbar-features.c:174 +#: ../extensions/statusbar-features.c:147 msgid "Netscape plugins" msgstr "Plugin Netscape" -#: ../extensions/statusbar-features.c:259 +#: ../extensions/statusbar-features.c:193 msgid "Statusbar Features" msgstr "Fitur Batang Status" -#: ../extensions/statusbar-features.c:260 +#: ../extensions/statusbar-features.c:194 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:589 ../extensions/tab-panel.c:676 +#: ../extensions/tab-panel.c:597 ../extensions/tab-panel.c:684 msgid "Tab Panel" msgstr "Panel Tab" -#: ../extensions/tab-panel.c:659 +#: ../extensions/tab-panel.c:667 msgid "T_ab Panel" msgstr "Panel T_ab" -#: ../extensions/tab-panel.c:677 +#: ../extensions/tab-panel.c:685 msgid "Show tabs in a vertical panel" msgstr "Tampilkan tab di sebuah panel vertikal" -#: ../extensions/tabs-minimized.c:76 +#: ../extensions/tabs-minimized.c:77 msgid "Only Icons on Tabs by default" msgstr "Hanya Ikon di Tab sebagai standar" -#: ../extensions/tabs-minimized.c:77 +#: ../extensions/tabs-minimized.c:78 msgid "New tabs have no label by default" msgstr "Tab baru tidak mempunyai label sebagai standar" -#: ../extensions/toolbar-editor.c:395 +#: ../extensions/toolbar-editor.c:391 msgid "Customize Toolbar" msgstr "Sesuaikan Batang Alat" -#: ../extensions/toolbar-editor.c:411 -msgid "" -"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:407 +msgid "Select items to be displayed on the toolbar. Items can be reodered 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:427 +#: ../extensions/toolbar-editor.c:423 msgid "Available Items" msgstr "Item Tersedia" -#: ../extensions/toolbar-editor.c:448 +#: ../extensions/toolbar-editor.c:444 msgid "Displayed Items" msgstr "Item Ditampilkan" -#: ../extensions/toolbar-editor.c:588 -msgid "_Customize Toolbar…" -msgstr "Sesuaikan _Batang Alat…" +#: ../extensions/toolbar-editor.c:579 +msgid "Customize _Toolbar..." +msgstr "Sesuaikan _Batang Alat..." + +#: ../extensions/toolbar-editor.c:595 +msgid "_Customize..." +msgstr "_Sesuaikan..." -#: ../extensions/toolbar-editor.c:617 +#: ../extensions/toolbar-editor.c:625 msgid "Toolbar Editor" msgstr "Penyunting Batang Alat" -#: ../extensions/toolbar-editor.c:618 +#: ../extensions/toolbar-editor.c:626 msgid "Easily edit the toolbar layout" msgstr "Sunting tata letak batang alat dengan mudah" -#: ../extensions/web-cache.c:462 +#: ../extensions/web-cache.c:471 msgid "Cache HTTP communication on disk" msgstr "Tembolok komunikasi HTTP di cakram" -#~ msgid "_Bookmark" -#~ msgstr "B_ookmark" - -#~ msgid "_Console" -#~ msgstr "_Konsol" - -#~ msgid "Remember last window size" -#~ msgstr "Ingat ukuran jendela terakhir" - -#~ msgid "Whether to save the last window size" -#~ msgstr "Apakah ingin menyimpan ukuran jendela yang terakhir tersimpan" - -#~ msgid "Last window width" -#~ msgstr "Lebar jendela terakhir" - -#~ msgid "The last saved window width" -#~ msgstr "Lebar jendela terakhir tersimpan" - -#~ msgid "Last window height" -#~ msgstr "Tinggi jendela terakhir" - -#~ msgid "The last saved window height" -#~ msgstr "Tinggi jendela terakhir tersimpan" - -#~ msgid "Last panel position" -#~ msgstr "Posisi panel terakhir" - -#~ msgid "The last saved panel position" -#~ msgstr "Posisi panel terakhir tersimpan" - -#~ msgid "Last panel page" -#~ msgstr "Halaman panel terakhir" - -#~ msgid "The last saved panel page" -#~ msgstr "Halaman panel terakhir tersimpan" - -#~ msgid "Last Web search" -#~ msgstr "Penelusuran Web terakhir" - -#~ msgid "The last saved Web search" -#~ msgstr "Penelusuran Web terakhir tersimpan" - -#~ msgid "Show Menubar" -#~ msgstr "Tampilkan Batang Menu" - -#~ msgid "Whether to show the menubar" -#~ msgstr "Apakah ingin menampilkan batang menu" - -#~ msgid "Show Navigationbar" -#~ msgstr "Tampilkan Batang Navigasi" - -#~ msgid "Whether to show the navigationbar" -#~ msgstr "Apakah ingin menampilkan batang navigasi" - -#~ msgid "Show Bookmarkbar" -#~ msgstr "Tampilkan Batang Penanda" - -#~ msgid "Whether to show the bookmarkbar" -#~ msgstr "Apakah ingin menampilkan batang penanda" - -#~ msgid "Show Panel" -#~ msgstr "Tampilkan Panel" - -#~ msgid "Whether to show the panel" -#~ msgstr "Apakah ingin menampilkan panel" - -#~ msgid "Show Statusbar" -#~ msgstr "Tampilkan Batang Status" - -#~ msgid "Whether to show the statusbar" -#~ msgstr "Apakah ingin menampilkan batang status" - -#~ msgid "Toolbar Items" -#~ msgstr "Item Batang Alat" - -#~ msgid "The items to show on the toolbar" -#~ msgstr "Item yang akan ditampilkan di batang alat" - -#~ msgid "Compact Sidepanel" -#~ msgstr "Panel Sisi Kompak" - -#~ msgid "Whether to make the sidepanel compact" -#~ msgstr "Apakah ingin membuat panel sisi kompak" - -#~ msgid "Align sidepanel on the right" -#~ msgstr "Ratakan panel sisi di kanan" - -#~ msgid "Whether to align the sidepanel on the right" -#~ msgstr "Apakah ingin meratakan panel sisi di sebelah kanan" - -#~ msgid "Open panels in separate windows" -#~ msgstr "Buka panel di jendela yang terpisah" - -#~ msgid "Whether to always open panels in separate windows" -#~ msgstr "Apakah ingin selalu membuka panel jendela yang terpisah" - -#~ msgid "What to do when Midori starts" -#~ msgstr "Apa yang akan dilakukan saat Midori dijalankan" - -#~ msgid "The homepage" -#~ msgstr "Laman" - -#~ msgid "Show crash dialog" -#~ msgstr "Tampilkan dialog macet" - -#~ msgid "The folder downloaded files are saved to" -#~ msgstr "Folder berkas terunduh disimpan di" - -#~ msgid "An external text editor" -#~ msgstr "Penyunting teks eksternal" - -#~ msgid "An external news aggregator" -#~ msgstr "Sebuah agregator berita eksternal" - -#~ msgid "Location entry Search" -#~ msgstr "Pencari entri lokasi" - -#~ msgid "The search to perform inside the location entry" -#~ msgstr "Pencarian yang dilakukan di dalam entri lokasi" - -#~ msgid "The preferred character encoding" -#~ msgstr "Penyandian karakter kesukaan" - -#~ msgid "Always show the tabbar" -#~ msgstr "Selalu tampilkan batang tab" - -#~ msgid "Whether tabs have close buttons" -#~ msgstr "Apakah tab memiliki tombol tutup" - -#~ msgid "Where to open new pages" -#~ msgstr "Dimana membuka halaman baru" - -#~ msgid "Whether to open new tabs in the background" -#~ msgstr "Apakah ingin membuka tab baru di latar belakang" - -#~ msgid "Open popups in tabs" -#~ msgstr "Buka popup di tab" - -#~ msgid "Whether to open popup windows in tabs" -#~ msgstr "Apakah ingin membuka jendela popup di tab" - -#~ msgid "Load and display images automatically" -#~ msgstr "Muat dan tampilkan gambar secara otomatis" - -#~ msgid "Enable embedded scripting languages" -#~ msgstr "Aktifkan bahasa skrip terbenam" - -#~ msgid "Enable embedded Netscape plugin objects" -#~ msgstr "Aktifkan objek plugin Netscape terbenam" - -#~ msgid "Enable spell checking while typing" -#~ msgstr "Aktifkan pemeriksa ejaan ketika mengetik" - -#~ msgid "Enable HTML5 database support" -#~ msgstr "Aktifkan dukungan basis data HTML5" - -#~ msgid "Whether to enable HTML5 database support" -#~ msgstr "Apakah akan mengaktifkan dukungan basis data HTML5" - -#~ msgid "Whether to enable HTML5 local storage support" -#~ msgstr "Apakah akan mengaktifkan dukungan penyimpanan lokal HTML5" - -#~ msgid "Whether to enable offline web application cache" -#~ msgstr "Apakah akan mengaktifkan tembolok aplikasi web luring" - -#~ 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" - -#~ msgid "Allow websites to use OpenGL rendering" -#~ msgstr "Izinkan situs web untuk menggunakan sesuaian OpenGL" - -#~ msgid "Whether to zoom text and images" -#~ msgstr "Apakah ingin memperbesar teks dan gambar" - -#~ msgid "Find inline while typing" -#~ msgstr "Cari dalam baris ketika mengetik" - -#~ msgid "Whether to automatically find inline while typing" -#~ msgstr "Apakah akan secara otomatis mencari dalam baris ketika mengetik" - -#~ msgid "The type of proxy server to use" -#~ msgstr "Tipe server proxy yang akan digunakan" - -#~ msgid "HTTP Proxy Server" -#~ msgstr "Server Proxy HTTP" - -#~ msgid "The proxy server used for HTTP connections" -#~ msgstr "Proxy server yang digunakan untuk koneksi HTTP" - -#~ msgid "The proxy server port used for HTTP connections" -#~ msgstr "Proxy server yang digunakan untuk koneksi HTTP" - -#~ msgid "Identification string" -#~ msgstr "Tali identifikasi" - -#~ msgid "The application identification string" -#~ msgstr "Tali identifikasi aplikasi" - -#~ msgid "Clear private data" -#~ msgstr "Hapus data pribadi" - -#~ msgid "The private data selected for deletion" -#~ msgstr "Data pribadi yang dipilih untuk dihapus" - -#~ msgid "Clear data" -#~ msgstr "Hapus data" - -#~ msgid "The data selected for deletion" -#~ msgstr "Data terpilih untuk dihapus" - -#~ msgid "Close ot_her Tabs" -#~ msgstr "Tutup Tab _Lainnya" - -#~ msgid "_Icon:" -#~ msgstr "_Ikon:" - -#~ msgid "Filter:" -#~ msgstr "Filter:" - -#~ msgid "" -#~ "Enter a filter string to show only cookies whose name or domain field " -#~ "match the entered filter" -#~ msgstr "" -#~ "Masukkan sebuah tali filter untuk menampilkan hanya kuki yang nama atau " -#~ "daerah ranahnya cocok dengan filter yang dimasukkan" - -#~ msgid "Toplevel folder" -#~ msgstr "Folder level atas" - -#~ msgid "_Title:" -#~ msgstr "_Judul:" - -#~ msgid "_Folder:" -#~ msgstr "_Folder:" - -#~ msgid "_Customize…" -#~ msgstr "_Sesuaikan…" - -#~ msgid "The bookmarks couldn't be saved. %s" -#~ msgstr "Bookmark tak dapat disimpan. %s" - -#~ msgid "The specified configuration folder is invalid." -#~ msgstr "Folder konfigurasi yang ditentukan tidak valid." - -#~ 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 "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" @@ -3130,13 +2875,14 @@ msgstr "Tembolok komunikasi HTTP di cakram" #~ 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 "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" +#~ msgstr "Ganti tab menggunakan Ctrl+Tab yang diurutkan berdasarkan penggunaan terakhir" + +#~ msgid "Midori (Private Browsing)" +#~ msgstr "Midori (Meramban Privat)" #~ msgid "Quit the application" #~ msgstr "Keluar aplikasi" @@ -3255,6 +3001,9 @@ msgstr "Tembolok komunikasi HTTP di cakram" #~ msgid "Open target folder for selected addon" #~ msgstr "Buka folder target untuk pengaya terpilih" +#~ msgid "_Form History" +#~ msgstr "_Bentuk Riwayat" + #~ msgid "Next Tab (History List)" #~ msgstr "Tab Berikutnya (Senarai Riwayat)" @@ -3325,13 +3074,14 @@ msgstr "Tembolok komunikasi HTTP di cakram" #~ 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" +#~ msgstr "Apakah akan menampilkan sebuah notifikasi ketika sebuah transfer telah selesai" #~ msgid "Original cookies only" #~ msgstr "Hanya kuki asli" +#~ msgid "Accept cookies from the original website only" +#~ msgstr "Terima kuki hanya dari situs web asli" + #~ msgid "Remember last visited pages" #~ msgstr "Ingat halaman terakhir dikunjungi" @@ -3347,8 +3097,7 @@ msgstr "Tembolok komunikasi HTTP di cakram" #~ msgid "Detect proxy server automatically" #~ msgstr "Deteksi server proxy secara otomatis" -#~ msgid "" -#~ "Whether to detect the proxy server automatically from the environment" +#~ msgid "Whether to detect the proxy server automatically from the environment" #~ msgstr "Apakah akan mendeteksi server proxy secara otomatis dari lingkungan" #~ msgid "Cache size" @@ -3399,12 +3148,11 @@ msgstr "Tembolok komunikasi HTTP di cakram" #~ 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 "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" @@ -3469,6 +3217,9 @@ msgstr "Tembolok komunikasi HTTP di cakram" #~ msgid "%s.%s cannot be accessed" #~ msgstr "%s.%s tak dapat diakses" +#~ msgid "_Enable" +#~ msgstr "_Aktifkan" + #~ msgid "_Disable" #~ msgstr "_Non Aktifkan" diff --git a/po/it.po b/po/it.po index 4a10ef39..9fbdd6d4 100644 --- a/po/it.po +++ b/po/it.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.1.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-16 14:12+0000\n" -"PO-Revision-Date: 2011-12-24 09:51+0100\n" +"POT-Creation-Date: 2011-09-10 04:19+0000\n" +"PO-Revision-Date: 2010-11-05 21:04+0100\n" "Last-Translator: Cristian Marchi \n" "Language-Team: Italian \n" "MIME-Version: 1.0\n" @@ -19,416 +19,295 @@ msgstr "" "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 "Browse the Web" -msgstr "Naviga nel web" +msgid "Lightweight web browser" +msgstr "Browser web leggero" -#: ../data/midori.desktop.in.h:2 -msgid "Internet;WWW;Explorer" -msgstr "Internet;WWW;Explorer" - -#: ../data/midori.desktop.in.h:3 ../midori/main.c:1922 ../midori/main.c:1946 -#: ../midori/main.c:1960 ../midori/midori-websettings.c:200 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1431 ../midori/main.c:2005 +#: ../midori/main.c:2029 ../midori/main.c:2045 +#: ../midori/midori-websettings.c:293 msgid "Midori" msgstr "Midori" -#: ../data/midori.desktop.in.h:4 -msgid "Midori Web Browser" -msgstr "Browser web Midori" - -#: ../data/midori.desktop.in.h:5 -msgid "New Private Browsing Window" -msgstr "Nuova finestra di navigazione privata" - -#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1326 -msgid "New Tab" -msgstr "Nuova scheda" - -#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1323 -msgid "New Window" -msgstr "Nuova finestra" - -#: ../data/midori.desktop.in.h:8 +#: ../data/midori.desktop.in.h:3 msgid "Web Browser" msgstr "Browser web" -#: ../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:4355 -msgid "Private Browsing" -msgstr "Navigazione privata" - -#: ../midori/main.c:91 ../midori/main.c:97 +#: ../midori/main.c:106 ../midori/main.c:112 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Le impostazioni non possono essere caricate: %s\n" -#: ../midori/main.c:145 +#: ../midori/main.c:160 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Il valore «%s» non è valido per %s" -#: ../midori/main.c:150 ../midori/main.c:254 +#: ../midori/main.c:165 ../midori/main.c:258 #, c-format msgid "Invalid configuration value '%s'" msgstr "Valore di configurazione «%s» non valido" -#: ../midori/main.c:365 +#: ../midori/main.c:363 #, 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:419 +#: ../midori/main.c:417 #, c-format msgid "Failed to clear history: %s\n" msgstr "Errore nella cancellazione della cronologia: %s\n" -#: ../midori/main.c:441 ../extensions/formhistory/formhistory.c:531 +#: ../midori/main.c:437 ../midori/main.c:558 ../extensions/formhistory.c:423 #, 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:513 +#: ../midori/main.c:501 #, 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:535 +#: ../midori/main.c:541 ../panels/midori-history.c:193 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "Errore nell'eliminazione dell'elemento della cronologia: %s\n" + +#: ../midori/main.c:588 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "I segnalibri non possono essere salvati. %s" + +#: ../midori/main.c:622 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Le impostazioni non possono essere salvate. %s" -#: ../midori/main.c:561 +#: ../midori/main.c:657 #, 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:598 +#: ../midori/main.c:683 ../midori/main.c:703 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Il cestino non può essere salvato. %s" -#: ../midori/main.c:671 ../panels/midori-extensions.c:90 +#: ../midori/main.c:737 ../panels/midori-extensions.c:93 msgid "Extensions" msgstr "Estensioni" -#: ../midori/main.c:685 +#: ../midori/main.c:751 msgid "Privacy" msgstr "Privacy" -#: ../midori/main.c:687 -msgid "Delete old Cookies after:" -msgstr "Elimina i cookie obsoleti dopo:" - -#: ../midori/main.c:689 ../midori/main.c:692 -msgid "The maximum number of days to save cookies for" -msgstr "Numero massimo di giorni per cui possono essere validi i cookie" - -#: ../midori/main.c:696 -msgid "Only accept Cookies from sites you visit" -msgstr "Accettare i cookie solo dai siti visitati" - -#: ../midori/main.c:697 -msgid "Block cookies sent by third-party websites" -msgstr "Blocca i cookie inviati da siti di terze parti" - -#: ../midori/main.c:702 -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:709 -msgid "Enable offline web application cache" -msgstr "Abilita la cache delle applicazioni web offline" - -#: ../midori/main.c:712 -msgid "Enable HTML5 local storage support" -msgstr "Abilita il supporto allo storage locale HTML5" - -#. i18n: Reworded: Shorten details propagated when going to another page -#: ../midori/main.c:716 -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/main.c:718 -msgid "Whether the \"Referer\" header should be shortened to the hostname" -msgstr "Se il \"referer\" deve essere accorciato al nome host" - -#: ../midori/main.c:721 -msgid "Delete pages from history after:" -msgstr "Elimina le pagine dalla cronologia dopo:" - -#: ../midori/main.c:723 ../midori/main.c:726 -msgid "The maximum number of days to save the history for" -msgstr "Numero massimo di giorni per cui deve essere salvata la cronologia" +#: ../midori/main.c:759 +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:767 +#: ../midori/main.c:823 #, c-format msgid "The session couldn't be saved. %s" msgstr "La sessione non può essere salvata. %s" -#: ../midori/main.c:989 -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:1017 +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:1084 -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:1079 +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:1103 +#: ../midori/main.c:1098 msgid "Modify _preferences" msgstr "Modifica _preferenze" -#: ../midori/main.c:1107 +#: ../midori/main.c:1102 msgid "Disable all _extensions" msgstr "Disabilita tutte le _estensioni" -#: ../midori/main.c:1116 -msgid "Show a dialog after Midori crashed" -msgstr "" -"Abilitare questa opzione per mostrare una finestra nel caso Midori si sia " -"chiuso inaspettatamente" - -#: ../midori/main.c:1121 +#: ../midori/main.c:1115 msgid "Discard old tabs" msgstr "Scarta le schede vecchie" -#: ../midori/main.c:1122 ../midori/midori-websettings.c:108 +#: ../midori/main.c:1116 ../midori/midori-websettings.c:203 msgid "Show last tabs without loading" msgstr "Mostra le ultime schede senza caricarle" -#: ../midori/main.c:1123 ../midori/midori-websettings.c:107 +#: ../midori/main.c:1117 ../midori/midori-websettings.c:202 msgid "Show last open tabs" msgstr "Mostra le ultime schede aperte" -#: ../midori/main.c:1370 ../midori/main.c:2382 +#: ../midori/main.c:1310 ../midori/main.c:2366 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "La sessione non può essere caricata: %s\n" -#: ../midori/main.c:1508 +#: ../midori/main.c:1431 +msgid "No filename specified" +msgstr "Nessun file specificato" + +#: ../midori/main.c:1450 +msgid "An unknown error occured." +msgstr "Si è presentato un errore sconosciuto" + +#: ../midori/main.c:1479 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Istantanea salvata in: %s\n" -#: ../midori/main.c:1837 +#: ../midori/main.c:1889 msgid "Run ADDRESS as a web application" msgstr "Esegue INDIRIZZO come applicazione web" -#: ../midori/main.c:1837 +#: ../midori/main.c:1889 msgid "ADDRESS" msgstr "INDIRIZZO" -#: ../midori/main.c:1840 +#: ../midori/main.c:1892 msgid "Use FOLDER as configuration folder" msgstr "Usa CARTELLA come cartella di configurazione" -#: ../midori/main.c:1840 +#: ../midori/main.c:1892 msgid "FOLDER" msgstr "CARTELLA" -#: ../midori/main.c:1843 +#: ../midori/main.c:1895 msgid "Private browsing, no changes are saved" msgstr "Navigazione privata: non verrà salvata alcuna modifica" -#: ../midori/main.c:1846 -msgid "Portable mode, all runtime files are stored in one place" -msgstr "Modalità portatile: tutti i file della sessione sono salvati in una unica posizione" - -#: ../midori/main.c:1849 -msgid "Plain GTK+ window with WebKit, akin to GtkLauncher" -msgstr "" - -#: ../midori/main.c:1851 +#: ../midori/main.c:1897 msgid "Show a diagnostic dialog" msgstr "Mostra finestra di diagnostica" -#: ../midori/main.c:1853 +#: ../midori/main.c:1899 msgid "Run the specified filename as javascript" msgstr "Esegue il file specificato come javascript" -#: ../midori/main.c:1855 +#: ../midori/main.c:1901 msgid "Take a snapshot of the specified URI" msgstr "Scatta istantanea dell'URL specificato" -#: ../midori/main.c:1857 +#: ../midori/main.c:1903 msgid "Execute the specified command" msgstr "Esegue il comando specificato" -#: ../midori/main.c:1859 +#: ../midori/main.c:1905 msgid "List available commands to execute with -e/ --execute" msgstr "Elenca i comandi disponibili per l'esecuzione con -e/ --execute" -#: ../midori/main.c:1861 +#: ../midori/main.c:1907 msgid "Display program version" msgstr "Visualizza la versione dell'applicazione" -#: ../midori/main.c:1863 +#: ../midori/main.c:1909 msgid "Addresses" msgstr "Indirizzi" -#: ../midori/main.c:1865 +#: ../midori/main.c:1911 msgid "Block URIs according to regular expression PATTERN" msgstr "Blocca le URI secondo l'espressione regolare SCHEMA" -#: ../midori/main.c:1865 +#: ../midori/main.c:1911 msgid "PATTERN" msgstr "SCHEMA" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1869 +#: ../midori/main.c:1915 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "Riavvia Midori dopo SECONDI secondi di inattività" -#: ../midori/main.c:1869 +#: ../midori/main.c:1915 msgid "SECONDS" msgstr "SECONDI" -#: ../midori/main.c:1872 +#: ../midori/main.c:1918 msgid "Redirects console warnings to the specified FILENAME" msgstr "Redirige gli avvisi di console al NOMEFILE specificato" -#: ../midori/main.c:1872 +#: ../midori/main.c:1918 msgid "FILENAME" msgstr "NOMEFILE" +#: ../midori/main.c:2002 +msgid "[Addresses]" +msgstr "[Indirizzi]" + +#: ../midori/main.c:2016 +msgid "The specified configuration folder is invalid." +msgstr "La cartella di configurazione specificata non è valida." + # fp suggerisce "a:", mantengo "su:" per uniformita´ con le trad xfce -#: ../midori/main.c:1961 +#: ../midori/main.c:2046 msgid "Please report comments, suggestions and bugs to:" msgstr "Segnalare commenti, suggerimenti e bug su:" -#: ../midori/main.c:1963 +#: ../midori/main.c:2048 msgid "Check for new versions at:" msgstr "Controlla nuove versioni su:" +#: ../midori/main.c:2115 +msgid "Website icons" +msgstr "Icone dei siti" + #. i18n: Logins and passwords in websites and web forms -#: ../midori/main.c:2102 +#: ../midori/main.c:2118 msgid "Saved logins and _passwords" msgstr "_Password e login salvati" -#: ../midori/main.c:2104 -msgid "Cookies and Website data" -msgstr "Dati dei siti web e cookie" +#: ../midori/main.c:2120 +msgid "Cookies" +msgstr "Cookie" + +#: ../midori/main.c:2123 +msgid "'Flash' Cookies" +msgstr "Cookie \"Flash\"" -#. TODO: Preserve page icons of search engines and merge privacy items -#: ../midori/main.c:2108 ../midori/midori-preferences.c:505 -#: ../extensions/web-cache.c:461 ../extensions/web-cache.c:470 +#: ../midori/main.c:2126 +msgid "HTML5 _Databases" +msgstr "_Database HTML5" + +#: ../midori/main.c:2129 ../midori/midori-websettings.c:887 +#: ../extensions/web-cache.c:470 ../extensions/web-cache.c:479 msgid "Web Cache" msgstr "Cache web" -#: ../midori/main.c:2111 -msgid "Website icons" -msgstr "Icone dei siti" - -#: ../midori/main.c:2215 -msgid "An unknown error occured" -msgstr "Si è verificato un errore sconosciuto" +#: ../midori/main.c:2133 +msgid "Offline Application Cache" +msgstr "Cache dell'applicazioni offline" -#: ../midori/main.c:2330 +#: ../midori/main.c:2297 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:2364 +#: ../midori/main.c:2333 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "I segnalibri non possono essere caricati: %s\n" -#: ../midori/main.c:2397 +#: ../midori/main.c:2381 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Il cestino non può essere caricato: %s\n" -#: ../midori/main.c:2410 +#: ../midori/main.c:2394 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "La cronologia non può essere caricata: %s\n" -#: ../midori/main.c:2425 +#: ../midori/main.c:2410 msgid "The following errors occured:" msgstr "Si sono presentati i seguenti errori:" -#: ../midori/main.c:2441 +#: ../midori/main.c:2426 msgid "_Ignore" msgstr "_Ignora" -#: ../midori/midori-app.c:1156 ../midori/midori-browser.c:534 -#, c-format -msgid "Unexpected action '%s'." -msgstr "Azione \"%s\" inaspettata." - -#: ../midori/midori-app.c:1372 ../midori/midori-browser.c:6251 -msgid "_Bookmarks" -msgstr "Segnali_bri" - -#: ../midori/midori-app.c:1373 -msgid "Add Boo_kmark" -msgstr "Aggiungi se_gnalibro" - -#: ../midori/midori-app.c:1374 -msgid "_Extensions" -msgstr "_Estensioni" - -#. i18n: Browsing history, visited web pages, closed tabs -#: ../midori/midori-app.c:1375 ../midori/midori-browser.c:4700 -msgid "_History" -msgstr "C_ronologia" - -#: ../midori/midori-app.c:1376 -msgid "_Userscripts" -msgstr "Script dell'_utente" - -#: ../midori/midori-app.c:1377 -msgid "User_styles" -msgstr "_Stili dell'utente" - -#: ../midori/midori-app.c:1378 -msgid "New _Tab" -msgstr "Nuova _scheda" - -#: ../midori/midori-app.c:1379 -msgid "_Transfers" -msgstr "_Trasferimenti" - -#: ../midori/midori-app.c:1380 -msgid "Netscape p_lugins" -msgstr "Plugin N_etscape" - -#: ../midori/midori-app.c:1381 -msgid "_Closed Tabs" -msgstr "Schede _chiuse" - -#: ../midori/midori-app.c:1382 ../midori/midori-browser.c:5387 -msgid "New _Window" -msgstr "N_uova finestra" - -#: ../midori/midori-app.c:1383 -msgid "New _Folder" -msgstr "Nuova _cartella" - -#: ../midori/midori-app.c:1437 -msgid "[Addresses]" -msgstr "[Indirizzi]" - #: ../midori/midori-array.c:522 msgid "File not found." msgstr "File non trovato." @@ -442,294 +321,274 @@ msgstr "Documento corrotto." msgid "Unrecognized bookmark format." msgstr "Formato del segnalibro non riconosciuto." -#: ../midori/midori-array.c:915 +#: ../midori/midori-array.c:916 msgid "Writing failed." msgstr "Errore di scrittura." -#: ../midori/midori-browser.c:347 ../midori/midori-browser.c:5526 -msgid "Go forward to the next page" -msgstr "Va alla pagina successiva" - -#. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:354 ../midori/midori-browser.c:5534 -#: ../midori/midori-browser.c:5537 -msgid "Go to the next sub-page" -msgstr "Va alla sottopagina successiva" - -#: ../midori/midori-browser.c:441 ../midori/midori-browser.c:5475 -#: ../midori/midori-browser.c:5484 +#: ../midori/midori-browser.c:329 ../midori/midori-browser.c:5219 +#: ../midori/midori-browser.c:5228 msgid "Reload the current page" msgstr "Ricarica la pagina corrente" -#: ../midori/midori-browser.c:449 ../midori/midori-browser.c:5481 +#: ../midori/midori-browser.c:340 ../midori/midori-browser.c:5225 msgid "Stop loading the current page" msgstr "Interrompe il caricamento della pagina corrente" -#: ../midori/midori-browser.c:519 +#: ../midori/midori-browser.c:467 #, c-format msgid "Failed to update title: %s\n" msgstr "Errore nell'aggiornamento del titolo: %s\n" -#: ../midori/midori-browser.c:614 +#: ../midori/midori-browser.c:480 +#, c-format +msgid "Unexpected action '%s'." +msgstr "Azione \"%s\" inaspettata." + +#: ../midori/midori-browser.c:581 #, c-format msgid "%s (Private Browsing)" msgstr "%s (Navigazione privata)" -#: ../midori/midori-browser.c:724 ../midori/midori-browser.c:766 -#: ../panels/midori-bookmarks.c:114 -msgid "Bookmarks" -msgstr "Segnalibri" - -#: ../midori/midori-browser.c:826 +#: ../midori/midori-browser.c:721 msgid "New folder" msgstr "Nuova cartella" -#: ../midori/midori-browser.c:826 +#: ../midori/midori-browser.c:721 msgid "Edit folder" msgstr "Modifica cartella" -#: ../midori/midori-browser.c:828 +#: ../midori/midori-browser.c:723 msgid "New bookmark" msgstr "Nuovo segnalibro" -#: ../midori/midori-browser.c:828 +#: ../midori/midori-browser.c:723 msgid "Edit bookmark" msgstr "Modifica segnalibro" -#: ../midori/midori-browser.c:862 -msgid "Type a name for this bookmark and choose where to keep it." -msgstr "Inserire un nome per ils egnalibri e selezionare la posizione in cui conservarlo" +#: ../midori/midori-browser.c:754 +msgid "_Title:" +msgstr "_Titolo:" + +#: ../midori/midori-browser.c:774 ../midori/midori-searchaction.c:967 +#: ../extensions/feed-panel/main.c:377 +msgid "_Address:" +msgstr "_Indirizzo:" + +#: ../midori/midori-browser.c:807 ../midori/midori-browser.c:4264 +msgid "_Folder:" +msgstr "_Cartella:" + +#: ../midori/midori-browser.c:817 ../midori/midori-browser.c:905 +#: ../midori/midori-browser.c:4269 ../midori/midori-browser.c:4297 +msgid "Toplevel folder" +msgstr "Livello principale" -#: ../midori/midori-browser.c:923 +#: ../midori/midori-browser.c:848 msgid "Add to _Speed Dial" msgstr "Aggiungi a _selezione veloce" -#: ../midori/midori-browser.c:929 +#: ../midori/midori-browser.c:861 msgid "Show in the tool_bar" msgstr "Mostra nella _barra degli strumenti" -#: ../midori/midori-browser.c:937 +#: ../midori/midori-browser.c:876 msgid "Run as _web application" msgstr "Esegui come applicazione _web" -#: ../midori/midori-browser.c:1055 ../midori/midori-browser.c:4504 +#: ../midori/midori-browser.c:949 +#, 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:951 +#, 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:958 +#, c-format +msgid "There is not enough free space to download \"%s\"." +msgstr "Spazio insufficiente per scaricare \"%s\"." + +#: ../midori/midori-browser.c:961 +#, 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:1003 ../midori/midori-browser.c:4348 msgid "Save file as" msgstr "Salva come" -#: ../midori/midori-browser.c:1065 -msgid "Save associated _resources" -msgstr "" +#: ../midori/midori-browser.c:1322 +msgid "New Window" +msgstr "Nuova finestra" -#: ../midori/midori-browser.c:1323 +#: ../midori/midori-browser.c:1322 msgid "A new window has been opened" msgstr "È stata aperta una nuova finestra" -#: ../midori/midori-browser.c:1326 +#: ../midori/midori-browser.c:1325 +msgid "New Tab" +msgstr "Nuova scheda" + +#: ../midori/midori-browser.c:1325 msgid "A new tab has been opened" msgstr "È stata aperta una nuova scheda" -#: ../midori/midori-browser.c:1343 -msgid "Error opening the image!" -msgstr "Errore di apertura dell'immagine" - -#: ../midori/midori-browser.c:1344 -msgid "Can not open selected image in a default viewer." -msgstr "" -"Impossibile aprire l'immagine selezionata in un visualizzatore predefinito." - -#: ../midori/midori-browser.c:1350 -msgid "Error downloading the image!" -msgstr "Errore di scaricamento dell'immagine" - -#: ../midori/midori-browser.c:1351 -msgid "Can not download selected image." -msgstr "Impossibile scaricare l'immagine selezionata." - -#: ../midori/midori-browser.c:1408 +#: ../midori/midori-browser.c:1362 msgid "Save file" msgstr "Salva file" -#: ../midori/midori-browser.c:2335 +#: ../midori/midori-browser.c:2243 msgid "Open file" msgstr "Apre file" -#: ../midori/midori-browser.c:2467 +#: ../midori/midori-browser.c:2370 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 prossimo clic sull'icona del feed 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:2473 ../extensions/feed-panel/main.c:365 +#: ../midori/midori-browser.c:2376 ../extensions/feed-panel/main.c:365 msgid "New feed" msgstr "Nuovo feed" -#: ../midori/midori-browser.c:2516 ../midori/midori-browser.c:5550 -#: ../panels/midori-bookmarks.c:527 +#: ../midori/midori-browser.c:2419 ../midori/midori-browser.c:5288 +#: ../panels/midori-bookmarks.c:466 msgid "Add a new bookmark" msgstr "Aggiunge un nuovo segnalibro" -#: ../midori/midori-browser.c:3060 ../midori/midori-searchaction.c:487 +#: ../midori/midori-browser.c:2978 ../midori/midori-searchaction.c:488 msgid "Empty" msgstr "Vuoto" -#: ../midori/midori-browser.c:3506 ../midori/midori-browser.c:3507 -msgid "Toggle text cursor navigation" -msgstr "Abilita o disabilita la navigazione a cursore" - -#: ../midori/midori-browser.c:3509 -msgid "" -"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in " -"all websites." -msgstr "" -"Premendo F7 verrà abilitata la navigazione Caret. Quando è attiva, apparirà " -"un cursore di testo in tutti i siti web." - -#: ../midori/midori-browser.c:3512 -msgid "_Enable Caret Browsing" -msgstr "Abilita navigazione ca_ret" - -#: ../midori/midori-browser.c:3904 ../midori/midori-browser.c:5944 +#: ../midori/midori-browser.c:3766 ../midori/midori-browser.c:5698 #, 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:4230 ../panels/midori-bookmarks.c:850 -#: ../panels/midori-history.c:806 +#: ../midori/midori-browser.c:4096 ../panels/midori-bookmarks.c:782 +#: ../panels/midori-history.c:751 msgid "Open all in _Tabs" msgstr "Apri _tutti in nuove schede" -#: ../midori/midori-browser.c:4237 ../panels/midori-bookmarks.c:856 -#: ../panels/midori-history.c:812 ../extensions/feed-panel/feed-panel.c:528 +#: ../midori/midori-browser.c:4103 ../panels/midori-bookmarks.c:788 +#: ../panels/midori-history.c:757 ../extensions/feed-panel/feed-panel.c:533 msgid "Open in New _Tab" msgstr "Apri in una nuova sc_heda" -#: ../midori/midori-browser.c:4240 ../midori/midori-view.c:2952 -#: ../midori/midori-view.c:4928 ../panels/midori-bookmarks.c:858 -#: ../panels/midori-history.c:814 ../extensions/feed-panel/feed-panel.c:530 +#: ../midori/midori-browser.c:4106 ../midori/midori-view.c:2523 +#: ../midori/midori-view.c:4371 ../panels/midori-bookmarks.c:790 +#: ../panels/midori-history.c:759 ../extensions/feed-panel/feed-panel.c:535 msgid "Open in New _Window" msgstr "Apri in una nuova _finestra" -#: ../midori/midori-browser.c:4329 +#: ../midori/midori-browser.c:4186 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4330 +#: ../midori/midori-browser.c:4187 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4331 +#: ../midori/midori-browser.c:4188 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4332 +#: ../midori/midori-browser.c:4189 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4333 +#: ../midori/midori-browser.c:4190 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4334 -#, c-format -msgid "Firefox (%s)" -msgstr "Firefox (%s)" - -#: ../midori/midori-browser.c:4335 -msgid "Midori 0.2.6" -msgstr "Midori 0.2.6" +#: ../midori/midori-browser.c:4215 +msgid "Import bookmarks..." +msgstr "Importa segnalibri..." -#: ../midori/midori-browser.c:4356 -msgid "Import bookmarks…" -msgstr "Importa segnalibri…" - -#: ../midori/midori-browser.c:4359 ../midori/midori-browser.c:5555 +#: ../midori/midori-browser.c:4218 ../midori/midori-browser.c:5293 msgid "_Import bookmarks" msgstr "_Importa segnalibri" -#: ../midori/midori-browser.c:4370 +#: ../midori/midori-browser.c:4229 msgid "_Application:" msgstr "_Applicazione:" -#: ../midori/midori-browser.c:4435 +#: ../midori/midori-browser.c:4256 msgid "Import from XBEL or HTML file" msgstr "Importa da un file XBEL o HTML" -#: ../midori/midori-browser.c:4463 +#: ../midori/midori-browser.c:4305 msgid "Import from a file" msgstr "Importa da un file" -#: ../midori/midori-browser.c:4475 +#: ../midori/midori-browser.c:4317 msgid "Failed to import bookmarks" msgstr "Impossibile importare i segnalibri" -#: ../midori/midori-browser.c:4509 +#: ../midori/midori-browser.c:4353 msgid "XBEL Bookmarks" msgstr "Segnalibri XBEL" -#: ../midori/midori-browser.c:4514 +#: ../midori/midori-browser.c:4358 msgid "Netscape Bookmarks" msgstr "Segnalibri Netscape" -#: ../midori/midori-browser.c:4528 +#: ../midori/midori-browser.c:4372 msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)" -msgstr "" -"Midori può esportare solamente in formato XBEL (*.xbel) e Netscape (*.html)" +msgstr "Midori può esportare solamente in formato XBEL (*.xbel) e Netscape (*.html)" -#: ../midori/midori-browser.c:4543 +#: ../midori/midori-browser.c:4388 msgid "Failed to export bookmarks" msgstr "Impossibile esportare i segnalibri" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4665 +#: ../midori/midori-browser.c:4514 msgid "Clear Private Data" msgstr "Pulizia dati personali" -#: ../midori/midori-browser.c:4669 +#: ../midori/midori-browser.c:4518 msgid "_Clear private data" msgstr "_Pulizia dati personali" -#: ../midori/midori-browser.c:4684 +#: ../midori/midori-browser.c:4531 msgid "Clear the following data:" msgstr "Rimuovi i seguenti dati:" -#: ../midori/midori-browser.c:4694 +#: ../midori/midori-browser.c:4541 msgid "Last open _tabs" msgstr "Ultime sc_hede aperte" +#. i18n: Browsing history, visited web pages +#: ../midori/midori-browser.c:4547 ../midori/sokoke.c:1520 +msgid "_History" +msgstr "C_ronologia" + +#: ../midori/midori-browser.c:4552 ../midori/sokoke.c:1526 +msgid "_Closed Tabs" +msgstr "Schede _chiuse" + # cri.penta version -#: ../midori/midori-browser.c:4720 +#: ../midori/midori-browser.c:4572 msgid "Clear private data when _quitting Midori" msgstr "Cancella i dati personali _quando Midori viene chiuso" -#: ../midori/midori-browser.c:4935 +#: ../midori/midori-browser.c:4746 msgid "A lightweight web browser." msgstr "Un browser web leggero" -#: ../midori/midori-browser.c:4936 +#: ../midori/midori-browser.c:4747 msgid "See about:version for version info." msgstr "Consultare about:info per le informazioni di versione." -#: ../midori/midori-browser.c:4938 -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:4749 +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:4968 +#: ../midori/midori-browser.c:4768 msgid "translator-credits" msgstr "" "Sergio Durzu \n" @@ -738,1361 +597,1694 @@ msgstr "" "Gianluca Foddis \n" "Cristian Marchi , 2010" -#: ../midori/midori-browser.c:5385 +#: ../midori/midori-browser.c:5132 msgid "_File" msgstr "_File" -#: ../midori/midori-browser.c:5388 +#: ../midori/midori-browser.c:5134 ../midori/sokoke.c:1527 +msgid "New _Window" +msgstr "N_uova finestra" + +#: ../midori/midori-browser.c:5135 msgid "Open a new window" msgstr "Apre una nuova finestra" -#: ../midori/midori-browser.c:5391 +#: ../midori/midori-browser.c:5138 msgid "Open a new tab" msgstr "Apre una nuova scheda" -#: ../midori/midori-browser.c:5393 +#: ../midori/midori-browser.c:5140 msgid "New P_rivate Browsing Window" msgstr "Nuova _finestra di navigazione privata" -#: ../midori/midori-browser.c:5397 +#: ../midori/midori-browser.c:5141 +msgid "Don't save any private data while browsing" +msgstr "Non memorizza i dati personali durante la navigazione" + +#: ../midori/midori-browser.c:5145 msgid "Open a file" msgstr "Apre un file" -#: ../midori/midori-browser.c:5399 -msgid "_Save Page As…" -msgstr "Sa_lva pagina come…" +#: ../midori/midori-browser.c:5147 +msgid "_Save Page As..." +msgstr "Sa_lva pagina come..." -#: ../midori/midori-browser.c:5400 +#: ../midori/midori-browser.c:5148 msgid "Save to a file" msgstr "Salva in un file" -#: ../midori/midori-browser.c:5402 +#: ../midori/midori-browser.c:5150 msgid "Add to Speed _dial" msgstr "Aggiungi a selezione _veloce" -#: ../midori/midori-browser.c:5406 +#: ../midori/midori-browser.c:5151 +msgid "Add shortcut to speed dial" +msgstr "Aggiungi collegamento a selezione veloce" + +#: ../midori/midori-browser.c:5154 msgid "Add Shortcut to the _desktop" msgstr "Aggiungi collegamento sulla _scrivania" -#: ../midori/midori-browser.c:5408 +#: ../midori/midori-browser.c:5155 +msgid "Add shortcut to the desktop" +msgstr "Aggiunge collegamento sulla scrivania" + +#: ../midori/midori-browser.c:5157 msgid "Create _Launcher" msgstr "Crea avvia_tore" -#: ../midori/midori-browser.c:5412 +#: ../midori/midori-browser.c:5158 +msgid "Create a launcher" +msgstr "Crea un avviatore" + +#: ../midori/midori-browser.c:5161 msgid "Subscribe to News _feed" msgstr "Abbonati al _feed di notizie" -#: ../midori/midori-browser.c:5418 +#: ../midori/midori-browser.c:5162 +msgid "Subscribe to this news feed" +msgstr "Sottoscrivi questo feed di notizie" + +#: ../midori/midori-browser.c:5167 msgid "_Close Tab" msgstr "_Chiudi scheda" -#: ../midori/midori-browser.c:5419 +#: ../midori/midori-browser.c:5168 msgid "Close the current tab" msgstr "Chiude la scheda corrente" -#: ../midori/midori-browser.c:5421 +#: ../midori/midori-browser.c:5170 msgid "C_lose Window" msgstr "C_hiudi finestra" -#: ../midori/midori-browser.c:5425 -msgid "_Share" -msgstr "" +#: ../midori/midori-browser.c:5171 +msgid "Close this window" +msgstr "Chiude la finestra" -#: ../midori/midori-browser.c:5430 +#: ../midori/midori-browser.c:5174 msgid "Print the current page" msgstr "Stampa la pagina corrente" -#: ../midori/midori-browser.c:5433 +#: ../midori/midori-browser.c:5176 msgid "Close a_ll Windows" msgstr "Chiudi _tutte le finestre" -#: ../midori/midori-browser.c:5436 +#: ../midori/midori-browser.c:5177 +msgid "Close all open windows" +msgstr "Chiude tutte le finestre aperte" + +#: ../midori/midori-browser.c:5179 msgid "_Edit" msgstr "Mo_difica" -#: ../midori/midori-browser.c:5459 -msgid "_Find…" -msgstr "_Cerca…" +#: ../midori/midori-browser.c:5182 +msgid "Undo the last modification" +msgstr "Annulla l'ultima modifica" -#: ../midori/midori-browser.c:5460 +#: ../midori/midori-browser.c:5185 +msgid "Redo the last modification" +msgstr "Riesegui l'ultima modifica" + +#: ../midori/midori-browser.c:5188 +msgid "Cut the selected text" +msgstr "Taglia il testo selezionato" + +#: ../midori/midori-browser.c:5191 +msgid "Copy the selected text" +msgstr "Copia il testo selezionato" + +#: ../midori/midori-browser.c:5194 +msgid "Paste text from the clipboard" +msgstr "Incolla il testo dagli appunti" + +#: ../midori/midori-browser.c:5197 +msgid "Delete the selected text" +msgstr "Elimina il testo selezionato" + +#: ../midori/midori-browser.c:5200 +msgid "Select all text" +msgstr "Seleziona tutto" + +#: ../midori/midori-browser.c:5202 +msgid "_Find..." +msgstr "_Cerca..." + +#: ../midori/midori-browser.c:5203 msgid "Find a word or phrase in the page" msgstr "Cerca una parola o una frase nella pagina" -#: ../midori/midori-browser.c:5462 +#: ../midori/midori-browser.c:5205 msgid "Find _Next" msgstr "Trova s_uccessivo" -#: ../midori/midori-browser.c:5465 +#: ../midori/midori-browser.c:5206 +msgid "Find the next occurrence of a word or phrase" +msgstr "Trova la parola o frase successiva" + +#: ../midori/midori-browser.c:5208 msgid "Find _Previous" msgstr "Trova _precedente" -#: ../midori/midori-browser.c:5469 +#: ../midori/midori-browser.c:5209 +msgid "Find the previous occurrence of a word or phrase" +msgstr "Trova la parola o frase precedente" + +#: ../midori/midori-browser.c:5213 msgid "Configure the application preferences" msgstr "Imposta le preferenze dell'applicazione" -#: ../midori/midori-browser.c:5471 +#: ../midori/midori-browser.c:5215 msgid "_View" msgstr "_Visualizza" -#: ../midori/midori-browser.c:5472 +#: ../midori/midori-browser.c:5216 msgid "_Toolbars" msgstr "Barre degli _strumenti" -#: ../midori/midori-browser.c:5477 +#: ../midori/midori-browser.c:5221 ../midori/midori-browser.c:5222 msgid "Reload page without caching" msgstr "Ricarica la pagina senza effettuare il caching" -#: ../midori/midori-browser.c:5487 +#: ../midori/midori-browser.c:5231 msgid "Increase the zoom level" msgstr "Aumenta il livello di ingrandimento" -#: ../midori/midori-browser.c:5490 +#: ../midori/midori-browser.c:5234 msgid "Decrease the zoom level" msgstr "Diminuisce il livello di ingrandimento" -#: ../midori/midori-browser.c:5494 +#: ../midori/midori-browser.c:5237 +msgid "Reset the zoom level" +msgstr "Azzera il livello di ingrandimento" + +#: ../midori/midori-browser.c:5238 msgid "_Encoding" msgstr "_Codifica" -#: ../midori/midori-browser.c:5496 +#: ../midori/midori-browser.c:5240 msgid "View So_urce" msgstr "Visualizza s_orgente" -#: ../midori/midori-browser.c:5499 +#: ../midori/midori-browser.c:5241 +msgid "View the source code of the page" +msgstr "Visualizza il codice sorgente della pagina" + +#: ../midori/midori-browser.c:5243 msgid "Ca_ret Browsing" msgstr "Navigazione ca_ret" -#: ../midori/midori-browser.c:5503 +#: ../midori/midori-browser.c:5244 +msgid "Toggle text cursor navigation" +msgstr "Abilita o disabilita la navigazione a cursore" + +#: ../midori/midori-browser.c:5247 msgid "Toggle fullscreen view" msgstr "Schermo intero" -#: ../midori/midori-browser.c:5505 +#: ../midori/midori-browser.c:5249 msgid "Scroll _Left" msgstr "Scorri a _sinistra" -#: ../midori/midori-browser.c:5508 +#: ../midori/midori-browser.c:5250 +msgid "Scroll to the left" +msgstr "Scorre verso sinistra" + +#: ../midori/midori-browser.c:5252 msgid "Scroll _Down" msgstr "Scorri in _basso" -#: ../midori/midori-browser.c:5511 +#: ../midori/midori-browser.c:5253 +msgid "Scroll down" +msgstr "Scorre in basso" + +#: ../midori/midori-browser.c:5255 msgid "Scroll _Up" msgstr "Scorri in _alto" -#: ../midori/midori-browser.c:5514 +#: ../midori/midori-browser.c:5256 +msgid "Scroll up" +msgstr "Scorre in alto" + +#: ../midori/midori-browser.c:5258 msgid "Scroll _Right" msgstr "Scorri a _destra" -#: ../midori/midori-browser.c:5517 -#, fuzzy -msgid "_Readable" -msgstr "_Abilita" +#: ../midori/midori-browser.c:5259 +msgid "Scroll to the right" +msgstr "Scorre verso destra" -#: ../midori/midori-browser.c:5520 +#: ../midori/midori-browser.c:5261 msgid "_Go" msgstr "V_ai" -#: ../midori/midori-browser.c:5523 +#: ../midori/midori-browser.c:5264 msgid "Go back to the previous page" msgstr "Va alla pagina precedente" +#: ../midori/midori-browser.c:5267 +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:5530 +#: ../midori/midori-browser.c:5271 msgid "Go to the previous sub-page" -msgstr "Va alla sottopagina precedente" +msgstr "Va alla pagina precedente" -#: ../midori/midori-browser.c:5539 -msgid "_Homepage" -msgstr "_Pagina iniziale" +#. i18n: Visit the following logical page, ie. in a forum or blog +#: ../midori/midori-browser.c:5275 +msgid "Go to the next sub-page" +msgstr "Va alla sottopagina successiva" -#: ../midori/midori-browser.c:5540 +#: ../midori/midori-browser.c:5278 msgid "Go to your homepage" msgstr "Va alla pagina iniziale" -#: ../midori/midori-browser.c:5542 +#: ../midori/midori-browser.c:5280 msgid "Empty Trash" msgstr "Svuota cestino" -#: ../midori/midori-browser.c:5545 +#: ../midori/midori-browser.c:5281 +msgid "Delete the contents of the trash" +msgstr "Elimina il contenuto del cestino" + +#: ../midori/midori-browser.c:5283 msgid "Undo _Close Tab" msgstr "Annulla chi_usura scheda" -#: ../midori/midori-browser.c:5552 +#: ../midori/midori-browser.c:5284 +msgid "Open the last closed tab" +msgstr "Apre l'ultima scheda chiusa" + +#: ../midori/midori-browser.c:5290 msgid "Add a new _folder" msgstr "Aggiungi una nuova _cartella" -#: ../midori/midori-browser.c:5558 +#: ../midori/midori-browser.c:5291 +msgid "Add a new bookmark folder" +msgstr "Aggiunge un nuova cartella di preferiti" + +#: ../midori/midori-browser.c:5296 msgid "_Export bookmarks" msgstr "Esp_orta segnalibri" -#: ../midori/midori-browser.c:5561 ../midori/midori-searchaction.c:496 +#: ../midori/midori-browser.c:5299 ../midori/midori-searchaction.c:497 msgid "_Manage Search Engines" msgstr "Gestione _motori di ricerca" -#: ../midori/midori-browser.c:5564 +#: ../midori/midori-browser.c:5300 +msgid "Add, edit and remove search engines..." +msgstr "Aggiunge, modifica e elimina motori di ricerca..." + +#: ../midori/midori-browser.c:5303 msgid "_Clear Private Data" msgstr "_Rimuovi dati privati" -#: ../midori/midori-browser.c:5567 +#: ../midori/midori-browser.c:5304 +msgid "Clear private data..." +msgstr "Rimozione dati privati..." + +#: ../midori/midori-browser.c:5307 msgid "_Inspect Page" msgstr "Ispeziona pa_gina" -#: ../midori/midori-browser.c:5571 +#: ../midori/midori-browser.c:5308 +msgid "Inspect page details and access developer tools..." +msgstr "Vedi i dettagli della pagina ed accedi agli strumenti per sviluppatori..." + +#: ../midori/midori-browser.c:5312 msgid "_Previous Tab" msgstr "Scheda _precedente" -#: ../midori/midori-browser.c:5574 +#: ../midori/midori-browser.c:5313 +msgid "Switch to the previous tab" +msgstr "Passa alla scheda precedente" + +#: ../midori/midori-browser.c:5315 msgid "_Next Tab" msgstr "Scheda _successiva" -#: ../midori/midori-browser.c:5576 +#: ../midori/midori-browser.c:5316 +msgid "Switch to the next tab" +msgstr "Passa alla scheda successiva" + +#: ../midori/midori-browser.c:5317 msgid "Move Tab _Backward" msgstr "Sposta scheda in_dietro" -#: ../midori/midori-browser.c:5578 +#: ../midori/midori-browser.c:5318 +msgid "Move tab behind the previous tab" +msgstr "Sposta la scheda dietro a di quella precedente" + +#: ../midori/midori-browser.c:5319 msgid "_Move Tab Forward" msgstr "Sposta scheda da_vanti" +#: ../midori/midori-browser.c:5320 +msgid "Move tab in front of the next tab" +msgstr "Sposta la scheda davanti a quella successiva" + # comando per selezionare la scheda corrente -#: ../midori/midori-browser.c:5581 +#: ../midori/midori-browser.c:5322 msgid "Focus _Current Tab" msgstr "Scheda _corrente" -#: ../midori/midori-browser.c:5584 +#: ../midori/midori-browser.c:5323 +msgid "Focus the current tab" +msgstr "Posiziona il fuoco sulla scheda corrente" + +#: ../midori/midori-browser.c:5325 msgid "Focus _Next view" msgstr "Metti a fuoco la vista _successiva" -#: ../midori/midori-browser.c:5587 +#: ../midori/midori-browser.c:5326 +msgid "Cycle focus between views" +msgstr "Scorre il fuoco tra le viste" + +#: ../midori/midori-browser.c:5328 msgid "Only show the Icon of the _Current Tab" msgstr "Mostra solo l'icona della scheda corren_te" -#: ../midori/midori-browser.c:5590 +#: ../midori/midori-browser.c:5329 +msgid "Only show the icon of the current tab" +msgstr "Mostra solo l'icona della scheda corrente" + +#: ../midori/midori-browser.c:5331 msgid "_Duplicate Current Tab" msgstr "_Duplica la scheda corrente" +#: ../midori/midori-browser.c:5332 +msgid "Duplicate the current tab" +msgstr "Duplica la scheda corrente" + # acceleratore sulla h per evitare conflitti -#: ../midori/midori-browser.c:5593 +#: ../midori/midori-browser.c:5334 msgid "Close Ot_her Tabs" msgstr "Chiudi le altre sc_hede" -#: ../midori/midori-browser.c:5596 +#: ../midori/midori-browser.c:5335 +msgid "Close all tabs except the current tab" +msgstr "Chiude tutte le schede eccetto la corrente" + +#: ../midori/midori-browser.c:5337 msgid "Open last _session" msgstr "Apri ultima s_essione" -#: ../midori/midori-browser.c:5599 +#: ../midori/midori-browser.c:5338 +msgid "Open the tabs saved in the last session" +msgstr "Apre le schede salvate nell'ultima sessione" + +#: ../midori/midori-browser.c:5340 msgid "_Help" msgstr "A_iuto" -#: ../midori/midori-browser.c:5601 +#: ../midori/midori-browser.c:5342 msgid "_Frequent Questions" msgstr "Domande fre_quenti" -#: ../midori/midori-browser.c:5604 -msgid "_Report a Problem…" -msgstr "Segnala un _problema…" +#: ../midori/midori-browser.c:5343 +msgid "Show the Frequently Asked Questions" +msgstr "Mostra le domande e risposte frequenti (F.A.Q.)" -#: ../midori/midori-browser.c:5609 ../midori/midori-browser.c:6270 -msgid "_Tools" -msgstr "_Strumenti" +#: ../midori/midori-browser.c:5345 +msgid "_Report a Problem..." +msgstr "Segnala un _problema..." -#: ../midori/midori-browser.c:5616 +#: ../midori/midori-browser.c:5346 +msgid "Open Midori's bug tracker" +msgstr "Apre lo strumento di segnalazione bug di Midori" + +#: ../midori/midori-browser.c:5349 +msgid "Show information about the program" +msgstr "Mostra le informazioni sull'applicazione" + +#: ../midori/midori-browser.c:5357 msgid "_Menubar" msgstr "Barra dei _menu" -#: ../midori/midori-browser.c:5620 +#: ../midori/midori-browser.c:5358 +msgid "Show menubar" +msgstr "Mostra la barra dei menu" + +#: ../midori/midori-browser.c:5361 msgid "_Navigationbar" msgstr "Barra di _navigazione" -#: ../midori/midori-browser.c:5624 +#: ../midori/midori-browser.c:5362 +msgid "Show navigationbar" +msgstr "Mostra la barra di navigazione" + +#: ../midori/midori-browser.c:5365 msgid "Side_panel" msgstr "Pannello _laterale" -#: ../midori/midori-browser.c:5625 -msgid "Sidepanel" -msgstr "Pannello laterale" +#: ../midori/midori-browser.c:5366 +msgid "Show sidepanel" +msgstr "Mostra il pannello laterale" -#: ../midori/midori-browser.c:5628 +#: ../midori/midori-browser.c:5369 msgid "_Bookmarkbar" msgstr "Barra dei s_egnalibri" -#: ../midori/midori-browser.c:5632 +#: ../midori/midori-browser.c:5370 +msgid "Show bookmarkbar" +msgstr "Mostra la barra dei segnalibri" + +#: ../midori/midori-browser.c:5373 msgid "_Statusbar" msgstr "Barra di stat_o" -#: ../midori/midori-browser.c:5641 ../midori/midori-websettings.c:199 +#: ../midori/midori-browser.c:5374 +msgid "Show statusbar" +msgstr "Mostra la barra di stato" + +#: ../midori/midori-browser.c:5382 msgid "_Automatic" msgstr "_Automatico" -#: ../midori/midori-browser.c:5644 ../midori/midori-websettings.c:123 -msgid "Chinese Traditional (BIG5)" -msgstr "Cinese tradizionale (BIG5)" - -#: ../midori/midori-browser.c:5647 ../midori/midori-websettings.c:124 -msgid "Chinese Simplified (GB18030)" -msgstr "Cinese semplificato (GB18030)" +#: ../midori/midori-browser.c:5385 ../midori/midori-websettings.c:218 +msgid "Chinese (BIG5)" +msgstr "Cinese (BIGS)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5651 +#: ../midori/midori-browser.c:5389 msgid "Japanese (SHIFT__JIS)" msgstr "Giapponese (SHIFT__JIS)" -#: ../midori/midori-browser.c:5654 ../midori/midori-websettings.c:126 +#: ../midori/midori-browser.c:5392 ../midori/midori-websettings.c:220 msgid "Korean (EUC-KR)" msgstr "Coreano (EUC-KR)" -#: ../midori/midori-browser.c:5657 ../midori/midori-websettings.c:127 +#: ../midori/midori-browser.c:5395 ../midori/midori-websettings.c:221 msgid "Russian (KOI8-R)" msgstr "Russo (KOI8-R)" -#: ../midori/midori-browser.c:5660 ../midori/midori-websettings.c:128 +#: ../midori/midori-browser.c:5398 ../midori/midori-websettings.c:222 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5663 ../midori/midori-websettings.c:129 +#: ../midori/midori-browser.c:5401 ../midori/midori-websettings.c:223 msgid "Western (ISO-8859-1)" msgstr "Occidentale (ISO-8859-1)" -#: ../midori/midori-browser.c:5666 -msgid "Custom…" -msgstr "Personalizzato…" +#: ../midori/midori-browser.c:5404 ../midori/midori-websettings.c:224 +#: ../midori/midori-websettings.c:298 ../katze/katze-utils.c:732 +msgid "Custom..." +msgstr "Personalizzato..." -#: ../midori/midori-browser.c:6176 +#: ../midori/midori-browser.c:5934 msgid "_Separator" msgstr "_Separatore" -#: ../midori/midori-browser.c:6183 -msgid "_Location…" -msgstr "I_ndirizzo…" +#: ../midori/midori-browser.c:5941 +msgid "_Location..." +msgstr "I_ndirizzo..." -#: ../midori/midori-browser.c:6185 +#: ../midori/midori-browser.c:5943 msgid "Open a particular location" msgstr "Apre un indirizzo specifico" -#: ../midori/midori-browser.c:6207 -msgid "_Web Search…" -msgstr "Ricerca sul _web…" +#: ../midori/midori-browser.c:5965 +msgid "_Web Search..." +msgstr "Ricerca sul _web..." -#: ../midori/midori-browser.c:6209 +#: ../midori/midori-browser.c:5967 msgid "Run a web search" msgstr "Esegue una ricerca sul web" -#: ../midori/midori-browser.c:6236 +#: ../midori/midori-browser.c:5988 msgid "Reopen a previously closed tab or window" msgstr "Riapre una scheda o una finestra chiusa precedentemente" -#: ../midori/midori-browser.c:6253 +#: ../midori/midori-browser.c:6001 ../midori/sokoke.c:1516 +msgid "_Bookmarks" +msgstr "Segnali_bri" + +#: ../midori/midori-browser.c:6003 msgid "Show the saved bookmarks" msgstr "Mostra i segnalibri salvati" -#: ../midori/midori-browser.c:6286 +#: ../midori/midori-browser.c:6017 +msgid "_Tools" +msgstr "_Strumenti" + +#: ../midori/midori-browser.c:6032 msgid "_Window" msgstr "Fi_nestra" -#: ../midori/midori-browser.c:6288 +#: ../midori/midori-browser.c:6034 msgid "Show a list of all open tabs" msgstr "Mostra un elenco delle schede aperte" -#: ../midori/midori-browser.c:6302 +#: ../midori/midori-browser.c:6048 msgid "_Menu" msgstr "_Menu" -#: ../midori/midori-browser.c:6304 +#: ../midori/midori-browser.c:6050 msgid "Menu" msgstr "Menu" -#: ../midori/midori-browser.c:7134 +#: ../midori/midori-browser.c:6602 #, c-format msgid "Unexpected setting '%s'" msgstr "Impostazione \"%s\" non prevista" -#: ../midori/midori-extension.c:330 +#: ../midori/midori-extension.c:305 #, c-format 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-extension.c:752 ../midori/midori-extension.c:849 -#: ../midori/midori-extension.c:946 ../midori/midori-extension.c:1058 -#: ../extensions/addons.c:1686 +#: ../midori/midori-extension.c:703 ../midori/midori-extension.c:800 +#: ../midori/midori-extension.c:897 ../midori/midori-extension.c:1009 +#: ../extensions/addons.c:1640 #, c-format 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:398 -#, c-format -msgid "Search with %s" -msgstr "Cerca con %s" - -#: ../midori/midori-locationaction.c:418 -msgid "Search with…" -msgstr "Cerca con…" - -#: ../midori/midori-locationaction.c:545 +#: ../midori/midori-locationaction.c:400 #, c-format msgid "Failed to select from history\n" msgstr "Impossibile selezionare dalla cronologia\n" -#: ../midori/midori-locationaction.c:632 +#: ../midori/midori-locationaction.c:484 #, c-format msgid "Search for %s" msgstr "Cerca %s" -#: ../midori/midori-locationaction.c:1227 -msgid "Export certificate" -msgstr "Esporta il certificato" - -#: ../midori/midori-locationaction.c:1259 -msgid "The signing certificate authority is not known." -msgstr "" - -#: ../midori/midori-locationaction.c:1261 -msgid "" -"The certificate does not match the expected identity of the site that it was " -"retrieved from." -msgstr "Il certificato non corrisponde all'identità del sito da cui è stato ottenuto." - -#: ../midori/midori-locationaction.c:1263 -msgid "The certificate's activation time is still in the future." -msgstr "" - -#: ../midori/midori-locationaction.c:1265 -msgid "The certificate has expired" -msgstr "Il certificato è scaduto" - -#: ../midori/midori-locationaction.c:1267 -msgid "" -"The certificate has been revoked according to the GTlsConnection's " -"certificate revocation list." -msgstr "" - -#: ../midori/midori-locationaction.c:1269 -msgid "The certificate's algorithm is considered insecure." -msgstr "L'algoritmo del certificato è considerato insicuro." - -#: ../midori/midori-locationaction.c:1271 -msgid "Some other error occurred validating the certificate." -msgstr "Si è verificato un errore durante la validazione del certificato." - -#: ../midori/midori-locationaction.c:1318 -msgid "_Export certificate" -msgstr "_Esporta certificato" - -#: ../midori/midori-locationaction.c:1333 -msgid "Self-signed" -msgstr "" - -#: ../midori/midori-locationaction.c:1367 -msgid "Security details" -msgstr "Dettagli di sicurezza" +#: ../midori/midori-locationaction.c:510 +#, c-format +msgid "Search with %s" +msgstr "Cerca con %s" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1650 +#: ../midori/midori-locationaction.c:1258 msgid "Paste and p_roceed" msgstr "Incolla e p_rocedi" -#: ../midori/midori-locationaction.c:1974 +#: ../midori/midori-locationaction.c:1653 msgid "Not verified" msgstr "Non verificata" -#: ../midori/midori-locationaction.c:1982 +#: ../midori/midori-locationaction.c:1668 msgid "Verified and encrypted connection" msgstr "Connessione verificata e cifrata" -#: ../midori/midori-locationaction.c:1989 -msgid "Open, unencrypted connection" -msgstr "Connessione aperta, non cifrata" - -#: ../midori/midori-panel.c:317 ../midori/midori-panel.c:319 -#: ../midori/midori-panel.c:483 ../midori/midori-panel.c:486 +#: ../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:329 ../midori/midori-panel.c:330 +#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410 msgid "Close panel" msgstr "Chiude il pannello" -#: ../midori/midori-panel.c:484 ../midori/midori-panel.c:487 +#: ../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-websettings.c:105 +#: ../midori/midori-websettings.c:200 msgid "Show Speed Dial" msgstr "Mostra selezione veloce" -#: ../midori/midori-websettings.c:106 +#: ../midori/midori-websettings.c:201 msgid "Show Homepage" msgstr "Mostra la pagina iniziale" -#: ../midori/midori-websettings.c:125 +#: ../midori/midori-websettings.c:219 msgid "Japanese (SHIFT_JIS)" msgstr "Giapponese (SHIFT_JIS)" -#: ../midori/midori-websettings.c:130 ../midori/midori-websettings.c:206 -#: ../katze/katze-utils.c:633 -#, fuzzy -msgid "Custom..." -msgstr "Personalizzato…" - -#: ../midori/midori-websettings.c:145 +#: ../midori/midori-websettings.c:239 msgid "New tab" msgstr "Nuova scheda" -#: ../midori/midori-websettings.c:146 +#: ../midori/midori-websettings.c:240 msgid "New window" msgstr "Nuova finestra" -#: ../midori/midori-websettings.c:147 +#: ../midori/midori-websettings.c:241 msgid "Current tab" msgstr "Scheda corrente" -#: ../midori/midori-websettings.c:162 +#: ../midori/midori-websettings.c:256 msgid "Default" msgstr "Predefinito" -#: ../midori/midori-websettings.c:163 +#: ../midori/midori-websettings.c:257 msgid "Icons" msgstr "Icone" -#: ../midori/midori-websettings.c:164 +#: ../midori/midori-websettings.c:258 msgid "Small icons" msgstr "Icone piccole" -#: ../midori/midori-websettings.c:165 +#: ../midori/midori-websettings.c:259 msgid "Text" msgstr "Testo" -#: ../midori/midori-websettings.c:166 +#: ../midori/midori-websettings.c:260 msgid "Icons and text" msgstr "Icone e testo" -#: ../midori/midori-websettings.c:167 +#: ../midori/midori-websettings.c:261 msgid "Text beside icons" msgstr "Testo accanto alle icone" -#: ../midori/midori-websettings.c:182 +#: ../midori/midori-websettings.c:276 msgid "Automatic (GNOME or environment)" msgstr "Automatico (GNOME o ambiente)" -#: ../midori/midori-websettings.c:183 +#: ../midori/midori-websettings.c:277 msgid "HTTP proxy server" msgstr "Server proxy HTTP" -#: ../midori/midori-websettings.c:184 +#: ../midori/midori-websettings.c:278 msgid "No proxy server" msgstr "Nessun proxy" -#: ../midori/midori-websettings.c:201 -#, fuzzy -msgid "Chrome" -msgstr "Chrome" - -#: ../midori/midori-websettings.c:202 +#: ../midori/midori-websettings.c:294 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:203 +#: ../midori/midori-websettings.c:295 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:296 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:297 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:278 +#: ../midori/midori-websettings.c:350 +msgid "Remember last window size" +msgstr "Ricorda la dimensione dell'ultima finestra" + +#: ../midori/midori-websettings.c:351 +msgid "Whether to save the last window size" +msgstr "Abilitare questa opzione per salvare le dimensioni dell'ultima finestra" + +#: ../midori/midori-websettings.c:359 +msgid "Last window width" +msgstr "Larghezza dell'ultima finestra" + +#: ../midori/midori-websettings.c:360 +msgid "The last saved window width" +msgstr "L'ultima larghezza salvata per la finestra" + +#: ../midori/midori-websettings.c:368 +msgid "Last window height" +msgstr "Altezza dell'ultima finestra" + +#: ../midori/midori-websettings.c:369 +msgid "The last saved window height" +msgstr "L'ultima altezza salvata per la finestra" + +#: ../midori/midori-websettings.c:394 +msgid "Last panel position" +msgstr "Posizione del pannello" + +#: ../midori/midori-websettings.c:395 +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:404 +msgid "Last panel page" +msgstr "Pagina dell'ultimo pannello" + +#: ../midori/midori-websettings.c:405 +msgid "The last saved panel page" +msgstr "L'ultima pagina salvata per il pannello" + +#: ../midori/midori-websettings.c:413 +msgid "Last Web search" +msgstr "Ultima ricerca web" + +#: ../midori/midori-websettings.c:414 +msgid "The last saved Web search" +msgstr "L'ultima ricerca web salvata" + +#: ../midori/midori-websettings.c:423 +msgid "Show Menubar" +msgstr "Mostra barra dei menu" + +#: ../midori/midori-websettings.c:424 +msgid "Whether to show the menubar" +msgstr "Abilitare questa opzione per mostrare la barra dei menu" + +#: ../midori/midori-websettings.c:432 +msgid "Show Navigationbar" +msgstr "Mostra barra di navigazione" + +#: ../midori/midori-websettings.c:433 +msgid "Whether to show the navigationbar" +msgstr "Abilitare questa opzione per mostrare la barra di navigazione" + +#: ../midori/midori-websettings.c:441 +msgid "Show Bookmarkbar" +msgstr "Mostra barra dei segnalibri" + +#: ../midori/midori-websettings.c:442 +msgid "Whether to show the bookmarkbar" +msgstr "Abilitare questa opzione per mostrare la barra dei segnalibri" + +#: ../midori/midori-websettings.c:450 +msgid "Show Panel" +msgstr "Mostra pannello" + +#: ../midori/midori-websettings.c:451 +msgid "Whether to show the panel" +msgstr "Abilitare questa opzione per mostrare il pannello" + +#: ../midori/midori-websettings.c:459 +msgid "Show Statusbar" +msgstr "Mostra barra di stato" + +#: ../midori/midori-websettings.c:460 +msgid "Whether to show the statusbar" +msgstr "Abilitare questa opzione per mostrare la barra di stato" + +#: ../midori/midori-websettings.c:469 msgid "Toolbar Style:" msgstr "Stile della barra degli strumenti:" -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-websettings.c:470 msgid "The style of the toolbar" msgstr "Scegliere lo stile della barra degli strumenti" -#: ../midori/midori-websettings.c:288 +#: ../midori/midori-websettings.c:479 +msgid "Toolbar Items" +msgstr "Elementi barra degli strumenti" + +#: ../midori/midori-websettings.c:480 +msgid "The items to show on the toolbar" +msgstr "Indicare gli elementi da mostrare nella barra degli strumenti" + +#: ../midori/midori-websettings.c:488 +msgid "Compact Sidepanel" +msgstr "Pannello compatto" + +#: ../midori/midori-websettings.c:489 +msgid "Whether to make the sidepanel compact" +msgstr "Abilitare questa opzione per la visualizzazione compatta del pannello" + +#: ../midori/midori-websettings.c:504 +msgid "Align sidepanel on the right" +msgstr "Allinea a destra il pannello laterale" + +#: ../midori/midori-websettings.c:505 +msgid "Whether to align the sidepanel on the right" +msgstr "Abilitare questa opzione per allineare il pannello laterale a destra" + +#: ../midori/midori-websettings.c:520 +msgid "Open panels in separate windows" +msgstr "Apri i pannelli in finestre separate" + +#: ../midori/midori-websettings.c:521 +msgid "Whether to always open panels in separate windows" +msgstr "Abilitare questa opzione per aprire sempre i pannelli in finestre separate" + +#: ../midori/midori-websettings.c:530 msgid "When Midori starts:" msgstr "All'avvio di Midori:" -#: ../midori/midori-websettings.c:298 +#: ../midori/midori-websettings.c:531 +msgid "What to do when Midori starts" +msgstr "Cosa fare all'avvio di Midori" + +#: ../midori/midori-websettings.c:540 +msgid "Homepage:" +msgstr "Pagina iniziale:" + +#: ../midori/midori-websettings.c:541 +msgid "The homepage" +msgstr "La pagina iniziale" + +#: ../midori/midori-websettings.c:556 +msgid "Show crash dialog" +msgstr "Mostra finestra di errore" + +#: ../midori/midori-websettings.c:557 +msgid "Show a dialog after Midori crashed" +msgstr "Abilitare questa opzione per mostrare una finestra nel caso Midori si sia chiuso inaspettatamente" + +#: ../midori/midori-websettings.c:565 +msgid "Save downloaded files to:" +msgstr "Salva i file scaricati in:" + +#: ../midori/midori-websettings.c:566 +msgid "The folder downloaded files are saved to" +msgstr "Scegliere la cartella dove devono essere salvati i file scaricati" + +#: ../midori/midori-websettings.c:574 +msgid "Text Editor" +msgstr "Editor di testo" + +#: ../midori/midori-websettings.c:575 +msgid "An external text editor" +msgstr "Inserire un editor di testo esterno" + +#: ../midori/midori-websettings.c:590 +msgid "News Aggregator" +msgstr "Aggregatore notizie" + +#: ../midori/midori-websettings.c:591 +msgid "An external news aggregator" +msgstr "Aggregatore di notizie esterno" + +#: ../midori/midori-websettings.c:599 +msgid "Location entry Search" +msgstr "Motore di ricerca predefinito" + +#: ../midori/midori-websettings.c:600 +msgid "The search to perform inside the location entry" +msgstr "Inserire il motore di ricerca predefinito da utilizzare dalla barra degli indirizzi" + +#: ../midori/midori-websettings.c:608 msgid "Preferred Encoding" msgstr "Codifica preferita" -#: ../midori/midori-websettings.c:325 +#: ../midori/midori-websettings.c:609 +msgid "The preferred character encoding" +msgstr "Scegliere la codifica dei caratteri preferita" + +#: ../midori/midori-websettings.c:619 +msgid "Always Show Tabbar" +msgstr "Mostra sempre le schede" + +#: ../midori/midori-websettings.c:620 +msgid "Always show the tabbar" +msgstr "Abilitare questa opzione per mostrare sempre le etichette delle schede" + +#: ../midori/midori-websettings.c:628 +msgid "Close Buttons on Tabs" +msgstr "Pulsante di chiusura schede" + +#: ../midori/midori-websettings.c:629 +msgid "Whether tabs have close buttons" +msgstr "Abilitare questa opzione per visualizzare il pulsante di chiusura nelle schede" + +#: ../midori/midori-websettings.c:654 msgid "Open new pages in:" msgstr "Apri le nuove pagine in:" +#: ../midori/midori-websettings.c:655 +msgid "Where to open new pages" +msgstr "Scegliere dove aprire le nuove pagine" + +#: ../midori/midori-websettings.c:664 +msgid "Middle click opens Selection" +msgstr "Tasto centrale apre la selezione" + +#: ../midori/midori-websettings.c:665 +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" + +#: ../midori/midori-websettings.c:673 +msgid "Open tabs in the background" +msgstr "Apri schede sullo sfondo" + +#: ../midori/midori-websettings.c:674 +msgid "Whether to open new tabs in the background" +msgstr "Abilitare questa opzione per aprire le nuove schede sullo sfondo" + +#: ../midori/midori-websettings.c:682 +msgid "Open Tabs next to Current" +msgstr "Apri schede dopo quella corrente" + +#: ../midori/midori-websettings.c:683 +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" + +#: ../midori/midori-websettings.c:691 +msgid "Open popups in tabs" +msgstr "Apri popup in schede" + +#: ../midori/midori-websettings.c:692 +msgid "Whether to open popup windows in tabs" +msgstr "Abilitare questa opzione per aprire le finestre popup in schede" + +#: ../midori/midori-websettings.c:702 ../extensions/statusbar-features.c:132 +msgid "Load images automatically" +msgstr "Carica immagini automaticamente" + +#: ../midori/midori-websettings.c:703 +msgid "Load and display images automatically" +msgstr "Abilitare questa opzione per caricare e visualizzare automaticamente le immagini" + +#: ../midori/midori-websettings.c:710 ../extensions/statusbar-features.c:141 +msgid "Enable scripts" +msgstr "Abilita script" + +#: ../midori/midori-websettings.c:711 +msgid "Enable embedded scripting languages" +msgstr "Abilitare questa opzione per attivare i linguaggi di scripting integrati" + +#: ../midori/midori-websettings.c:718 ../extensions/statusbar-features.c:150 +msgid "Enable Netscape plugins" +msgstr "Abilita plugin di Netscape" + +#: ../midori/midori-websettings.c:719 +msgid "Enable embedded Netscape plugin objects" +msgstr "Abilitare questa opzione per attivare gli oggetti integrati con i plugin di Netscape" + +#: ../midori/midori-websettings.c:739 +msgid "Enable Spell Checking" +msgstr "Abilita controllo ortografico" + +#: ../midori/midori-websettings.c:740 +msgid "Enable spell checking while typing" +msgstr "Abilita questa opzione per attivare il controllo ortografico durante la digitazione" + +#: ../midori/midori-websettings.c:746 +msgid "Enable HTML5 database support" +msgstr "Abilita il supporto al database HTML5" + +#: ../midori/midori-websettings.c:747 +msgid "Whether to enable HTML5 database support" +msgstr "Abilitare questa opzione per attivare il supporto al database HTML5" + +#: ../midori/midori-websettings.c:753 +msgid "Enable HTML5 local storage support" +msgstr "Abilita il supporto allo storage locale HTML5" + +#: ../midori/midori-websettings.c:754 +msgid "Whether to enable HTML5 local storage support" +msgstr "Abilitare questa opzione per attivare il supporto allo storage locale HTML5" + +#: ../midori/midori-websettings.c:760 +msgid "Enable offline web application cache" +msgstr "Abilita la cache delle applicazioni web offline" + +#: ../midori/midori-websettings.c:761 +msgid "Whether to enable offline web application cache" +msgstr "Abilitare questa opzione per attivare la cache delle applicazioni web quando offline" + +#: ../midori/midori-websettings.c:777 +msgid "Flash window on background tabs" +msgstr "Lampeggia la finestra se ci sono schede in secondo piano" + +#: ../midori/midori-websettings.c:778 +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:793 +msgid "Zoom Text and Images" +msgstr "Ingrandimento testo e immagini" + +#: ../midori/midori-websettings.c:794 +msgid "Whether to zoom text and images" +msgstr "Abilitare questa opzione per ingrandire il testo e le immagini" + +#: ../midori/midori-websettings.c:809 +msgid "Find inline while typing" +msgstr "Cerca nella pagina durante la digitazione" + +#: ../midori/midori-websettings.c:810 +msgid "Whether to automatically find inline while typing" +msgstr "Abilitare questa opzione per cercare automaticamente nella pagina durante la digitazione" + +#: ../midori/midori-websettings.c:825 +msgid "Kinetic scrolling" +msgstr "Scorrimento per movimento" + +#: ../midori/midori-websettings.c:826 +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:834 +msgid "Delete old Cookies after:" +msgstr "Elimina i cookie obsoleti dopo:" + +#: ../midori/midori-websettings.c:835 +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:844 +msgid "Delete pages from history after:" +msgstr "Elimina le pagine dalla cronologia dopo:" + +#: ../midori/midori-websettings.c:845 +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:860 +msgid "Proxy server" +msgstr "Server proxy" + +#: ../midori/midori-websettings.c:861 +msgid "The type of proxy server to use" +msgstr "Il tipo di server proxy da usare" + +#: ../midori/midori-websettings.c:870 +msgid "HTTP Proxy Server" +msgstr "Server proxy HTTP" + +#: ../midori/midori-websettings.c:871 +msgid "The proxy server used for HTTP connections" +msgstr "Inserire il server proxy usato per le connessioni HTTP" + +#: ../midori/midori-websettings.c:888 +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:388 +#: ../midori/midori-websettings.c:905 msgid "Identify as" msgstr "Identifica come" -#: ../midori/midori-websettings.c:389 +#: ../midori/midori-websettings.c:906 msgid "What to identify as to web pages" msgstr "Come essere identificati sul web" -#: ../midori/midori-websettings.c:422 +#: ../midori/midori-websettings.c:922 +msgid "Identification string" +msgstr "Stringa di identificazione" + +#: ../midori/midori-websettings.c:923 +msgid "The application identification string" +msgstr "Inserire la stringa di identificazione dell'applicazione" + +#: ../midori/midori-websettings.c:939 msgid "Preferred languages" msgstr "Lingue preferite" -#: ../midori/midori-websettings.c:423 -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:940 +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:472 -msgid "Always use my font choices" -msgstr "Usa sempre il tipo di carattere di mia scelta" +#: ../midori/midori-websettings.c:955 +msgid "Clear private data" +msgstr "Cancella i dati personali" -#: ../midori/midori-websettings.c:473 -msgid "Override fonts picked by websites with user preferences" -msgstr "" -"Preferisci le impostazioni utente degli stili di carattere a quelle dei siti" +#: ../midori/midori-websettings.c:956 +msgid "The private data selected for deletion" +msgstr "Dati privati selezionati per la cancellazione" -#: ../midori/midori-view.c:1012 ../midori/midori-view.c:1151 -msgid "Trust this website" -msgstr "" +#: ../midori/midori-websettings.c:971 +msgid "Clear data" +msgstr "Cancella i dati" -#: ../midori/midori-view.c:1149 -msgid "Security unknown" -msgstr "Sicurezza sconosciuta" +#: ../midori/midori-websettings.c:972 +msgid "The data selected for deletion" +msgstr "I dati selezionati per la cancellazione" -#: ../midori/midori-view.c:1447 +#. i18n: Reworded: Shorten details propagated when going to another page +#: ../midori/midori-websettings.c:1005 +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:1007 +msgid "Whether the \"Referer\" header should be shortened to the hostname" +msgstr "Se il \"referer\" deve essere accorciato al nome host" + +#: ../midori/midori-view.c:1349 #, c-format msgid "%s wants to save an HTML5 database." msgstr "%s vuole salvare un database HTML5." -#: ../midori/midori-view.c:1451 ../midori/midori-view.c:1485 +#: ../midori/midori-view.c:1353 ../midori/midori-view.c:1382 msgid "_Deny" msgstr "_Nega" -#: ../midori/midori-view.c:1451 ../midori/midori-view.c:1485 +#: ../midori/midori-view.c:1353 ../midori/midori-view.c:1382 msgid "_Allow" msgstr "_Permetti" -#: ../midori/midori-view.c:1480 +#: ../midori/midori-view.c:1378 #, c-format msgid "%s wants to know your location." msgstr "%s vuole conoscere la propria posizione." -#: ../midori/midori-view.c:1576 +#: ../midori/midori-view.c:1467 #, c-format msgid "Error - %s" msgstr "Errore - %s" -#: ../midori/midori-view.c:1577 +#: ../midori/midori-view.c:1468 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "La pagina \"%s\" non può essere caricata." -#: ../midori/midori-view.c:1579 +#: ../midori/midori-view.c:1470 msgid "Try again" msgstr "Riprova" -#: ../midori/midori-view.c:1775 ../midori/midori-view.c:2887 +#: ../midori/midori-view.c:1629 ../midori/midori-view.c:2464 #, c-format msgid "Send a message to %s" msgstr "Invia un messaggio a %s" -#: ../midori/midori-view.c:2673 -#, fuzzy -msgid "Add _search engine..." -msgstr "Aggiungi motore di ricerca" - -#: ../midori/midori-view.c:2717 ../midori/midori-view.c:3043 +#: ../midori/midori-view.c:2303 ../midori/midori-view.c:2617 msgid "Inspect _Element" msgstr "Ispeziona _elemento" -#: ../midori/midori-view.c:2769 +#: ../midori/midori-view.c:2353 msgid "Open Link in New _Tab" msgstr "Apri collegamento in una nuova sc_heda" -#: ../midori/midori-view.c:2773 +#: ../midori/midori-view.c:2357 msgid "Open Link in _Foreground Tab" msgstr "Apri collegamento in una scheda in primo _piano" -#: ../midori/midori-view.c:2774 +#: ../midori/midori-view.c:2358 msgid "Open Link in _Background Tab" msgstr "Apri collegamento in una scheda in secondo p_iano" -#: ../midori/midori-view.c:2777 +#: ../midori/midori-view.c:2361 msgid "Open Link in New _Window" msgstr "Apri collegamento in una nuova _finestra" -#: ../midori/midori-view.c:2780 +#: ../midori/midori-view.c:2364 msgid "Open Link as Web A_pplication" msgstr "Apri il collegamento come applicazione _web" -#: ../midori/midori-view.c:2785 +#: ../midori/midori-view.c:2367 msgid "Copy Link de_stination" msgstr "Copia l'indirizzo di de_stinazione" -#: ../midori/midori-view.c:2801 +#: ../midori/midori-view.c:2379 msgid "Open _Image in New Tab" msgstr "Apri _immagine in nuova scheda" -#: ../midori/midori-view.c:2804 +#: ../midori/midori-view.c:2382 msgid "Copy Image _Address" msgstr "Copi_a indirizzo immagine" -#: ../midori/midori-view.c:2807 +#: ../midori/midori-view.c:2385 msgid "Save I_mage" msgstr "Salva i_mmagine" -#: ../midori/midori-view.c:2810 -msgid "Open in Image _Viewer" -msgstr "Apri immagine nel _visualizzatore" - -#: ../midori/midori-view.c:2817 +#: ../midori/midori-view.c:2392 msgid "Copy Video _Address" msgstr "Copi_a indirizzo video" -#: ../midori/midori-view.c:2820 +#: ../midori/midori-view.c:2395 msgid "Save _Video" msgstr "Salva _video" -#: ../midori/midori-view.c:2820 +#: ../midori/midori-view.c:2395 msgid "Download _Video" msgstr "Scarica _video" -#: ../midori/midori-view.c:2846 +#: ../midori/midori-view.c:2421 msgid "Search _with" msgstr "Cerca _con" -#: ../midori/midori-view.c:2878 +#: ../midori/midori-view.c:2455 msgid "_Search the Web" msgstr "_Cerca nel web" -#: ../midori/midori-view.c:2895 +#: ../midori/midori-view.c:2472 msgid "Open Address in New _Tab" msgstr "Apri indirizzi in una nuova _scheda" -#: ../midori/midori-view.c:2948 -msgid "Open _Frame in New Tab" -msgstr "Apri _cornice in nuova scheda" - -#: ../midori/midori-view.c:3203 -#, c-format -msgid "Open or download file from %s" -msgstr "Apri o scarica file da %s" +#: ../midori/midori-view.c:2756 +msgid "Open or download file" +msgstr "Apri o scarica file" -#: ../midori/midori-view.c:3216 -#, c-format -msgid "File Name: %s" -msgstr "Nome file: %s" - -#: ../midori/midori-view.c:3221 +#: ../midori/midori-view.c:2775 #, c-format msgid "File Type: '%s'" msgstr "Tipo di file: \"%s\"" -#: ../midori/midori-view.c:3223 +#: ../midori/midori-view.c:2777 #, c-format msgid "File Type: %s ('%s')" msgstr "Tipo di file: %s (\"%s\")" -#: ../midori/midori-view.c:3260 -#, c-format -msgid "Size: %s" -msgstr "Dimensione: %s" +#: ../midori/midori-view.c:2788 +msgid "MD5-Checksum:" +msgstr "MD5-Checksum:" + +#: ../midori/midori-view.c:2795 +msgid "SHA1-Checksum:" +msgstr "SHA1-Checksum:" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:3271 +#: ../midori/midori-view.c:2805 #, c-format msgid "Open %s" msgstr "Apri %s" -#: ../midori/midori-view.c:3882 +#: ../midori/midori-view.c:3386 #, c-format msgid "Inspect page - %s" msgstr "Controllo pagina - %s" -#: ../midori/midori-view.c:4279 -#, c-format -msgid "No documentation installed" -msgstr "La documentazione non è installata" +#: ../midori/midori-view.c:3675 +msgid "Speed Dial" +msgstr "Selezione veloce" -#: ../midori/midori-view.c:4356 -msgid "Midori doesn't store any personal data:" -msgstr "Midori non salva alcun dato personale:" +#: ../midori/midori-view.c:3676 +msgid "Click to add a shortcut" +msgstr "Fare clic per aggiungere un collegamento" -#: ../midori/midori-view.c:4357 -msgid "No history or web cookies are being saved." -msgstr "Non sono salvati cronologia o cookie." +#: ../midori/midori-view.c:3677 +msgid "Enter shortcut address" +msgstr "Inserire l'indirizzo del collegamento" -#: ../midori/midori-view.c:4358 -msgid "Extensions are disabled." -msgstr "Le estensioni sono disabilitate." +#: ../midori/midori-view.c:3678 +msgid "Enter shortcut title" +msgstr "Inserire il titolo del collegamento" -#: ../midori/midori-view.c:4359 -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:3679 +msgid "Are you sure you want to delete this shortcut?" +msgstr "Eliminare davvero questo collegamento?" -#: ../midori/midori-view.c:4360 -msgid "Midori prevents websites from tracking the user:" -msgstr "Midori impedisce ai siti web di tracciare l'utente:" +#: ../midori/midori-view.c:3680 +msgid "Set number of columns and rows" +msgstr "Imposta il numero di righe e colonne" -#: ../midori/midori-view.c:4361 -msgid "Referrer URLs are stripped down to the hostname." -msgstr "Gli URL referenti sono limitati al nome host." +#: ../midori/midori-view.c:3681 +msgid "Enter number of columns and rows:" +msgstr "Inserire il numero di righe e colonne" -#: ../midori/midori-view.c:4362 -msgid "DNS prefetching is disabled." -msgstr "Il prefetching DNS è disabilitato." +#: ../midori/midori-view.c:3682 +msgid "Invalid input for the size of the speed dial" +msgstr "Valore non valido per la dimensione della selezione veloce" -#: ../midori/midori-view.c:4363 -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:3683 +msgid "Thumb size:" +msgstr "Dimensione della miniatura:" -#: ../midori/midori-view.c:4364 -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:3684 +msgid "Small" +msgstr "Piccolo" + +#: ../midori/midori-view.c:3685 +msgid "Medium" +msgstr "Medio" + +#: ../midori/midori-view.c:3686 +msgid "Big" +msgstr "Grande" + +#: ../midori/midori-view.c:3875 +#, c-format +msgid "No documentation installed" +msgstr "La documentazione non è installata" -#: ../midori/midori-view.c:4450 +#: ../midori/midori-view.c:3941 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." +msgstr "I numeri di versione tra parentesi indicano la versione usata durante l'esecuzione." -#: ../midori/midori-view.c:4499 +#: ../midori/midori-view.c:3990 msgid "Page loading delayed" msgstr "Caricamento pagina ritardato" -#: ../midori/midori-view.c:4500 +#: ../midori/midori-view.c:3991 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:4501 +#: ../midori/midori-view.c:3992 msgid "Load Page" msgstr "Carica pagina" -#: ../midori/midori-view.c:4668 +#: ../midori/midori-view.c:4135 msgid "Blank page" msgstr "Pagina vuota" -#: ../midori/midori-view.c:4932 +#: ../midori/midori-view.c:4375 msgid "_Duplicate Tab" msgstr "_Duplica scheda" -#: ../midori/midori-view.c:4937 +#: ../midori/midori-view.c:4380 msgid "Show Tab _Label" msgstr "Mostra l'_etichetta nelle schede" -#: ../midori/midori-view.c:4937 +#: ../midori/midori-view.c:4380 msgid "Show Tab _Icon Only" msgstr "Mostra solo l'_icona nelle schede" -# acceleratore sulla h per evitare conflitti -#: ../midori/midori-view.c:4944 -#, fuzzy -msgid "Close Ot_her Tab" -msgid_plural "Close Ot_her Tabs" -msgstr[0] "Chiudi le altre sc_hede" -msgstr[1] "Chiudi le altre sc_hede" - -#. i18n: word stem of "previous page" type links, case is not important -#: ../midori/midori-view.c:5701 -msgid "previous" -msgstr "precedente" - -#. i18n: word stem of "next page" type links, case is not important -#: ../midori/midori-view.c:5720 -msgid "next" -msgstr "successiva" - -#: ../midori/midori-view.c:5733 +#: ../midori/midori-view.c:4386 +msgid "Close ot_her Tabs" +msgstr "Chiudi le altre sc_hede" + +#: ../midori/midori-view.c:5006 msgid "Print background images" msgstr "Stampa immagini di sfondo" -#: ../midori/midori-view.c:5734 +#: ../midori/midori-view.c:5007 msgid "Whether background images should be printed" msgstr "Abilitare questa opzione per stampare le immagini di sfondo" -#: ../midori/midori-view.c:5766 +#: ../midori/midori-view.c:5039 msgid "Features" msgstr "Opzioni" -#. i18n: Download tooltip (size): 4KB of 43MB -#: ../midori/midori-download.vala:48 -#, c-format -msgid "%s of %s" -msgstr "%s di %s" - -#: ../midori/midori-download.vala:64 -#, c-format -msgid "%d hour" -msgid_plural "%d hours" -msgstr[0] "%d ora" -msgstr[1] "%d ore" - -#: ../midori/midori-download.vala:65 -#, c-format -msgid "%d minute" -msgid_plural "%d minutes" -msgstr[0] "%d minuto" -msgstr[1] "%d minuti" - -#: ../midori/midori-download.vala:66 -#, c-format -msgid "%d second" -msgid_plural "%d seconds" -msgstr[0] "%d secondo" -msgstr[1] "%d secondi" - -#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning -#: ../midori/midori-download.vala:82 -#, c-format -msgid " - %s remaining" -msgstr " - %s restanti" - -#. i18n: Unknown number of bytes, used for transfer rate like ?B/s -#: ../midori/midori-download.vala:92 -msgid "?B" -msgstr "?B" - -#. i18n: Download tooltip (transfer rate): (130KB/s) -#: ../midori/midori-download.vala:94 -#, c-format -msgid " (%s/s)" -msgstr " (%s/s)" - -#: ../midori/midori-download.vala:188 -msgid "The downloaded file is erroneous." -msgstr "Il file scaricato è erroneo." - -#: ../midori/midori-download.vala:189 -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." - -#: ../midori/midori-download.vala:300 -#, 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-download.vala:302 -msgid "You don't have permission to write in this location." -msgstr "Non si ha il permesso di scrivere in questa posizione." - -#: ../midori/midori-download.vala:305 -#, c-format -msgid "There is not enough free space to download \"%s\"." -msgstr "Spazio insufficiente per scaricare \"%s\"." - -#: ../midori/midori-download.vala:307 -#, 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-speeddial.vala:180 -msgid "Speed Dial" -msgstr "Selezione veloce" - -#: ../midori/midori-speeddial.vala:181 ../midori/midori-speeddial.vala:261 -msgid "Click to add a shortcut" -msgstr "Fare clic per aggiungere un collegamento" - -#: ../midori/midori-speeddial.vala:182 -msgid "Enter shortcut address" -msgstr "Inserire l'indirizzo del collegamento" - -#: ../midori/midori-speeddial.vala:183 -msgid "Enter shortcut title" -msgstr "Inserire il titolo del collegamento" - -#: ../midori/midori-speeddial.vala:184 -msgid "Are you sure you want to delete this shortcut?" -msgstr "Eliminare davvero questo collegamento?" - -#: ../midori/midori-preferences.c:299 +#: ../midori/midori-preferences.c:301 msgid "Startup" msgstr "Avvio" -#: ../midori/midori-preferences.c:305 -msgid "Homepage:" -msgstr "Pagina iniziale:" - -#: ../midori/midori-preferences.c:313 +#: ../midori/midori-preferences.c:314 msgid "Use _current page" msgstr "Usa la pagina co_rrente" -#: ../midori/midori-preferences.c:317 +#: ../midori/midori-preferences.c:318 msgid "Use current page as homepage" msgstr "Usa la pagina corrente come homepage" #. Page "Appearance" -#: ../midori/midori-preferences.c:326 +#: ../midori/midori-preferences.c:327 msgid "Fonts" msgstr "Carattere" -#: ../midori/midori-preferences.c:329 +#: ../midori/midori-preferences.c:330 msgid "Proportional Font Family" msgstr "Famiglia di caratteri proporzionale" -#: ../midori/midori-preferences.c:333 +#: ../midori/midori-preferences.c:334 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:336 +#: ../midori/midori-preferences.c:337 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:338 +#: ../midori/midori-preferences.c:339 msgid "Fixed-width Font Family" msgstr "Caratteri a larghezza fissa" -#: ../midori/midori-preferences.c:342 +#: ../midori/midori-preferences.c:343 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:345 +#: ../midori/midori-preferences.c:346 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:347 +#: ../midori/midori-preferences.c:348 msgid "Minimum Font Size" msgstr "Dimensione minima caratteri" -#: ../midori/midori-preferences.c:351 +#: ../midori/midori-preferences.c:352 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:362 +#: ../midori/midori-preferences.c:361 msgid "Behavior" msgstr "Comportamento" -#: ../midori/midori-preferences.c:366 ../extensions/statusbar-features.c:155 -msgid "Load images automatically" -msgstr "Carica immagini automaticamente" - -#: ../midori/midori-preferences.c:369 -msgid "Enable Spell Checking" -msgstr "Abilita controllo ortografico" - -#: ../midori/midori-preferences.c:383 ../extensions/statusbar-features.c:165 -msgid "Enable scripts" -msgstr "Abilita script" - -#: ../midori/midori-preferences.c:386 ../extensions/statusbar-features.c:177 -msgid "Enable Netscape plugins" -msgstr "Abilita plugin di Netscape" - -#: ../midori/midori-preferences.c:391 -msgid "Zoom Text and Images" -msgstr "Ingrandimento testo e immagini" - -#: ../midori/midori-preferences.c:394 +#: ../midori/midori-preferences.c:387 msgid "Allow scripts to open popups" msgstr "Permetti agli script di aprire popup" -#: ../midori/midori-preferences.c:395 +#: ../midori/midori-preferences.c:388 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:401 -msgid "Kinetic scrolling" -msgstr "Scorrimento per movimento" - -#: ../midori/midori-preferences.c:402 -msgid "Whether scrolling should kinetically move according to speed" -msgstr "" -"Se durante lo scorrimento si deve tener conto della velocità del movimento" - -#: ../midori/midori-preferences.c:407 -msgid "Middle click opens Selection" -msgstr "Tasto centrale apre la selezione" - -#: ../midori/midori-preferences.c:408 -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" - -#: ../midori/midori-preferences.c:414 -msgid "Enable WebGL support" -msgstr "Abilita il supporto a WebGL" - -#: ../midori/midori-preferences.c:419 -msgid "Flash window on background tabs" -msgstr "Lampeggia la finestra se ci sono schede in secondo piano" - -#: ../midori/midori-preferences.c:428 -msgid "Save downloaded files to:" -msgstr "Salva i file scaricati in:" +msgstr "Abilitare questa opzione per consentire l'apertura automatica delle finestre di popup" #. Page "Interface" -#: ../midori/midori-preferences.c:435 +#: ../midori/midori-preferences.c:411 msgid "Browsing" msgstr "Navigazione" -#: ../midori/midori-preferences.c:451 -msgid "Close Buttons on Tabs" -msgstr "Pulsante di chiusura schede" - -#: ../midori/midori-preferences.c:455 -msgid "Always Show Tabbar" -msgstr "Mostra sempre le schede" - -#: ../midori/midori-preferences.c:459 -msgid "Open Tabs next to Current" -msgstr "Apri schede dopo quella corrente" - -#: ../midori/midori-preferences.c:460 -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" - -#: ../midori/midori-preferences.c:463 -msgid "Open tabs in the background" -msgstr "Apri schede sullo sfondo" - -#: ../midori/midori-preferences.c:467 -msgid "Text Editor" -msgstr "Editor di testo" - -#: ../midori/midori-preferences.c:472 -msgid "News Aggregator" -msgstr "Aggregatore notizie" - #. Page "Network" -#: ../midori/midori-preferences.c:479 +#: ../midori/midori-preferences.c:449 msgid "Network" msgstr "Rete" -#: ../midori/midori-preferences.c:481 -msgid "Proxy server" -msgstr "Server proxy" - -#: ../midori/midori-preferences.c:486 +#: ../midori/midori-preferences.c:456 msgid "Hostname" msgstr "Nome host" -#: ../midori/midori-preferences.c:494 -msgid "Port" -msgstr "Porta" - -#: ../midori/midori-preferences.c:506 ../midori/midori-preferences.c:509 -msgid "The maximum size of cached pages on disk" -msgstr "La dimensione massima della cache delle pagine su disco" - -#: ../midori/midori-preferences.c:511 +#: ../midori/midori-preferences.c:472 msgid "MB" msgstr "MB" -#: ../midori/midori-searchaction.c:957 +#: ../midori/midori-searchaction.c:908 msgid "Add search engine" msgstr "Aggiungi motore di ricerca" -#: ../midori/midori-searchaction.c:957 +#: ../midori/midori-searchaction.c:908 msgid "Edit search engine" msgstr "Modifica motore di ricerca" -#: ../midori/midori-searchaction.c:985 +#: ../midori/midori-searchaction.c:937 msgid "_Name:" msgstr "_Nome:" -#: ../midori/midori-searchaction.c:1000 +#: ../midori/midori-searchaction.c:953 msgid "_Description:" msgstr "_Descrizione:" -#: ../midori/midori-searchaction.c:1013 ../extensions/feed-panel/main.c:377 -msgid "_Address:" -msgstr "_Indirizzo:" +#: ../midori/midori-searchaction.c:986 +msgid "_Icon:" +msgstr "I_cona:" -#: ../midori/midori-searchaction.c:1032 +#: ../midori/midori-searchaction.c:1000 msgid "_Token:" msgstr "Parame_tro:" -#: ../midori/midori-searchaction.c:1330 -msgid "Manage Search Engines" -msgstr "Gestione motori di ricerca" +#: ../midori/midori-searchaction.c:1300 +msgid "Manage Search Engines" +msgstr "Gestione motori di ricerca" + +#: ../midori/midori-searchaction.c:1400 +msgid "Use as _default" +msgstr "Usa come _predefinito" + +#: ../midori/sokoke.c:452 +msgid "Open with" +msgstr "Apri con" + +#: ../midori/sokoke.c:460 +#, c-format +msgid "Choose an application or command to open \"%s\":" +msgstr "Selezionare un'applicazione o un comando per aprire \"%s\":" + +#: ../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 "Non è possibile eseguire l'applicazione esterna." + +#: ../midori/sokoke.c:1515 +msgid "_Bookmark" +msgstr "S_egnalibro" + +#: ../midori/sokoke.c:1517 +msgid "Add Boo_kmark" +msgstr "Aggiungi se_gnalibro" + +#: ../midori/sokoke.c:1518 +msgid "_Console" +msgstr "_Console" + +#: ../midori/sokoke.c:1519 +msgid "_Extensions" +msgstr "_Estensioni" + +#: ../midori/sokoke.c:1521 +msgid "_Homepage" +msgstr "_Pagina iniziale" + +#: ../midori/sokoke.c:1522 +msgid "_Userscripts" +msgstr "Script dell'_utente" + +#: ../midori/sokoke.c:1523 +msgid "New _Tab" +msgstr "Nuova _scheda" + +#: ../midori/sokoke.c:1524 +msgid "_Transfers" +msgstr "_Trasferimenti" + +#: ../midori/sokoke.c:1525 +msgid "Netscape p_lugins" +msgstr "Plugin N_etscape" + +#: ../midori/sokoke.c:1528 +msgid "New _Folder" +msgstr "Nuova _cartella" + +#: ../midori/sokoke.c:2214 +#, c-format +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "%d ora" +msgstr[1] "%d ore" + +#: ../midori/sokoke.c:2215 +#, c-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "%d minuto" +msgstr[1] "%d minuti" + +#: ../midori/sokoke.c:2216 +#, c-format +msgid "%d second" +msgid_plural "%d seconds" +msgstr[0] "%d secondo" +msgstr[1] "%d secondi" -#: ../midori/midori-searchaction.c:1432 -msgid "Use as _default" -msgstr "Usa come _predefinito" +#. i18n: Download tooltip (size): 4KB of 43MB +#: ../midori/sokoke.c:2224 ../panels/midori-transfers.c:268 +#, c-format +msgid "%s of %s" +msgstr "%s di %s" -#: ../midori/sokoke.c:353 -msgid "Open with" -msgstr "Apri con" +#. i18n: Unknown number of bytes, used for transfer rate like ?B/s +#: ../midori/sokoke.c:2233 +msgid "?B" +msgstr "?B" -#: ../midori/sokoke.c:361 +#. i18n: Download tooltip (transfer rate): (130KB/s) +#: ../midori/sokoke.c:2236 #, c-format -msgid "Choose an application or command to open \"%s\":" -msgstr "Selezionare un'applicazione o un comando per aprire \"%s\":" +msgid " (%s/s)" +msgstr " (%s/s)" -#: ../midori/sokoke.c:476 ../midori/sokoke.c:490 -msgid "Could not run external program." -msgstr "Non è possibile eseguire l'applicazione esterna." +#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning +#: ../midori/sokoke.c:2253 +#, c-format +msgid " - %s remaining" +msgstr " - %s restanti" #. i18n: A panel at the bottom, to search text in pages -#: ../toolbars/midori-findbar.c:265 +#: ../toolbars/midori-findbar.c:230 msgid "_Inline Find:" msgstr "Cerca nel _testo:" -#: ../toolbars/midori-findbar.c:287 +#: ../toolbars/midori-findbar.c:264 msgid "Previous" -msgstr "Precedente" +msgstr "Successivo" -#: ../toolbars/midori-findbar.c:293 +#: ../toolbars/midori-findbar.c:270 msgid "Next" -msgstr "Successiva" +msgstr "Precedente" -#: ../toolbars/midori-findbar.c:297 +#: ../toolbars/midori-findbar.c:274 msgid "Match Case" msgstr "Maiuscole/minuscole" -#: ../toolbars/midori-findbar.c:306 +#: ../toolbars/midori-findbar.c:283 msgid "Highlight Matches" msgstr "Evidenzia risultati" -#: ../toolbars/midori-findbar.c:317 +#: ../toolbars/midori-findbar.c:294 msgid "Close Findbar" msgstr "Chiudi barra ricerca" -#: ../toolbars/midori-transferbar.c:109 +#: ../toolbars/midori-transferbar.c:129 #, c-format msgid "The file '%s' has been downloaded." msgstr "Il file «%s» è stato trasferito." -#: ../toolbars/midori-transferbar.c:114 +#: ../toolbars/midori-transferbar.c:132 msgid "Transfer completed" msgstr "Trasferimento completato" -#: ../toolbars/midori-transferbar.c:239 ../panels/midori-transfers.c:139 +#: ../toolbars/midori-transferbar.c:214 +msgid "The downloaded file is erroneous." +msgstr "Il file scaricato è erroneo." + +#: ../toolbars/midori-transferbar.c:215 +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:323 ../panels/midori-transfers.c:142 msgid "Clear All" msgstr "Cancella tutto" -#: ../toolbars/midori-transferbar.c:272 ../toolbars/midori-transferbar.c:274 +#: ../toolbars/midori-transferbar.c:360 ../toolbars/midori-transferbar.c:362 msgid "Some files are being downloaded" msgstr "Alcuni file sono stati scaricati" -#: ../toolbars/midori-transferbar.c:278 +#: ../toolbars/midori-transferbar.c:366 msgid "_Quit Midori" msgstr "_Chiudi Midori" -#: ../toolbars/midori-transferbar.c:280 +#: ../toolbars/midori-transferbar.c:368 msgid "The transfers will be cancelled if Midori quits." msgstr "I trasferimenti verranno cancellati se Midori viene chiuso" -#: ../panels/midori-bookmarks.c:308 +#: ../panels/midori-bookmarks.c:116 +msgid "Bookmarks" +msgstr "Segnalibri" + +#: ../panels/midori-bookmarks.c:294 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "Impossibile aggiungere il segnalibro: %s\n" -#: ../panels/midori-bookmarks.c:475 -#, c-format -msgid "Failed to update bookmark : %s\n" -msgstr "Impossibile aggiornare il segnalibro: %s\n" - -#: ../panels/midori-bookmarks.c:535 +#: ../panels/midori-bookmarks.c:474 msgid "Edit the selected bookmark" msgstr "Modifica il segnalibro selezionato" -#: ../panels/midori-bookmarks.c:543 +#: ../panels/midori-bookmarks.c:482 msgid "Delete the selected bookmark" msgstr "Elimina il segnalibro selezionato" -#: ../panels/midori-bookmarks.c:558 +#: ../panels/midori-bookmarks.c:497 msgid "Add a new folder" msgstr "Aggiunge una nuova cartella" -#: ../panels/midori-bookmarks.c:697 ../panels/midori-history.c:638 +#: ../panels/midori-bookmarks.c:631 ../panels/midori-history.c:583 msgid "Separator" msgstr "Separatore" -#. Create the filter entry -#: ../panels/midori-bookmarks.c:1027 -msgid "Search Bookmarks" -msgstr "Cerca tra i segnalibri" - -#: ../panels/midori-history.c:111 +#: ../panels/midori-history.c:114 msgid "History" msgstr "Cronologia" -#: ../panels/midori-history.c:158 ../panels/midori-history.c:189 -msgid "Today" -msgstr "Oggi" - -#: ../panels/midori-history.c:160 ../panels/midori-history.c:191 -msgid "Yesterday" -msgstr "Ieri" +#: ../panels/midori-history.c:146 +msgid "A week ago" +msgstr "Una settimana fa" -#: ../panels/midori-history.c:162 ../panels/midori-history.c:186 +#: ../panels/midori-history.c:148 #, 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:165 ../panels/midori-history.c:184 -msgid "A week ago" -msgstr "Una settimana fa" +#: ../panels/midori-history.c:151 +msgid "Today" +msgstr "Oggi" -#: ../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" +#: ../panels/midori-history.c:153 +msgid "Yesterday" +msgstr "Ieri" -#: ../panels/midori-history.c:360 +#: ../panels/midori-history.c:321 msgid "Are you sure you want to remove all history items?" msgstr "Cancellare completamente la cronologia?" -#: ../panels/midori-history.c:407 +#: ../panels/midori-history.c:367 msgid "Bookmark the selected history item" msgstr "Crea un segnalibro dall'elemento della cronologia selezionato" -#: ../panels/midori-history.c:416 +#: ../panels/midori-history.c:376 msgid "Delete the selected history item" msgstr "Elimina l'elemento selezionato dalla cronologia" -#: ../panels/midori-history.c:424 +#: ../panels/midori-history.c:384 msgid "Clear the entire history" msgstr "Cancella l'intera cronologia" -#. Create the filter entry -#: ../panels/midori-history.c:997 -msgid "Search History" -msgstr "Cerca nella cronologia" - #: ../panels/midori-transfers.c:87 msgid "Transfers" msgstr "Trasferimenti" -#: ../panels/midori-transfers.c:435 +#: ../panels/midori-transfers.c:468 msgid "Open Destination _Folder" msgstr "Apri _cartella di destinazione" -#: ../panels/midori-transfers.c:438 +#: ../panels/midori-transfers.c:471 msgid "Copy Link Loc_ation" msgstr "Copia l'indirizzo del colle_gamento" -#: ../katze/katze-http-auth.c:210 +#: ../katze/katze-http-auth.c:213 msgid "Authentication Required" msgstr "Autenticazione richiesta" -#: ../katze/katze-http-auth.c:226 +#: ../katze/katze-http-auth.c:229 msgid "" "A username and a password are required\n" "to open this location:" @@ -2100,200 +2292,187 @@ msgstr "" "Sono necessari un nome utente e una password\n" "per aprire questo indirizzo:" -#: ../katze/katze-http-auth.c:240 +#: ../katze/katze-http-auth.c:243 msgid "Username" msgstr "Nome utente" -#: ../katze/katze-http-auth.c:253 +#: ../katze/katze-http-auth.c:256 msgid "Password" msgstr "Password" -#: ../katze/katze-http-auth.c:267 +#: ../katze/katze-http-auth.c:270 msgid "_Remember password" msgstr "Memo_rizza password" -#: ../katze/katze-throbber.c:949 +#: ../katze/katze-throbber.c:879 #, c-format msgid "Named icon '%s' couldn't be loaded" msgstr "L'icona denominata \"%s\" non può essere caricata" -#: ../katze/katze-throbber.c:962 +#: ../katze/katze-throbber.c:892 #, c-format msgid "Stock icon '%s' couldn't be loaded" msgstr "L'icona \"%s\" dello stock non può essere caricata" -#: ../katze/katze-throbber.c:1042 +#: ../katze/katze-throbber.c:964 msgid "Animation frames are broken" msgstr "I fotogrammi dell'animazione sono danneggiati" -#: ../katze/katze-utils.c:443 ../katze/katze-utils.c:866 +#: ../katze/katze-utils.c:536 ../katze/katze-utils.c:971 #, c-format msgid "Property '%s' is invalid for %s" msgstr "La proprietà \"%s\" non è valida per %s" -#: ../katze/katze-utils.c:489 ../katze/katze-utils.c:518 -#: ../extensions/addons.c:309 +#: ../katze/katze-utils.c:582 ../katze/katze-utils.c:611 +#: ../extensions/addons.c:306 msgid "Choose file" msgstr "Selezionare un file" -#: ../katze/katze-utils.c:504 +#: ../katze/katze-utils.c:597 msgid "Choose folder" msgstr "Selezionare una cartella" -#: ../katze/katze-utils.c:602 +#: ../katze/katze-utils.c:701 msgid "None" msgstr "Nessuno" -#: ../katze/katze-utils.c:717 +#: ../katze/katze-utils.c:819 msgid "1 hour" msgstr "1 ora" -#: ../katze/katze-utils.c:718 +#: ../katze/katze-utils.c:820 msgid "1 day" msgstr "1 giorno" -#: ../katze/katze-utils.c:719 +#: ../katze/katze-utils.c:821 msgid "1 week" msgstr "1 settimana" -#: ../katze/katze-utils.c:720 +#: ../katze/katze-utils.c:822 msgid "1 month" msgstr "1 mese" -#: ../katze/katze-utils.c:721 +#: ../katze/katze-utils.c:823 msgid "1 year" msgstr "1 anno" -#: ../katze/katze-preferences.c:98 ../extensions/history-list.vala:235 +#: ../katze/katze-preferences.c:95 ../extensions/history-list.vala:227 #, c-format msgid "Preferences for %s" msgstr "Preferenze per %s" -#: ../katze/midori-uri.vala:173 -msgid "MD5-Checksum:" -msgstr "MD5-Checksum:" - -#: ../katze/midori-uri.vala:180 -msgid "SHA1-Checksum:" -msgstr "SHA1-Checksum:" - -#: ../extensions/adblock.c:495 +#: ../extensions/adblock.c:418 msgid "Configure Advertisement filters" msgstr "Configurazione dei filtri per gli avvisi pubblicitari" -#: ../extensions/adblock.c:528 +#: ../extensions/adblock.c:450 #, 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. È possibile " -"trovare altre liste su %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 "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:944 +#: ../extensions/adblock.c:813 msgid "Edit rule" msgstr "Modifica regola" -#: ../extensions/adblock.c:958 +#: ../extensions/adblock.c:826 msgid "_Rule:" msgstr "_Regola:" -#: ../extensions/adblock.c:1012 +#: ../extensions/adblock.c:880 msgid "Bl_ock image" msgstr "Bl_occa immagine" -#: ../extensions/adblock.c:1017 +#: ../extensions/adblock.c:885 msgid "Bl_ock link" msgstr "Bl_occa collegamento" -#: ../extensions/adblock.c:1915 +#: ../extensions/adblock.c:1453 msgid "Advertisement blocker" msgstr "Blocca avvisi pubblicitari" -#: ../extensions/adblock.c:1916 +#: ../extensions/adblock.c:1454 msgid "Block advertisements according to a filter list" msgstr "Blocca gli avvisi pubblicitari in accordo alla lista dei filtri" #. i18n: An infobar shows up when viewing a script on userscripts.org -#: ../extensions/addons.c:222 +#: ../extensions/addons.c:218 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:223 +#: ../extensions/addons.c:219 msgid "_Install user script" msgstr "_Installa script utente" #. i18n: An infobar shows up when viewing a style on userstyles.org -#: ../extensions/addons.c:228 +#: ../extensions/addons.c:224 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:229 +#: ../extensions/addons.c:225 msgid "_Install user style" msgstr "_Installa stile utente" -#: ../extensions/addons.c:237 +#: ../extensions/addons.c:233 msgid "Don't install" msgstr "Non installare" -#: ../extensions/addons.c:320 ../extensions/addons.c:675 +#: ../extensions/addons.c:317 ../extensions/addons.c:679 msgid "Userscripts" msgstr "Script dell'utente" -#: ../extensions/addons.c:325 ../extensions/addons.c:677 +#: ../extensions/addons.c:322 ../extensions/addons.c:681 msgid "Userstyles" msgstr "Stili dell'utente" -#: ../extensions/addons.c:371 ../extensions/addons.c:450 +#: ../extensions/addons.c:378 ../extensions/addons.c:457 #: ../extensions/feed-panel/main.c:129 msgid "Error" msgstr "Errore" -#: ../extensions/addons.c:412 +#: ../extensions/addons.c:419 #, c-format msgid "Do you want to delete '%s'?" msgstr "Cancellare \"%s\"?" -#: ../extensions/addons.c:418 +#: ../extensions/addons.c:425 msgid "Delete user script" msgstr "Elimina script dell'utente" -#: ../extensions/addons.c:419 +#: ../extensions/addons.c:426 msgid "Delete user style" msgstr "Elimina stile utente" -#: ../extensions/addons.c:422 +#: ../extensions/addons.c:429 #, c-format msgid "The file %s will be permanently deleted." msgstr "Il file «%s» verrà eliminato definitivamente." -#: ../extensions/addons.c:564 ../extensions/addons.c:641 +#: ../extensions/addons.c:568 ../extensions/addons.c:645 msgid "Open in Text Editor" msgstr "Apre nell'editor di testo" -#: ../extensions/addons.c:566 ../extensions/addons.c:650 +#: ../extensions/addons.c:570 ../extensions/addons.c:654 msgid "Open Target Folder" msgstr "Apri cartella di destinazione" -#: ../extensions/addons.c:632 +#: ../extensions/addons.c:636 msgid "Add new addon" msgstr "Aggiunge nuovo addon" -#: ../extensions/addons.c:658 +#: ../extensions/addons.c:662 msgid "Remove selected addon" msgstr "Rimuove l'addon selezionato" -#: ../extensions/addons.c:1687 ../extensions/addons.c:1905 +#: ../extensions/addons.c:1641 ../extensions/addons.c:1803 msgid "User addons" msgstr "Estensioni utente" -#: ../extensions/addons.c:1817 +#: ../extensions/addons.c:1762 #, c-format msgid "Can't monitor folder '%s': %s" msgstr "Impossibile monitorare la cartella «%s»: %s" -#: ../extensions/addons.c:1906 +#: ../extensions/addons.c:1804 msgid "Support for userscripts and userstyles" msgstr "Supporto per script utente e stili utente" @@ -2305,48 +2484,44 @@ msgstr "Schede colorate" msgid "Tint each tab distinctly" msgstr "Colora ogni etichetta in modo differente" -#: ../extensions/cookie-manager/cookie-manager-page.c:73 +#: ../extensions/cookie-manager/cookie-manager-page.c:82 #: ../extensions/cookie-manager/main.c:35 msgid "Cookie Manager" msgstr "Gestore Cookie" -#: ../extensions/cookie-manager/cookie-manager-page.c:103 +#: ../extensions/cookie-manager/cookie-manager-page.c:112 msgid "Delete All" msgstr "Rimuovi tutto" -#: ../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: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 dal filtraggio" -#: ../extensions/cookie-manager/cookie-manager-page.c:120 +#: ../extensions/cookie-manager/cookie-manager-page.c:129 msgid "Expand All" msgstr "Espandi tutto" -#: ../extensions/cookie-manager/cookie-manager-page.c:127 +#: ../extensions/cookie-manager/cookie-manager-page.c:136 msgid "Collapse All" msgstr "Riduci tutto" -#: ../extensions/cookie-manager/cookie-manager-page.c:572 +#: ../extensions/cookie-manager/cookie-manager-page.c:578 msgid "Do you really want to delete all cookies?" msgstr "Vuoi davvero cancellare tutti i cookie?" -#: ../extensions/cookie-manager/cookie-manager-page.c:574 +#: ../extensions/cookie-manager/cookie-manager-page.c:580 msgid "Question" msgstr "Domanda" -#: ../extensions/cookie-manager/cookie-manager-page.c:583 +#: ../extensions/cookie-manager/cookie-manager-page.c:589 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:671 +#: ../extensions/cookie-manager/cookie-manager-page.c:677 msgid "At the end of the session" msgstr "Alla fine della sessione" -#: ../extensions/cookie-manager/cookie-manager-page.c:674 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 #, c-format msgid "" "Host: %s\n" @@ -2363,15 +2538,15 @@ msgstr "" "Protezione: %s\n" "Scadenza: %s" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:686 msgid "Yes" msgstr "Si" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:686 msgid "No" msgstr "No" -#: ../extensions/cookie-manager/cookie-manager-page.c:694 +#: ../extensions/cookie-manager/cookie-manager-page.c:700 #, c-format msgid "" "Domain: %s\n" @@ -2380,35 +2555,39 @@ msgstr "" "Dominio: %s\n" "Cookie: %d" -#: ../extensions/cookie-manager/cookie-manager-page.c:1017 +#: ../extensions/cookie-manager/cookie-manager-page.c:1030 msgid "Name" msgstr "Nome" -#: ../extensions/cookie-manager/cookie-manager-page.c:1069 +#: ../extensions/cookie-manager/cookie-manager-page.c:1083 msgid "_Expand All" msgstr "_Espandi tutto" -#: ../extensions/cookie-manager/cookie-manager-page.c:1077 +#: ../extensions/cookie-manager/cookie-manager-page.c:1091 msgid "_Collapse All" msgstr "_Riduci tutto" -#: ../extensions/cookie-manager/cookie-manager-page.c:1129 -msgid "Search Cookies by Name or Domain" -msgstr "Cerca i cookie per nome o dominio" +#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +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:36 msgid "List, view and delete cookies" msgstr "Elenca, mostra o elimina i cookie" -#: ../extensions/copy-tabs.c:38 +#: ../extensions/copy-tabs.c:39 msgid "Copy Tab _Addresses" msgstr "Copia in_dirizzi delle schede" -#: ../extensions/copy-tabs.c:95 +#: ../extensions/copy-tabs.c:96 msgid "Copy Addresses of Tabs" msgstr "Copia gli indirizzi delle schede" -#: ../extensions/copy-tabs.c:96 +#: ../extensions/copy-tabs.c:97 msgid "Copy the addresses of all tabs to the clipboard" msgstr "Copia gli indirizzi di tutte le schede negli appunti" @@ -2421,25 +2600,25 @@ 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:387 +#: ../extensions/feed-panel/feed-panel.c:392 #, c-format msgctxt "Feed" msgid "Last updated: %s." msgstr "Ultimo aggiornamento: %s." -#: ../extensions/feed-panel/feed-panel.c:653 +#: ../extensions/feed-panel/feed-panel.c:658 msgid "Feeds" msgstr "Feed" -#: ../extensions/feed-panel/feed-panel.c:706 +#: ../extensions/feed-panel/feed-panel.c:711 msgid "Add new feed" msgstr "Aggiunge un nuovo feed" -#: ../extensions/feed-panel/feed-panel.c:713 +#: ../extensions/feed-panel/feed-panel.c:718 msgid "Delete feed" msgstr "Elimina feed" -#: ../extensions/feed-panel/feed-panel.c:795 +#: ../extensions/feed-panel/feed-panel.c:800 msgid "_Feeds" msgstr "_Feeds" @@ -2490,131 +2669,103 @@ msgstr "Pannello Feed" #: ../extensions/feed-panel/main.c:519 msgid "Read Atom/ RSS feeds" -msgstr "Leggi feed Atom o RSS" +msgstr "Leggi feed Atom/RSS" -#: ../extensions/formhistory/formhistory.c:39 +#: ../extensions/formhistory.c:151 #, c-format msgid "Failed to add form value: %s\n" msgstr "Errore nell'aggiunta del valore della form: %s\n" -#: ../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 +#: ../extensions/formhistory.c:303 msgid "Toggle form history state" msgstr "Attiva/disattiva la cronologia dei form" -#: ../extensions/formhistory/formhistory.c:438 +#: ../extensions/formhistory.c:304 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 +#: ../extensions/formhistory.c:438 ../extensions/formhistory.c:442 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Errore nell'esecuzione della richiesta al database: %s\n" -#: ../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.c:517 +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:669 +#: ../extensions/formhistory.c:576 msgid "Stores history of entered form data" msgstr "Memorizza una cronologia dei dati inseriti nei form" -#: ../extensions/formhistory/formhistory-gdom-frontend.c:225 -#: ../extensions/formhistory/formhistory-js-frontend.c:106 +#: ../extensions/formhistory.c:580 #, c-format -msgid "Failed to select suggestions\n" -msgstr "Impossibile selezionare i suggerimenti\n" +msgid "Not available: %s" +msgstr "Non disponibile: %s" + +#: ../extensions/formhistory.c:581 +msgid "Resource files not installed" +msgstr "I file della risorsa non sono installati" -#: ../extensions/history-list.vala:197 +#: ../extensions/formhistory.c:587 +msgid "Form history filler" +msgstr "Gestore cronologia form" + +#: ../extensions/history-list.vala:189 msgid "There are no unvisited tabs" msgstr "Sono presenti schede non viste" -#: ../extensions/history-list.vala:235 +#: ../extensions/history-list.vala:227 #, c-format msgid "History-List" msgstr "Lista-cronologia" -#: ../extensions/history-list.vala:275 +#: ../extensions/history-list.vala:266 msgid "Tab closing behavior" msgstr "Comportamento alla chiusura della scheda " -#: ../extensions/history-list.vala:283 +#: ../extensions/history-list.vala:274 msgid "Do nothing" msgstr "Non fare niente" -#: ../extensions/history-list.vala:289 +#: ../extensions/history-list.vala:280 msgid "Switch to last viewed tab" msgstr "Vai all'ultima scheda visitata" -#: ../extensions/history-list.vala:295 +#: ../extensions/history-list.vala:286 msgid "Switch to newest tab" msgstr "Vai alla scheda più recente" -#: ../extensions/history-list.vala:423 +#: ../extensions/history-list.vala:410 msgid "Next new Tab (History List)" msgstr "Nuova scheda successiva (lista cronologia)" -#: ../extensions/history-list.vala:424 +#: ../extensions/history-list.vala:411 msgid "Next new tab from history" msgstr "Nuova scheda successiva dalla cronologia" -#: ../extensions/history-list.vala:433 +#: ../extensions/history-list.vala:420 msgid "Previous new Tab (History List)" msgstr "Nuova scheda precedente (lista cronologia)" -#: ../extensions/history-list.vala:434 +#: ../extensions/history-list.vala:421 msgid "Previous new tab from history" msgstr "Nuova scheda precedente dalla cronologia" -#: ../extensions/history-list.vala:443 +#: ../extensions/history-list.vala:430 msgid "Display tab in background (History List)" msgstr "Visualizza scheda in secondo piano (lista cronologia)" -#: ../extensions/history-list.vala:444 +#: ../extensions/history-list.vala:431 msgid "Display the current selected tab in background" msgstr "Visualizza la scheda selezionata in secondo piano" -#: ../extensions/history-list.vala:566 +#: ../extensions/history-list.vala:556 msgid "History List" msgstr "Lista cronologia" -#: ../extensions/history-list.vala:567 +#: ../extensions/history-list.vala:557 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" +msgstr "Va all'ultima scheda utilizzata quando si cambia o si chiude una scheda" #: ../extensions/mouse-gestures.c:301 msgid "Mouse Gestures" @@ -2624,7 +2775,7 @@ msgstr "Gesti del mouse" msgid "Control Midori by moving the mouse" msgstr "Permette di controllare Midori con i movimenti del mouse" -#: ../extensions/shortcuts.c:109 +#: ../extensions/shortcuts.c:110 msgid "Reload page or stop loading" msgstr "Ricarica la pagina o interrompe il caricamento" @@ -2632,15 +2783,15 @@ msgstr "Ricarica la pagina o interrompe il caricamento" msgid "Customize Keyboard shortcuts" msgstr "Personalizzazione delle scorciatoie da tastiera" -#: ../extensions/shortcuts.c:283 +#: ../extensions/shortcuts.c:282 msgid "Customize Sh_ortcuts..." msgstr "Personalizza sc_orciatoie..." -#: ../extensions/shortcuts.c:320 +#: ../extensions/shortcuts.c:319 msgid "Shortcuts" msgstr "Scorciatoie" -#: ../extensions/shortcuts.c:321 +#: ../extensions/shortcuts.c:320 msgid "View and edit keyboard shortcuts" msgstr "Visualizza e modifica le scorciatoie da tastiera" @@ -2652,537 +2803,85 @@ msgstr "Orologio della barra di stato" msgid "Display date and time in the statusbar" msgstr "Mostra la data e l'ora nella barra di stato" -#: ../extensions/statusbar-features.c:152 +#: ../extensions/statusbar-features.c:129 msgid "Images" msgstr "Immagini" -#: ../extensions/statusbar-features.c:162 +#: ../extensions/statusbar-features.c:138 msgid "Scripts" msgstr "Script" -#: ../extensions/statusbar-features.c:174 +#: ../extensions/statusbar-features.c:147 msgid "Netscape plugins" msgstr "Plugin di Netscape" -#: ../extensions/statusbar-features.c:259 +#: ../extensions/statusbar-features.c:193 msgid "Statusbar Features" msgstr "Proprietà della barra di stato" -#: ../extensions/statusbar-features.c:260 +#: ../extensions/statusbar-features.c:194 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:589 ../extensions/tab-panel.c:676 +#: ../extensions/tab-panel.c:597 ../extensions/tab-panel.c:684 msgid "Tab Panel" msgstr "Pannello a scheda" -#: ../extensions/tab-panel.c:659 +#: ../extensions/tab-panel.c:667 msgid "T_ab Panel" msgstr "Pannello _a scheda" -#: ../extensions/tab-panel.c:677 +#: ../extensions/tab-panel.c:685 msgid "Show tabs in a vertical panel" msgstr "Mostra le schede in un pannello verticale" -#: ../extensions/tabs-minimized.c:76 +#: ../extensions/tabs-minimized.c:77 msgid "Only Icons on Tabs by default" msgstr "Solo icone sulle schede" -#: ../extensions/tabs-minimized.c:77 +#: ../extensions/tabs-minimized.c:78 msgid "New tabs have no label by default" msgstr "Le nuove schede non hanno alcuna etichetta di default" -#: ../extensions/toolbar-editor.c:395 +#: ../extensions/toolbar-editor.c:391 msgid "Customize Toolbar" msgstr "Personalizza la barra degli strumenti" -#: ../extensions/toolbar-editor.c:411 -msgid "" -"Select items to be displayed on the toolbar. Items can be reordered by drag " -"and drop." +#: ../extensions/toolbar-editor.c:407 +msgid "Select items to be displayed on the toolbar. Items can be reodered by drag and drop." msgstr "" -"Selezionare gli oggetti da visualizzare nella barra degli strumenti. Gli " -"oggetti possono essere riordinati tramite trascinamento." +"Selezionare gli oggetti da visualizzare nella barra degli strumenti.\n" +"\r\n" +"Gli oggetti possono essere riordinati tramite trascinamento." -#: ../extensions/toolbar-editor.c:427 +#: ../extensions/toolbar-editor.c:423 msgid "Available Items" msgstr "Oggetti disponibili" -#: ../extensions/toolbar-editor.c:448 +#: ../extensions/toolbar-editor.c:444 msgid "Displayed Items" msgstr "Oggetti visualizzati" -#: ../extensions/toolbar-editor.c:588 -msgid "_Customize Toolbar…" +#: ../extensions/toolbar-editor.c:579 +msgid "Customize _Toolbar..." msgstr "Personalizza barra degli s_trumenti..." -#: ../extensions/toolbar-editor.c:617 +#: ../extensions/toolbar-editor.c:595 +msgid "_Customize..." +msgstr "_Personalizza..." + +#: ../extensions/toolbar-editor.c:625 msgid "Toolbar Editor" msgstr "Editor della barra degli strumenti" -#: ../extensions/toolbar-editor.c:618 +#: ../extensions/toolbar-editor.c:626 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:462 +#: ../extensions/web-cache.c:471 msgid "Cache HTTP communication on disk" msgstr "Memorizza la comunicazione HTTP sul disco" -#~ msgid "_Bookmark" -#~ msgstr "S_egnalibro" - -#~ msgid "_Console" -#~ msgstr "_Console" - -#~ msgid "Toplevel folder" -#~ msgstr "Livello principale" - -#~ msgid "_Title:" -#~ msgstr "_Titolo:" - -#~ msgid "_Folder:" -#~ msgstr "_Cartella:" - -#~ msgid "Remember last window size" -#~ msgstr "Ricorda la dimensione dell'ultima finestra" - -#~ msgid "Whether to save the last window size" -#~ msgstr "" -#~ "Abilitare questa opzione per salvare le dimensioni dell'ultima finestra" - -#~ msgid "Last window width" -#~ msgstr "Larghezza dell'ultima finestra" - -#~ msgid "The last saved window width" -#~ msgstr "L'ultima larghezza salvata per la finestra" - -#~ msgid "Last window height" -#~ msgstr "Altezza dell'ultima finestra" - -#~ msgid "The last saved window height" -#~ msgstr "L'ultima altezza salvata per la finestra" - -#~ msgid "Last panel position" -#~ msgstr "Posizione del pannello" - -#~ msgid "The last saved panel position" -#~ msgstr "L'ultima posizione salvata per il pannello" - -#~ msgid "Last panel page" -#~ msgstr "Pagina dell'ultimo pannello" - -#~ msgid "The last saved panel page" -#~ msgstr "L'ultima pagina salvata per il pannello" - -#~ msgid "Last Web search" -#~ msgstr "Ultima ricerca web" - -#~ msgid "The last saved Web search" -#~ msgstr "L'ultima ricerca web salvata" - -#~ msgid "Show Menubar" -#~ msgstr "Mostra barra dei menu" - -#~ msgid "Whether to show the menubar" -#~ msgstr "Abilitare questa opzione per mostrare la barra dei menu" - -#~ msgid "Show Navigationbar" -#~ msgstr "Mostra barra di navigazione" - -#~ msgid "Whether to show the navigationbar" -#~ msgstr "Abilitare questa opzione per mostrare la barra di navigazione" - -#~ msgid "Show Bookmarkbar" -#~ msgstr "Mostra barra dei segnalibri" - -#~ msgid "Whether to show the bookmarkbar" -#~ msgstr "Abilitare questa opzione per mostrare la barra dei segnalibri" - -#~ msgid "Show Panel" -#~ msgstr "Mostra pannello" - -#~ msgid "Whether to show the panel" -#~ msgstr "Abilitare questa opzione per mostrare il pannello" - -#~ msgid "Show Statusbar" -#~ msgstr "Mostra barra di stato" - -#~ msgid "Whether to show the statusbar" -#~ msgstr "Abilitare questa opzione per mostrare la barra di stato" - -#~ msgid "Toolbar Items" -#~ msgstr "Elementi barra degli strumenti" - -#~ msgid "The items to show on the toolbar" -#~ msgstr "Indicare gli elementi da mostrare nella barra degli strumenti" - -#~ msgid "Compact Sidepanel" -#~ msgstr "Pannello compatto" - -#~ msgid "Whether to make the sidepanel compact" -#~ msgstr "" -#~ "Abilitare questa opzione per la visualizzazione compatta del pannello" - -#~ msgid "Align sidepanel on the right" -#~ msgstr "Allinea a destra il pannello laterale" - -#~ msgid "Whether to align the sidepanel on the right" -#~ msgstr "" -#~ "Abilitare questa opzione per allineare il pannello laterale a destra" - -#~ msgid "Open panels in separate windows" -#~ msgstr "Apri i pannelli in finestre separate" - -#~ msgid "Whether to always open panels in separate windows" -#~ msgstr "" -#~ "Abilitare questa opzione per aprire sempre i pannelli in finestre separate" - -#~ msgid "What to do when Midori starts" -#~ msgstr "Cosa fare all'avvio di Midori" - -#~ msgid "The homepage" -#~ msgstr "La pagina iniziale" - -#~ msgid "Show crash dialog" -#~ msgstr "Mostra finestra di errore" - -#~ msgid "The folder downloaded files are saved to" -#~ msgstr "Scegliere la cartella dove devono essere salvati i file scaricati" - -#~ msgid "An external text editor" -#~ msgstr "Inserire un editor di testo esterno" - -#~ msgid "An external news aggregator" -#~ msgstr "Aggregatore di notizie esterno" - -#~ msgid "Location entry Search" -#~ msgstr "Motore di ricerca predefinito" - -#~ msgid "The search to perform inside the location entry" -#~ msgstr "" -#~ "Inserire il motore di ricerca predefinito da utilizzare dalla barra degli " -#~ "indirizzi" - -#~ msgid "The preferred character encoding" -#~ msgstr "Scegliere la codifica dei caratteri preferita" - -#~ msgid "Always show the tabbar" -#~ msgstr "" -#~ "Abilitare questa opzione per mostrare sempre le etichette delle schede" - -#~ msgid "Whether tabs have close buttons" -#~ msgstr "" -#~ "Abilitare questa opzione per visualizzare il pulsante di chiusura nelle " -#~ "schede" - -#~ msgid "Where to open new pages" -#~ msgstr "Scegliere dove aprire le nuove pagine" - -#~ msgid "Whether to open new tabs in the background" -#~ msgstr "Abilitare questa opzione per aprire le nuove schede sullo sfondo" - -#~ msgid "Open popups in tabs" -#~ msgstr "Apri popup in schede" - -#~ msgid "Whether to open popup windows in tabs" -#~ msgstr "Abilitare questa opzione per aprire le finestre popup in schede" - -#~ msgid "Load and display images automatically" -#~ msgstr "" -#~ "Abilitare questa opzione per caricare e visualizzare automaticamente le " -#~ "immagini" - -#~ msgid "Enable embedded scripting languages" -#~ msgstr "" -#~ "Abilitare questa opzione per attivare i linguaggi di scripting integrati" - -#~ msgid "Enable embedded Netscape plugin objects" -#~ msgstr "" -#~ "Abilitare questa opzione per attivare gli oggetti integrati con i plugin " -#~ "di Netscape" - -#~ msgid "Enable spell checking while typing" -#~ msgstr "" -#~ "Abilita questa opzione per attivare il controllo ortografico durante la " -#~ "digitazione" - -#~ msgid "Enable HTML5 database support" -#~ msgstr "Abilita il supporto al database HTML5" - -#~ msgid "Whether to enable HTML5 database support" -#~ msgstr "Abilitare questa opzione per attivare il supporto al database HTML5" - -#~ msgid "Whether to enable HTML5 local storage support" -#~ msgstr "" -#~ "Abilitare questa opzione per attivare il supporto allo storage locale " -#~ "HTML5" - -#~ msgid "Whether to enable offline web application cache" -#~ msgstr "" -#~ "Abilitare questa opzione per attivare la cache delle applicazioni web " -#~ "quando offline" - -#~ 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" - -#~ msgid "Allow websites to use OpenGL rendering" -#~ msgstr "Permette ai siti internet di utilizzare la visualizzazione OpenGL" - -#~ msgid "Whether to zoom text and images" -#~ msgstr "Abilitare questa opzione per ingrandire il testo e le immagini" - -#~ msgid "Find inline while typing" -#~ msgstr "Cerca nella pagina durante la digitazione" - -#~ msgid "Whether to automatically find inline while typing" -#~ msgstr "" -#~ "Abilitare questa opzione per cercare automaticamente nella pagina durante " -#~ "la digitazione" - -#~ msgid "The type of proxy server to use" -#~ msgstr "Il tipo di server proxy da usare" - -#~ msgid "HTTP Proxy Server" -#~ msgstr "Server proxy HTTP" - -#~ msgid "The proxy server used for HTTP connections" -#~ msgstr "Il server proxy usato per le connessioni HTTP" - -#~ msgid "The proxy server port used for HTTP connections" -#~ msgstr "La porta per il server proxy usato per le connessioni HTTP" - -#~ msgid "Identification string" -#~ msgstr "Stringa di identificazione" - -#~ msgid "The application identification string" -#~ msgstr "Inserire la stringa di identificazione dell'applicazione" - -#~ msgid "Clear private data" -#~ msgstr "Cancella i dati personali" - -#~ msgid "The private data selected for deletion" -#~ msgstr "Dati privati selezionati per la cancellazione" - -#~ msgid "Clear data" -#~ msgstr "Cancella i dati" - -#~ msgid "The data selected for deletion" -#~ msgstr "I dati selezionati per la cancellazione" - -#~ msgid "Close ot_her Tabs" -#~ msgstr "Chiudi le altre sc_hede" - -#~ msgid "_Icon:" -#~ msgstr "I_cona:" - -#~ msgid "Filter:" -#~ msgstr "Filtro:" - -#~ 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" - -#~ msgid "_Customize…" -#~ msgstr "_Personalizza…" - -#~ msgid "The bookmarks couldn't be saved. %s" -#~ msgstr "I segnalibri non possono essere salvati. %s" - -#~ 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 "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" @@ -3198,8 +2897,8 @@ msgstr "Memorizza la comunicazione HTTP sul disco" #~ 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 "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" @@ -3222,6 +2921,9 @@ msgstr "Memorizza la comunicazione HTTP sul disco" #~ msgid "Delete old cookies after 1 year" #~ msgstr "Elimina i cookie obsoleti dopo 1 anno" +#~ msgid "Midori (Private Browsing)" +#~ msgstr "Midori (Navigazione privata)" + #~ msgid "Failed to execute database statement\n" #~ msgstr "Impossibile eseguire la richiesta al database\n" @@ -3241,24 +2943,19 @@ msgstr "Memorizza la comunicazione HTTP sul disco" #~ 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" +#~ 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" +#~ 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" +#~ msgstr "Abilitare questa opzione per mostrare la selezione veloce nelle nuove schede" #~ msgid "Download Manager" #~ msgstr "Gestione scaricamenti" @@ -3288,8 +2985,7 @@ msgstr "Memorizza la comunicazione HTTP sul disco" #~ 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" +#~ msgstr "Abilitare questa opzione per salvare l'elenco degli ultimi file scaricati" #~ msgid "General" #~ msgstr "Generale" @@ -3306,6 +3002,9 @@ msgstr "Memorizza la comunicazione HTTP sul disco" #~ msgid "Navigationbar" #~ msgstr "Barra di navigazione" +#~ msgid "_Form History" +#~ msgstr "Cronologia _form" + #~ msgid "Next Tab (History List)" #~ msgstr "Scheda successiva (lista cronologia)" @@ -3364,9 +3063,7 @@ msgstr "Memorizza la comunicazione HTTP sul disco" #~ 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" +#~ msgstr "Abilitare questa opzione per mostrare la percentuale di caricamento della pagina nella barra degli indirizzi" #~ msgid "_Save Link destination" #~ msgstr "_Salva indirizzo collegamento" @@ -3378,14 +3075,10 @@ msgstr "Memorizza la comunicazione HTTP sul disco" #~ 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" +#~ 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" +#~ msgstr "Abilitare questa opzione per mostrare una notifica quando viene completato un trasferimento" #~ msgid "Download I_mage" #~ msgstr "Scarica i_mmagine" @@ -3402,12 +3095,8 @@ msgstr "Memorizza la comunicazione HTTP sul disco" #~ 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 "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" @@ -3460,21 +3149,20 @@ msgstr "Memorizza la comunicazione HTTP sul disco" #~ 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" +#~ 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 "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" @@ -3486,14 +3174,13 @@ msgstr "Memorizza la comunicazione HTTP sul disco" #~ msgstr "Abilita strumenti di sviluppo" #~ msgid "Enable special extensions for developers" -#~ msgstr "" -#~ "Abilitare questa opzione per utilizzare le estensioni per gli sviluppatori" +#~ 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 "" -#~ "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" @@ -3505,8 +3192,7 @@ msgstr "Memorizza la comunicazione HTTP sul disco" #~ msgstr "Ridimensiona immagini" #~ msgid "Automatically shrink standalone images to fit" -#~ msgstr "" -#~ "Abilitare per ridimensionare automaticamente le immagini caricate da sole" +#~ msgstr "Abilitare per ridimensionare automaticamente le immagini caricate da sole" #~ msgid "Tint tabs distinctly" #~ msgstr "Colora le etichette in modo distinto" @@ -3556,6 +3242,12 @@ msgstr "Memorizza la comunicazione HTTP sul disco" #~ 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 "_Enable" +#~ msgstr "_Abilita" + #~ msgid "Enable" #~ msgstr "Abilita" diff --git a/po/ja.po b/po/ja.po index 9eb32205..dfebc50f 100644 --- a/po/ja.po +++ b/po/ja.po @@ -1,449 +1,404 @@ # Japanese translations for midori package. -# Copyright (C) 2008-2012 THE midori'S COPYRIGHT HOLDER +# Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER # This file is distributed under the same license as the midori package. -# Masato Hashimoto , 2008-2012. +# Masato Hashimoto 2008-2011 # msgid "" msgstr "" "Project-Id-Version: Midori 0.1.9\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-12 21:43+0900\n" -"PO-Revision-Date: 2012-09-12 21:41+0900\n" +"POT-Creation-Date: 2011-11-09 13:18+0900\n" +"PO-Revision-Date: 2011-11-09 13:19+0900\n" "Last-Translator: Masato Hashimoto \n" -"Language-Team: Japanese \n" +"Language-Team: Japanese \n" "Language: ja\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" +"Plural-Forms: nplurals=2; plural=0;\n" -#: ../data/midori.desktop.in.h:1 ../midori/main.c:1922 ../midori/main.c:1946 -#: ../midori/main.c:1960 ../midori/midori-websettings.c:200 -msgid "Midori" -msgstr "Midori" +#: ../data/midori.desktop.in.h:1 +msgid "Lightweight web browser" +msgstr "軽量級ウェブブラウザ" #: ../data/midori.desktop.in.h:2 -msgid "Web Browser" -msgstr "ウェブブラウザー" +#: ../midori/main.c:2017 +#: ../midori/main.c:2037 +#: ../midori/main.c:2053 +#: ../midori/midori-websettings.c:300 +msgid "Midori" +msgstr "Midori" #: ../data/midori.desktop.in.h:3 -msgid "Midori Web Browser" -msgstr "Midori ウェブブラウザー" - -#: ../data/midori.desktop.in.h:4 -msgid "Browse the Web" -msgstr "ウェブを閲覧します" - -#: ../data/midori.desktop.in.h:5 -msgid "Internet;WWW;Explorer" -msgstr "インターネット;WWW;エクスプローラー" - -#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1325 -msgid "New Tab" -msgstr "新しいタブ" - -#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1322 -msgid "New Window" -msgstr "新しいウィンドウ" - -#: ../data/midori.desktop.in.h:8 -msgid "New Private Browsing Window" -msgstr "新しいプライベートブラウジングウィンドウ" +msgid "Web Browser" +msgstr "ウェブブラウザ" #: ../data/midori-private.desktop.in.h:1 -msgid "Midori Private Browsing" -msgstr "Midori プライベートブラウジング" +msgid "Open a new private browsing window" +msgstr "新しいプライベートブラウジングウィンドウを開きます" -#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:4349 +#: ../data/midori-private.desktop.in.h:2 msgid "Private Browsing" msgstr "プライベートブラウジング" -#: ../data/midori-private.desktop.in.h:3 -msgid "Open a new private browsing window" -msgstr "新しいプライベートブラウジングウィンドウを開きます" - -#: ../midori/main.c:91 ../midori/main.c:97 +#: ../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:145 +#: ../midori/main.c:150 #, c-format msgid "Value '%s' is invalid for %s" msgstr "'%s' は %s の値として無効です" -#: ../midori/main.c:150 ../midori/main.c:254 +#: ../midori/main.c:155 +#: ../midori/main.c:261 #, c-format msgid "Invalid configuration value '%s'" msgstr "無効な設定値 '%s'" -#: ../midori/main.c:365 +#: ../midori/main.c:366 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "検索エンジンを読み込めませんでした。%s\n" -#: ../midori/main.c:419 +#: ../midori/main.c:420 #, c-format msgid "Failed to clear history: %s\n" msgstr "履歴のクリアに失敗しました: %s\n" -#: ../midori/main.c:441 ../extensions/formhistory/formhistory.c:531 +#: ../midori/main.c:440 +#: ../midori/main.c:561 +#: ../extensions/formhistory.c:415 #, 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:513 +#: ../midori/main.c:504 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "古い履歴アイテムの削除に失敗しました: %s\n" -#: ../midori/main.c:535 +#: ../midori/main.c:544 +#: ../panels/midori-history.c:189 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "履歴アイテムの削除に失敗しました: %s\n" + +#: ../midori/main.c:591 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "ブックマークを保存できませんでした。%s" + +#: ../midori/main.c:626 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "設定を保存できませんでした。%s" -#: ../midori/main.c:561 +#: ../midori/main.c:661 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "検索エンジンを保存できませんでした。%s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:598 +#: ../midori/main.c:687 +#: ../midori/main.c:707 #, c-format msgid "The trash couldn't be saved. %s" msgstr "ゴミ箱を保存できませんでした。%s" -#: ../midori/main.c:671 ../panels/midori-extensions.c:90 +#: ../midori/main.c:741 +#: ../panels/midori-extensions.c:91 msgid "Extensions" msgstr "エクステンション" -#: ../midori/main.c:685 +#: ../midori/main.c:755 msgid "Privacy" msgstr "プライバシー" -#: ../midori/main.c:687 -msgid "Delete old Cookies after:" -msgstr "古い Cookie を削除:" - -# tooltip -#: ../midori/main.c:689 ../midori/main.c:692 -msgid "The maximum number of days to save cookies for" -msgstr "Cookie を保存する最大日数です" - -#: ../midori/main.c:696 -msgid "Only accept Cookies from sites you visit" -msgstr "訪問したウェブサイトからの Cookie のみ受け入れる" - -#: ../midori/main.c:697 -msgid "Block cookies sent by third-party websites" -msgstr "サードパーティウェブサイトから送られた Cookie はブロックします" - -#: ../midori/main.c:702 -msgid "" -"Cookies store login data, saved games, or user profiles for advertisement " -"purposes." -msgstr "" -"Cookie には、ログインデータやゲームデータ、広告用のユーザープロファイルなどが" -"格納されます。" - -#: ../midori/main.c:709 -msgid "Enable offline web application cache" -msgstr "オフラインウェブアプリケーションキャッシュを有効にする" - -#: ../midori/main.c:712 -msgid "Enable HTML5 local storage support" -msgstr "HTML5 ローカルストレージサポートを有効にする" - -#. i18n: Reworded: Shorten details propagated when going to another page -#: ../midori/main.c:716 -msgid "Strip referrer details sent to websites" -msgstr "外部サイトへ送るリファラーの詳細情報を除去する" - -#. i18n: Referer here is not a typo but a technical term -#: ../midori/main.c:718 -msgid "Whether the \"Referer\" header should be shortened to the hostname" -msgstr "\"Referer\" ヘッダーはホスト名に短縮されます" - -#: ../midori/main.c:721 -msgid "Delete pages from history after:" -msgstr "履歴から古いページを削除:" - -# tooltip -#: ../midori/main.c:723 ../midori/main.c:726 -msgid "The maximum number of days to save the history for" -msgstr "履歴を保存する最大日数です" - #: ../midori/main.c:767 +msgid "Cookies store login data, saved games, or user profiles for advertisement purposes." +msgstr "Cookie には、ログインデータやゲームデータ、広告用のユーザプロファイルなどが格納されます。" + +#: ../midori/main.c:829 #, c-format msgid "The session couldn't be saved. %s" msgstr "セッションは保存できませんでした。%s" -#: ../midori/main.c:989 -msgid "" -"No root certificate file is available. SSL certificates cannot be verified." +#: ../midori/main.c:1039 +msgid "No root certificate file is available. SSL certificates cannot be verified." msgstr "ルート証明書が利用できません。SSL 認証書を照合できませんでした。" -#: ../midori/main.c:1084 -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:1107 +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:1103 +#: ../midori/main.c:1126 msgid "Modify _preferences" msgstr "設定を変更する(_P)" -#: ../midori/main.c:1107 +#: ../midori/main.c:1130 msgid "Disable all _extensions" msgstr "すべてのエクステンションを無効にする(_E)" -# tooltip -#: ../midori/main.c:1116 -msgid "Show a dialog after Midori crashed" -msgstr "Midori がクラッシュした後の起動時にダイアログを表示します" - -#: ../midori/main.c:1121 +#: ../midori/main.c:1143 msgid "Discard old tabs" msgstr "以前のタブを破棄" -#: ../midori/main.c:1122 ../midori/midori-websettings.c:108 +#: ../midori/main.c:1144 +#: ../midori/midori-websettings.c:209 msgid "Show last tabs without loading" msgstr "最後のタブを読み込まずに表示" -#: ../midori/main.c:1123 ../midori/midori-websettings.c:107 +#: ../midori/main.c:1145 +#: ../midori/midori-websettings.c:208 msgid "Show last open tabs" msgstr "最後に開いたタブを表示" -#: ../midori/main.c:1370 ../midori/main.c:2382 +#: ../midori/main.c:1355 +#: ../midori/main.c:2425 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "セッションを読み込めませんでした: %s\n" -#: ../midori/main.c:1508 +#: ../midori/main.c:1496 #, c-format msgid "Snapshot saved to: %s\n" msgstr "スナップショットを取得しました: %s\n" # CLI --help -#: ../midori/main.c:1837 +#: ../midori/main.c:1920 msgid "Run ADDRESS as a web application" msgstr "ADDRESS をウェブアプリケーションとして実行する" -#: ../midori/main.c:1837 +#: ../midori/main.c:1920 msgid "ADDRESS" msgstr "ADDRESS" # CLI --help -#: ../midori/main.c:1840 +#: ../midori/main.c:1923 msgid "Use FOLDER as configuration folder" -msgstr "設定フォルダーとして FOLDER を使用する" +msgstr "設定フォルダとして FOLDER を使用する" -#: ../midori/main.c:1840 +#: ../midori/main.c:1923 msgid "FOLDER" msgstr "FOLDER" # CLI --help -#: ../midori/main.c:1843 +#: ../midori/main.c:1926 msgid "Private browsing, no changes are saved" msgstr "プライベートブラウジングで変更を保存しない" -# CLI --help -#: ../midori/main.c:1846 -msgid "Portable mode, all runtime files are stored in one place" -msgstr "ポータブルモード。すべてのランタイムファイルを 1 箇所に格納する" - -# CLI --help -#: ../midori/main.c:1849 -msgid "Plain GTK+ window with WebKit, akin to GtkLauncher" -msgstr "GtkLauncher と同種の、WebKit を使用したプレーン GTK+ ウィンドウ" - -# CLI --help -#: ../midori/main.c:1851 +#: ../midori/main.c:1928 msgid "Show a diagnostic dialog" msgstr "診断ダイアログを表示する" # CLI --help -#: ../midori/main.c:1853 +#: ../midori/main.c:1930 msgid "Run the specified filename as javascript" msgstr "指定されたファイル名を javascript として実行する" # CLI --help -#: ../midori/main.c:1855 +#: ../midori/main.c:1932 msgid "Take a snapshot of the specified URI" msgstr "指定された URI のスナップショットを取得する" # CLI --help -#: ../midori/main.c:1857 +#: ../midori/main.c:1934 msgid "Execute the specified command" msgstr "指定されたコマンドを実行する" # CLI help -#: ../midori/main.c:1859 +#: ../midori/main.c:1936 msgid "List available commands to execute with -e/ --execute" msgstr "-e/ --execute で実行できるコマンドの一覧を表示する" # CLI --help -#: ../midori/main.c:1861 +#: ../midori/main.c:1938 msgid "Display program version" msgstr "プログラムのバージョンを表示する" -#: ../midori/main.c:1863 +#: ../midori/main.c:1940 msgid "Addresses" msgstr "アドレス" # CLI --help -#: ../midori/main.c:1865 +#: ../midori/main.c:1942 msgid "Block URIs according to regular expression PATTERN" msgstr "正規表現 PATTERN に従って URI をブロックする" -#: ../midori/main.c:1865 +#: ../midori/main.c:1942 msgid "PATTERN" msgstr "PATTERN" # CLI --help #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1869 +#: ../midori/main.c:1946 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "非アクティブになって SECONDS 秒後に Midori をリセットする" -#: ../midori/main.c:1869 +#: ../midori/main.c:1946 msgid "SECONDS" msgstr "SECONDS" # CLI --help -#: ../midori/main.c:1872 +#: ../midori/main.c:1949 msgid "Redirects console warnings to the specified FILENAME" msgstr "コンソール警告を指定された FILENAME にリダイレクトする" -#: ../midori/main.c:1872 +#: ../midori/main.c:1949 msgid "FILENAME" msgstr "FILENAME" -#: ../midori/main.c:1961 +#: ../midori/main.c:2014 +msgid "[Addresses]" +msgstr "[アドレス]" + +#: ../midori/main.c:2024 +msgid "The specified configuration folder is invalid." +msgstr "指定された設定フォルダが正しくありません。" + +#: ../midori/main.c:2054 msgid "Please report comments, suggestions and bugs to:" msgstr "コメント、ご提案、またはバグの報告はこちらまでお願いします:" -#: ../midori/main.c:1963 +#: ../midori/main.c:2056 msgid "Check for new versions at:" msgstr "新しいバージョンのチェックはこちら:" +#: ../midori/main.c:2139 +msgid "Website icons" +msgstr "ウェブサイトアイコン" + #. i18n: Logins and passwords in websites and web forms -#: ../midori/main.c:2102 +#: ../midori/main.c:2142 msgid "Saved logins and _passwords" msgstr "ログインおよびパスワード情報(_P)" -#: ../midori/main.c:2104 -msgid "Cookies and Website data" -msgstr "Cookie およびウェブサイトデータ" +#: ../midori/main.c:2144 +msgid "Cookies" +msgstr "Cookie" -#. TODO: Preserve page icons of search engines and merge privacy items -#: ../midori/main.c:2108 ../midori/midori-preferences.c:505 -#: ../extensions/web-cache.c:461 ../extensions/web-cache.c:470 +#: ../midori/main.c:2147 +msgid "'Flash' Cookies" +msgstr "'Flash' Cookie" + +#: ../midori/main.c:2150 +msgid "HTML5 _Databases" +msgstr "HTML5 データベース(_D)" + +#: ../midori/main.c:2153 +#: ../midori/midori-websettings.c:933 +#: ../extensions/web-cache.c:462 +#: ../extensions/web-cache.c:471 msgid "Web Cache" msgstr "ウェブキャッシュ" -#: ../midori/main.c:2111 -msgid "Website icons" -msgstr "ウェブサイトアイコン" +#: ../midori/main.c:2155 +msgid "Offline Application Cache" +msgstr "オフラインアプリケーションキャッシュ" -#: ../midori/main.c:2215 +#: ../midori/main.c:2258 msgid "An unknown error occured" msgstr "未知のエラーが発生しました" -#: ../midori/main.c:2330 +#: ../midori/main.c:2356 msgid "An instance of Midori is already running but not responding.\n" msgstr "Midori のインスタンスはすでに実行中ですが応答がありません。\n" -#: ../midori/main.c:2364 +#: ../midori/main.c:2392 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "ブックマークを読み込めませんでした: %s\n" -#: ../midori/main.c:2397 +#: ../midori/main.c:2440 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "ゴミ箱を読み込めませんでした: %s\n" -#: ../midori/main.c:2410 +#: ../midori/main.c:2453 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "履歴を読み込めませんでした: %s\n" -#: ../midori/main.c:2425 +#: ../midori/main.c:2469 msgid "The following errors occured:" msgstr "次のエラーが発生しました:" -#: ../midori/main.c:2441 +#: ../midori/main.c:2485 msgid "_Ignore" msgstr "無視(_I)" -#: ../midori/midori-app.c:1156 ../midori/midori-browser.c:533 -#, c-format -msgid "Unexpected action '%s'." -msgstr "'%s' は想定外のアクションです。" +#: ../midori/midori-app.c:1324 +msgid "_Bookmark" +msgstr "ブックマーク(_B)" -#: ../midori/midori-app.c:1372 ../midori/midori-browser.c:6224 +#: ../midori/midori-app.c:1325 +#: ../midori/midori-browser.c:5962 msgid "_Bookmarks" msgstr "ブックマーク(_B)" -#: ../midori/midori-app.c:1373 +#: ../midori/midori-app.c:1326 msgid "Add Boo_kmark" msgstr "ブックマークに追加(_K)" -#: ../midori/midori-app.c:1374 +#: ../midori/midori-app.c:1327 +msgid "_Console" +msgstr "コンソール(_C)" + +#: ../midori/midori-app.c:1328 msgid "_Extensions" msgstr "エクステンション(_E)" #. i18n: Browsing history, visited web pages, closed tabs -#: ../midori/midori-app.c:1375 ../midori/midori-browser.c:4677 +#: ../midori/midori-app.c:1329 +#: ../midori/midori-browser.c:4547 msgid "_History" msgstr "履歴(_H)" -#: ../midori/midori-app.c:1376 -msgid "_Userscripts" -msgstr "ユーザースクリプト(_U)" +#: ../midori/midori-app.c:1330 +msgid "_Homepage" +msgstr "ホームページ(_H)" -#: ../midori/midori-app.c:1377 -msgid "User_styles" -msgstr "ユーザースタイル(_S)" +#: ../midori/midori-app.c:1331 +msgid "_Userscripts" +msgstr "ユーザスクリプト(_U)" -#: ../midori/midori-app.c:1378 +#: ../midori/midori-app.c:1332 msgid "New _Tab" msgstr "新しいタブ(_T)" -#: ../midori/midori-app.c:1379 +#: ../midori/midori-app.c:1333 msgid "_Transfers" msgstr "転送(_T)" -#: ../midori/midori-app.c:1380 +#: ../midori/midori-app.c:1334 msgid "Netscape p_lugins" msgstr "Netscape プラグイン(_L)" -#: ../midori/midori-app.c:1381 +#: ../midori/midori-app.c:1335 msgid "_Closed Tabs" msgstr "閉じたタブ(_C)" -#: ../midori/midori-app.c:1382 ../midori/midori-browser.c:5360 +#: ../midori/midori-app.c:1336 +#: ../midori/midori-browser.c:5135 msgid "New _Window" msgstr "新しいウィンドウ(_W)" -#: ../midori/midori-app.c:1383 +#: ../midori/midori-app.c:1337 msgid "New _Folder" -msgstr "新しいフォルダー(_F)" - -#: ../midori/midori-app.c:1437 -msgid "[Addresses]" -msgstr "[アドレス]" +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 +#: ../midori/midori-array.c:547 +#: ../midori/midori-array.c:586 +#: ../midori/midori-array.c:609 +#: ../midori/midori-array.c:619 msgid "Malformed document." msgstr "不正な形式のドキュメントです。" @@ -451,1510 +406,1713 @@ msgstr "不正な形式のドキュメントです。" msgid "Unrecognized bookmark format." msgstr "認識できないブックマーク形式です。" -#: ../midori/midori-array.c:915 +#: ../midori/midori-array.c:916 msgid "Writing failed." msgstr "書き込みに失敗しました。" -# tooltip -#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:5499 -msgid "Go forward to the next page" -msgstr "次のページへ進みます" - -# tooltip -#. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:353 ../midori/midori-browser.c:5507 -#: ../midori/midori-browser.c:5510 -msgid "Go to the next sub-page" -msgstr "次のサブページへ進みます" - -#: ../midori/midori-browser.c:440 ../midori/midori-browser.c:5448 -#: ../midori/midori-browser.c:5457 +#: ../midori/midori-browser.c:328 +#: ../midori/midori-browser.c:5217 +#: ../midori/midori-browser.c:5226 msgid "Reload the current page" msgstr "現在のページを再読み込みします" -#: ../midori/midori-browser.c:448 ../midori/midori-browser.c:5454 +#: ../midori/midori-browser.c:339 +#: ../midori/midori-browser.c:5223 msgid "Stop loading the current page" msgstr "現在のページの読み込みを中止します" -#: ../midori/midori-browser.c:518 +#: ../midori/midori-browser.c:466 #, c-format msgid "Failed to update title: %s\n" msgstr "タイトルの更新に失敗しました: %s\n" -#: ../midori/midori-browser.c:613 +#: ../midori/midori-browser.c:479 +#, c-format +msgid "Unexpected action '%s'." +msgstr "'%s' は想定外のアクションです。" + +#: ../midori/midori-browser.c:580 #, c-format msgid "%s (Private Browsing)" msgstr "%s (プライベートブラウジング)" -#: ../midori/midori-browser.c:723 ../midori/midori-browser.c:765 -#: ../panels/midori-bookmarks.c:114 -msgid "Bookmarks" -msgstr "ブックマーク" +#: ../midori/midori-browser.c:691 +#: ../midori/midori-browser.c:724 +msgid "Toplevel folder" +msgstr "トップレベルフォルダ" -#: ../midori/midori-browser.c:825 +#: ../midori/midori-browser.c:781 msgid "New folder" -msgstr "新しいフォルダー" +msgstr "新しいフォルダ" -#: ../midori/midori-browser.c:825 +#: ../midori/midori-browser.c:781 msgid "Edit folder" -msgstr "フォルダーの編集" +msgstr "フォルダの編集" -#: ../midori/midori-browser.c:827 +#: ../midori/midori-browser.c:783 msgid "New bookmark" msgstr "新しいブックマーク" -#: ../midori/midori-browser.c:827 +#: ../midori/midori-browser.c:783 msgid "Edit bookmark" msgstr "ブックマークの編集" -#: ../midori/midori-browser.c:861 -msgid "Type a name for this bookmark and choose where to keep it." -msgstr "このブックマークの名前のと追加先を指定してください。" +#: ../midori/midori-browser.c:814 +msgid "_Title:" +msgstr "タイトル(_T):" + +#: ../midori/midori-browser.c:834 +#: ../midori/midori-searchaction.c:966 +#: ../extensions/feed-panel/main.c:377 +msgid "_Address:" +msgstr "アドレス(_A):" + +#: ../midori/midori-browser.c:857 +#: ../midori/midori-browser.c:4282 +msgid "_Folder:" +msgstr "フォルダ(_F):" -#: ../midori/midori-browser.c:922 +#: ../midori/midori-browser.c:873 msgid "Add to _Speed Dial" msgstr "スピードダイアルに追加(_S)" -#: ../midori/midori-browser.c:928 +#: ../midori/midori-browser.c:886 msgid "Show in the tool_bar" msgstr "ツールバーに表示する(_B)" -#: ../midori/midori-browser.c:936 +#: ../midori/midori-browser.c:901 msgid "Run as _web application" msgstr "ウェブアプリケーションとして実行する(_W)" -#: ../midori/midori-browser.c:1054 ../midori/midori-browser.c:4481 +#: ../midori/midori-browser.c:972 +#, c-format +msgid "The file \"%s\" can't be saved in this folder." +msgstr "ファイル \"%s\" をこのフォルダに保存することはできません。" + +#: ../midori/midori-browser.c:974 +#, c-format +msgid "You don't have permission to write in this location." +msgstr "この場所への書き込み権がありません。" + +#: ../midori/midori-browser.c:981 +#, c-format +msgid "There is not enough free space to download \"%s\"." +msgstr "\"%s\" をダウンロードする十分な空きスペースがありません。" + +#: ../midori/midori-browser.c:984 +#, c-format +msgid "The file needs %s but only %s are left." +msgstr "ファイルのダウンロードには %s 必要ですが、%s しか空きがありません。" + +#: ../midori/midori-browser.c:1028 +#: ../midori/midori-browser.c:4352 msgid "Save file as" msgstr "名前を付けて保存" -#: ../midori/midori-browser.c:1064 -msgid "Save associated _resources" -msgstr "関連リソースも保存する(_R)" +#: ../midori/midori-browser.c:1337 +msgid "New Window" +msgstr "新しいウィンドウ" -#: ../midori/midori-browser.c:1322 +#: ../midori/midori-browser.c:1337 msgid "A new window has been opened" msgstr "新しいウィンドウが開かれました" -#: ../midori/midori-browser.c:1325 +#: ../midori/midori-browser.c:1340 +msgid "New Tab" +msgstr "新しいタブ" + +#: ../midori/midori-browser.c:1340 msgid "A new tab has been opened" msgstr "新しいタブが開かれました" -#: ../midori/midori-browser.c:1342 -msgid "Error opening the image!" -msgstr "画像を開く際にエラーが発生しました" - -#: ../midori/midori-browser.c:1343 -msgid "Can not open selected image in a default viewer." -msgstr "デフォルトの画像ビューアーでは選択された画像を開けません。" - -#: ../midori/midori-browser.c:1349 -msgid "Error downloading the image!" -msgstr "画像をダウンロードする際にエラーが発生しました" - -#: ../midori/midori-browser.c:1350 -msgid "Can not download selected image." -msgstr "選択された画像をダウンロードできません。" - -#: ../midori/midori-browser.c:1407 +#: ../midori/midori-browser.c:1377 msgid "Save file" msgstr "ファイルの保存" -#: ../midori/midori-browser.c:2312 +#: ../midori/midori-browser.c:2267 msgid "Open file" msgstr "ファイルを開く" -#: ../midori/midori-browser.c:2444 +#: ../midori/midori-browser.c:2397 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:2450 ../extensions/feed-panel/main.c:365 +#: ../midori/midori-browser.c:2403 +#: ../extensions/feed-panel/main.c:365 msgid "New feed" msgstr "新しいフィード" # tooltip -#: ../midori/midori-browser.c:2493 ../midori/midori-browser.c:5523 -#: ../panels/midori-bookmarks.c:527 +#: ../midori/midori-browser.c:2446 +#: ../midori/midori-browser.c:5286 +#: ../panels/midori-bookmarks.c:463 msgid "Add a new bookmark" msgstr "新しいブックマークを追加します" -#: ../midori/midori-browser.c:3037 ../midori/midori-searchaction.c:487 +#: ../midori/midori-browser.c:2967 +#: ../midori/midori-searchaction.c:487 msgid "Empty" msgstr "空です" -#: ../midori/midori-browser.c:3483 ../midori/midori-browser.c:3484 +#: ../midori/midori-browser.c:3462 msgid "Toggle text cursor navigation" -msgstr "テキストカーソルナビゲーションへの切り替え" - -#: ../midori/midori-browser.c:3486 -msgid "" -"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in " -"all websites." -msgstr "" -"F7 キーでキャレットブラウジングに切り替えます。有効にすると、テキストカーソル" -"がすべてのウェブサイト上に表示されます。" +msgstr "テキストカーソルでのナビゲーションに切り替えます" -#: ../midori/midori-browser.c:3489 -msgid "_Enable Caret Browsing" -msgstr "キャレットブラウジングを有効にする(_E)" - -#: ../midori/midori-browser.c:3881 ../midori/midori-browser.c:5917 +#: ../midori/midori-browser.c:3748 +#: ../midori/midori-browser.c:5693 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "新規履歴アイテムの挿入に失敗しました: %s\n" -#: ../midori/midori-browser.c:4207 ../panels/midori-bookmarks.c:850 -#: ../panels/midori-history.c:806 +#: ../midori/midori-browser.c:4079 +#: ../panels/midori-bookmarks.c:779 +#: ../panels/midori-history.c:747 msgid "Open all in _Tabs" msgstr "タブですべて開く(_T)" -#: ../midori/midori-browser.c:4214 ../panels/midori-bookmarks.c:856 -#: ../panels/midori-history.c:812 ../extensions/feed-panel/feed-panel.c:528 +#: ../midori/midori-browser.c:4086 +#: ../panels/midori-bookmarks.c:785 +#: ../panels/midori-history.c:753 +#: ../extensions/feed-panel/feed-panel.c:528 msgid "Open in New _Tab" msgstr "新しいタブで開く(_T)" -#: ../midori/midori-browser.c:4217 ../midori/midori-view.c:2952 -#: ../midori/midori-view.c:4922 ../panels/midori-bookmarks.c:858 -#: ../panels/midori-history.c:814 ../extensions/feed-panel/feed-panel.c:530 +#: ../midori/midori-browser.c:4089 +#: ../midori/midori-view.c:2532 +#: ../midori/midori-view.c:4337 +#: ../panels/midori-bookmarks.c:787 +#: ../panels/midori-history.c:755 +#: ../extensions/feed-panel/feed-panel.c:530 msgid "Open in New _Window" msgstr "新しいウィンドウで開く(_W)" -#: ../midori/midori-browser.c:4306 +#: ../midori/midori-browser.c:4169 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4307 +#: ../midori/midori-browser.c:4170 msgid "Kazehakase" msgstr "風博士" -#: ../midori/midori-browser.c:4308 +#: ../midori/midori-browser.c:4171 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4309 +#: ../midori/midori-browser.c:4172 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4310 +#: ../midori/midori-browser.c:4173 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4311 +#: ../midori/midori-browser.c:4174 #, c-format msgid "Firefox (%s)" msgstr "Firefox (%s)" -#: ../midori/midori-browser.c:4312 -msgid "Midori 0.2.6" -msgstr "Midori 0.2.6" +#: ../midori/midori-browser.c:4195 +msgid "Import bookmarks..." +msgstr "ブックマークのインポート..." -#: ../midori/midori-browser.c:4333 -msgid "Import bookmarks…" -msgstr "ブックマークのインポート…" - -#: ../midori/midori-browser.c:4336 ../midori/midori-browser.c:5528 +#: ../midori/midori-browser.c:4198 +#: ../midori/midori-browser.c:5291 msgid "_Import bookmarks" msgstr "ブックマークのインポート(_I)" -#: ../midori/midori-browser.c:4347 +#: ../midori/midori-browser.c:4209 msgid "_Application:" msgstr "アプリケーション(_A):" -#: ../midori/midori-browser.c:4412 +#: ../midori/midori-browser.c:4274 msgid "Import from XBEL or HTML file" msgstr "XBEL または HTML ファイルからインポート" -#: ../midori/midori-browser.c:4440 +#: ../midori/midori-browser.c:4309 msgid "Import from a file" msgstr "ファイルからインポート" -#: ../midori/midori-browser.c:4452 +#: ../midori/midori-browser.c:4321 msgid "Failed to import bookmarks" msgstr "ブックマークのインポートに失敗しました" -#: ../midori/midori-browser.c:4486 +#: ../midori/midori-browser.c:4357 msgid "XBEL Bookmarks" msgstr "XBEL ブックマーク" -#: ../midori/midori-browser.c:4491 +#: ../midori/midori-browser.c:4362 msgid "Netscape Bookmarks" msgstr "Netscape ブックマーク" -#: ../midori/midori-browser.c:4505 +#: ../midori/midori-browser.c:4376 msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)" -msgstr "" -"Midori は XBEL (*.xbel) および Netscape (*.html) へのみエクスポートできます" +msgstr "Midori は XBEL (*.xbel) および Netscape (*.html) へのみエクスポートできます" -#: ../midori/midori-browser.c:4520 +#: ../midori/midori-browser.c:4392 msgid "Failed to export bookmarks" msgstr "ブックマークのエクスポートに失敗しました" # Dialog title #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4642 +#: ../midori/midori-browser.c:4514 msgid "Clear Private Data" msgstr "プライベートデータのクリア" # Button label -#: ../midori/midori-browser.c:4646 +#: ../midori/midori-browser.c:4518 msgid "_Clear private data" msgstr "プライベートデータのクリア(_C)" -#: ../midori/midori-browser.c:4661 +#: ../midori/midori-browser.c:4531 msgid "Clear the following data:" msgstr "以下のデータをクリアします:" -#: ../midori/midori-browser.c:4671 +#: ../midori/midori-browser.c:4541 msgid "Last open _tabs" msgstr "最後に開いたタブ(_T)" -#: ../midori/midori-browser.c:4697 +#: ../midori/midori-browser.c:4567 msgid "Clear private data when _quitting Midori" msgstr "Midori 終了時にプライベートデータをクリアする(_Q)" -#: ../midori/midori-browser.c:4912 +#: ../midori/midori-browser.c:4743 msgid "A lightweight web browser." -msgstr "軽快なウェブブラウザー" +msgstr "軽快なウェブブラウザ" -#: ../midori/midori-browser.c:4913 +#: ../midori/midori-browser.c:4744 msgid "See about:version for version info." msgstr "バージョン情報は about:version をご覧ください。" -#: ../midori/midori-browser.c:4915 -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:4746 +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:4945 +#: ../midori/midori-browser.c:4767 msgid "translator-credits" msgstr "Masato Hashimoto " -#: ../midori/midori-browser.c:5358 +#: ../midori/midori-browser.c:5133 msgid "_File" msgstr "ファイル(_F)" # tooltip -#: ../midori/midori-browser.c:5361 +#: ../midori/midori-browser.c:5136 msgid "Open a new window" msgstr "新しいウィンドウを開きます" # tooltip -#: ../midori/midori-browser.c:5364 +#: ../midori/midori-browser.c:5139 msgid "Open a new tab" msgstr "新しいタブを開きます" -#: ../midori/midori-browser.c:5366 +#: ../midori/midori-browser.c:5141 msgid "New P_rivate Browsing Window" msgstr "新しいプライベートブラウジングウィンドウ(_R)" # tooltip -#: ../midori/midori-browser.c:5370 +#: ../midori/midori-browser.c:5145 msgid "Open a file" msgstr "ファイルを開きます" -#: ../midori/midori-browser.c:5372 -msgid "_Save Page As…" -msgstr "名前を付けてページを保存(_S)…" +#: ../midori/midori-browser.c:5147 +msgid "_Save Page As..." +msgstr "名前を付けてページを保存(_S)" # tooltip -#: ../midori/midori-browser.c:5373 +#: ../midori/midori-browser.c:5148 msgid "Save to a file" msgstr "ファイルへ保存します" -#: ../midori/midori-browser.c:5375 +#: ../midori/midori-browser.c:5150 msgid "Add to Speed _dial" msgstr "スピードダイアルに追加(_D)" -#: ../midori/midori-browser.c:5379 +#: ../midori/midori-browser.c:5154 msgid "Add Shortcut to the _desktop" msgstr "デスクトップにショートカットを追加(_D)" -#: ../midori/midori-browser.c:5381 +#: ../midori/midori-browser.c:5156 msgid "Create _Launcher" -msgstr "ランチャーの作成(_L)" +msgstr "ランチャの作成(_L)" -#: ../midori/midori-browser.c:5385 +#: ../midori/midori-browser.c:5160 msgid "Subscribe to News _feed" msgstr "ニュースフィードを購読(_F)" -#: ../midori/midori-browser.c:5391 +#: ../midori/midori-browser.c:5166 msgid "_Close Tab" msgstr "タブを閉じる(_C)" # tooltip -#: ../midori/midori-browser.c:5392 +#: ../midori/midori-browser.c:5167 msgid "Close the current tab" msgstr "現在のタブを閉じます" -#: ../midori/midori-browser.c:5394 +#: ../midori/midori-browser.c:5169 msgid "C_lose Window" msgstr "ウィンドウを閉じる(_L)" -#: ../midori/midori-browser.c:5398 -msgid "_Share" -msgstr "共有(_S)" - # tooltip -#: ../midori/midori-browser.c:5403 +#: ../midori/midori-browser.c:5173 msgid "Print the current page" msgstr "現在のページを印刷します" -#: ../midori/midori-browser.c:5406 +#: ../midori/midori-browser.c:5175 msgid "Close a_ll Windows" msgstr "すべてのウィンドウを閉じる(_L)" -#: ../midori/midori-browser.c:5409 +#: ../midori/midori-browser.c:5178 msgid "_Edit" msgstr "編集(_E)" -#: ../midori/midori-browser.c:5432 -msgid "_Find…" -msgstr "検索(_F)…" +#: ../midori/midori-browser.c:5201 +msgid "_Find..." +msgstr "検索(_F)..." # tooltip -#: ../midori/midori-browser.c:5433 +#: ../midori/midori-browser.c:5202 msgid "Find a word or phrase in the page" msgstr "ページ内の単語やフレーズを検索します" -#: ../midori/midori-browser.c:5435 +#: ../midori/midori-browser.c:5204 msgid "Find _Next" msgstr "次を検索(_N)" -#: ../midori/midori-browser.c:5438 +#: ../midori/midori-browser.c:5207 msgid "Find _Previous" msgstr "前を検索(_P)" # tooltip -#: ../midori/midori-browser.c:5442 +#: ../midori/midori-browser.c:5211 msgid "Configure the application preferences" msgstr "このアプリケーションの設定を行います" -#: ../midori/midori-browser.c:5444 +#: ../midori/midori-browser.c:5213 msgid "_View" msgstr "表示(_V)" -#: ../midori/midori-browser.c:5445 +#: ../midori/midori-browser.c:5214 msgid "_Toolbars" msgstr "ツールバー(_T)" -#: ../midori/midori-browser.c:5450 +#: ../midori/midori-browser.c:5219 msgid "Reload page without caching" msgstr "ページをキャッシュせずに再読み込み" # tooltip -#: ../midori/midori-browser.c:5460 +#: ../midori/midori-browser.c:5229 msgid "Increase the zoom level" msgstr "ズームレベルを大きくします" # tooltip -#: ../midori/midori-browser.c:5463 +#: ../midori/midori-browser.c:5232 msgid "Decrease the zoom level" msgstr "ズームレベルを小さくします" -#: ../midori/midori-browser.c:5467 +#: ../midori/midori-browser.c:5236 msgid "_Encoding" msgstr "エンコーディング(_E)" -#: ../midori/midori-browser.c:5469 +#: ../midori/midori-browser.c:5238 msgid "View So_urce" msgstr "ソースを表示(_U)" -#: ../midori/midori-browser.c:5472 +#: ../midori/midori-browser.c:5241 msgid "Ca_ret Browsing" msgstr "キャレットブラウジング(_R)" # tooltip -#: ../midori/midori-browser.c:5476 +#: ../midori/midori-browser.c:5245 msgid "Toggle fullscreen view" msgstr "全画面表示/解除を切り替えます" -#: ../midori/midori-browser.c:5478 +#: ../midori/midori-browser.c:5247 msgid "Scroll _Left" msgstr "左へスクロール(_L)" -#: ../midori/midori-browser.c:5481 +#: ../midori/midori-browser.c:5250 msgid "Scroll _Down" msgstr "下へスクロール(_D)" -#: ../midori/midori-browser.c:5484 +#: ../midori/midori-browser.c:5253 msgid "Scroll _Up" msgstr "上へスクロール(_U)" -#: ../midori/midori-browser.c:5487 +#: ../midori/midori-browser.c:5256 msgid "Scroll _Right" msgstr "右へスクロール(_R)" -#: ../midori/midori-browser.c:5490 -msgid "_Readable" -msgstr "読み込み可(_R)" - -#: ../midori/midori-browser.c:5493 +#: ../midori/midori-browser.c:5259 msgid "_Go" msgstr "移動(_G)" # tooltip -#: ../midori/midori-browser.c:5496 +#: ../midori/midori-browser.c:5262 msgid "Go back to the previous page" msgstr "前のページへ戻ります" +# tooltip +#: ../midori/midori-browser.c:5265 +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:5503 +#: ../midori/midori-browser.c:5269 msgid "Go to the previous sub-page" msgstr "前のサブページへ戻ります" -#: ../midori/midori-browser.c:5512 -msgid "_Homepage" -msgstr "ホームページ(_H)" +# tooltip +#. i18n: Visit the following logical page, ie. in a forum or blog +#: ../midori/midori-browser.c:5273 +msgid "Go to the next sub-page" +msgstr "次のサブページへ進みます" # tooltip -#: ../midori/midori-browser.c:5513 +#: ../midori/midori-browser.c:5276 msgid "Go to your homepage" msgstr "ホームページに移動します" -#: ../midori/midori-browser.c:5515 +#: ../midori/midori-browser.c:5278 msgid "Empty Trash" msgstr "ゴミ箱を空にする" -#: ../midori/midori-browser.c:5518 +#: ../midori/midori-browser.c:5281 msgid "Undo _Close Tab" msgstr "閉じたタブを元に戻す(_C)" -#: ../midori/midori-browser.c:5525 +#: ../midori/midori-browser.c:5288 msgid "Add a new _folder" -msgstr "新しいフォルダーの追加(_F)" +msgstr "新しいフォルダの追加(_F)" -#: ../midori/midori-browser.c:5531 +#: ../midori/midori-browser.c:5294 msgid "_Export bookmarks" msgstr "ブックマークのエクスポート(_E)" -#: ../midori/midori-browser.c:5534 ../midori/midori-searchaction.c:496 +#: ../midori/midori-browser.c:5297 +#: ../midori/midori-searchaction.c:496 msgid "_Manage Search Engines" msgstr "検索エンジンの管理(_M)" -#: ../midori/midori-browser.c:5537 +#: ../midori/midori-browser.c:5300 msgid "_Clear Private Data" msgstr "プライベートデータのクリア(_C)" -#: ../midori/midori-browser.c:5540 +#: ../midori/midori-browser.c:5303 msgid "_Inspect Page" msgstr "ページの調査(_I)" -#: ../midori/midori-browser.c:5544 +#: ../midori/midori-browser.c:5307 msgid "_Previous Tab" msgstr "前のタブ(_P)" -#: ../midori/midori-browser.c:5547 +#: ../midori/midori-browser.c:5310 msgid "_Next Tab" msgstr "次のタブ(_N)" -#: ../midori/midori-browser.c:5549 +#: ../midori/midori-browser.c:5312 msgid "Move Tab _Backward" msgstr "後ろのタブへ移動(_B)" -#: ../midori/midori-browser.c:5551 +#: ../midori/midori-browser.c:5314 msgid "_Move Tab Forward" msgstr "前のタブへ移動(_M)" -#: ../midori/midori-browser.c:5554 +#: ../midori/midori-browser.c:5317 msgid "Focus _Current Tab" msgstr "現在のタブにフォーカス(_C)" -#: ../midori/midori-browser.c:5557 +#: ../midori/midori-browser.c:5320 msgid "Focus _Next view" msgstr "次のビューをフォーカス(_N)" -#: ../midori/midori-browser.c:5560 +#: ../midori/midori-browser.c:5323 msgid "Only show the Icon of the _Current Tab" msgstr "現在のタブのアイコンのみ表示(_C)" -#: ../midori/midori-browser.c:5563 +#: ../midori/midori-browser.c:5326 msgid "_Duplicate Current Tab" msgstr "現在のタブの複製(_D)" -#: ../midori/midori-browser.c:5566 +#: ../midori/midori-browser.c:5329 msgid "Close Ot_her Tabs" msgstr "他のタブを閉じる(_H)" -#: ../midori/midori-browser.c:5569 +#: ../midori/midori-browser.c:5332 msgid "Open last _session" msgstr "最後のセッションを開く(_S)" -#: ../midori/midori-browser.c:5572 +#: ../midori/midori-browser.c:5335 msgid "_Help" msgstr "ヘルプ(_H)" -#: ../midori/midori-browser.c:5574 +#: ../midori/midori-browser.c:5337 msgid "_Frequent Questions" msgstr "よくある質問(_F)" -#: ../midori/midori-browser.c:5577 -msgid "_Report a Problem…" -msgstr "問題を報告(_R)…" - -#: ../midori/midori-browser.c:5582 ../midori/midori-browser.c:6243 -msgid "_Tools" -msgstr "ツール(_T)" +#: ../midori/midori-browser.c:5340 +msgid "_Report a Problem..." +msgstr "問題を報告(_R)" -#: ../midori/midori-browser.c:5589 +#: ../midori/midori-browser.c:5352 msgid "_Menubar" msgstr "メニューバー(_M)" -#: ../midori/midori-browser.c:5593 +#: ../midori/midori-browser.c:5356 msgid "_Navigationbar" msgstr "ナビゲーションバー(_N)" -#: ../midori/midori-browser.c:5597 +#: ../midori/midori-browser.c:5360 msgid "Side_panel" msgstr "サイドパネル(_P)" -#: ../midori/midori-browser.c:5598 +#: ../midori/midori-browser.c:5361 msgid "Sidepanel" msgstr "サイドパネル" -#: ../midori/midori-browser.c:5601 +#: ../midori/midori-browser.c:5364 msgid "_Bookmarkbar" msgstr "ブックマークバー(_B)" -#: ../midori/midori-browser.c:5605 +#: ../midori/midori-browser.c:5368 msgid "_Statusbar" msgstr "ステータスバー(_S)" -#: ../midori/midori-browser.c:5614 ../midori/midori-websettings.c:199 +#: ../midori/midori-browser.c:5377 +#: ../midori/midori-websettings.c:299 msgid "_Automatic" msgstr "自動(_A)" -#: ../midori/midori-browser.c:5617 ../midori/midori-websettings.c:123 -msgid "Chinese Traditional (BIG5)" -msgstr "中国語繁体字 (BIG5)" - -#: ../midori/midori-browser.c:5620 ../midori/midori-websettings.c:124 -msgid "Chinese Simplified (GB18030)" -msgstr "中国語簡体字 (GB18030)" +#: ../midori/midori-browser.c:5380 +#: ../midori/midori-websettings.c:224 +msgid "Chinese (BIG5)" +msgstr "中国語 (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5624 +#: ../midori/midori-browser.c:5384 msgid "Japanese (SHIFT__JIS)" msgstr "日本語 (SHIFT__JIS)" -#: ../midori/midori-browser.c:5627 ../midori/midori-websettings.c:126 +#: ../midori/midori-browser.c:5387 +#: ../midori/midori-websettings.c:226 msgid "Korean (EUC-KR)" msgstr "韓国語 (EUC-KR)" -#: ../midori/midori-browser.c:5630 ../midori/midori-websettings.c:127 +#: ../midori/midori-browser.c:5390 +#: ../midori/midori-websettings.c:227 msgid "Russian (KOI8-R)" msgstr "ロシア語 (KOI8-R)" -#: ../midori/midori-browser.c:5633 ../midori/midori-websettings.c:128 +#: ../midori/midori-browser.c:5393 +#: ../midori/midori-websettings.c:228 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5636 ../midori/midori-websettings.c:129 +#: ../midori/midori-browser.c:5396 +#: ../midori/midori-websettings.c:229 msgid "Western (ISO-8859-1)" msgstr "西欧 (ISO-8859-1)" -#: ../midori/midori-browser.c:5639 -msgid "Custom…" -msgstr "カスタム…" +#: ../midori/midori-browser.c:5399 +#: ../midori/midori-websettings.c:230 +#: ../midori/midori-websettings.c:305 +#: ../katze/katze-utils.c:635 +msgid "Custom..." +msgstr "カスタム..." -#: ../midori/midori-browser.c:6149 +#: ../midori/midori-browser.c:5895 msgid "_Separator" -msgstr "セパレーター(_S)" +msgstr "セパレータ(_S)" -#: ../midori/midori-browser.c:6156 -msgid "_Location…" -msgstr "場所(_L)…" +#: ../midori/midori-browser.c:5902 +msgid "_Location..." +msgstr "場所(_L)..." # tooltip -#: ../midori/midori-browser.c:6158 +#: ../midori/midori-browser.c:5904 msgid "Open a particular location" msgstr "指定された場所を開きます" -#: ../midori/midori-browser.c:6180 -msgid "_Web Search…" -msgstr "ウェブ検索(_W)…" +#: ../midori/midori-browser.c:5926 +msgid "_Web Search..." +msgstr "ウェブ検索(_W)..." # tooltip -#: ../midori/midori-browser.c:6182 +#: ../midori/midori-browser.c:5928 msgid "Run a web search" msgstr "ウェブ検索を実行します" # tooltip -#: ../midori/midori-browser.c:6209 +#: ../midori/midori-browser.c:5949 msgid "Reopen a previously closed tab or window" msgstr "これまでに閉じられたタブやウィンドウを再び開きます" # tooltip -#: ../midori/midori-browser.c:6226 +#: ../midori/midori-browser.c:5964 msgid "Show the saved bookmarks" msgstr "ブックマークを表示します" -#: ../midori/midori-browser.c:6259 +#: ../midori/midori-browser.c:5978 +msgid "_Tools" +msgstr "ツール(_T)" + +#: ../midori/midori-browser.c:5993 msgid "_Window" msgstr "ウィンドウ(_W)" # tooltip -#: ../midori/midori-browser.c:6261 +#: ../midori/midori-browser.c:5995 msgid "Show a list of all open tabs" msgstr "開いているすべてのタブのリストを表示します" -#: ../midori/midori-browser.c:6275 +#: ../midori/midori-browser.c:6009 msgid "_Menu" msgstr "メニュー(_M)" -#: ../midori/midori-browser.c:6277 +#: ../midori/midori-browser.c:6011 msgid "Menu" msgstr "メニュー" -#: ../midori/midori-browser.c:7107 +#: ../midori/midori-browser.c:6578 #, c-format msgid "Unexpected setting '%s'" msgstr "'%s' は予想外の設定です" -#: ../midori/midori-extension.c:330 +#: ../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:752 ../midori/midori-extension.c:849 -#: ../midori/midori-extension.c:946 ../midori/midori-extension.c:1058 -#: ../extensions/addons.c:1686 +#: ../midori/midori-extension.c:721 +#: ../midori/midori-extension.c:818 +#: ../midori/midori-extension.c:915 +#: ../midori/midori-extension.c:1027 +#: ../extensions/addons.c:1712 #, c-format msgid "The configuration of the extension '%s' couldn't be saved: %s\n" msgstr "エクステンション '%s' の設定を保存できませんでした: %s\n" -#: ../midori/midori-locationaction.c:398 -#, c-format -msgid "Search with %s" -msgstr "%s で検索" - -#: ../midori/midori-locationaction.c:418 -msgid "Search with…" -msgstr "検索…" - -#: ../midori/midori-locationaction.c:545 +#: ../midori/midori-locationaction.c:425 #, c-format msgid "Failed to select from history\n" msgstr "履歴からの選択に失敗しました\n" -#: ../midori/midori-locationaction.c:632 +#: ../midori/midori-locationaction.c:509 #, c-format msgid "Search for %s" msgstr "%s を検索" -#: ../midori/midori-locationaction.c:1227 -msgid "Export certificate" -msgstr "証明書のエクスポート" - -#: ../midori/midori-locationaction.c:1259 -msgid "The signing certificate authority is not known." -msgstr "未知の署名認証局です。" - -#: ../midori/midori-locationaction.c:1261 -msgid "" -"The certificate does not match the expected identity of the site that it was " -"retrieved from." -msgstr "証明書が、それが回収されたサイトから想定されるものと一致しません。" - -#: ../midori/midori-locationaction.c:1263 -msgid "The certificate's activation time is still in the future." -msgstr "証明書のアクティベート日時がまだ未来なままです。" - -#: ../midori/midori-locationaction.c:1265 -msgid "The certificate has expired" -msgstr "証明書は失効しています" - -#: ../midori/midori-locationaction.c:1267 -msgid "" -"The certificate has been revoked according to the GTlsConnection's " -"certificate revocation list." -msgstr "GTlsConnection の証明書失効リストに従いこの証明書は破棄されました。" - -#: ../midori/midori-locationaction.c:1269 -msgid "The certificate's algorithm is considered insecure." -msgstr "この証明書のアルゴリズムはセキュアでないと考えられます。" - -#: ../midori/midori-locationaction.c:1271 -msgid "Some other error occurred validating the certificate." -msgstr "この証明書の認証中にいくつか他のエラーが発生しました。" - -#: ../midori/midori-locationaction.c:1318 -msgid "_Export certificate" -msgstr "証明書のエクスポート(_E)" - -#: ../midori/midori-locationaction.c:1333 -msgid "Self-signed" -msgstr "自己署名" - -#: ../midori/midori-locationaction.c:1367 -msgid "Security details" -msgstr "セキュリティ詳細" +#: ../midori/midori-locationaction.c:535 +#, c-format +msgid "Search with %s" +msgstr "%s で検索" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1650 +#: ../midori/midori-locationaction.c:1285 msgid "Paste and p_roceed" -msgstr "貼り付けて開く(_R)" +msgstr "貼り付けて続行(_R)" -#: ../midori/midori-locationaction.c:1974 +#: ../midori/midori-locationaction.c:1681 msgid "Not verified" msgstr "未検証" -#: ../midori/midori-locationaction.c:1982 +#: ../midori/midori-locationaction.c:1696 msgid "Verified and encrypted connection" msgstr "検証済および暗号化接続" -#: ../midori/midori-locationaction.c:1989 -msgid "Open, unencrypted connection" -msgstr "公開、非暗号化接続" - # tooltip -#: ../midori/midori-panel.c:317 ../midori/midori-panel.c:319 -#: ../midori/midori-panel.c:483 ../midori/midori-panel.c:486 +#: ../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:329 ../midori/midori-panel.c:330 +#: ../midori/midori-panel.c:409 +#: ../midori/midori-panel.c:410 msgid "Close panel" msgstr "パネルを閉じます" # tooltip -#: ../midori/midori-panel.c:484 ../midori/midori-panel.c:487 +#: ../midori/midori-panel.c:563 +#: ../midori/midori-panel.c:566 msgid "Align sidepanel to the left" msgstr "サイドパネルを左側に配置します" -#: ../midori/midori-websettings.c:105 +#: ../midori/midori-websettings.c:206 msgid "Show Speed Dial" msgstr "スピードダイアルを表示" -#: ../midori/midori-websettings.c:106 +#: ../midori/midori-websettings.c:207 msgid "Show Homepage" msgstr "ホームページを表示" -#: ../midori/midori-websettings.c:125 +#: ../midori/midori-websettings.c:225 msgid "Japanese (SHIFT_JIS)" msgstr "日本語 (SHIFT_JIS)" -#: ../midori/midori-websettings.c:130 ../midori/midori-websettings.c:206 -#: ../katze/katze-utils.c:633 -msgid "Custom..." -msgstr "カスタム..." - -#: ../midori/midori-websettings.c:145 +#: ../midori/midori-websettings.c:245 msgid "New tab" msgstr "新しいタブ" -#: ../midori/midori-websettings.c:146 +#: ../midori/midori-websettings.c:246 msgid "New window" msgstr "新しいウィンドウ" -#: ../midori/midori-websettings.c:147 +#: ../midori/midori-websettings.c:247 msgid "Current tab" msgstr "現在のタブ" -#: ../midori/midori-websettings.c:162 +#: ../midori/midori-websettings.c:262 msgid "Default" msgstr "デフォルト" -#: ../midori/midori-websettings.c:163 +#: ../midori/midori-websettings.c:263 msgid "Icons" msgstr "アイコン" -#: ../midori/midori-websettings.c:164 +#: ../midori/midori-websettings.c:264 msgid "Small icons" msgstr "小さいアイコン" -#: ../midori/midori-websettings.c:165 +#: ../midori/midori-websettings.c:265 msgid "Text" msgstr "文字" -#: ../midori/midori-websettings.c:166 +#: ../midori/midori-websettings.c:266 msgid "Icons and text" msgstr "アイコンと文字" -#: ../midori/midori-websettings.c:167 +#: ../midori/midori-websettings.c:267 msgid "Text beside icons" msgstr "アイコンと文字 (横方向)" -#: ../midori/midori-websettings.c:182 +#: ../midori/midori-websettings.c:282 msgid "Automatic (GNOME or environment)" msgstr "自動 (GNOME または環境変数)" -#: ../midori/midori-websettings.c:183 +#: ../midori/midori-websettings.c:283 msgid "HTTP proxy server" -msgstr "HTTP プロキシサーバー" +msgstr "HTTP プロキシサーバ" -#: ../midori/midori-websettings.c:184 +#: ../midori/midori-websettings.c:284 msgid "No proxy server" -msgstr "プロキシサーバーなし" +msgstr "プロキシサーバなし" -#: ../midori/midori-websettings.c:201 -msgid "Chrome" -msgstr "Chrome" - -#: ../midori/midori-websettings.c:202 +#: ../midori/midori-websettings.c:301 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:203 +#: ../midori/midori-websettings.c:302 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:303 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:304 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:278 -msgid "Toolbar Style:" -msgstr "ツールバー方式:" +#: ../midori/midori-websettings.c:357 +msgid "Remember last window size" +msgstr "最後のウィンドウサイズを記憶する" # tooltip -#: ../midori/midori-websettings.c:279 -msgid "The style of the toolbar" -msgstr "ツールバーの表示方式を指定します" +#: ../midori/midori-websettings.c:358 +msgid "Whether to save the last window size" +msgstr "最後のウィンドウサイズを記憶します" -#: ../midori/midori-websettings.c:288 -msgid "When Midori starts:" -msgstr "Midori を起動した時:" +#: ../midori/midori-websettings.c:366 +msgid "Last window width" +msgstr "最後のウィンドウの幅" -#: ../midori/midori-websettings.c:298 -msgid "Preferred Encoding" -msgstr "文字のエンコーディング" +#: ../midori/midori-websettings.c:367 +msgid "The last saved window width" +msgstr "最後に保存されたウィンドウ幅" -#: ../midori/midori-websettings.c:325 -msgid "Open new pages in:" -msgstr "新しくページを開く時:" +#: ../midori/midori-websettings.c:375 +msgid "Last window height" +msgstr "最後のウィンドウの高さ" -#. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:388 -msgid "Identify as" -msgstr "識別名" +# tooltip +#: ../midori/midori-websettings.c:376 +msgid "The last saved window height" +msgstr "最後に保存されたウィンドウの高さにします" + +#: ../midori/midori-websettings.c:401 +msgid "Last panel position" +msgstr "最後のパネルの位置" # tooltip -#: ../midori/midori-websettings.c:389 -msgid "What to identify as to web pages" -msgstr "ウェブページに報告するユーザーエージェントの識別名を指定します" +#: ../midori/midori-websettings.c:402 +msgid "The last saved panel position" +msgstr "最後に保存されたパネルの位置にします" -#: ../midori/midori-websettings.c:422 -msgid "Preferred languages" -msgstr "言語の優先度" +#. i18n: The internal index of the last opened panel +#: ../midori/midori-websettings.c:411 +msgid "Last panel page" +msgstr "最後のパネルページ" -#: ../midori/midori-websettings.c:423 -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\" など" +# tooltip +#: ../midori/midori-websettings.c:412 +msgid "The last saved panel page" +msgstr "最後に保存されたパネルのページです" -#: ../midori/midori-websettings.c:472 -msgid "Always use my font choices" -msgstr "常にこの設定を使用する" +#: ../midori/midori-websettings.c:420 +msgid "Last Web search" +msgstr "最後のウェブ検索" -#: ../midori/midori-websettings.c:473 -msgid "Override fonts picked by websites with user preferences" -msgstr "ウェブサイトで指定されているフォントより本設定を優先します" +#: ../midori/midori-websettings.c:421 +msgid "The last saved Web search" +msgstr "最後に保存されたウェブ検索です" -#: ../midori/midori-view.c:1012 ../midori/midori-view.c:1151 -msgid "Trust this website" -msgstr "このウェブサイトを信用する" +#: ../midori/midori-websettings.c:430 +msgid "Show Menubar" +msgstr "メニューバーを表示する" -#: ../midori/midori-view.c:1149 -msgid "Security unknown" -msgstr "セキュリティ不明" +# tooltip +#: ../midori/midori-websettings.c:431 +msgid "Whether to show the menubar" +msgstr "メニューバーを表示します" -#: ../midori/midori-view.c:1447 -#, c-format -msgid "%s wants to save an HTML5 database." -msgstr "%s は HTML5 データベースの保存を要求しています。" +#: ../midori/midori-websettings.c:439 +msgid "Show Navigationbar" +msgstr "ナビゲーションバーを表示する" -#: ../midori/midori-view.c:1451 ../midori/midori-view.c:1485 -msgid "_Deny" -msgstr "許可しない(_D)" +# tooltip +#: ../midori/midori-websettings.c:440 +msgid "Whether to show the navigationbar" +msgstr "ナビゲーションバーを表示します" -#: ../midori/midori-view.c:1451 ../midori/midori-view.c:1485 -msgid "_Allow" -msgstr "許可する(_A)" +#: ../midori/midori-websettings.c:448 +msgid "Show Bookmarkbar" +msgstr "ブックマークバーを表示する" -#: ../midori/midori-view.c:1480 -#, c-format -msgid "%s wants to know your location." -msgstr "%s はあなたの場所を知ろうとしています。" +# tooltip +#: ../midori/midori-websettings.c:449 +msgid "Whether to show the bookmarkbar" +msgstr "ブックマークバーを表示します" -#: ../midori/midori-view.c:1576 -#, c-format -msgid "Error - %s" -msgstr "エラー - %s" +#: ../midori/midori-websettings.c:457 +msgid "Show Panel" +msgstr "パネルを表示する" -#: ../midori/midori-view.c:1577 -#, c-format -msgid "The page '%s' couldn't be loaded." -msgstr "ページ '%s' を読み込めませんでした" +# tooltip +#: ../midori/midori-websettings.c:458 +msgid "Whether to show the panel" +msgstr "パネルを表示します" -#: ../midori/midori-view.c:1579 -msgid "Try again" -msgstr "再試行" +#: ../midori/midori-websettings.c:466 +msgid "Show Statusbar" +msgstr "ステータスバーを表示する" -#: ../midori/midori-view.c:1775 ../midori/midori-view.c:2887 +# tooltip +#: ../midori/midori-websettings.c:467 +msgid "Whether to show the statusbar" +msgstr "ステータスバーを表示します" + +#: ../midori/midori-websettings.c:476 +msgid "Toolbar Style:" +msgstr "ツールバー方式:" + +# tooltip +#: ../midori/midori-websettings.c:477 +msgid "The style of the toolbar" +msgstr "ツールバーの表示方式を指定します" + +#: ../midori/midori-websettings.c:486 +msgid "Toolbar Items" +msgstr "ツールバーアイテム" + +# tooltip +#: ../midori/midori-websettings.c:487 +msgid "The items to show on the toolbar" +msgstr "ツールバーに表示するアイテムを指定します" + +#: ../midori/midori-websettings.c:495 +msgid "Compact Sidepanel" +msgstr "サイドパネルをコンパクトにする" + +# tooltip +#: ../midori/midori-websettings.c:496 +msgid "Whether to make the sidepanel compact" +msgstr "サイドパネルの表示をコンパクトにします" + +#: ../midori/midori-websettings.c:511 +msgid "Align sidepanel on the right" +msgstr "サイドパネルを右側に配置する" + +# tooltip +#: ../midori/midori-websettings.c:512 +msgid "Whether to align the sidepanel on the right" +msgstr "サイドパネルを右側に表示します" + +#: ../midori/midori-websettings.c:527 +msgid "Open panels in separate windows" +msgstr "パネルを別のウィンドウで開く" + +# tooltip +#: ../midori/midori-websettings.c:528 +msgid "Whether to always open panels in separate windows" +msgstr "パネルを常に別のウィンドウで開きます" + +#: ../midori/midori-websettings.c:537 +msgid "When Midori starts:" +msgstr "Midori を起動した時:" + +# tooltip +#: ../midori/midori-websettings.c:538 +msgid "What to do when Midori starts" +msgstr "Midori の起動時に表示するページを指定します" + +#: ../midori/midori-websettings.c:547 +msgid "Homepage:" +msgstr "ホームページ:" + +# tooltip +#: ../midori/midori-websettings.c:548 +msgid "The homepage" +msgstr "ホームページを指定します" + +#: ../midori/midori-websettings.c:563 +msgid "Show crash dialog" +msgstr "クラッシュダイアログを表示する" + +# tooltip +#: ../midori/midori-websettings.c:564 +msgid "Show a dialog after Midori crashed" +msgstr "Midori がクラッシュした後の起動時にダイアログを表示します" + +#: ../midori/midori-websettings.c:572 +msgid "Save downloaded files to:" +msgstr "ダウンロードファイルの保存先:" + +# tooltip +#: ../midori/midori-websettings.c:573 +msgid "The folder downloaded files are saved to" +msgstr "ダウンロードファイルの保存先を指定します" + +#: ../midori/midori-websettings.c:581 +msgid "Text Editor" +msgstr "テキストエディタ" + +# tooltip +#: ../midori/midori-websettings.c:582 +msgid "An external text editor" +msgstr "外部テキストエディタを指定します" + +#: ../midori/midori-websettings.c:597 +msgid "News Aggregator" +msgstr "フィードリーダ" + +# tooltip +#: ../midori/midori-websettings.c:598 +msgid "An external news aggregator" +msgstr "外部フィードリーダを指定します" + +#: ../midori/midori-websettings.c:606 +msgid "Location entry Search" +msgstr "ロケーションエントリの検索" + +# tooltip +#: ../midori/midori-websettings.c:607 +msgid "The search to perform inside the location entry" +msgstr "ロケーションエントリに入力された文字列の検索エンジンを指定します" + +#: ../midori/midori-websettings.c:615 +msgid "Preferred Encoding" +msgstr "文字のエンコーディング" + +# tooltip +#: ../midori/midori-websettings.c:616 +msgid "The preferred character encoding" +msgstr "文字のエンコーディングを指定します" + +#: ../midori/midori-websettings.c:626 +msgid "Always Show Tabbar" +msgstr "常にタブバーを表示する" + +# tooltip +#: ../midori/midori-websettings.c:627 +msgid "Always show the tabbar" +msgstr "常にタブバーを表示します" + +#: ../midori/midori-websettings.c:635 +msgid "Close Buttons on Tabs" +msgstr "タブに閉じるボタンを表示する" + +# tooltip +#: ../midori/midori-websettings.c:636 +msgid "Whether tabs have close buttons" +msgstr "タブに閉じるボタンを表示します" + +#: ../midori/midori-websettings.c:661 +msgid "Open new pages in:" +msgstr "新しくページを開く時:" + +# tooltip +#: ../midori/midori-websettings.c:662 +msgid "Where to open new pages" +msgstr "新しいページをどこに開くか指定します" + +#: ../midori/midori-websettings.c:671 +msgid "Middle click opens Selection" +msgstr "選択範囲を中央クリックで開く" + +# tooltip +#: ../midori/midori-websettings.c:672 +msgid "Load an address from the selection via middle click" +msgstr "選択したアドレスをマウスの中央クリックで読み込みます" + +#: ../midori/midori-websettings.c:680 +msgid "Open tabs in the background" +msgstr "タブをバックグラウンドで開く" + +# tooltip +#: ../midori/midori-websettings.c:681 +msgid "Whether to open new tabs in the background" +msgstr "新しいタブをバックグラウンドで開きます" + +#: ../midori/midori-websettings.c:689 +msgid "Open Tabs next to Current" +msgstr "現在のタブの隣に開く" + +# tooltip +#: ../midori/midori-websettings.c:690 +msgid "Whether to open new tabs next to the current tab or after the last one" +msgstr "新しいタブを現在のタブの隣に開くか、最後のタブの隣に開くかを指定します" + +#: ../midori/midori-websettings.c:698 +msgid "Open popups in tabs" +msgstr "ポップアップをタブに開く" + +# tooltip +#: ../midori/midori-websettings.c:699 +msgid "Whether to open popup windows in tabs" +msgstr "ポップアップウィンドウをタブに開きます" + +#: ../midori/midori-websettings.c:709 +#: ../extensions/statusbar-features.c:131 +msgid "Load images automatically" +msgstr "画像を自動的に読み込む" + +# tooltip +#: ../midori/midori-websettings.c:710 +msgid "Load and display images automatically" +msgstr "画像を自動的に読み込んで表示します" + +#: ../midori/midori-websettings.c:717 +#: ../extensions/statusbar-features.c:140 +msgid "Enable scripts" +msgstr "スクリプトを有効にする" + +# tooltip +#: ../midori/midori-websettings.c:718 +msgid "Enable embedded scripting languages" +msgstr "組み込みスクリプト言語を有効にします" + +#: ../midori/midori-websettings.c:725 +#: ../extensions/statusbar-features.c:149 +msgid "Enable Netscape plugins" +msgstr "Netscape プラグインを有効にする" + +# tooltip +#: ../midori/midori-websettings.c:726 +msgid "Enable embedded Netscape plugin objects" +msgstr "組み込み Netscape プラグインオブジェクトを有効にします" + +#: ../midori/midori-websettings.c:746 +msgid "Enable Spell Checking" +msgstr "スペルチェックを有効にする" + +# tooltip +#: ../midori/midori-websettings.c:747 +msgid "Enable spell checking while typing" +msgstr "キー入力中のスペルチェックを有効にします" + +#: ../midori/midori-websettings.c:753 +msgid "Enable HTML5 database support" +msgstr "HTML5 データベースサポートを有効にする" + +#: ../midori/midori-websettings.c:754 +msgid "Whether to enable HTML5 database support" +msgstr "HTML5 データベースサポートを有効にします" + +#: ../midori/midori-websettings.c:760 +msgid "Enable HTML5 local storage support" +msgstr "HTML5 ローカルストレージサポートを有効にする" + +#: ../midori/midori-websettings.c:761 +msgid "Whether to enable HTML5 local storage support" +msgstr "HTML5 ローカルストレージサポートを有効にします" + +#: ../midori/midori-websettings.c:767 +msgid "Enable offline web application cache" +msgstr "オフラインウェブアプリケーションキャッシュを有効にする" + +#: ../midori/midori-websettings.c:768 +msgid "Whether to enable offline web application cache" +msgstr "オフラインウェブアプリケーションキャッシュを有効にします" + +#: ../midori/midori-websettings.c:784 +msgid "Flash window on background tabs" +msgstr "バックグラウンドでタブが開いた時にウィンドウを点滅する" + +#: ../midori/midori-websettings.c:785 +msgid "Flash the browser window if a new tab was opened in the background" +msgstr "新しいタブがバックグラウンドで開かれたときにブラウザウィンドウを点滅します" + +#: ../midori/midori-websettings.c:800 +msgid "Zoom Text and Images" +msgstr "文字や画像を拡大/縮小する" + +# tooltip +#: ../midori/midori-websettings.c:801 +msgid "Whether to zoom text and images" +msgstr "文字や画像の拡大/縮小を可能にします" + +#: ../midori/midori-websettings.c:816 +msgid "Find inline while typing" +msgstr "キー入力中に自動的に検索する" + +# tooltip +#: ../midori/midori-websettings.c:817 +msgid "Whether to automatically find inline while typing" +msgstr "インライン検索において、キー入力に従い自動的に検索します" + +#: ../midori/midori-websettings.c:832 +msgid "Kinetic scrolling" +msgstr "慣性スクロール" + +#: ../midori/midori-websettings.c:833 +msgid "Whether scrolling should kinetically move according to speed" +msgstr "速度にしたがって慣性がかかったようにスクロールします" + +#: ../midori/midori-websettings.c:841 +msgid "Delete old Cookies after:" +msgstr "古い Cookie を削除:" + +# tooltip +#: ../midori/midori-websettings.c:842 +msgid "The maximum number of days to save cookies for" +msgstr "Cookie を保存する最大日数です" + +#: ../midori/midori-websettings.c:858 +msgid "Only accept Cookies from sites you visit" +msgstr "訪問したウェブサイトからの Cookie のみ受け入れる" + +#: ../midori/midori-websettings.c:859 +msgid "Block cookies sent by third-party websites" +msgstr "サードパーティウェブサイトから送られた Cookie はブロックします" + +#: ../midori/midori-websettings.c:873 +msgid "Delete pages from history after:" +msgstr "履歴から古いページを削除:" + +# tooltip +#: ../midori/midori-websettings.c:874 +msgid "The maximum number of days to save the history for" +msgstr "履歴を保存する最大日数です" + +#: ../midori/midori-websettings.c:889 +msgid "Proxy server" +msgstr "プロキシサーバ" + +#: ../midori/midori-websettings.c:890 +msgid "The type of proxy server to use" +msgstr "使用するプロキシサーバの種類を指定します" + +#: ../midori/midori-websettings.c:899 +msgid "HTTP Proxy Server" +msgstr "HTTP プロキシサーバ" + +# tooltip +#: ../midori/midori-websettings.c:900 +msgid "The proxy server used for HTTP connections" +msgstr "HTTP 接続でプロキシサーバを使用する場合に設定します" + +#: ../midori/midori-websettings.c:915 +msgid "Port" +msgstr "ポート" + +# tooltip +#: ../midori/midori-websettings.c:916 +msgid "The proxy server port used for HTTP connections" +msgstr "HTTP 接続で使用するプロキシサーバのポート番号を設定します" + +# tooltip +#: ../midori/midori-websettings.c:934 +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:951 +msgid "Identify as" +msgstr "識別名" + +# tooltip +#: ../midori/midori-websettings.c:952 +msgid "What to identify as to web pages" +msgstr "ウェブページに報告するユーザエージェントの識別名を指定します" + +#: ../midori/midori-websettings.c:968 +msgid "Identification string" +msgstr "識別文字列" + +# tooltip +#: ../midori/midori-websettings.c:969 +msgid "The application identification string" +msgstr "アプリケーション識別文字列です" + +#: ../midori/midori-websettings.c:985 +msgid "Preferred languages" +msgstr "言語の優先度" + +#: ../midori/midori-websettings.c:986 +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\"" + +# Button title +#: ../midori/midori-websettings.c:1001 +msgid "Clear private data" +msgstr "プライベートデータのクリア" + +# FIXME: +#: ../midori/midori-websettings.c:1002 +msgid "The private data selected for deletion" +msgstr "選択されているプライベートデータを削除します" + +#: ../midori/midori-websettings.c:1017 +msgid "Clear data" +msgstr "データのクリア" + +# FIXME: +#: ../midori/midori-websettings.c:1018 +msgid "The data selected for deletion" +msgstr "選択されているデータを削除します" + +#. i18n: Reworded: Shorten details propagated when going to another page +#: ../midori/midori-websettings.c:1051 +msgid "Strip referrer details sent to websites" +msgstr "外部サイトへ送るリファラの詳細情報を除去する" + +#. i18n: Referer here is not a typo but a technical term +#: ../midori/midori-websettings.c:1053 +msgid "Whether the \"Referer\" header should be shortened to the hostname" +msgstr "\"Referer\" ヘッダはホスト名に短縮されます" + +#: ../midori/midori-websettings.c:1067 +msgid "Always use my font choices" +msgstr "常にこの設定を使用する" + +#: ../midori/midori-websettings.c:1068 +msgid "Override fonts picked by websites with user preferences" +msgstr "ウェブサイトで指定されているフォントより本設定を優先します" + +#: ../midori/midori-view.c:1347 +#, c-format +msgid "%s wants to save an HTML5 database." +msgstr "%s は HTML5 データベースの保存を要求しています。" + +#: ../midori/midori-view.c:1351 +#: ../midori/midori-view.c:1380 +msgid "_Deny" +msgstr "許可しない(_D)" + +#: ../midori/midori-view.c:1351 +#: ../midori/midori-view.c:1380 +msgid "_Allow" +msgstr "許可する(_A)" + +#: ../midori/midori-view.c:1376 +#, c-format +msgid "%s wants to know your location." +msgstr "%s はあなたの場所を知ろうとしています。" + +#: ../midori/midori-view.c:1463 +#, c-format +msgid "Error - %s" +msgstr "エラー - %s" + +#: ../midori/midori-view.c:1464 +#, c-format +msgid "The page '%s' couldn't be loaded." +msgstr "ページ '%s' を読み込めませんでした" + +#: ../midori/midori-view.c:1466 +msgid "Try again" +msgstr "再試行" + +#: ../midori/midori-view.c:1628 +#: ../midori/midori-view.c:2473 #, c-format msgid "Send a message to %s" msgstr "メッセージを送信します 宛先: %s" -#: ../midori/midori-view.c:2673 -msgid "Add _search engine..." -msgstr "検索エンジンの追加(_S)..." - -#: ../midori/midori-view.c:2717 ../midori/midori-view.c:3043 +#: ../midori/midori-view.c:2315 +#: ../midori/midori-view.c:2626 msgid "Inspect _Element" msgstr "要素の検証(_E)" -#: ../midori/midori-view.c:2769 +#: ../midori/midori-view.c:2365 msgid "Open Link in New _Tab" msgstr "リンクを新しいタブで開く(_T)" -#: ../midori/midori-view.c:2773 +#: ../midori/midori-view.c:2369 msgid "Open Link in _Foreground Tab" -msgstr "リンクをフォアグラウンドのタブで開く(_F)" +msgstr "リンクをフォアグラウンドのタブで開く(_T)" -#: ../midori/midori-view.c:2774 +#: ../midori/midori-view.c:2370 msgid "Open Link in _Background Tab" -msgstr "リンクをバックグラウンドのタブで開く(_B)" +msgstr "リンクをバックグラウンドのタブで開く(_T)" -#: ../midori/midori-view.c:2777 +#: ../midori/midori-view.c:2373 msgid "Open Link in New _Window" msgstr "リンクを新しいウィンドウで開く(_W)" -#: ../midori/midori-view.c:2780 +#: ../midori/midori-view.c:2376 msgid "Open Link as Web A_pplication" msgstr "ウェブアプリケーションとして実行する(_P)" -#: ../midori/midori-view.c:2785 +#: ../midori/midori-view.c:2379 msgid "Copy Link de_stination" msgstr "リンク先をコピー(_S)" -#: ../midori/midori-view.c:2801 +#: ../midori/midori-view.c:2391 msgid "Open _Image in New Tab" msgstr "画像を新しいタブで開く(_I)" -#: ../midori/midori-view.c:2804 +#: ../midori/midori-view.c:2394 msgid "Copy Image _Address" msgstr "画像のアドレスをコピー(_A)" -#: ../midori/midori-view.c:2807 +#: ../midori/midori-view.c:2397 msgid "Save I_mage" msgstr "画像を保存(_M)" -#: ../midori/midori-view.c:2810 -msgid "Open in Image _Viewer" -msgstr "画像ビューアーで開く(_V)" - -#: ../midori/midori-view.c:2817 +#: ../midori/midori-view.c:2404 msgid "Copy Video _Address" msgstr "動画のアドレスをコピー(_A)" -#: ../midori/midori-view.c:2820 +#: ../midori/midori-view.c:2407 msgid "Save _Video" msgstr "動画を保存(_V)" -#: ../midori/midori-view.c:2820 +#: ../midori/midori-view.c:2407 msgid "Download _Video" msgstr "動画をダウンロード(_V)" -#: ../midori/midori-view.c:2846 +#: ../midori/midori-view.c:2433 msgid "Search _with" msgstr "検索(_W)" -#: ../midori/midori-view.c:2878 +#: ../midori/midori-view.c:2465 msgid "_Search the Web" msgstr "ウェブで検索(_S)" -#: ../midori/midori-view.c:2895 +#: ../midori/midori-view.c:2481 msgid "Open Address in New _Tab" msgstr "アドレスを新しいタブで開く(_T)" -#: ../midori/midori-view.c:2948 -msgid "Open _Frame in New Tab" -msgstr "フレームを新しいタブで開く(_F)" - -#: ../midori/midori-view.c:3203 -#, c-format -msgid "Open or download file from %s" -msgstr "%s を開く、またはダウンロードします" - -#: ../midori/midori-view.c:3216 -#, c-format -msgid "File Name: %s" -msgstr "ファイル名: %s" +#: ../midori/midori-view.c:2766 +msgid "Open or download file" +msgstr "ファイルを開きますか、保存しますか?" -#: ../midori/midori-view.c:3221 +#: ../midori/midori-view.c:2785 #, c-format msgid "File Type: '%s'" msgstr "ファイルタイプ: '%s'" -#: ../midori/midori-view.c:3223 +#: ../midori/midori-view.c:2787 #, c-format msgid "File Type: %s ('%s')" msgstr "ファイルタイプ: %s ('%s')" -#: ../midori/midori-view.c:3260 -#, c-format -msgid "Size: %s" -msgstr "サイズ: %s" - #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:3271 +#: ../midori/midori-view.c:2804 #, c-format msgid "Open %s" msgstr "%s を開く" -#: ../midori/midori-view.c:3876 +#: ../midori/midori-view.c:3390 #, c-format msgid "Inspect page - %s" msgstr "ページの調査 - %s" -#: ../midori/midori-view.c:4273 -#, c-format -msgid "No documentation installed" -msgstr "ドキュメントはインストールされていません" - -#: ../midori/midori-view.c:4350 -msgid "Midori doesn't store any personal data:" -msgstr "Midori はあらゆる個人データを保存しません:" - -#: ../midori/midori-view.c:4351 -msgid "No history or web cookies are being saved." -msgstr "履歴あるいはウェブ Cookie は保存されません。" - -#: ../midori/midori-view.c:4352 -msgid "Extensions are disabled." -msgstr "エクステンションは無効になります。" - -#: ../midori/midori-view.c:4353 -msgid "HTML5 storage, local database and application caches are disabled." -msgstr "" -"HTML5 ストレージ、ローカルデータベース、およびアプリケーションキャッシュは無" -"効になります。" +#: ../midori/midori-view.c:3677 +msgid "Speed Dial" +msgstr "スピードダイアル" -#: ../midori/midori-view.c:4354 -msgid "Midori prevents websites from tracking the user:" -msgstr "Midori はウェブサイトによるユーザーのトラッキングを阻止します:" +#: ../midori/midori-view.c:3678 +#: ../midori/midori-view.c:3763 +msgid "Click to add a shortcut" +msgstr "クリックするとショートカットを追加できます" -#: ../midori/midori-view.c:4355 -msgid "Referrer URLs are stripped down to the hostname." -msgstr "リファラー URL はホスト名に短縮されます。" +#: ../midori/midori-view.c:3679 +msgid "Enter shortcut address" +msgstr "ショートカットのアドレスを入力してください" -#: ../midori/midori-view.c:4356 -msgid "DNS prefetching is disabled." -msgstr "DNS プリフェッチは無効になります。" +#: ../midori/midori-view.c:3680 +msgid "Enter shortcut title" +msgstr "ショートカットの名前を入力してください" -#: ../midori/midori-view.c:4357 -msgid "The language and timezone are not revealed to websites." -msgstr "言語およびタイムゾーンはウェブサイトには通知されません。" +#: ../midori/midori-view.c:3681 +msgid "Are you sure you want to delete this shortcut?" +msgstr "このショートカットを削除してもよろしいですか?" -#: ../midori/midori-view.c:4358 -msgid "Flash and other Netscape plugins cannot be listed by websites." -msgstr "" -"Flash およびその他の Netscape プラグインはウェブサイトには記録されません。" +#: ../midori/midori-view.c:3840 +#, c-format +msgid "No documentation installed" +msgstr "ドキュメントはインストールされていません" -#: ../midori/midori-view.c:4444 +#: ../midori/midori-view.c:3890 msgid "Version numbers in brackets show the version used at runtime." -msgstr "" -"カッコ内のバージョン番号は実行中に使用されているバージョンを表しています。" +msgstr "カッコ内のバージョン番号は実行中に使用されているバージョンを表しています。" -#: ../midori/midori-view.c:4493 +#: ../midori/midori-view.c:3935 msgid "Page loading delayed" msgstr "読み込みが保留されたページ" -#: ../midori/midori-view.c:4494 +#: ../midori/midori-view.c:3936 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "最近のクラッシュか起動設定により読み込みが保留されています。" -#: ../midori/midori-view.c:4495 +#: ../midori/midori-view.c:3937 msgid "Load Page" msgstr "ページを読み込む" -#: ../midori/midori-view.c:4662 +#: ../midori/midori-view.c:4077 msgid "Blank page" msgstr "空白ページ" -#: ../midori/midori-view.c:4926 +#: ../midori/midori-view.c:4341 msgid "_Duplicate Tab" msgstr "タブの複製(_D)" -#: ../midori/midori-view.c:4931 +#: ../midori/midori-view.c:4346 msgid "Show Tab _Label" msgstr "タブラベルの表示(_L)" -#: ../midori/midori-view.c:4931 +#: ../midori/midori-view.c:4346 msgid "Show Tab _Icon Only" msgstr "タブアイコンのみ表示(_I)" -#: ../midori/midori-view.c:4938 -msgid "Close Ot_her Tab" -msgid_plural "Close Ot_her Tabs" -msgstr[0] "他のタブを閉じる(_H)" +#: ../midori/midori-view.c:4352 +msgid "Close ot_her Tabs" +msgstr "他のタブを閉じる(_H)" #. i18n: word stem of "previous page" type links, case is not important -#: ../midori/midori-view.c:5695 +#: ../midori/midori-view.c:4969 msgid "previous" msgstr "前" #. i18n: word stem of "next page" type links, case is not important -#: ../midori/midori-view.c:5714 +#: ../midori/midori-view.c:4988 msgid "next" msgstr "次" -#: ../midori/midori-view.c:5727 +#: ../midori/midori-view.c:5001 msgid "Print background images" msgstr "背景画像を印刷する" # tooltip -#: ../midori/midori-view.c:5728 +#: ../midori/midori-view.c:5002 msgid "Whether background images should be printed" msgstr "印刷する時に背景画像も印刷します" -#: ../midori/midori-view.c:5760 +#: ../midori/midori-view.c:5034 msgid "Features" msgstr "機能" -#. i18n: Download tooltip (size): 4KB of 43MB -#: ../midori/midori-download.vala:48 -#, c-format -msgid "%s of %s" -msgstr "%s / %s" - -#: ../midori/midori-download.vala:64 -#, c-format -msgid "%d hour" -msgid_plural "%d hours" -msgstr[0] "%d 時間" - -#: ../midori/midori-download.vala:65 -#, c-format -msgid "%d minute" -msgid_plural "%d minutes" -msgstr[0] "%d 分" - -#: ../midori/midori-download.vala:66 -#, c-format -msgid "%d second" -msgid_plural "%d seconds" -msgstr[0] "%d 秒" - -#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning -#: ../midori/midori-download.vala:82 -#, c-format -msgid " - %s remaining" -msgstr " - 残り %s" - -#. i18n: Unknown number of bytes, used for transfer rate like ?B/s -#: ../midori/midori-download.vala:92 -msgid "?B" -msgstr "?B" - -#. i18n: Download tooltip (transfer rate): (130KB/s) -#: ../midori/midori-download.vala:94 -#, c-format -msgid " (%s/s)" -msgstr " (%s/s)" - -#: ../midori/midori-download.vala:188 -msgid "The downloaded file is erroneous." -msgstr "ダウンロードしたファイルに問題があります。" - -#: ../midori/midori-download.vala:189 -msgid "" -"The checksum provided with the link did not match. This means the file is " -"probably incomplete or was modified afterwards." -msgstr "" -"リンク先で示されているチェックサムとマッチしませんでした。ファイルのダウン" -"ロードが正常に終了しなかったか、その後変更された可能性があります。" - -#: ../midori/midori-download.vala:298 -#, c-format -msgid "The file \"%s\" can't be saved in this folder." -msgstr "ファイル \"%s\" をこのフォルダーに保存することはできません。" - -#: ../midori/midori-download.vala:300 -msgid "You don't have permission to write in this location." -msgstr "この場所への書き込み権がありません。" - -#: ../midori/midori-download.vala:303 -#, c-format -msgid "There is not enough free space to download \"%s\"." -msgstr "\"%s\" をダウンロードする十分な空きスペースがありません。" - -#: ../midori/midori-download.vala:305 -#, c-format -msgid "The file needs %s but only %s are left." -msgstr "ファイルのダウンロードには %s 必要ですが、%s しか空きがありません。" - -#: ../midori/midori-speeddial.vala:167 -msgid "Speed Dial" -msgstr "スピードダイアル" - -#: ../midori/midori-speeddial.vala:168 ../midori/midori-speeddial.vala:253 -msgid "Click to add a shortcut" -msgstr "クリックするとショートカットを追加できます" - -#: ../midori/midori-speeddial.vala:169 -msgid "Enter shortcut address" -msgstr "ショートカットのアドレスを入力してください" - -#: ../midori/midori-speeddial.vala:170 -msgid "Enter shortcut title" -msgstr "ショートカットの名前を入力してください" - -#: ../midori/midori-speeddial.vala:171 -msgid "Are you sure you want to delete this shortcut?" -msgstr "このショートカットを削除してもよろしいですか?" - -#: ../midori/midori-preferences.c:299 +#: ../midori/midori-preferences.c:297 msgid "Startup" msgstr "起動" -#: ../midori/midori-preferences.c:305 -msgid "Homepage:" -msgstr "ホームページ:" - -#: ../midori/midori-preferences.c:313 +#: ../midori/midori-preferences.c:310 msgid "Use _current page" msgstr "現在のページを使用(_C)" -#: ../midori/midori-preferences.c:317 +#: ../midori/midori-preferences.c:314 msgid "Use current page as homepage" msgstr "現在のページをホームページにする" #. Page "Appearance" -#: ../midori/midori-preferences.c:326 +#: ../midori/midori-preferences.c:323 msgid "Fonts" msgstr "フォント" -#: ../midori/midori-preferences.c:329 +#: ../midori/midori-preferences.c:326 msgid "Proportional Font Family" msgstr "プロポーショナルフォントファミリ" # tooltip -#: ../midori/midori-preferences.c:333 +#: ../midori/midori-preferences.c:330 msgid "The default font family used to display text" msgstr "文字表示で使用するデフォルトのフォントファミリを指定します" # tooltip -#: ../midori/midori-preferences.c:336 +#: ../midori/midori-preferences.c:333 msgid "The default font size used to display text" msgstr "文字表示で使用するデフォルトのフォントサイズを指定します" -#: ../midori/midori-preferences.c:338 +#: ../midori/midori-preferences.c:335 msgid "Fixed-width Font Family" msgstr "等幅フォントファミリ" # tooltip -#: ../midori/midori-preferences.c:342 +#: ../midori/midori-preferences.c:339 msgid "The font family used to display fixed-width text" msgstr "等幅文字表示で使用するフォントファミリを指定します" # tooltip -#: ../midori/midori-preferences.c:345 +#: ../midori/midori-preferences.c:342 msgid "The font size used to display fixed-width text" msgstr "等幅文字表示で使用するフォントのサイズを指定します" -#: ../midori/midori-preferences.c:347 +#: ../midori/midori-preferences.c:344 msgid "Minimum Font Size" msgstr "最小フォントサイズ" # tooltip -#: ../midori/midori-preferences.c:351 +#: ../midori/midori-preferences.c:348 msgid "The minimum font size used to display text" msgstr "文字表示で使用する最小のフォントサイズを指定します" #. Page "Behavior" -#: ../midori/midori-preferences.c:362 +#: ../midori/midori-preferences.c:359 msgid "Behavior" msgstr "振る舞い" -#: ../midori/midori-preferences.c:366 ../extensions/statusbar-features.c:155 -msgid "Load images automatically" -msgstr "画像を自動的に読み込む" - -#: ../midori/midori-preferences.c:369 -msgid "Enable Spell Checking" -msgstr "スペルチェックを有効にする" - -#: ../midori/midori-preferences.c:383 ../extensions/statusbar-features.c:165 -msgid "Enable scripts" -msgstr "スクリプトを有効にする" - -#: ../midori/midori-preferences.c:386 ../extensions/statusbar-features.c:177 -msgid "Enable Netscape plugins" -msgstr "Netscape プラグインを有効にする" - -#: ../midori/midori-preferences.c:391 -msgid "Zoom Text and Images" -msgstr "文字や画像を拡大/縮小する" - -#: ../midori/midori-preferences.c:394 -msgid "Allow scripts to open popups" -msgstr "ポップアップを表示するスクリプトを許可する" - -# tooltip -#: ../midori/midori-preferences.c:395 -msgid "Whether scripts are allowed to open popup windows automatically" -msgstr "ポップアップウィンドウを自動的に開くスクリプトの実行を許可します" - -#: ../midori/midori-preferences.c:401 -msgid "Kinetic scrolling" -msgstr "慣性スクロール" - -#: ../midori/midori-preferences.c:402 -msgid "Whether scrolling should kinetically move according to speed" -msgstr "速度にしたがって慣性がかかったようにスクロールします" - -#: ../midori/midori-preferences.c:407 -msgid "Middle click opens Selection" -msgstr "選択範囲を中央クリックで開く" - -# tooltip -#: ../midori/midori-preferences.c:408 -msgid "Load an address from the selection via middle click" -msgstr "選択したアドレスをマウスの中央クリックで読み込みます" - -#: ../midori/midori-preferences.c:414 -msgid "Enable WebGL support" -msgstr "WebGL サポートを有効にする" - -#: ../midori/midori-preferences.c:419 -msgid "Flash window on background tabs" -msgstr "バックグラウンドでタブが開いた時にウィンドウを点滅する" - -#: ../midori/midori-preferences.c:428 -msgid "Save downloaded files to:" -msgstr "ダウンロードファイルの保存先:" - -#. Page "Interface" -#: ../midori/midori-preferences.c:435 -msgid "Browsing" -msgstr "ブラウジング" - -#: ../midori/midori-preferences.c:451 -msgid "Close Buttons on Tabs" -msgstr "タブに閉じるボタンを表示する" - -#: ../midori/midori-preferences.c:455 -msgid "Always Show Tabbar" -msgstr "常にタブバーを表示する" - -#: ../midori/midori-preferences.c:459 -msgid "Open Tabs next to Current" -msgstr "現在のタブの隣に開く" - -# tooltip -#: ../midori/midori-preferences.c:460 -msgid "Whether to open new tabs next to the current tab or after the last one" -msgstr "新しいタブを現在のタブの隣に開くか、最後のタブの隣に開くかを指定します" - -#: ../midori/midori-preferences.c:463 -msgid "Open tabs in the background" -msgstr "タブをバックグラウンドで開く" +#: ../midori/midori-preferences.c:385 +msgid "Allow scripts to open popups" +msgstr "ポップアップを表示するスクリプトを許可する" -#: ../midori/midori-preferences.c:467 -msgid "Text Editor" -msgstr "テキストエディター" +# tooltip +#: ../midori/midori-preferences.c:386 +msgid "Whether scripts are allowed to open popup windows automatically" +msgstr "ポップアップウィンドウを自動的に開くスクリプトの実行を許可します" -#: ../midori/midori-preferences.c:472 -msgid "News Aggregator" -msgstr "フィードリーダー" +#. Page "Interface" +#: ../midori/midori-preferences.c:409 +msgid "Browsing" +msgstr "ブラウジング" #. Page "Network" -#: ../midori/midori-preferences.c:479 +#: ../midori/midori-preferences.c:447 msgid "Network" msgstr "ネットワーク" -#: ../midori/midori-preferences.c:481 -msgid "Proxy server" -msgstr "プロキシサーバー" - -#: ../midori/midori-preferences.c:486 +#: ../midori/midori-preferences.c:454 msgid "Hostname" msgstr "ホスト名" -#: ../midori/midori-preferences.c:494 -msgid "Port" -msgstr "ポート" - -# tooltip -#: ../midori/midori-preferences.c:506 ../midori/midori-preferences.c:509 -msgid "The maximum size of cached pages on disk" -msgstr "ディスクのキャッシュページの最大サイズを指定します" - -#: ../midori/midori-preferences.c:511 +#: ../midori/midori-preferences.c:478 msgid "MB" msgstr "MB" -#: ../midori/midori-searchaction.c:957 +#: ../midori/midori-searchaction.c:907 msgid "Add search engine" msgstr "検索エンジンの追加" -#: ../midori/midori-searchaction.c:957 +#: ../midori/midori-searchaction.c:907 msgid "Edit search engine" msgstr "検索エンジンの編集" -#: ../midori/midori-searchaction.c:985 +#: ../midori/midori-searchaction.c:936 msgid "_Name:" msgstr "名前(_N):" -#: ../midori/midori-searchaction.c:1000 +#: ../midori/midori-searchaction.c:952 msgid "_Description:" msgstr "説明(_D):" -#: ../midori/midori-searchaction.c:1013 ../extensions/feed-panel/main.c:377 -msgid "_Address:" -msgstr "アドレス(_A):" +#: ../midori/midori-searchaction.c:985 +msgid "_Icon:" +msgstr "アイコン(_I):" -#: ../midori/midori-searchaction.c:1032 +#: ../midori/midori-searchaction.c:999 msgid "_Token:" msgstr "トークン(_T):" -#: ../midori/midori-searchaction.c:1330 +#: ../midori/midori-searchaction.c:1299 msgid "Manage Search Engines" msgstr "検索エンジンの管理" -#: ../midori/midori-searchaction.c:1432 +#: ../midori/midori-searchaction.c:1399 msgid "Use as _default" msgstr "デフォルトで使う(_D)" -#: ../midori/sokoke.c:353 +#: ../midori/sokoke.c:406 msgid "Open with" msgstr "アプリケーションで開く" -#: ../midori/sokoke.c:361 +#: ../midori/sokoke.c:414 #, c-format msgid "Choose an application or command to open \"%s\":" msgstr "\"%s\" を開くアプリケーションまたはコマンドを選択してください:" -#: ../midori/sokoke.c:476 ../midori/sokoke.c:490 +#: ../midori/sokoke.c:455 +#: ../midori/sokoke.c:465 +#: ../midori/sokoke.c:493 +#: ../midori/sokoke.c:522 +#: ../midori/sokoke.c:536 msgid "Could not run external program." msgstr "外部プログラムを実行できませんでした。" +#: ../midori/sokoke.c:1792 +#, c-format +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "%d 時間" +msgstr[1] "%d 時間" + +#: ../midori/sokoke.c:1793 +#, c-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "%d 分" +msgstr[1] "%d 分" + +#: ../midori/sokoke.c:1794 +#, c-format +msgid "%d second" +msgid_plural "%d seconds" +msgstr[0] "%d 秒" +msgstr[1] "%d 秒" + +#. i18n: Download tooltip (size): 4KB of 43MB +#: ../midori/sokoke.c:1802 +#: ../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:1811 +msgid "?B" +msgstr "?B" + +#. i18n: Download tooltip (transfer rate): (130KB/s) +#: ../midori/sokoke.c:1814 +#, c-format +msgid " (%s/s)" +msgstr " (%s/s)" + +#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning +#: ../midori/sokoke.c:1831 +#, c-format +msgid " - %s remaining" +msgstr " - 残り %s" + #. i18n: A panel at the bottom, to search text in pages -#: ../toolbars/midori-findbar.c:265 +#: ../toolbars/midori-findbar.c:260 msgid "_Inline Find:" msgstr "インライン検索(_I)" @@ -1978,124 +2136,120 @@ msgstr "強調表示" msgid "Close Findbar" msgstr "検索バーを閉じる" -#: ../toolbars/midori-transferbar.c:109 +#: ../toolbars/midori-transferbar.c:122 #, c-format msgid "The file '%s' has been downloaded." msgstr "ファイル '%s' をダウンロードしました。" -#: ../toolbars/midori-transferbar.c:114 +#: ../toolbars/midori-transferbar.c:125 msgid "Transfer completed" msgstr "転送完了" -#: ../toolbars/midori-transferbar.c:239 ../panels/midori-transfers.c:139 +#: ../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:272 ../toolbars/midori-transferbar.c:274 +#: ../toolbars/midori-transferbar.c:368 +#: ../toolbars/midori-transferbar.c:370 msgid "Some files are being downloaded" msgstr "ファイルのダウンロード中です" -#: ../toolbars/midori-transferbar.c:278 +#: ../toolbars/midori-transferbar.c:374 msgid "_Quit Midori" msgstr "Midori を終了(_Q)" -#: ../toolbars/midori-transferbar.c:280 +#: ../toolbars/midori-transferbar.c:376 msgid "The transfers will be cancelled if Midori quits." msgstr "Midori を終了すると転送がキャンセルされます。" -#: ../panels/midori-bookmarks.c:308 +#: ../panels/midori-bookmarks.c:113 +msgid "Bookmarks" +msgstr "ブックマーク" + +#: ../panels/midori-bookmarks.c:291 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "ブックマークアイテムの追加に失敗しました: %s\n" -#: ../panels/midori-bookmarks.c:475 -#, c-format -msgid "Failed to update bookmark : %s\n" -msgstr "ブックマークの更新に失敗しました: %s\n" - # tooltip -#: ../panels/midori-bookmarks.c:535 +#: ../panels/midori-bookmarks.c:471 msgid "Edit the selected bookmark" msgstr "選択したブックマークを編集します" # tooltip -#: ../panels/midori-bookmarks.c:543 +#: ../panels/midori-bookmarks.c:479 msgid "Delete the selected bookmark" msgstr "選択したブックマークを削除します" -#: ../panels/midori-bookmarks.c:558 +#: ../panels/midori-bookmarks.c:494 msgid "Add a new folder" -msgstr "新しいフォルダーの追加" +msgstr "新しいフォルダの追加" -#: ../panels/midori-bookmarks.c:697 ../panels/midori-history.c:638 +#: ../panels/midori-bookmarks.c:628 +#: ../panels/midori-history.c:579 msgid "Separator" -msgstr "セパレーター" +msgstr "セパレータ" -#. Create the filter entry -#: ../panels/midori-bookmarks.c:1027 -msgid "Search Bookmarks" -msgstr "ブックマークを検索" - -#: ../panels/midori-history.c:111 +#: ../panels/midori-history.c:110 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:142 +msgid "A week ago" +msgstr "一週間前" -#: ../panels/midori-history.c:162 ../panels/midori-history.c:186 +#: ../panels/midori-history.c:144 #, c-format msgid "%d day ago" msgid_plural "%d days ago" msgstr[0] "%d 日前" +msgstr[1] "%d 日前" -#: ../panels/midori-history.c:165 ../panels/midori-history.c:184 -msgid "A week ago" -msgstr "一週間前" +#: ../panels/midori-history.c:147 +msgid "Today" +msgstr "今日" -#: ../panels/midori-history.c:232 -#, c-format -msgid "Failed to remove history item: %s\n" -msgstr "履歴アイテムの削除に失敗しました: %s\n" +#: ../panels/midori-history.c:149 +msgid "Yesterday" +msgstr "昨日" -#: ../panels/midori-history.c:360 +#: ../panels/midori-history.c:317 msgid "Are you sure you want to remove all history items?" msgstr "すべての履歴アイテムを削除してよろしいですか?" # tooltip -#: ../panels/midori-history.c:407 +#: ../panels/midori-history.c:363 msgid "Bookmark the selected history item" msgstr "選択した履歴アイテムをブックマークに追加します" # tooltip -#: ../panels/midori-history.c:416 +#: ../panels/midori-history.c:372 msgid "Delete the selected history item" msgstr "選択した履歴アイテムを削除します" # tooltip -#: ../panels/midori-history.c:424 +#: ../panels/midori-history.c:380 msgid "Clear the entire history" msgstr "すべての履歴をクリアします" -#. Create the filter entry -#: ../panels/midori-history.c:997 -msgid "Search History" -msgstr "履歴を検索" - -#: ../panels/midori-transfers.c:87 +#: ../panels/midori-transfers.c:86 msgid "Transfers" msgstr "転送" -#: ../panels/midori-transfers.c:435 +#: ../panels/midori-transfers.c:467 msgid "Open Destination _Folder" -msgstr "保存先フォルダーを開く(_F)" +msgstr "保存先フォルダを開く(_F)" -#: ../panels/midori-transfers.c:438 +#: ../panels/midori-transfers.c:470 msgid "Copy Link Loc_ation" msgstr "リンクの場所をコピー(_A)" @@ -2108,12 +2262,12 @@ msgid "" "A username and a password are required\n" "to open this location:" msgstr "" -"この場所を開くためにはユーザー名とパスワードが\n" +"この場所を開くためにはユーザ名とパスワードが\n" "必要です:" #: ../katze/katze-http-auth.c:240 msgid "Username" -msgstr "ユーザー名" +msgstr "ユーザ名" #: ../katze/katze-http-auth.c:253 msgid "Password" @@ -2123,252 +2277,242 @@ msgstr "パスワード" msgid "_Remember password" msgstr "パスワードを記憶する(_R)" -#: ../katze/katze-throbber.c:949 +#: ../katze/katze-throbber.c:942 #, c-format msgid "Named icon '%s' couldn't be loaded" msgstr "アイコン名 '%s' を読み込めませんでした" -#: ../katze/katze-throbber.c:962 +#: ../katze/katze-throbber.c:955 #, c-format msgid "Stock icon '%s' couldn't be loaded" msgstr "ストックアイコン '%s' を読み込めませんでした" -#: ../katze/katze-throbber.c:1042 +#: ../katze/katze-throbber.c:1035 msgid "Animation frames are broken" msgstr "アニメーションフレームは壊れています" -#: ../katze/katze-utils.c:443 ../katze/katze-utils.c:866 +#: ../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:489 ../katze/katze-utils.c:518 -#: ../extensions/addons.c:309 +#: ../katze/katze-utils.c:485 +#: ../katze/katze-utils.c:514 +#: ../extensions/addons.c:308 msgid "Choose file" msgstr "ファイルの選択" -#: ../katze/katze-utils.c:504 +#: ../katze/katze-utils.c:500 msgid "Choose folder" -msgstr "フォルダーの選択" +msgstr "フォルダの選択" -#: ../katze/katze-utils.c:602 +#: ../katze/katze-utils.c:604 msgid "None" msgstr "なし" -#: ../katze/katze-utils.c:717 +#: ../katze/katze-utils.c:719 msgid "1 hour" msgstr "1 時間以上過去" -#: ../katze/katze-utils.c:718 +#: ../katze/katze-utils.c:720 msgid "1 day" msgstr "1 日以上過去" -#: ../katze/katze-utils.c:719 +#: ../katze/katze-utils.c:721 msgid "1 week" msgstr "1 週間以上過去" -#: ../katze/katze-utils.c:720 +#: ../katze/katze-utils.c:722 msgid "1 month" msgstr "1 ヶ月以上過去" -#: ../katze/katze-utils.c:721 +#: ../katze/katze-utils.c:723 msgid "1 year" msgstr "1 年以上過去" -#: ../katze/katze-preferences.c:98 ../extensions/history-list.vala:235 +#: ../katze/katze-preferences.c:91 +#: ../extensions/history-list.vala:235 #, c-format msgid "Preferences for %s" msgstr "%s の設定" -#: ../katze/midori-uri.vala:173 -msgid "MD5-Checksum:" -msgstr "MD5 チェックサム:" - -#: ../katze/midori-uri.vala:180 -msgid "SHA1-Checksum:" -msgstr "SHA1 チェックサム:" - -#: ../extensions/adblock.c:495 +#: ../extensions/adblock.c:428 msgid "Configure Advertisement filters" -msgstr "広告フィルターの設定" +msgstr "広告フィルタの設定" -#: ../extensions/adblock.c:528 +#: ../extensions/adblock.c:459 #, 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:942 +#: ../extensions/adblock.c:823 msgid "Edit rule" msgstr "ルールの編集" -#: ../extensions/adblock.c:956 +#: ../extensions/adblock.c:837 msgid "_Rule:" msgstr "ルール(_R):" -#: ../extensions/adblock.c:1010 +#: ../extensions/adblock.c:891 msgid "Bl_ock image" msgstr "画像をブロック(_O)" -#: ../extensions/adblock.c:1015 +#: ../extensions/adblock.c:896 msgid "Bl_ock link" msgstr "リンクをブロック(_O)" -#: ../extensions/adblock.c:1913 +#: ../extensions/adblock.c:1484 msgid "Advertisement blocker" -msgstr "広告ブロッカー" +msgstr "広告ブロッカ" # description -#: ../extensions/adblock.c:1914 +#: ../extensions/adblock.c:1485 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:222 +#: ../extensions/addons.c:221 msgid "This page appears to contain a user script. Do you wish to install it?" -msgstr "" -"このページにはユーザースクリプトが含まれているようです。それをインストールし" -"てもよろしいですか?" +msgstr "このページにはユーザスクリプトが含まれているようです。それをインストールしてもよろしいですか?" -#: ../extensions/addons.c:223 +#: ../extensions/addons.c:222 msgid "_Install user script" -msgstr "ユーザースクリプトをインストール(_I)" +msgstr "ユーザスクリプトをインストール(_I)" #. i18n: An infobar shows up when viewing a style on userstyles.org -#: ../extensions/addons.c:228 +#: ../extensions/addons.c:227 msgid "This page appears to contain a user style. Do you wish to install it?" -msgstr "" -"このページはユーザースタイルを含んでいるようです。それをインストールしますか?" +msgstr "このページはユーザスタイルを含んでいるようです。それをインストールしますか?" -#: ../extensions/addons.c:229 +#: ../extensions/addons.c:228 msgid "_Install user style" -msgstr "ユーザースタイルをインストール(_I)" +msgstr "ユーザスタイルをインストール(_I)" -#: ../extensions/addons.c:237 +#: ../extensions/addons.c:236 msgid "Don't install" msgstr "インストールしない" -#: ../extensions/addons.c:320 ../extensions/addons.c:675 +#: ../extensions/addons.c:319 +#: ../extensions/addons.c:681 msgid "Userscripts" -msgstr "ユーザースクリプト" +msgstr "ユーザスクリプト" -#: ../extensions/addons.c:325 ../extensions/addons.c:677 +#: ../extensions/addons.c:324 +#: ../extensions/addons.c:683 msgid "Userstyles" -msgstr "ユーザースタイル" +msgstr "ユーザスタイル" -#: ../extensions/addons.c:371 ../extensions/addons.c:450 +#: ../extensions/addons.c:380 +#: ../extensions/addons.c:459 #: ../extensions/feed-panel/main.c:129 msgid "Error" msgstr "エラー" -#: ../extensions/addons.c:412 +#: ../extensions/addons.c:421 #, c-format msgid "Do you want to delete '%s'?" msgstr "'%s' を削除してよろしいですか?" -#: ../extensions/addons.c:418 +#: ../extensions/addons.c:427 msgid "Delete user script" -msgstr "ユーザースクリプトの削除" +msgstr "ユーザスクリプトの削除" -#: ../extensions/addons.c:419 +#: ../extensions/addons.c:428 msgid "Delete user style" -msgstr "ユーザースタイルの削除" +msgstr "ユーザスタイルの削除" -#: ../extensions/addons.c:422 +#: ../extensions/addons.c:431 #, c-format msgid "The file %s will be permanently deleted." msgstr "ファイル %s は完全に削除されます。" # tooltip -#: ../extensions/addons.c:564 ../extensions/addons.c:641 +#: ../extensions/addons.c:570 +#: ../extensions/addons.c:647 msgid "Open in Text Editor" -msgstr "テキストエディターで開きます" +msgstr "テキストエディタで開きます" # tooltip -#: ../extensions/addons.c:566 ../extensions/addons.c:650 +#: ../extensions/addons.c:572 +#: ../extensions/addons.c:656 msgid "Open Target Folder" -msgstr "対象フォルダーを開きます" +msgstr "対象フォルダを開きます" # tooltip -#: ../extensions/addons.c:632 +#: ../extensions/addons.c:638 msgid "Add new addon" msgstr "新しいアドオンを追加します" # tooltip -#: ../extensions/addons.c:658 +#: ../extensions/addons.c:664 msgid "Remove selected addon" msgstr "選択したアドオンを削除します" -#: ../extensions/addons.c:1687 ../extensions/addons.c:1905 +#: ../extensions/addons.c:1713 +#: ../extensions/addons.c:1890 msgid "User addons" -msgstr "ユーザーアドオン" +msgstr "ユーザアドオン" -#: ../extensions/addons.c:1817 +#: ../extensions/addons.c:1843 #, c-format msgid "Can't monitor folder '%s': %s" -msgstr "フォルダー '%s' をモニターできません: %s" +msgstr "フォルダ '%s' をモニタできません: %s" -#: ../extensions/addons.c:1906 +#: ../extensions/addons.c:1891 msgid "Support for userscripts and userstyles" -msgstr "ユーザースクリプトやユーザースタイルをサポートします" +msgstr "ユーザスクリプトやユーザスタイルをサポートします" -#: ../extensions/colorful-tabs.c:201 +#: ../extensions/colorful-tabs.c:202 msgid "Colorful Tabs" msgstr "カラフルタブ" # description -#: ../extensions/colorful-tabs.c:202 +#: ../extensions/colorful-tabs.c:203 msgid "Tint each tab distinctly" msgstr "各タブにそれぞれを区別する色をつけます" -#: ../extensions/cookie-manager/cookie-manager-page.c:73 +#: ../extensions/cookie-manager/cookie-manager-page.c:80 #: ../extensions/cookie-manager/main.c:35 msgid "Cookie Manager" -msgstr "Cookie マネージャー" +msgstr "Cookie マネージャ" -#: ../extensions/cookie-manager/cookie-manager-page.c:103 +#: ../extensions/cookie-manager/cookie-manager-page.c:110 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 "" -"表示されているすべての Cookie を削除します。フィルターが設定されていれば、" -"フィルターにマッチした Cookie のみ削除されます。" +#: ../extensions/cookie-manager/cookie-manager-page.c:112 +msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter." +msgstr "表示されているすべての Cookie を削除します。フィルタが設定されていれば、フィルタにマッチした Cookie のみ削除されます。" # tooltip -#: ../extensions/cookie-manager/cookie-manager-page.c:120 +#: ../extensions/cookie-manager/cookie-manager-page.c:127 msgid "Expand All" msgstr "すべて展開します" # tooltip -#: ../extensions/cookie-manager/cookie-manager-page.c:127 +#: ../extensions/cookie-manager/cookie-manager-page.c:134 msgid "Collapse All" msgstr "すべて折り畳みます" -#: ../extensions/cookie-manager/cookie-manager-page.c:572 +#: ../extensions/cookie-manager/cookie-manager-page.c:576 msgid "Do you really want to delete all cookies?" msgstr "本当にすべての Cookie を削除してよろしいですか?" # Dialog title -#: ../extensions/cookie-manager/cookie-manager-page.c:574 +#: ../extensions/cookie-manager/cookie-manager-page.c:578 msgid "Question" msgstr "確認" -#: ../extensions/cookie-manager/cookie-manager-page.c:583 +#: ../extensions/cookie-manager/cookie-manager-page.c:587 msgid "Only cookies which match the filter will be deleted." -msgstr "フィルターに入力された文字列にマッチした Cookie のみ削除されます。" +msgstr "フィルタに入力された文字列にマッチした Cookie のみ削除されます。" -#: ../extensions/cookie-manager/cookie-manager-page.c:671 +#: ../extensions/cookie-manager/cookie-manager-page.c:675 msgid "At the end of the session" msgstr "セッションの終わりまで" -#: ../extensions/cookie-manager/cookie-manager-page.c:674 +#: ../extensions/cookie-manager/cookie-manager-page.c:678 #, c-format msgid "" "Host: %s\n" @@ -2386,16 +2530,16 @@ msgstr "" "有効期限: %s" # cookie: Secure flag is set. -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:684 msgid "Yes" msgstr "あり" # cookie: Secure flag isn't set. -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:684 msgid "No" msgstr "なし" -#: ../extensions/cookie-manager/cookie-manager-page.c:694 +#: ../extensions/cookie-manager/cookie-manager-page.c:698 #, c-format msgid "" "Domain: %s\n" @@ -2405,21 +2549,26 @@ msgstr "" "Cookie の数: %d" # Column name of cookie browser -#: ../extensions/cookie-manager/cookie-manager-page.c:1017 +#: ../extensions/cookie-manager/cookie-manager-page.c:1028 msgid "Name" msgstr "名前" -#: ../extensions/cookie-manager/cookie-manager-page.c:1069 +#: ../extensions/cookie-manager/cookie-manager-page.c:1081 msgid "_Expand All" msgstr "すべて展開する(_E)" -#: ../extensions/cookie-manager/cookie-manager-page.c:1077 +#: ../extensions/cookie-manager/cookie-manager-page.c:1089 msgid "_Collapse All" msgstr "すべて折り畳む(_C)" -#: ../extensions/cookie-manager/cookie-manager-page.c:1129 -msgid "Search Cookies by Name or Domain" -msgstr "名前またはドメインで Cookie を検索" +#: ../extensions/cookie-manager/cookie-manager-page.c:1142 +msgid "Filter:" +msgstr "フィルタ:" + +# tooltip +#: ../extensions/cookie-manager/cookie-manager-page.c:1147 +msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" +msgstr "フィルタに入力された文字列と、名前またはドメインフィールドがマッチした Cookie のみ表示します。" # description #: ../extensions/cookie-manager/main.c:36 @@ -2520,70 +2669,45 @@ msgstr "フィードパネル" msgid "Read Atom/ RSS feeds" msgstr "Atom/RSS フィードを購読します" -#: ../extensions/formhistory/formhistory.c:39 +#: ../extensions/formhistory.c:143 #, 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 +#: ../extensions/formhistory.c:295 msgid "Toggle form history state" msgstr "フォーム履歴の切り替え" -#: ../extensions/formhistory/formhistory.c:438 +#: ../extensions/formhistory.c:296 msgid "Activate or deactivate form history for the current tab." msgstr "現在のタブでのフォーム履歴を有効または無効にします。" -#: ../extensions/formhistory/formhistory.c:549 -#: ../extensions/formhistory/formhistory.c:553 +#: ../extensions/formhistory.c:430 +#: ../extensions/formhistory.c:434 #, 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" +#: ../extensions/formhistory.c:509 +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 +#: ../extensions/formhistory.c:568 msgid "Stores history of entered form data" msgstr "入力されたフォームデータの履歴を記憶します" -#: ../extensions/formhistory/formhistory-gdom-frontend.c:225 -#: ../extensions/formhistory/formhistory-js-frontend.c:106 +#: ../extensions/formhistory.c:572 #, c-format -msgid "Failed to select suggestions\n" -msgstr "サジェスチョンの選択に失敗しました\n" +msgid "Not available: %s" +msgstr "利用できません: %s" + +#: ../extensions/formhistory.c:573 +msgid "Resource files not installed" +msgstr "リソースファイルがインストールされていません" + +#: ../extensions/formhistory.c:579 +msgid "Form history filler" +msgstr "入力フォーム履歴フィルタ" #: ../extensions/history-list.vala:197 msgid "There are no unvisited tabs" @@ -2659,16 +2783,16 @@ msgstr "ページの再読み込みまたは読み込みの停止" msgid "Customize Keyboard shortcuts" msgstr "キーボードショートカットのカスタマイズ" -#: ../extensions/shortcuts.c:283 +#: ../extensions/shortcuts.c:285 msgid "Customize Sh_ortcuts..." msgstr "ショートカットのカスタマイズ(_O)..." -#: ../extensions/shortcuts.c:320 +#: ../extensions/shortcuts.c:322 msgid "Shortcuts" msgstr "ショートカット" # description -#: ../extensions/shortcuts.c:321 +#: ../extensions/shortcuts.c:323 msgid "View and edit keyboard shortcuts" msgstr "キーボードショートカットの表示および編集を行います" @@ -2680,37 +2804,38 @@ msgstr "ステータスバー時計" msgid "Display date and time in the statusbar" msgstr "ステータスバーに日付と時刻を表示します" -#: ../extensions/statusbar-features.c:152 +#: ../extensions/statusbar-features.c:128 msgid "Images" msgstr "画像" -#: ../extensions/statusbar-features.c:162 +#: ../extensions/statusbar-features.c:137 msgid "Scripts" msgstr "スクリプト" -#: ../extensions/statusbar-features.c:174 +#: ../extensions/statusbar-features.c:146 msgid "Netscape plugins" msgstr "Netscape プラグイン" -#: ../extensions/statusbar-features.c:259 +#: ../extensions/statusbar-features.c:192 msgid "Statusbar Features" msgstr "ステータスバー機能" # description -#: ../extensions/statusbar-features.c:260 +#: ../extensions/statusbar-features.c:193 msgid "Easily toggle features on web pages on and off" msgstr "ウェブページへの機能のオン/オフを簡単に切り替えます" -#: ../extensions/tab-panel.c:589 ../extensions/tab-panel.c:676 +#: ../extensions/tab-panel.c:596 +#: ../extensions/tab-panel.c:683 msgid "Tab Panel" msgstr "タブパネル" -#: ../extensions/tab-panel.c:659 +#: ../extensions/tab-panel.c:666 msgid "T_ab Panel" msgstr "タブパネル(_A)" # description -#: ../extensions/tab-panel.c:677 +#: ../extensions/tab-panel.c:684 msgid "Show tabs in a vertical panel" msgstr "タブを縦のパネルに表示します" @@ -2723,357 +2848,40 @@ msgstr "デフォルトでタブのアイコンのみ表示" msgid "New tabs have no label by default" msgstr "デフォルトで新しいタブのラベルを表示しません" -#: ../extensions/toolbar-editor.c:395 +#: ../extensions/toolbar-editor.c:393 msgid "Customize Toolbar" msgstr "ツールバーのカスタマイズ" -#: ../extensions/toolbar-editor.c:411 -msgid "" -"Select items to be displayed on the toolbar. Items can be reordered by drag " -"and drop." -msgstr "" -"ツールバーに表示するアイテムを選択してください。表示順はドラッグアンドドロッ" -"プで変更できます。" +#: ../extensions/toolbar-editor.c:413 +msgid "Select items to be displayed on the toolbar. Items can be reodered by drag and drop." +msgstr "ツールバーに表示するアイテムを選択してください。表示順はドラッグアンドドロップで変更できます。" -#: ../extensions/toolbar-editor.c:427 +#: ../extensions/toolbar-editor.c:429 msgid "Available Items" msgstr "利用可能なアイテム" -#: ../extensions/toolbar-editor.c:448 +#: ../extensions/toolbar-editor.c:450 msgid "Displayed Items" msgstr "表示するアイテム" -#: ../extensions/toolbar-editor.c:588 -msgid "_Customize Toolbar…" -msgstr "ツールバーのカスタマイズ(_C)…" +#: ../extensions/toolbar-editor.c:585 +msgid "Customize _Toolbar..." +msgstr "ツールバーのカスタマイズ(_T)..." -#: ../extensions/toolbar-editor.c:617 +#: ../extensions/toolbar-editor.c:601 +msgid "_Customize..." +msgstr "カスタマイズ(_C)..." + +#: ../extensions/toolbar-editor.c:631 msgid "Toolbar Editor" -msgstr "ツールバーエディター" +msgstr "ツールバーエディタ" # description -#: ../extensions/toolbar-editor.c:618 +#: ../extensions/toolbar-editor.c:632 msgid "Easily edit the toolbar layout" msgstr "ツールバーのレイアウトを簡単に編集できます" -#: ../extensions/web-cache.c:462 +#: ../extensions/web-cache.c:463 msgid "Cache HTTP communication on disk" msgstr "HTTP 通信をディスクにキャッシュします" -#~ msgid "Remember last window size" -#~ msgstr "最後のウィンドウサイズを記憶する" - -# tooltip -#~ msgid "Whether to save the last window size" -#~ msgstr "最後のウィンドウサイズを記憶します" - -#~ msgid "Last window width" -#~ msgstr "最後のウィンドウの幅" - -#~ msgid "The last saved window width" -#~ msgstr "最後に保存されたウィンドウ幅" - -#~ msgid "Last window height" -#~ msgstr "最後のウィンドウの高さ" - -# tooltip -#~ msgid "The last saved window height" -#~ msgstr "最後に保存されたウィンドウの高さにします" - -#~ msgid "Last panel position" -#~ msgstr "最後のパネルの位置" - -# tooltip -#~ msgid "The last saved panel position" -#~ msgstr "最後に保存されたパネルの位置にします" - -#~ msgid "Last panel page" -#~ msgstr "最後のパネルページ" - -# tooltip -#~ msgid "The last saved panel page" -#~ msgstr "最後に保存されたパネルのページです" - -#~ msgid "Last Web search" -#~ msgstr "最後のウェブ検索" - -#~ msgid "The last saved Web search" -#~ msgstr "最後に保存されたウェブ検索です" - -#~ msgid "Show Menubar" -#~ msgstr "メニューバーを表示する" - -# tooltip -#~ msgid "Whether to show the menubar" -#~ msgstr "メニューバーを表示します" - -#~ msgid "Show Navigationbar" -#~ msgstr "ナビゲーションバーを表示する" - -# tooltip -#~ msgid "Whether to show the navigationbar" -#~ msgstr "ナビゲーションバーを表示します" - -#~ msgid "Show Bookmarkbar" -#~ msgstr "ブックマークバーを表示する" - -# tooltip -#~ msgid "Whether to show the bookmarkbar" -#~ msgstr "ブックマークバーを表示します" - -#~ msgid "Show Panel" -#~ msgstr "パネルを表示する" - -# tooltip -#~ msgid "Whether to show the panel" -#~ msgstr "パネルを表示します" - -#~ msgid "Show Statusbar" -#~ msgstr "ステータスバーを表示する" - -# tooltip -#~ msgid "Whether to show the statusbar" -#~ msgstr "ステータスバーを表示します" - -#~ msgid "Toolbar Items" -#~ msgstr "ツールバーアイテム" - -# tooltip -#~ msgid "The items to show on the toolbar" -#~ msgstr "ツールバーに表示するアイテムを指定します" - -#~ msgid "Compact Sidepanel" -#~ msgstr "サイドパネルをコンパクトにする" - -# tooltip -#~ msgid "Whether to make the sidepanel compact" -#~ msgstr "サイドパネルの表示をコンパクトにします" - -#~ msgid "Align sidepanel on the right" -#~ msgstr "サイドパネルを右側に配置する" - -# tooltip -#~ msgid "Whether to align the sidepanel on the right" -#~ msgstr "サイドパネルを右側に表示します" - -#~ msgid "Open panels in separate windows" -#~ msgstr "パネルを別のウィンドウで開く" - -# tooltip -#~ msgid "Whether to always open panels in separate windows" -#~ msgstr "パネルを常に別のウィンドウで開きます" - -# tooltip -#~ msgid "What to do when Midori starts" -#~ msgstr "Midori の起動時に表示するページを指定します" - -# tooltip -#~ msgid "The homepage" -#~ msgstr "ホームページを指定します" - -#~ msgid "Show crash dialog" -#~ msgstr "クラッシュダイアログを表示する" - -# tooltip -#~ msgid "The folder downloaded files are saved to" -#~ msgstr "ダウンロードファイルの保存先を指定します" - -# tooltip -#~ msgid "An external text editor" -#~ msgstr "外部テキストエディターを指定します" - -# tooltip -#~ msgid "An external news aggregator" -#~ msgstr "外部フィードリーダーを指定します" - -#~ msgid "Location entry Search" -#~ msgstr "ロケーションエントリの検索" - -# tooltip -#~ msgid "The search to perform inside the location entry" -#~ msgstr "ロケーションエントリに入力された文字列の検索エンジンを指定します" - -# tooltip -#~ msgid "The preferred character encoding" -#~ msgstr "文字のエンコーディングを指定します" - -# tooltip -#~ msgid "Always show the tabbar" -#~ msgstr "常にタブバーを表示します" - -# tooltip -#~ msgid "Whether tabs have close buttons" -#~ msgstr "タブに閉じるボタンを表示します" - -# tooltip -#~ msgid "Where to open new pages" -#~ msgstr "新しいページをどこに開くか指定します" - -# tooltip -#~ msgid "Whether to open new tabs in the background" -#~ msgstr "新しいタブをバックグラウンドで開きます" - -#~ msgid "Open popups in tabs" -#~ msgstr "ポップアップをタブに開く" - -# tooltip -#~ msgid "Whether to open popup windows in tabs" -#~ msgstr "ポップアップウィンドウをタブに開きます" - -# tooltip -#~ msgid "Load and display images automatically" -#~ msgstr "画像を自動的に読み込んで表示します" - -# tooltip -#~ msgid "Enable embedded scripting languages" -#~ msgstr "組み込みスクリプト言語を有効にします" - -# tooltip -#~ msgid "Enable embedded Netscape plugin objects" -#~ msgstr "組み込み Netscape プラグインオブジェクトを有効にします" - -# tooltip -#~ msgid "Enable spell checking while typing" -#~ msgstr "キー入力中のスペルチェックを有効にします" - -#~ msgid "Enable HTML5 database support" -#~ msgstr "HTML5 データベースサポートを有効にする" - -#~ msgid "Whether to enable HTML5 database support" -#~ msgstr "HTML5 データベースサポートを有効にします" - -#~ msgid "Whether to enable HTML5 local storage support" -#~ msgstr "HTML5 ローカルストレージサポートを有効にします" - -#~ msgid "Whether to enable offline web application cache" -#~ msgstr "オフラインウェブアプリケーションキャッシュを有効にします" - -#~ msgid "Flash the browser window if a new tab was opened in the background" -#~ msgstr "" -#~ "新しいタブがバックグラウンドで開かれたときにブラウザーウィンドウを点滅しま" -#~ "す" - -#~ msgid "Allow websites to use OpenGL rendering" -#~ msgstr "すべてのウェブサイトで OpenGL レンダリングを許可します" - -# tooltip -#~ msgid "Whether to zoom text and images" -#~ msgstr "文字や画像の拡大/縮小を可能にします" - -#~ msgid "Find inline while typing" -#~ msgstr "キー入力中に自動的に検索する" - -# tooltip -#~ msgid "Whether to automatically find inline while typing" -#~ msgstr "インライン検索において、キー入力に従い自動的に検索します" - -#~ msgid "The type of proxy server to use" -#~ msgstr "使用するプロキシサーバーの種類を指定します" - -#~ msgid "HTTP Proxy Server" -#~ msgstr "HTTP プロキシサーバー" - -# tooltip -#~ msgid "The proxy server used for HTTP connections" -#~ msgstr "HTTP 接続でプロキシサーバーを使用する場合に設定します" - -# tooltip -#~ msgid "The proxy server port used for HTTP connections" -#~ msgstr "HTTP 接続で使用するプロキシサーバーのポート番号を設定します" - -#~ msgid "Identification string" -#~ msgstr "識別文字列" - -# tooltip -#~ msgid "The application identification string" -#~ msgstr "アプリケーション識別文字列です" - -# Button title -#~ msgid "Clear private data" -#~ msgstr "プライベートデータのクリア" - -# FIXME: -#~ msgid "The private data selected for deletion" -#~ msgstr "選択されているプライベートデータを削除します" - -#~ msgid "Clear data" -#~ msgstr "データのクリア" - -# FIXME: -#~ msgid "The data selected for deletion" -#~ msgstr "選択されているデータを削除します" - -#~ msgid "Close ot_her Tabs" -#~ msgstr "他のタブを閉じる(_H)" - -#~ msgid "_Icon:" -#~ msgstr "アイコン(_I):" - -#~ msgid "Filter:" -#~ msgstr "フィルター:" - -# tooltip -#~ msgid "" -#~ "Enter a filter string to show only cookies whose name or domain field " -#~ "match the entered filter" -#~ msgstr "" -#~ "フィルターに入力された文字列と、名前またはドメインフィールドがマッチした " -#~ "Cookie のみ表示します。" - -#, fuzzy -#~ msgid "Load page" -#~ msgstr "ページを読み込む" - -#~ msgid "_Bookmark" -#~ msgstr "ブックマーク(_B)" - -#~ msgid "_Console" -#~ msgstr "コンソール(_C)" - -#~ msgid "Toplevel folder" -#~ msgstr "トップレベルフォルダー" - -#~ msgid "_Title:" -#~ msgstr "タイトル(_T):" - -#~ msgid "_Folder:" -#~ msgstr "フォルダー(_F):" - -#~ msgid "Import bookmarks..." -#~ msgstr "ブックマークのインポート..." - -#~ msgid "Search with..." -#~ msgstr "他の検索エンジンで検索..." - -#~ msgid "Customize _Toolbar..." -#~ msgstr "ツールバーのカスタマイズ(_T)..." - -#~ msgid "_Customize..." -#~ msgstr "カスタマイズ(_C)..." - -#~ msgid "The bookmarks couldn't be saved. %s" -#~ msgstr "ブックマークを保存できませんでした。%s" - -#~ msgid "The specified configuration folder is invalid." -#~ msgstr "指定された設定フォルダーが正しくありません。" - -#~ msgid "Cookies" -#~ msgstr "Cookie" - -#~ msgid "'Flash' Cookies" -#~ msgstr "'Flash' Cookie" - -#~ 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 "リソースファイルがインストールされていません" diff --git a/po/ko.po b/po/ko.po index 662d6791..21a65fdf 100644 --- a/po/ko.po +++ b/po/ko.po @@ -1,63 +1,37 @@ # Korean translations for midori package. -# Copyright (C) 2007-2012 Christian Dywan et al. +# Copyright (C) 2009 THE midori'S COPYRIGHT HOLDER # This file is distributed under the same license as the midori package. # Seo Sanghyeon 2009 -# Kim Boram 2009-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 " +# Kim Boram 2009-2010 # msgid "" msgstr "" "Project-Id-Version: midori 0.2.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-19 11:45+0000\n" -"PO-Revision-Date: 2012-08-28 21:59+0900\n" -"Last-Translator: Kim, Boram \n" +"POT-Creation-Date: 2011-11-29 05:39+0000\n" +"PO-Revision-Date: 2011-08-19 19:51+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" +"Language: \n" "Plural-Forms: nplurals=1; plural=0;\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:1921 ../midori/main.c:1936 -#: ../midori/main.c:1949 ../midori/midori-websettings.c:200 +#: ../data/midori.desktop.in.h:2 +msgid "Lightweight web browser" +msgstr "가벼운 웹 브라우저" + +#: ../data/midori.desktop.in.h:3 ../midori/main.c:2005 ../midori/main.c:2025 +#: ../midori/main.c:2036 ../midori/midori-websettings.c:303 msgid "Midori" msgstr "미도리" #: ../data/midori.desktop.in.h:4 -msgid "Midori Web Browser" -msgstr "미도리 웹 브라우저" - -#: ../data/midori.desktop.in.h:5 -msgid "New Private Browsing Window" -msgstr "새 사생활 보호 모드 창" - -#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1326 -msgid "New Tab" -msgstr "새 탭" - -#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1323 -msgid "New Window" -msgstr "새 창" - -#: ../data/midori.desktop.in.h:8 msgid "Web Browser" msgstr "웹 브라우저" @@ -69,87 +43,81 @@ msgstr "미도리 개인 정보 보호 모드" msgid "Open a new private browsing window" msgstr "새 사생활 보호 모드 창 열기" -#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4307 +#: ../data/midori-private.desktop.in.h:3 msgid "Private Browsing" msgstr "사생활 보호 모드" -#: ../midori/main.c:84 ../midori/main.c:90 +#: ../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:138 +#: ../midori/main.c:150 #, c-format msgid "Value '%s' is invalid for %s" msgstr "값 '%s'은(는) %s의 잘못된 값입니다" -#: ../midori/main.c:143 ../midori/main.c:247 +#: ../midori/main.c:155 ../midori/main.c:261 #, c-format msgid "Invalid configuration value '%s'" msgstr " '%s'은(는) 잘못된 설정 값입니다." -#: ../midori/main.c:357 +#: ../midori/main.c:366 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "검색 엔진을 불러올 수 없습니다. %s\n" -#: ../midori/main.c:411 +#: ../midori/main.c:420 #, c-format msgid "Failed to clear history: %s\n" msgstr "기록을 제거할 수 없습니다: %s\n" -#: ../midori/main.c:433 ../extensions/formhistory/formhistory.c:531 +#: ../midori/main.c:440 ../midori/main.c:561 ../extensions/formhistory.c:417 #, 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:505 +#: ../midori/main.c:504 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "오래된 기록 항목을 지울 수 없습니다: %s\n" -#: ../midori/main.c:527 +#: ../midori/main.c:544 ../panels/midori-history.c:189 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "기록 항목을 제거할 수 없습니다: %s\n" + +#: ../midori/main.c:591 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "책갈피를 저장할 수 없습니다.%s" + +#: ../midori/main.c:624 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "설정을 저장할 수 없습니다. %s" -#: ../midori/main.c:553 +#: ../midori/main.c:659 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "검색 엔진을 저장할 수 없습니다. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:590 +#: ../midori/main.c:685 ../midori/main.c:705 #, c-format msgid "The trash couldn't be saved. %s" msgstr "휴지통을 저장할 수 없습니다.%s" -#: ../midori/main.c:663 ../panels/midori-extensions.c:90 +#: ../midori/main.c:739 ../panels/midori-extensions.c:91 msgid "Extensions" msgstr "확장 기능" -#: ../midori/main.c:677 +#: ../midori/main.c:753 msgid "Privacy" msgstr "개인 정보" -#: ../midori/main.c:679 -msgid "Delete old Cookies after:" -msgstr "쿠키를 보존할 기간:" - -#: ../midori/main.c:681 ../midori/main.c:684 -msgid "The maximum number of days to save cookies for" -msgstr "쿠키를 저장할 최장 기간을 설정합니다" - -#: ../midori/main.c:688 -msgid "Only accept Cookies from sites you visit" -msgstr "방문한 사이트의 쿠키 만을 허용" - -#: ../midori/main.c:689 -msgid "Block cookies sent by third-party websites" -msgstr "서드 파티 웹 사이트가 보낸 쿠키 막기" - -#: ../midori/main.c:694 +#: ../midori/main.c:765 msgid "" "Cookies store login data, saved games, or user profiles for advertisement " "purposes." @@ -157,44 +125,18 @@ msgstr "" "쿠키는 로그인 데이터, 게임 기록 또는 광고 목적의 사용자 프로필을 보관하고 있" "습니다." -#: ../midori/main.c:701 -msgid "Enable offline web application cache" -msgstr "오프라인 웹 응용 프로그램 캐시 사용" - -#: ../midori/main.c:704 -msgid "Enable HTML5 local storage support" -msgstr "HTML5 로컬 기억 장치 지원 사용" - -#. i18n: Reworded: Shorten details propagated when going to another page -#: ../midori/main.c:708 -msgid "Strip referrer details sent to websites" -msgstr "외부 사이트에 보낼 리퍼러의 자세한 내용을 제거" - -#. i18n: Referer here is not a typo but a technical term -#: ../midori/main.c:710 -msgid "Whether the \"Referer\" header should be shortened to the hostname" -msgstr "\"리퍼러\" 헤더를 호스트 이름으로 줄이기" - -#: ../midori/main.c:713 -msgid "Delete pages from history after:" -msgstr "기록에 페이지를 보존할 기간:" - -#: ../midori/main.c:715 ../midori/main.c:718 -msgid "The maximum number of days to save the history for" -msgstr "방문 기록을 저장할 최대 기간을 설정합니다" - -#: ../midori/main.c:759 +#: ../midori/main.c:821 #, c-format msgid "The session couldn't be saved. %s" msgstr "세션을 저장할 수 없습니다.%s" -#: ../midori/main.c:981 +#: ../midori/main.c:1031 msgid "" "No root certificate file is available. SSL certificates cannot be verified." msgstr "" "사용 가능한 루트 인증서 파일이 없습니다. SSL 인증서를 검증할 수 없습니다." -#: ../midori/main.c:1076 +#: ../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." @@ -202,237 +144,243 @@ msgstr "" "미도리를 마지막으로 실행했을 때 비 정상적으로 끝난 것 같습니다. 이런 일이 계" "속된다면, 문제 해결을 위해 다음 중 하나를 선택하십시오." -#: ../midori/main.c:1095 +#: ../midori/main.c:1118 msgid "Modify _preferences" msgstr "기본 설정 수정(_P)" -#: ../midori/main.c:1099 +#: ../midori/main.c:1122 msgid "Disable all _extensions" msgstr "모든 확장 기능 사용하지 않기(_E)" -#: ../midori/main.c:1108 -msgid "Show a dialog after Midori crashed" -msgstr "미도리가 충돌한 후 대화 상자를 표시합니다" - -#: ../midori/main.c:1113 +#: ../midori/main.c:1135 msgid "Discard old tabs" msgstr "오래된 탭 버리기" -#: ../midori/main.c:1114 ../midori/midori-websettings.c:108 +#: ../midori/main.c:1136 ../midori/midori-websettings.c:212 msgid "Show last tabs without loading" msgstr "마지막 탭을 불러오지는 않고 표시" -#: ../midori/main.c:1115 ../midori/midori-websettings.c:107 +#: ../midori/main.c:1137 ../midori/midori-websettings.c:211 msgid "Show last open tabs" msgstr "마지막에 연 탭 표시" -#: ../midori/main.c:1362 ../midori/main.c:2377 +#: ../midori/main.c:1345 ../midori/main.c:2408 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "세션을 열 수 없습니다: %s\n" -#: ../midori/main.c:1500 +#: ../midori/main.c:1484 #, c-format msgid "Snapshot saved to: %s\n" msgstr "스냅샷을 다음에 저장했습니다: %s\n" -#: ../midori/main.c:1836 +#: ../midori/main.c:1908 msgid "Run ADDRESS as a web application" msgstr "[주소]를 웹 응용 프로그램으로 실행" -#: ../midori/main.c:1836 +#: ../midori/main.c:1908 msgid "ADDRESS" msgstr "[주소]" -#: ../midori/main.c:1839 +#: ../midori/main.c:1911 msgid "Use FOLDER as configuration folder" msgstr "[폴더]를 설정 폴더로 사용" -#: ../midori/main.c:1839 +#: ../midori/main.c:1911 msgid "FOLDER" msgstr "[폴더]" -#: ../midori/main.c:1842 +#: ../midori/main.c:1914 msgid "Private browsing, no changes are saved" msgstr "개인 정보 보호 모드, 바뀐 사항을 저장하지 않습니다." -#: ../midori/main.c:1845 -msgid "Portable mode, all runtime files are stored in one place" -msgstr "휴대 모드, 모든 런타임 파일을 한 곳에 보관합니다." - -#: ../midori/main.c:1848 -msgid "Plain GTK+ window with WebKit, akin to GtkLauncher" -msgstr "GtkLauncher와 유사한 웹킷을 사용하는 일반적인 GTK 창" - -#: ../midori/main.c:1850 +#: ../midori/main.c:1916 msgid "Show a diagnostic dialog" msgstr "진단 대화 상자 보기" -#: ../midori/main.c:1852 +#: ../midori/main.c:1918 msgid "Run the specified filename as javascript" msgstr "특정한 파일 이름을 자바 스크립트로 실행" -#: ../midori/main.c:1854 +#: ../midori/main.c:1920 msgid "Take a snapshot of the specified URI" msgstr "지정한 주소의 스냅샷 저장" -#: ../midori/main.c:1856 +#: ../midori/main.c:1922 msgid "Execute the specified command" msgstr "실행할 특정 명령어" -#: ../midori/main.c:1858 +#: ../midori/main.c:1924 msgid "List available commands to execute with -e/ --execute" msgstr "-e/ --execute와 함께 실행하시면 실행 가능한 명령어의 목록을 표시합니다" -#: ../midori/main.c:1860 +#: ../midori/main.c:1926 msgid "Display program version" msgstr "프로그램의 버전 표시" -#: ../midori/main.c:1862 +#: ../midori/main.c:1928 msgid "Addresses" msgstr "주소" -#: ../midori/main.c:1864 +#: ../midori/main.c:1930 msgid "Block URIs according to regular expression PATTERN" msgstr "정규 표현 패턴에 따라 주소를 막기" -#: ../midori/main.c:1864 +#: ../midori/main.c:1930 msgid "PATTERN" msgstr "[패턴]" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1868 +#: ../midori/main.c:1934 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "수 초 이상 활동이 없을 경우 미도리 초기화" -#: ../midori/main.c:1868 +#: ../midori/main.c:1934 msgid "SECONDS" msgstr "[초]" -#: ../midori/main.c:1871 +#: ../midori/main.c:1937 msgid "Redirects console warnings to the specified FILENAME" msgstr "콘솔 경고를 지정한 파일로 전송합니다." -#: ../midori/main.c:1871 +#: ../midori/main.c:1937 msgid "FILENAME" msgstr "[파일 이름]" -#: ../midori/main.c:1950 +#: ../midori/main.c:2002 +msgid "[Addresses]" +msgstr "[주소]" + +#: ../midori/main.c:2012 +msgid "The specified configuration folder is invalid." +msgstr "지정한 설정 폴더가 올바르지 않습니다." + +#: ../midori/main.c:2037 msgid "Please report comments, suggestions and bugs to:" msgstr "코멘트, 제안, 버그 등을 이곳에 보고해 주십시오:" -#: ../midori/main.c:1952 +#: ../midori/main.c:2039 msgid "Check for new versions at:" msgstr "다음에서 새 버전 검색:" +#: ../midori/main.c:2122 +msgid "Website icons" +msgstr "웹 사이트 아이콘" + #. i18n: Logins and passwords in websites and web forms -#: ../midori/main.c:2091 +#: ../midori/main.c:2125 msgid "Saved logins and _passwords" msgstr "저장한 사용자 이름과 암호(_P)" -#: ../midori/main.c:2093 -msgid "Cookies and Website data" -msgstr "쿠키와 웹사이트 데이터" +#: ../midori/main.c:2127 +msgid "Cookies" +msgstr "쿠키" + +#: ../midori/main.c:2130 +msgid "'Flash' Cookies" +msgstr "'플래시' 쿠키" + +#: ../midori/main.c:2133 +msgid "HTML5 _Databases" +msgstr "HTML5 데이터 베이스(_D)" -#. TODO: Preserve page icons of search engines and merge privacy items -#: ../midori/main.c:2097 ../midori/midori-preferences.c:508 -#: ../extensions/web-cache.c:461 ../extensions/web-cache.c:470 +#: ../midori/main.c:2136 ../midori/midori-websettings.c:936 +#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471 msgid "Web Cache" msgstr "웹 캐시" -#: ../midori/main.c:2100 -msgid "Website icons" -msgstr "웹 사이트 아이콘" +#: ../midori/main.c:2138 +msgid "Offline Application Cache" +msgstr "오프라인 웹 응용 프로그램 캐시" -#: ../midori/main.c:2210 +#: ../midori/main.c:2241 msgid "An unknown error occured" msgstr "알 수 없는 오류가 발생했습니다." -#: ../midori/main.c:2325 +#: ../midori/main.c:2339 msgid "An instance of Midori is already running but not responding.\n" msgstr "미도리를 이미 실행했지만 응답이 없습니다.\n" -#: ../midori/main.c:2359 +#: ../midori/main.c:2375 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "책갈피를 읽어올 수 없습니다: %s\n" -#: ../midori/main.c:2392 +#: ../midori/main.c:2423 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "휴지통을 열 수 없습니다: %s\n" -#: ../midori/main.c:2405 +#: ../midori/main.c:2436 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "기록을 열 수 없습니다: %s\n" -#: ../midori/main.c:2420 +#: ../midori/main.c:2452 msgid "The following errors occured:" msgstr "다음의 오류가 발생했습니다:" -#: ../midori/main.c:2436 +#: ../midori/main.c:2468 msgid "_Ignore" msgstr "무시(_I)" -#: ../midori/midori-app.c:1156 ../midori/midori-browser.c:534 -#, c-format -msgid "Unexpected action '%s'." -msgstr "기대하지 않은 동작 '%s'." +#: ../midori/midori-app.c:1335 +msgid "_Bookmark" +msgstr "책갈피(_B)" -#: ../midori/midori-app.c:1372 ../midori/midori-browser.c:6251 +#: ../midori/midori-app.c:1336 ../midori/midori-browser.c:5982 msgid "_Bookmarks" msgstr "책갈피(_B)" -#: ../midori/midori-app.c:1373 +#: ../midori/midori-app.c:1337 msgid "Add Boo_kmark" msgstr "책갈피 더하기(_K)" -#: ../midori/midori-app.c:1374 +#: ../midori/midori-app.c:1338 +msgid "_Console" +msgstr "콘솔(_C)" + +#: ../midori/midori-app.c:1339 msgid "_Extensions" msgstr "확장 기능(_E)" #. i18n: Browsing history, visited web pages, closed tabs -#: ../midori/midori-app.c:1375 ../midori/midori-browser.c:4700 +#: ../midori/midori-app.c:1340 ../midori/midori-browser.c:4577 msgid "_History" msgstr "기록(_H)" -#: ../midori/midori-app.c:1376 +#: ../midori/midori-app.c:1341 +msgid "_Homepage" +msgstr "홈페이지(_H)" + +#: ../midori/midori-app.c:1342 msgid "_Userscripts" msgstr "사용자 스크립트(_U)" -#: ../midori/midori-app.c:1377 -msgid "User_styles" -msgstr "사용자 스타일(_S)" - -#: ../midori/midori-app.c:1378 +#: ../midori/midori-app.c:1343 msgid "New _Tab" msgstr "새 탭(_T)" -#: ../midori/midori-app.c:1379 +#: ../midori/midori-app.c:1344 msgid "_Transfers" msgstr "전송(_T)" -#: ../midori/midori-app.c:1380 +#: ../midori/midori-app.c:1345 msgid "Netscape p_lugins" msgstr "넷스케이프 플러그인(_L)" -#: ../midori/midori-app.c:1381 +#: ../midori/midori-app.c:1346 msgid "_Closed Tabs" -msgstr "닫은 탭(_C)" +msgstr "닫은 탭 (_C)" -#: ../midori/midori-app.c:1382 ../midori/midori-browser.c:5387 +#: ../midori/midori-app.c:1347 ../midori/midori-browser.c:5165 msgid "New _Window" msgstr "새 창(_W)" -#: ../midori/midori-app.c:1383 +#: ../midori/midori-app.c:1348 msgid "New _Folder" msgstr "새 폴더(_F)" -#: ../midori/midori-app.c:1437 -msgid "[Addresses]" -msgstr "[주소]" - #: ../midori/midori-array.c:522 msgid "File not found." msgstr "파일이 없습니다." @@ -450,113 +398,124 @@ msgstr "책갈피 형식을 알 수 없습니다." msgid "Writing failed." msgstr "쓸 수 없습니다." -#: ../midori/midori-browser.c:347 ../midori/midori-browser.c:5526 -msgid "Go forward to the next page" -msgstr "다음 들렀던 페이지로 갑니다" - -#. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:354 ../midori/midori-browser.c:5534 -#: ../midori/midori-browser.c:5537 -msgid "Go to the next sub-page" -msgstr "다음 들렀던 하위 페이지로 갑니다" - -#: ../midori/midori-browser.c:441 ../midori/midori-browser.c:5475 -#: ../midori/midori-browser.c:5484 +#: ../midori/midori-browser.c:329 ../midori/midori-browser.c:5247 +#: ../midori/midori-browser.c:5256 msgid "Reload the current page" msgstr "현재 페이지 다시 불러오기" -#: ../midori/midori-browser.c:449 ../midori/midori-browser.c:5481 +#: ../midori/midori-browser.c:337 ../midori/midori-browser.c:5253 msgid "Stop loading the current page" msgstr "현재 페이지 불러오기 중지" -#: ../midori/midori-browser.c:519 +#: ../midori/midori-browser.c:462 #, c-format msgid "Failed to update title: %s\n" msgstr "제목 업데이트 실패: %s\n" -#: ../midori/midori-browser.c:614 +#: ../midori/midori-browser.c:475 +#, c-format +msgid "Unexpected action '%s'." +msgstr "기대하지 않은 동작 '%s'." + +#: ../midori/midori-browser.c:576 #, c-format msgid "%s (Private Browsing)" msgstr "%s (사생활 보호 모드)" -#: ../midori/midori-browser.c:724 ../midori/midori-browser.c:766 -#: ../panels/midori-bookmarks.c:114 -msgid "Bookmarks" -msgstr "책갈피" +#: ../midori/midori-browser.c:687 ../midori/midori-browser.c:720 +msgid "Toplevel folder" +msgstr "최상위 폴더" -#: ../midori/midori-browser.c:826 +#: ../midori/midori-browser.c:777 msgid "New folder" msgstr "새 폴더" -#: ../midori/midori-browser.c:826 +#: ../midori/midori-browser.c:777 msgid "Edit folder" msgstr "폴더 편집" -#: ../midori/midori-browser.c:828 +#: ../midori/midori-browser.c:779 msgid "New bookmark" msgstr "새 책갈피" -#: ../midori/midori-browser.c:828 +#: ../midori/midori-browser.c:779 msgid "Edit bookmark" msgstr "책갈피 편집" -#: ../midori/midori-browser.c:862 -msgid "Type a name for this bookmark and choose where to keep it." -msgstr "이 책갈피의 이름을 입력한 후 보관할 장소를 선택하십시오." +#: ../midori/midori-browser.c:810 +msgid "_Title:" +msgstr "제목(_T):" + +#: ../midori/midori-browser.c:830 ../midori/midori-searchaction.c:966 +#: ../extensions/feed-panel/main.c:377 +msgid "_Address:" +msgstr "주소(_A):" + +#: ../midori/midori-browser.c:853 ../midori/midori-browser.c:4312 +msgid "_Folder:" +msgstr "폴더(_F):" -#: ../midori/midori-browser.c:923 +#: ../midori/midori-browser.c:869 msgid "Add to _Speed Dial" msgstr "단축 번호에 더하기(_S)" -#: ../midori/midori-browser.c:929 +#: ../midori/midori-browser.c:882 msgid "Show in the tool_bar" msgstr "도구 모음에 보이기(_B)" -#: ../midori/midori-browser.c:937 +#: ../midori/midori-browser.c:897 msgid "Run as _web application" msgstr "웹 응용 프로그램으로 실행(_W)" -#: ../midori/midori-browser.c:1055 ../midori/midori-browser.c:4504 +#: ../midori/midori-browser.c:968 +#, c-format +msgid "The file \"%s\" can't be saved in this folder." +msgstr "이 폴더에 파일 \"%s\"을(를) 저장할 수 없습니다." + +#: ../midori/midori-browser.c:970 +#, c-format +msgid "You don't have permission to write in this location." +msgstr "이 위치에 쓸 수 있는 권한을 가지고 있지 않습니다." + +#: ../midori/midori-browser.c:977 +#, c-format +msgid "There is not enough free space to download \"%s\"." +msgstr "\"%s\"을(를) 다운로드 할 빈 공간이 부족합니다." + +#: ../midori/midori-browser.c:980 +#, c-format +msgid "The file needs %s but only %s are left." +msgstr "파일 다운로드에는 %s이(가) 필요합니다 만 %s 만이 남아있습니다." + +#: ../midori/midori-browser.c:1024 ../midori/midori-browser.c:4382 msgid "Save file as" msgstr "다른 이름으로 저장" -#: ../midori/midori-browser.c:1065 -msgid "Save associated _resources" -msgstr "관련된 자원 저장(_R)" +#: ../midori/midori-browser.c:1333 +msgid "New Window" +msgstr "새 창" -#: ../midori/midori-browser.c:1323 +#: ../midori/midori-browser.c:1333 msgid "A new window has been opened" msgstr "새 창이 열렸습니다." -#: ../midori/midori-browser.c:1326 +#: ../midori/midori-browser.c:1336 +msgid "New Tab" +msgstr "새 탭" + +#: ../midori/midori-browser.c:1336 msgid "A new tab has been opened" msgstr "새 탭이 열렸습니다." -#: ../midori/midori-browser.c:1343 -msgid "Error opening the image!" -msgstr "그림을 여는 중 오류가 발생했습니다!" - -#: ../midori/midori-browser.c:1344 -msgid "Can not open selected image in a default viewer." -msgstr "기본 그림 보기 프로그램으로 선택할 그림을 열 수 없습니다." - -#: ../midori/midori-browser.c:1350 -msgid "Error downloading the image!" -msgstr "그림을 다운로드하는 중 오류가 발생했습니다!" - -#: ../midori/midori-browser.c:1351 -msgid "Can not download selected image." -msgstr "선택한 그림을 다운로드할 수 없습니다." - -#: ../midori/midori-browser.c:1408 +#: ../midori/midori-browser.c:1373 msgid "Save file" msgstr "파일 저장" -#: ../midori/midori-browser.c:2335 +#: ../midori/midori-browser.c:2265 msgid "Open file" msgstr "파일 열기" -#: ../midori/midori-browser.c:2467 +#: ../midori/midori-browser.c:2396 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" @@ -569,156 +528,140 @@ msgstr "" "이 외에 미도리 기본 설정 안 프로그램 탭으로 이동하여 뉴스 수집기를 선택하면 " "다음 뉴스 피드 아이콘을 누를 때 자동으로 추가될 것입니다." -#: ../midori/midori-browser.c:2473 ../extensions/feed-panel/main.c:365 +#: ../midori/midori-browser.c:2402 ../extensions/feed-panel/main.c:365 msgid "New feed" msgstr "새 피드" -#: ../midori/midori-browser.c:2516 ../midori/midori-browser.c:5550 -#: ../panels/midori-bookmarks.c:527 +#: ../midori/midori-browser.c:2445 ../midori/midori-browser.c:5316 +#: ../panels/midori-bookmarks.c:432 msgid "Add a new bookmark" msgstr "새 책갈피 더하기" -#: ../midori/midori-browser.c:3060 ../midori/midori-searchaction.c:487 +#: ../midori/midori-browser.c:2971 ../midori/midori-searchaction.c:487 msgid "Empty" msgstr "비어있음" -#: ../midori/midori-browser.c:3506 ../midori/midori-browser.c:3507 +#: ../midori/midori-browser.c:3461 msgid "Toggle text cursor navigation" msgstr "" "키보드로 커서를 조작하여 페이지의 텍스트 사이를 이동하는 기능을 켜고 끄기" -#: ../midori/midori-browser.c:3509 -msgid "" -"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in " -"all websites." -msgstr "" -"캐럿 브라우징을 켜고 끄려면 F7 키를 눌러주십시오. 사용하게 되면 모든 웹사이트" -"에 텍스트 커서가 표시됩니다." - -#: ../midori/midori-browser.c:3512 -msgid "_Enable Caret Browsing" -msgstr "캐럿 브라우징 사용(_E)" - -#: ../midori/midori-browser.c:3904 ../midori/midori-browser.c:5944 +#: ../midori/midori-browser.c:3773 ../midori/midori-browser.c:5723 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "새 기록 항목 삽입 실패: %s\n" -#: ../midori/midori-browser.c:4230 ../panels/midori-bookmarks.c:850 -#: ../panels/midori-history.c:806 +#: ../midori/midori-browser.c:4109 ../panels/midori-bookmarks.c:748 +#: ../panels/midori-history.c:747 msgid "Open all in _Tabs" msgstr "전부 탭으로 열기(_T)" -#: ../midori/midori-browser.c:4237 ../panels/midori-bookmarks.c:856 -#: ../panels/midori-history.c:812 ../extensions/feed-panel/feed-panel.c:528 +#: ../midori/midori-browser.c:4116 ../panels/midori-bookmarks.c:754 +#: ../panels/midori-history.c:753 ../extensions/feed-panel/feed-panel.c:528 msgid "Open in New _Tab" msgstr "새 탭에서 열기(_T)" -#: ../midori/midori-browser.c:4240 ../midori/midori-view.c:2904 -#: ../midori/midori-view.c:4880 ../panels/midori-bookmarks.c:858 -#: ../panels/midori-history.c:814 ../extensions/feed-panel/feed-panel.c:530 +#: ../midori/midori-browser.c:4119 ../midori/midori-view.c:2530 +#: ../midori/midori-view.c:4357 ../panels/midori-bookmarks.c:756 +#: ../panels/midori-history.c:755 ../extensions/feed-panel/feed-panel.c:530 msgid "Open in New _Window" msgstr "새 창에서 열기(_W)" -#: ../midori/midori-browser.c:4329 +#: ../midori/midori-browser.c:4199 msgid "Arora" msgstr "아로라" -#: ../midori/midori-browser.c:4330 +#: ../midori/midori-browser.c:4200 msgid "Kazehakase" msgstr "카제하카세" -#: ../midori/midori-browser.c:4331 +#: ../midori/midori-browser.c:4201 msgid "Opera" msgstr "오페라" -#: ../midori/midori-browser.c:4332 +#: ../midori/midori-browser.c:4202 msgid "Konqueror" msgstr "컨쿼러" -#: ../midori/midori-browser.c:4333 +#: ../midori/midori-browser.c:4203 msgid "Epiphany" msgstr "에피파니" -#: ../midori/midori-browser.c:4334 +#: ../midori/midori-browser.c:4204 #, c-format msgid "Firefox (%s)" msgstr "파이어폭스 (%s)" -#: ../midori/midori-browser.c:4335 -msgid "Midori 0.2.6" -msgstr "미도리 0.2.6" +#: ../midori/midori-browser.c:4225 +msgid "Import bookmarks..." +msgstr "책갈피 가져오기..." -#: ../midori/midori-browser.c:4356 -msgid "Import bookmarks…" -msgstr "책갈피 가져오기…" - -#: ../midori/midori-browser.c:4359 ../midori/midori-browser.c:5555 +#: ../midori/midori-browser.c:4228 ../midori/midori-browser.c:5321 msgid "_Import bookmarks" msgstr "책갈피 가져오기(_I)" -#: ../midori/midori-browser.c:4370 +#: ../midori/midori-browser.c:4239 msgid "_Application:" msgstr "응용 프로그램(_A):" -#: ../midori/midori-browser.c:4435 +#: ../midori/midori-browser.c:4304 msgid "Import from XBEL or HTML file" msgstr "XBEL 또는 HTML 파일에서 가져오기" -#: ../midori/midori-browser.c:4463 +#: ../midori/midori-browser.c:4339 msgid "Import from a file" msgstr "파일에서 가져오기" -#: ../midori/midori-browser.c:4475 +#: ../midori/midori-browser.c:4351 msgid "Failed to import bookmarks" msgstr "책갈피 가져오기 실패" -#: ../midori/midori-browser.c:4509 +#: ../midori/midori-browser.c:4387 msgid "XBEL Bookmarks" msgstr "XBEL 책갈피" -#: ../midori/midori-browser.c:4514 +#: ../midori/midori-browser.c:4392 msgid "Netscape Bookmarks" msgstr "넷스케이프 책갈피" -#: ../midori/midori-browser.c:4528 +#: ../midori/midori-browser.c:4406 msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)" msgstr "미도리는 XBEL(*.xbel) 그리고 넷스케이프(*.html)로만 내보낼 수 있습니다" -#: ../midori/midori-browser.c:4543 +#: ../midori/midori-browser.c:4422 msgid "Failed to export bookmarks" msgstr "책갈피 내보내기 실패" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4665 +#: ../midori/midori-browser.c:4544 msgid "Clear Private Data" msgstr "개인 데이터 모두 지우기" -#: ../midori/midori-browser.c:4669 +#: ../midori/midori-browser.c:4548 msgid "_Clear private data" msgstr "개인 데이터 지우기(_C)" -#: ../midori/midori-browser.c:4684 +#: ../midori/midori-browser.c:4561 msgid "Clear the following data:" msgstr "다음의 데이터 지우기:" -#: ../midori/midori-browser.c:4694 +#: ../midori/midori-browser.c:4571 msgid "Last open _tabs" msgstr "마지막에 연 탭(_T)" -#: ../midori/midori-browser.c:4720 +#: ../midori/midori-browser.c:4597 msgid "Clear private data when _quitting Midori" msgstr "미도리를 종료할 때 개인 데이터를 제거합니다(_Q)" -#: ../midori/midori-browser.c:4935 +#: ../midori/midori-browser.c:4773 msgid "A lightweight web browser." msgstr "가벼운 웹 브라우저." -#: ../midori/midori-browser.c:4936 +#: ../midori/midori-browser.c:4774 msgid "See about:version for version info." msgstr "버전 정보를 보려면 about:version 페이지를 확인하십시오." -#: ../midori/midori-browser.c:4938 +#: ../midori/midori-browser.c:4776 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 " @@ -726,1328 +669,1465 @@ msgid "" "option) any later version." msgstr "" "이 라이브러리는 자유 소프트웨어입니다; 이 프로그램은 자유 소프트웨어 재단에" -"서 발표한 GNU 약소 일반 공중 사용 허가서 버전 2.1 또는 이후 버전(선택적)에 따" -"라 재배포하거나 수정할 수 있습니다." +"서 발표한 GNU 약소 일반 공중 사용 허가서 버전 2.1 또는 이후 버전 (선택적)에 " +"따라 재배포하거나 수정할 수 있습니다." -#: ../midori/midori-browser.c:4968 +#: ../midori/midori-browser.c:4797 msgid "translator-credits" msgstr "" "Seo Sanghyeon \n" "김보람 " -#: ../midori/midori-browser.c:5385 +#: ../midori/midori-browser.c:5163 msgid "_File" msgstr "파일(_F)" -#: ../midori/midori-browser.c:5388 +#: ../midori/midori-browser.c:5166 msgid "Open a new window" msgstr "새 창을 엽니다" -#: ../midori/midori-browser.c:5391 +#: ../midori/midori-browser.c:5169 msgid "Open a new tab" msgstr "새 탭을 엽니다" -#: ../midori/midori-browser.c:5393 +#: ../midori/midori-browser.c:5171 msgid "New P_rivate Browsing Window" msgstr "새 사생활 보호 모드 창(_R)" -#: ../midori/midori-browser.c:5397 +#: ../midori/midori-browser.c:5175 msgid "Open a file" msgstr "파일을 엽니다" -#: ../midori/midori-browser.c:5399 -msgid "_Save Page As…" -msgstr "다른 이름으로 페이지 저장(_S)…" +#: ../midori/midori-browser.c:5177 +msgid "_Save Page As..." +msgstr "다른 이름으로 페이지 저장(_S)..." -#: ../midori/midori-browser.c:5400 +#: ../midori/midori-browser.c:5178 msgid "Save to a file" msgstr "파일로 저장" -#: ../midori/midori-browser.c:5402 +#: ../midori/midori-browser.c:5180 msgid "Add to Speed _dial" msgstr "단축 번호 더하기(_D)" -#: ../midori/midori-browser.c:5406 +#: ../midori/midori-browser.c:5184 msgid "Add Shortcut to the _desktop" msgstr "바로 가기를 바탕 화면에 추가(_D)" -#: ../midori/midori-browser.c:5408 +#: ../midori/midori-browser.c:5186 msgid "Create _Launcher" msgstr "실행 아이콘 만들기(_L)" -#: ../midori/midori-browser.c:5412 +#: ../midori/midori-browser.c:5190 msgid "Subscribe to News _feed" msgstr "뉴스 피드 구독(_F)" -#: ../midori/midori-browser.c:5418 +#: ../midori/midori-browser.c:5196 msgid "_Close Tab" msgstr "탭 닫기(_C)" -#: ../midori/midori-browser.c:5419 +#: ../midori/midori-browser.c:5197 msgid "Close the current tab" msgstr "현재 탭을 닫습니다." -#: ../midori/midori-browser.c:5421 +#: ../midori/midori-browser.c:5199 msgid "C_lose Window" msgstr "창 닫기(_L)" -#: ../midori/midori-browser.c:5425 -msgid "_Share" -msgstr "공유(_S)" - -#: ../midori/midori-browser.c:5430 +#: ../midori/midori-browser.c:5203 msgid "Print the current page" msgstr "현재 페이지를 인쇄합니다" -#: ../midori/midori-browser.c:5433 +#: ../midori/midori-browser.c:5205 msgid "Close a_ll Windows" msgstr "모든 창 닫기(_L)" -#: ../midori/midori-browser.c:5436 +#: ../midori/midori-browser.c:5208 msgid "_Edit" msgstr "편집(_E)" -#: ../midori/midori-browser.c:5459 -msgid "_Find…" -msgstr "찾기(_F)…" +#: ../midori/midori-browser.c:5231 +msgid "_Find..." +msgstr "찾기(_F)..." -#: ../midori/midori-browser.c:5460 +#: ../midori/midori-browser.c:5232 msgid "Find a word or phrase in the page" msgstr "이 페이지에서 단어나 단락을 찾습니다" -#: ../midori/midori-browser.c:5462 +#: ../midori/midori-browser.c:5234 msgid "Find _Next" msgstr "다음 찾기(_N)" -#: ../midori/midori-browser.c:5465 +#: ../midori/midori-browser.c:5237 msgid "Find _Previous" msgstr "이전 찾기(_P)" -#: ../midori/midori-browser.c:5469 +#: ../midori/midori-browser.c:5241 msgid "Configure the application preferences" msgstr "프로그램 기본 설정을 편집합니다" -#: ../midori/midori-browser.c:5471 +#: ../midori/midori-browser.c:5243 msgid "_View" msgstr "보기(_V)" -#: ../midori/midori-browser.c:5472 +#: ../midori/midori-browser.c:5244 msgid "_Toolbars" msgstr "도구 모음(_T)" -#: ../midori/midori-browser.c:5477 +#: ../midori/midori-browser.c:5249 msgid "Reload page without caching" msgstr "저장하지 않고 페이지 다시 불러오기" -#: ../midori/midori-browser.c:5487 +#: ../midori/midori-browser.c:5259 msgid "Increase the zoom level" msgstr "확대/축소 단계 키우기" -#: ../midori/midori-browser.c:5490 +#: ../midori/midori-browser.c:5262 msgid "Decrease the zoom level" msgstr "확대/축소 단계 줄이기" -#: ../midori/midori-browser.c:5494 +#: ../midori/midori-browser.c:5266 msgid "_Encoding" msgstr "인코딩(_E)" -#: ../midori/midori-browser.c:5496 +#: ../midori/midori-browser.c:5268 msgid "View So_urce" msgstr "소스 보기(_U)" -#: ../midori/midori-browser.c:5499 +#: ../midori/midori-browser.c:5271 msgid "Ca_ret Browsing" msgstr "캐럿 브라우징(_R)" -#: ../midori/midori-browser.c:5503 +#: ../midori/midori-browser.c:5275 msgid "Toggle fullscreen view" msgstr "전체 화면 보기 전환" -#: ../midori/midori-browser.c:5505 +#: ../midori/midori-browser.c:5277 msgid "Scroll _Left" msgstr "왼쪽으로 스크롤(_L)" -#: ../midori/midori-browser.c:5508 +#: ../midori/midori-browser.c:5280 msgid "Scroll _Down" msgstr "아래쪽으로 스크롤(_D)" -#: ../midori/midori-browser.c:5511 +#: ../midori/midori-browser.c:5283 msgid "Scroll _Up" msgstr "위쪽으로 스크롤(_U)" -#: ../midori/midori-browser.c:5514 +#: ../midori/midori-browser.c:5286 msgid "Scroll _Right" msgstr "오른쪽으로 스크롤(_R)" -#: ../midori/midori-browser.c:5517 -msgid "_Readable" -msgstr "읽기 쉽게(_R)" - -#: ../midori/midori-browser.c:5520 +#: ../midori/midori-browser.c:5289 msgid "_Go" msgstr "이동(_G)" -#: ../midori/midori-browser.c:5523 +#: ../midori/midori-browser.c:5292 msgid "Go back to the previous page" msgstr "전에 들렀던 페이지로 갑니다" +#: ../midori/midori-browser.c:5295 +msgid "Go forward to the next page" +msgstr "다음 들렀던 페이지로 갑니다" + #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5530 +#: ../midori/midori-browser.c:5299 msgid "Go to the previous sub-page" msgstr "전에 들렀던 하위 페이지로 갑니다" -#: ../midori/midori-browser.c:5539 -msgid "_Homepage" -msgstr "홈페이지(_H)" +#. i18n: Visit the following logical page, ie. in a forum or blog +#: ../midori/midori-browser.c:5303 +msgid "Go to the next sub-page" +msgstr "다음 들렀던 하위 페이지로 갑니다" -#: ../midori/midori-browser.c:5540 +#: ../midori/midori-browser.c:5306 msgid "Go to your homepage" msgstr "홈 페이지로 갑니다." -#: ../midori/midori-browser.c:5542 +#: ../midori/midori-browser.c:5308 msgid "Empty Trash" msgstr "휴지통 비우기" -#: ../midori/midori-browser.c:5545 +#: ../midori/midori-browser.c:5311 msgid "Undo _Close Tab" msgstr "닫은 탭 되돌리기(_C)" -#: ../midori/midori-browser.c:5552 +#: ../midori/midori-browser.c:5318 msgid "Add a new _folder" msgstr "새 폴더 더하기(_F)" -#: ../midori/midori-browser.c:5558 +#: ../midori/midori-browser.c:5324 msgid "_Export bookmarks" msgstr "책갈피 내보내기(_E)" -#: ../midori/midori-browser.c:5561 ../midori/midori-searchaction.c:496 +#: ../midori/midori-browser.c:5327 ../midori/midori-searchaction.c:496 msgid "_Manage Search Engines" msgstr "검색 엔진 관리(_M)" -#: ../midori/midori-browser.c:5564 +#: ../midori/midori-browser.c:5330 msgid "_Clear Private Data" msgstr "개인 데이터 지우기(_C)" -#: ../midori/midori-browser.c:5567 +#: ../midori/midori-browser.c:5333 msgid "_Inspect Page" msgstr "페이지 검사(_I)" -#: ../midori/midori-browser.c:5571 +#: ../midori/midori-browser.c:5337 msgid "_Previous Tab" msgstr "이전 탭(_P)" -#: ../midori/midori-browser.c:5574 +#: ../midori/midori-browser.c:5340 msgid "_Next Tab" msgstr "다음 탭(_N)" -#: ../midori/midori-browser.c:5576 +#: ../midori/midori-browser.c:5342 msgid "Move Tab _Backward" msgstr "탭을 뒤로 옮기기(_B)" -#: ../midori/midori-browser.c:5578 +#: ../midori/midori-browser.c:5344 msgid "_Move Tab Forward" msgstr "탭을 앞으로 옮기기(_M)" -#: ../midori/midori-browser.c:5581 +#: ../midori/midori-browser.c:5347 msgid "Focus _Current Tab" msgstr "현재 탭에 포커스 맞추기(_C)" -#: ../midori/midori-browser.c:5584 +#: ../midori/midori-browser.c:5350 msgid "Focus _Next view" msgstr "다음 보기에 포커스(_N)" -#: ../midori/midori-browser.c:5587 +#: ../midori/midori-browser.c:5353 msgid "Only show the Icon of the _Current Tab" msgstr "현재 탭의 아이콘만 보이기(_C)" -#: ../midori/midori-browser.c:5590 +#: ../midori/midori-browser.c:5356 msgid "_Duplicate Current Tab" msgstr "현재 탭 복제(_D)" -#: ../midori/midori-browser.c:5593 +#: ../midori/midori-browser.c:5359 msgid "Close Ot_her Tabs" msgstr "다른 탭 닫기(_H)" -#: ../midori/midori-browser.c:5596 +#: ../midori/midori-browser.c:5362 msgid "Open last _session" msgstr "마지막 세션 열기(_S)" -#: ../midori/midori-browser.c:5599 +#: ../midori/midori-browser.c:5365 msgid "_Help" msgstr "도움말(_H)" -#: ../midori/midori-browser.c:5601 +#: ../midori/midori-browser.c:5367 msgid "_Frequent Questions" msgstr "일반적인 질문들(_F)" -#: ../midori/midori-browser.c:5604 -msgid "_Report a Problem…" -msgstr "버그 보고(_R)…" - -#: ../midori/midori-browser.c:5609 ../midori/midori-browser.c:6270 -msgid "_Tools" -msgstr "도구(_T)" +#: ../midori/midori-browser.c:5370 +msgid "_Report a Problem..." +msgstr "버그 보고(_R)..." -#: ../midori/midori-browser.c:5616 +#: ../midori/midori-browser.c:5382 msgid "_Menubar" msgstr "메뉴 모음(_M)" -#: ../midori/midori-browser.c:5620 +#: ../midori/midori-browser.c:5386 msgid "_Navigationbar" msgstr "내비게이션 줄(_N)" -#: ../midori/midori-browser.c:5624 +#: ../midori/midori-browser.c:5390 msgid "Side_panel" msgstr "가장자리 패널(_P)" -#: ../midori/midori-browser.c:5625 +#: ../midori/midori-browser.c:5391 msgid "Sidepanel" msgstr "가장자리 패널" -#: ../midori/midori-browser.c:5628 +#: ../midori/midori-browser.c:5394 msgid "_Bookmarkbar" msgstr "책갈피 모음(_B)" -#: ../midori/midori-browser.c:5632 +#: ../midori/midori-browser.c:5398 msgid "_Statusbar" msgstr "상태 표시줄(_S)" -#: ../midori/midori-browser.c:5641 ../midori/midori-websettings.c:199 +#: ../midori/midori-browser.c:5407 ../midori/midori-websettings.c:302 msgid "_Automatic" msgstr "자동(_A)" -#: ../midori/midori-browser.c:5644 ../midori/midori-websettings.c:123 -msgid "Chinese Traditional (BIG5)" -msgstr "중국어 번체(BIG5)" - -#: ../midori/midori-browser.c:5647 ../midori/midori-websettings.c:124 -msgid "Chinese Simplified (GB18030)" -msgstr "중국어 간체(GB18030)" +#: ../midori/midori-browser.c:5410 ../midori/midori-websettings.c:227 +msgid "Chinese (BIG5)" +msgstr "중국어 번체 (Big5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5651 +#: ../midori/midori-browser.c:5414 msgid "Japanese (SHIFT__JIS)" -msgstr "일본어(Shift_JIS)" +msgstr "일본어 (Shift_JIS)" -#: ../midori/midori-browser.c:5654 ../midori/midori-websettings.c:126 +#: ../midori/midori-browser.c:5417 ../midori/midori-websettings.c:229 msgid "Korean (EUC-KR)" -msgstr "한국어(EUC-KR)" +msgstr "한국어 (EUC-KR)" -#: ../midori/midori-browser.c:5657 ../midori/midori-websettings.c:127 +#: ../midori/midori-browser.c:5420 ../midori/midori-websettings.c:230 msgid "Russian (KOI8-R)" -msgstr "키릴어(KOI8-R)" +msgstr "키릴어 (KOI8-R)" -#: ../midori/midori-browser.c:5660 ../midori/midori-websettings.c:128 +#: ../midori/midori-browser.c:5423 ../midori/midori-websettings.c:231 msgid "Unicode (UTF-8)" -msgstr "유니코드(UTF-8)" +msgstr "유니코드 (UTF-8)" -#: ../midori/midori-browser.c:5663 ../midori/midori-websettings.c:129 +#: ../midori/midori-browser.c:5426 ../midori/midori-websettings.c:232 msgid "Western (ISO-8859-1)" -msgstr "서양어(ISO-8859-1)" +msgstr "서양어 (ISO-8859-1)" -#: ../midori/midori-browser.c:5666 -msgid "Custom…" -msgstr "사용자 지정…" +#: ../midori/midori-browser.c:5429 ../midori/midori-websettings.c:233 +#: ../midori/midori-websettings.c:308 ../katze/katze-utils.c:635 +msgid "Custom..." +msgstr "사용자 지정..." -#: ../midori/midori-browser.c:6176 +#: ../midori/midori-browser.c:5909 msgid "_Separator" msgstr "구분선(_S)" -#: ../midori/midori-browser.c:6183 -msgid "_Location…" -msgstr "위치(_L)…" +#: ../midori/midori-browser.c:5916 +msgid "_Location..." +msgstr "위치(_L)..." -#: ../midori/midori-browser.c:6185 +#: ../midori/midori-browser.c:5918 msgid "Open a particular location" msgstr "특정 위치 열기" -#: ../midori/midori-browser.c:6207 -msgid "_Web Search…" -msgstr "웹 검색(_W)…" +#: ../midori/midori-browser.c:5940 +msgid "_Web Search..." +msgstr "웹 검색(_W)..." -#: ../midori/midori-browser.c:6209 +#: ../midori/midori-browser.c:5942 msgid "Run a web search" msgstr "웹 검색 실행" -#: ../midori/midori-browser.c:6236 +#: ../midori/midori-browser.c:5969 msgid "Reopen a previously closed tab or window" msgstr "이전에 닫은 탭이나 창을 다시 엽니다" -#: ../midori/midori-browser.c:6253 +#: ../midori/midori-browser.c:5984 msgid "Show the saved bookmarks" msgstr "저장한 책갈피 보기" -#: ../midori/midori-browser.c:6286 +#: ../midori/midori-browser.c:5998 +msgid "_Tools" +msgstr "도구(_T)" + +#: ../midori/midori-browser.c:6013 msgid "_Window" msgstr "창(_W)" -#: ../midori/midori-browser.c:6288 +#: ../midori/midori-browser.c:6015 msgid "Show a list of all open tabs" msgstr "모든 열려있는 탭의 목록을 표시합니다" -#: ../midori/midori-browser.c:6302 +#: ../midori/midori-browser.c:6029 msgid "_Menu" msgstr "메뉴(_M)" -#: ../midori/midori-browser.c:6304 +#: ../midori/midori-browser.c:6031 msgid "Menu" msgstr "메뉴" -#: ../midori/midori-browser.c:7134 +#: ../midori/midori-browser.c:6679 #, c-format msgid "Unexpected setting '%s'" msgstr "기대하지 않은 설정 '%s'" -#: ../midori/midori-extension.c:330 +#: ../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:752 ../midori/midori-extension.c:849 -#: ../midori/midori-extension.c:946 ../midori/midori-extension.c:1058 -#: ../extensions/addons.c:1686 +#: ../midori/midori-extension.c:721 ../midori/midori-extension.c:818 +#: ../midori/midori-extension.c:915 ../midori/midori-extension.c:1027 +#: ../extensions/addons.c:1690 #, c-format msgid "The configuration of the extension '%s' couldn't be saved: %s\n" msgstr "확장 기능 '%s'의 설정을 저장할 수 없습니다: %s\n" -#: ../midori/midori-locationaction.c:398 -#, c-format -msgid "Search with %s" -msgstr "%s(으)로 검색" - -#: ../midori/midori-locationaction.c:418 -msgid "Search with…" -msgstr "다음으로 검색…" - -#: ../midori/midori-locationaction.c:545 +#: ../midori/midori-locationaction.c:425 #, c-format msgid "Failed to select from history\n" msgstr "기록에서 선택 실패\n" -#: ../midori/midori-locationaction.c:632 +#: ../midori/midori-locationaction.c:509 #, c-format msgid "Search for %s" msgstr "%s을(를) 검색" -#: ../midori/midori-locationaction.c:1227 -msgid "Export certificate" -msgstr "인증서 내보내기" - -#: ../midori/midori-locationaction.c:1259 -msgid "The signing certificate authority is not known." -msgstr "서명 인증 기관을 알 수 없습니다." - -#: ../midori/midori-locationaction.c:1261 -msgid "" -"The certificate does not match the expected identity of the site that it was " -"retrieved from." -msgstr "인증서가 사이트에서 가져온 신원 기대값과 일치하지 않습니다." - -#: ../midori/midori-locationaction.c:1263 -msgid "The certificate's activation time is still in the future." -msgstr "아직 인증서 활성 시간이 시작하지 않았습니다." - -#: ../midori/midori-locationaction.c:1265 -msgid "The certificate has expired" -msgstr "인증서가 만료되었습니다." - -#: ../midori/midori-locationaction.c:1267 -msgid "" -"The certificate has been revoked according to the GTlsConnection's " -"certificate revocation list." -msgstr "인증서가 GTlsConnection의 인증 철회 목록에 의해 취소되었습니다." - -#: ../midori/midori-locationaction.c:1269 -msgid "The certificate's algorithm is considered insecure." -msgstr "인증서의 알고리즘이 안전하지 않습니다." - -#: ../midori/midori-locationaction.c:1271 -msgid "Some other error occurred validating the certificate." -msgstr "인증서를 확인하던 중 다른 오류가 발생했습니다." - -#: ../midori/midori-locationaction.c:1318 -msgid "_Export certificate" -msgstr "인증서 내보내기(_E)" - -#: ../midori/midori-locationaction.c:1333 -msgid "Self-signed" -msgstr "스스로 서명함" - -#: ../midori/midori-locationaction.c:1367 -msgid "Security details" -msgstr "자세한 보안 내용" +#: ../midori/midori-locationaction.c:535 +#, c-format +msgid "Search with %s" +msgstr "%s(으)로 검색" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1650 +#: ../midori/midori-locationaction.c:1287 msgid "Paste and p_roceed" msgstr "붙여넣기 후 진행(_R)" -#: ../midori/midori-locationaction.c:1974 +#: ../midori/midori-locationaction.c:1656 msgid "Not verified" msgstr "확인하지 않음" -#: ../midori/midori-locationaction.c:1982 +#: ../midori/midori-locationaction.c:1671 msgid "Verified and encrypted connection" msgstr "확인하였고 암호화 한 연결" -#: ../midori/midori-locationaction.c:1989 -msgid "Open, unencrypted connection" -msgstr "열린, 암호화하지 않은 연결" - -#: ../midori/midori-panel.c:317 ../midori/midori-panel.c:319 -#: ../midori/midori-panel.c:483 ../midori/midori-panel.c:486 +#: ../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:329 ../midori/midori-panel.c:330 +#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410 msgid "Close panel" msgstr "패널 닫기" -#: ../midori/midori-panel.c:484 ../midori/midori-panel.c:487 +#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566 msgid "Align sidepanel to the left" msgstr "창을 왼쪽으로 이동" -#: ../midori/midori-websettings.c:105 +#: ../midori/midori-websettings.c:209 msgid "Show Speed Dial" msgstr "단축 번호 보이기" -#: ../midori/midori-websettings.c:106 +#: ../midori/midori-websettings.c:210 msgid "Show Homepage" msgstr "홈 페이지 표시" -#: ../midori/midori-websettings.c:125 +#: ../midori/midori-websettings.c:228 msgid "Japanese (SHIFT_JIS)" -msgstr "일본어(Shift_JIS)" - -#: ../midori/midori-websettings.c:130 ../midori/midori-websettings.c:206 -#: ../katze/katze-utils.c:633 -msgid "Custom..." -msgstr "사용자 지정..." +msgstr "일본어 (Shift_JIS)" -#: ../midori/midori-websettings.c:145 +#: ../midori/midori-websettings.c:248 msgid "New tab" msgstr "새 탭" -#: ../midori/midori-websettings.c:146 +#: ../midori/midori-websettings.c:249 msgid "New window" msgstr "새 창" -#: ../midori/midori-websettings.c:147 +#: ../midori/midori-websettings.c:250 msgid "Current tab" msgstr "현재 탭" -#: ../midori/midori-websettings.c:162 +#: ../midori/midori-websettings.c:265 msgid "Default" msgstr "기본 값" -#: ../midori/midori-websettings.c:163 +#: ../midori/midori-websettings.c:266 msgid "Icons" msgstr "아이콘" -#: ../midori/midori-websettings.c:164 +#: ../midori/midori-websettings.c:267 msgid "Small icons" msgstr "작은 아이콘" -#: ../midori/midori-websettings.c:165 +#: ../midori/midori-websettings.c:268 msgid "Text" msgstr "텍스트" -#: ../midori/midori-websettings.c:166 +#: ../midori/midori-websettings.c:269 msgid "Icons and text" msgstr "아이콘 및 텍스트" -#: ../midori/midori-websettings.c:167 +#: ../midori/midori-websettings.c:270 msgid "Text beside icons" msgstr "아이콘 옆에 글자" -#: ../midori/midori-websettings.c:182 +#: ../midori/midori-websettings.c:285 msgid "Automatic (GNOME or environment)" -msgstr "자동(그놈 또는 환경 변수)" +msgstr "자동 (그놈 또는 환경 변수)" -#: ../midori/midori-websettings.c:183 +#: ../midori/midori-websettings.c:286 msgid "HTTP proxy server" msgstr "HTTP 프록시 서버" -#: ../midori/midori-websettings.c:184 +#: ../midori/midori-websettings.c:287 msgid "No proxy server" msgstr "프록시 서버 없음" -#: ../midori/midori-websettings.c:201 -msgid "Chrome" -msgstr "크롬" - -#: ../midori/midori-websettings.c:202 +#: ../midori/midori-websettings.c:304 msgid "Safari" msgstr "사파리" -#: ../midori/midori-websettings.c:203 +#: ../midori/midori-websettings.c:305 msgid "iPhone" msgstr "아이폰" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:306 msgid "Firefox" msgstr "파이어폭스" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:307 msgid "Internet Explorer" msgstr "인터넷 익스플로러" -#: ../midori/midori-websettings.c:278 -msgid "Toolbar Style:" -msgstr "도구 모음 유형:" +#: ../midori/midori-websettings.c:360 +msgid "Remember last window size" +msgstr "마지막에 연 창 크기 기억" -#: ../midori/midori-websettings.c:279 -msgid "The style of the toolbar" -msgstr "도구 모음 유형:" +#: ../midori/midori-websettings.c:361 +msgid "Whether to save the last window size" +msgstr "마지막에 연 창의 크기를 저장할지 결정합니다." -#: ../midori/midori-websettings.c:288 -msgid "When Midori starts:" -msgstr "미도리를 시작할 때:" +#: ../midori/midori-websettings.c:369 +msgid "Last window width" +msgstr "마지막에 연 창 너비" -#: ../midori/midori-websettings.c:325 -msgid "Open new pages in:" -msgstr "새 페이지 다음에 열기:" +#: ../midori/midori-websettings.c:370 +msgid "The last saved window width" +msgstr "마지막에 저장한 창의 너비" -#. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:388 -msgid "Identify as" -msgstr "식별 명" +#: ../midori/midori-websettings.c:378 +msgid "Last window height" +msgstr "마지막에 연 창 높이" -#: ../midori/midori-websettings.c:389 -msgid "What to identify as to web pages" -msgstr "웹 페이지에 보낼 식별 명을 지정합니다." +#: ../midori/midori-websettings.c:379 +msgid "The last saved window height" +msgstr "마지막에 저장한 창의 높이" -#: ../midori/midori-websettings.c:472 -msgid "Always use my font choices" -msgstr "항상 사용자가 선택한 글꼴을 사용" +#: ../midori/midori-websettings.c:404 +msgid "Last panel position" +msgstr "마지막에 연 패널 위치" -#: ../midori/midori-websettings.c:473 -msgid "Override fonts picked by websites with user preferences" -msgstr "웹 사이트에 설정된 글꼴을 사용자 기본 설정으로 대체" +#: ../midori/midori-websettings.c:405 +msgid "The last saved panel position" +msgstr "마지막에 저장한 연 패널의 위치" -#: ../midori/midori-view.c:1012 ../midori/midori-view.c:1151 -msgid "Trust this website" -msgstr "이 웹사이트를 신뢰" +#. i18n: The internal index of the last opened panel +#: ../midori/midori-websettings.c:414 +msgid "Last panel page" +msgstr "마지막 패널 페이지" -#: ../midori/midori-view.c:1149 -msgid "Security unknown" -msgstr "보안 상태 알 수 없음" +#: ../midori/midori-websettings.c:415 +msgid "The last saved panel page" +msgstr "마지막에 저장한 연 패널 페이지" -#: ../midori/midori-view.c:1447 -#, c-format -msgid "%s wants to save an HTML5 database." -msgstr "%s이(가) HTML5 데이터 베이스를 저장하려 합니다." +#: ../midori/midori-websettings.c:423 +msgid "Last Web search" +msgstr "마지막 웹 검색" -#: ../midori/midori-view.c:1451 ../midori/midori-view.c:1485 -msgid "_Deny" -msgstr "거부(_D)" +#: ../midori/midori-websettings.c:424 +msgid "The last saved Web search" +msgstr "마지막에 저장한 한 검색" -#: ../midori/midori-view.c:1451 ../midori/midori-view.c:1485 -msgid "_Allow" -msgstr "허용(_A)" +#: ../midori/midori-websettings.c:433 +msgid "Show Menubar" +msgstr "메뉴 모음 표시" -#: ../midori/midori-view.c:1480 -#, c-format -msgid "%s wants to know your location." -msgstr "%s이(가) 위치를 알고 싶어합니다." +#: ../midori/midori-websettings.c:434 +msgid "Whether to show the menubar" +msgstr "메뉴 모음을 표시할 지 결정합니다." -#: ../midori/midori-view.c:1576 -#, c-format -msgid "Error - %s" -msgstr "오류 - %s" +#: ../midori/midori-websettings.c:442 +msgid "Show Navigationbar" +msgstr "내비게이션 바 표시" -#: ../midori/midori-view.c:1577 -#, c-format -msgid "The page '%s' couldn't be loaded." -msgstr "페이지 '%s'을(를) 불러올 수 없습니다." +#: ../midori/midori-websettings.c:443 +msgid "Whether to show the navigationbar" +msgstr "내비게이션 바를 표시할지 결정합니다." -#: ../midori/midori-view.c:1579 -msgid "Try again" -msgstr "다시 시도하십시오" +#: ../midori/midori-websettings.c:451 +msgid "Show Bookmarkbar" +msgstr "책갈피 모음 표시" -#: ../midori/midori-view.c:1775 ../midori/midori-view.c:2839 -#, c-format -msgid "Send a message to %s" -msgstr "%s에 메시지 보내기" +#: ../midori/midori-websettings.c:452 +msgid "Whether to show the bookmarkbar" +msgstr "책갈피 모음을 표시할 지 결정합니다." -#: ../midori/midori-view.c:2622 -msgid "Add _search engine..." -msgstr "검색 엔진 추가(_S)..." +#: ../midori/midori-websettings.c:460 +msgid "Show Panel" +msgstr "패널 표시" -#: ../midori/midori-view.c:2666 ../midori/midori-view.c:2995 -msgid "Inspect _Element" -msgstr "요소 검사(_E)" +#: ../midori/midori-websettings.c:461 +msgid "Whether to show the panel" +msgstr "패널을 표시할 지 결정합니다." -#: ../midori/midori-view.c:2718 -msgid "Open Link in New _Tab" -msgstr "새 탭에 링크 열기(_T)" +#: ../midori/midori-websettings.c:469 +msgid "Show Statusbar" +msgstr "상태 표시줄을 보기" -#: ../midori/midori-view.c:2722 -msgid "Open Link in _Foreground Tab" -msgstr "새 탭에 링크 열고 전환(_F)" +#: ../midori/midori-websettings.c:470 +msgid "Whether to show the statusbar" +msgstr "상태를 표시할 지 결정합니다." -#: ../midori/midori-view.c:2723 -msgid "Open Link in _Background Tab" -msgstr "새 탭에 링크 열고 전환 안 함(_B)" +#: ../midori/midori-websettings.c:479 +msgid "Toolbar Style:" +msgstr "도구 모음 유형:" -#: ../midori/midori-view.c:2726 -msgid "Open Link in New _Window" -msgstr "새 창에 링크 열기(_W)" +#: ../midori/midori-websettings.c:480 +msgid "The style of the toolbar" +msgstr "도구 모음 유형:" -#: ../midori/midori-view.c:2729 -msgid "Open Link as Web A_pplication" -msgstr "웹 응용 프로그램으로 링크 열기(_P)" +#: ../midori/midori-websettings.c:489 +msgid "Toolbar Items" +msgstr "도구 모음 항목" -#: ../midori/midori-view.c:2734 -msgid "Copy Link de_stination" -msgstr "링크 위치 복사(_S)" +#: ../midori/midori-websettings.c:490 +msgid "The items to show on the toolbar" +msgstr "도구 모음에 보일 항목" -#: ../midori/midori-view.c:2750 -msgid "Open _Image in New Tab" -msgstr "그림 새 탭에서 열기(_I)" +#: ../midori/midori-websettings.c:498 +msgid "Compact Sidepanel" +msgstr "간략한 사이드 패널(_C)" -#: ../midori/midori-view.c:2753 -msgid "Copy Im_age" -msgstr "그림 복사(_A)" +#: ../midori/midori-websettings.c:499 +msgid "Whether to make the sidepanel compact" +msgstr "사이드 패널을 간단하게 표시할지 결정합니다." -#: ../midori/midori-view.c:2756 -msgid "Save I_mage" -msgstr "그림 저장(_M)" +#: ../midori/midori-websettings.c:514 +msgid "Align sidepanel on the right" +msgstr "사이드 표시 줄을 오른쪽에" -#: ../midori/midori-view.c:2759 -msgid "Open in Image _Viewer" -msgstr "그림 보기 프로그램으로 열기(_V)" +#: ../midori/midori-websettings.c:515 +msgid "Whether to align the sidepanel on the right" +msgstr "오른쪽에 사이드 패널을 보여줄 지 결정합니다." -#: ../midori/midori-view.c:2766 -msgid "Copy Video _Address" -msgstr "비디오 주소 복사(_A)" +#: ../midori/midori-websettings.c:530 +msgid "Open panels in separate windows" +msgstr "패널 별도의 창에 열기" -#: ../midori/midori-view.c:2769 -msgid "Save _Video" -msgstr "비디오 저장(_V)" +#: ../midori/midori-websettings.c:531 +msgid "Whether to always open panels in separate windows" +msgstr "패널을 항상 별도의 창에 보일지 선택합니다." -#: ../midori/midori-view.c:2769 -msgid "Download _Video" -msgstr "비디오 다운로드(_V)" +#: ../midori/midori-websettings.c:540 +msgid "When Midori starts:" +msgstr "미도리를 시작할 때:" -#: ../midori/midori-view.c:2795 -msgid "Search _with" -msgstr "다음으로 검색(_W)" +#: ../midori/midori-websettings.c:541 +msgid "What to do when Midori starts" +msgstr "미도리를 시작할 때 실행할 동작을 설정합니다." -#: ../midori/midori-view.c:2827 -msgid "_Search the Web" -msgstr "웹 검색(_S)" +#: ../midori/midori-websettings.c:550 +msgid "Homepage:" +msgstr "홈페이지:" -#: ../midori/midori-view.c:2847 -msgid "Open Address in New _Tab" -msgstr "주소 새 탭에서 열기(_T)" +#: ../midori/midori-websettings.c:551 +msgid "The homepage" +msgstr "홈페이지" -#: ../midori/midori-view.c:2900 -msgid "Open _Frame in New Tab" -msgstr "프레임 새 탭에서 열기(_F)" +#: ../midori/midori-websettings.c:566 +msgid "Show crash dialog" +msgstr "충돌 대화 상자 보기" -#: ../midori/midori-view.c:3155 -#, c-format -msgid "Open or download file from %s" -msgstr "%s에서 파일을 열거나 다운로드" +#: ../midori/midori-websettings.c:567 +msgid "Show a dialog after Midori crashed" +msgstr "미도리가 충돌한 후 대화 상자를 표시합니다" -#: ../midori/midori-view.c:3168 -#, c-format -msgid "File Name: %s" -msgstr "파일 이름: %s" +#: ../midori/midori-websettings.c:575 +msgid "Save downloaded files to:" +msgstr "다운로드한 파일을 저장할 경로:" -#: ../midori/midori-view.c:3173 -#, c-format -msgid "File Type: '%s'" -msgstr "파일 종류: '%s'" +#: ../midori/midori-websettings.c:576 +msgid "The folder downloaded files are saved to" +msgstr "다운로드한 파일을 저장하는 폴더" -#: ../midori/midori-view.c:3175 -#, c-format -msgid "File Type: %s ('%s')" -msgstr "파일 종류: %s ('%s')" +#: ../midori/midori-websettings.c:584 +msgid "Text Editor" +msgstr "텍스트 편집기" -#: ../midori/midori-view.c:3212 -#, c-format -msgid "Size: %s" -msgstr "크기: %s" +#: ../midori/midori-websettings.c:585 +msgid "An external text editor" +msgstr "외부 텍스트 편집기" -#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:3223 -#, c-format -msgid "Open %s" -msgstr "%s 열기" +#: ../midori/midori-websettings.c:600 +msgid "News Aggregator" +msgstr "뉴스 수집기" -#: ../midori/midori-view.c:3834 -#, c-format -msgid "Inspect page - %s" -msgstr "페이지 살피기 - %s" +#: ../midori/midori-websettings.c:601 +msgid "An external news aggregator" +msgstr "외부 뉴스 수집기" -#: ../midori/midori-view.c:4231 -#, c-format -msgid "No documentation installed" -msgstr "설치한 문서 도구가 없습니다" +#: ../midori/midori-websettings.c:609 +msgid "Location entry Search" +msgstr "위치 항목에서 검색" -#: ../midori/midori-view.c:4308 -msgid "Midori doesn't store any personal data:" -msgstr "미도리는 어떤 개인 정보도 보존하지 않습니다:" +#: ../midori/midori-websettings.c:610 +msgid "The search to perform inside the location entry" +msgstr "위치 항목 안에서 검색을 실행합니다." -#: ../midori/midori-view.c:4309 -msgid "No history or web cookies are being saved." -msgstr "기록 또는 웹 쿠키를 저장하지 않습니다." +#: ../midori/midori-websettings.c:618 +msgid "Preferred Encoding" +msgstr "우선할 인코딩" -#: ../midori/midori-view.c:4310 -msgid "Extensions are disabled." -msgstr "확장 기능을 사용하지 않습니다." +#: ../midori/midori-websettings.c:619 +msgid "The preferred character encoding" +msgstr "우선할 문자 인코딩" -#: ../midori/midori-view.c:4311 -msgid "HTML5 storage, local database and application caches are disabled." -msgstr "" -"HTML5 저장소, 로컬 데이터베이스 그리고 프로그램 캐시를 사용하지 않습니다." +#: ../midori/midori-websettings.c:629 +msgid "Always Show Tabbar" +msgstr "탭 모음 항상 보기" -#: ../midori/midori-view.c:4312 -msgid "Midori prevents websites from tracking the user:" -msgstr "미도리가 사용자를 추적할 수 없게 합니다.:" +#: ../midori/midori-websettings.c:630 +msgid "Always show the tabbar" +msgstr "탭 모음을 항상 볼 수 있게 합니다." -#: ../midori/midori-view.c:4313 -msgid "Referrer URLs are stripped down to the hostname." -msgstr "리퍼러 웹 주소는 호스트 이름에서 기본적인 것만 남깁니다." +#: ../midori/midori-websettings.c:638 +msgid "Close Buttons on Tabs" +msgstr "탭에 닫기 단추 표시" -#: ../midori/midori-view.c:4314 -msgid "DNS prefetching is disabled." -msgstr "DNS 사전 판독을 사용하지 않습니다." +#: ../midori/midori-websettings.c:639 +msgid "Whether tabs have close buttons" +msgstr "탭에 닫기 단추를 표시할지 결정합니다." -#: ../midori/midori-view.c:4315 -msgid "The language and timezone are not revealed to websites." -msgstr "언어와 시간대를 웹 사이트가 알 수 없도록 합니다." +#: ../midori/midori-websettings.c:664 +msgid "Open new pages in:" +msgstr "새 페이지 다음에 열기:" -#: ../midori/midori-view.c:4316 -msgid "Flash and other Netscape plugins cannot be listed by websites." -msgstr "플래시와 넷스캐이프 플러그인을 웹 사이트가 알 수 없게 합니다." +#: ../midori/midori-websettings.c:665 +msgid "Where to open new pages" +msgstr "새 페이지를 어디에서 열지 결정합니다." -#: ../midori/midori-view.c:4402 -msgid "Version numbers in brackets show the version used at runtime." -msgstr "괄호 안의 버전 번호는 실행 중인 미도리가 사용하고 있는 버전입니다." +#: ../midori/midori-websettings.c:674 +msgid "Middle click opens Selection" +msgstr "가운데 버튼 클릭으로 선택한 주소 열기" -#: ../midori/midori-view.c:4451 -msgid "Page loading delayed" -msgstr "페이지 불러오기 연기" +#: ../midori/midori-websettings.c:675 +msgid "Load an address from the selection via middle click" +msgstr "선택 후 마우스 가운데 버튼 클릭으로 주소를 불러옵니다." -#: ../midori/midori-view.c:4452 -msgid "Loading delayed either due to a recent crash or startup preferences." -msgstr "" -"최근 발생한 충돌이나 기본 설정 내 시작 페이지 설정으로 인해 페이지 불러오기" -"를 연기합니다." +#: ../midori/midori-websettings.c:683 +msgid "Open tabs in the background" +msgstr "탭을 연 후 바로 전환하지 않음" -#: ../midori/midori-view.c:4453 -msgid "Load Page" -msgstr "페이지 불러오기" +#: ../midori/midori-websettings.c:684 +msgid "Whether to open new tabs in the background" +msgstr "탭이 열렸을 때 바로 전환할지 결정합니다" -#: ../midori/midori-view.c:4620 -msgid "Blank page" -msgstr "빈 페이지" +#: ../midori/midori-websettings.c:692 +msgid "Open Tabs next to Current" +msgstr "탭을 현재 탭 옆에 열기" -#: ../midori/midori-view.c:4884 -msgid "_Duplicate Tab" -msgstr "탭 복제(_D)" +#: ../midori/midori-websettings.c:693 +msgid "Whether to open new tabs next to the current tab or after the last one" +msgstr "새 탭을 현재 탭의 옆에 열지 마지막 탭 다음에 열지 결정합니다." -#: ../midori/midori-view.c:4889 -msgid "Show Tab _Label" -msgstr "탭 이름 보이기(_L)" +#: ../midori/midori-websettings.c:701 +msgid "Open popups in tabs" +msgstr "팝업 창을 탭에 열기" -#: ../midori/midori-view.c:4889 -msgid "Show Tab _Icon Only" -msgstr "탭 아이콘만 보이기(_I)" +#: ../midori/midori-websettings.c:702 +msgid "Whether to open popup windows in tabs" +msgstr "팝업 창을 탭에 열지 결정합니다." -#: ../midori/midori-view.c:4896 -msgid "Close Ot_her Tab" -msgid_plural "Close Ot_her Tabs" -msgstr[0] "다른 탭 닫기(_H)" +#: ../midori/midori-websettings.c:712 ../extensions/statusbar-features.c:131 +msgid "Load images automatically" +msgstr "자동으로 그림 읽기" -#. i18n: word stem of "previous page" type links, case is not important -#: ../midori/midori-view.c:5653 -msgid "previous" -msgstr "이전" +#: ../midori/midori-websettings.c:713 +msgid "Load and display images automatically" +msgstr "그림을 자동으로 읽고 표시합니다." -#. i18n: word stem of "next page" type links, case is not important -#: ../midori/midori-view.c:5672 -msgid "next" -msgstr "다음" +#: ../midori/midori-websettings.c:720 ../extensions/statusbar-features.c:140 +msgid "Enable scripts" +msgstr "스크립트 사용" -#: ../midori/midori-view.c:5685 -msgid "Print background images" -msgstr "배경 그림 인쇄" +#: ../midori/midori-websettings.c:721 +msgid "Enable embedded scripting languages" +msgstr "스크립트 언어를 사용합니다." -#: ../midori/midori-view.c:5686 -msgid "Whether background images should be printed" -msgstr "배경 그림을 인쇄할 지 결정합니다" +#: ../midori/midori-websettings.c:728 ../extensions/statusbar-features.c:149 +msgid "Enable Netscape plugins" +msgstr "넷스케이프 플러그인 사용" -#: ../midori/midori-view.c:5718 -msgid "Features" -msgstr "기능" +#: ../midori/midori-websettings.c:729 +msgid "Enable embedded Netscape plugin objects" +msgstr "넷스케이프 플러그인 개체를 사용합니다." -#. i18n: Download tooltip (size): 4KB of 43MB -#: ../midori/midori-download.vala:48 -#, c-format -msgid "%s of %s" -msgstr "%s / %s" +#: ../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 "HTML5 데이터 베이스 지원 사용" + +#: ../midori/midori-websettings.c:757 +msgid "Whether to enable HTML5 database support" +msgstr "HTML5 데이터 베이스 지원을 사용할지 결정합니다." + +#: ../midori/midori-websettings.c:763 +msgid "Enable HTML5 local storage support" +msgstr "HTML5 로컬 기억 장치 지원 사용" + +#: ../midori/midori-websettings.c:764 +msgid "Whether to enable HTML5 local storage support" +msgstr "HTML5 로컬 기억 장치 지원을 사용할지 결정합니다." + +#: ../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-download.vala:64 +#: ../midori/midori-websettings.c:803 +msgid "Zoom Text and Images" +msgstr "문자와 그림 확대" + +#: ../midori/midori-websettings.c:804 +msgid "Whether to zoom text and images" +msgstr "글자와 그림을 확대할지 결정합니다." + +#: ../midori/midori-websettings.c:819 +msgid "Find inline while typing" +msgstr "주소 창에 입력할 때 바로 찾기" + +#: ../midori/midori-websettings.c:820 +msgid "Whether to automatically find inline while typing" +msgstr "입력 중 자동으로 찾을지 결정합니다." + +#: ../midori/midori-websettings.c:835 +msgid "Kinetic scrolling" +msgstr "동역학 스크롤" + +#: ../midori/midori-websettings.c:836 +msgid "Whether scrolling should kinetically move according to speed" +msgstr "속도에 따라 관성이 걸린 것처럼 스크롤 합니다." + +#: ../midori/midori-websettings.c:844 +msgid "Delete old Cookies after:" +msgstr "쿠키를 보존할 기간:" + +#: ../midori/midori-websettings.c:845 +msgid "The maximum number of days to save cookies for" +msgstr "쿠키를 저장할 최장 기간을 설정합니다" + +#: ../midori/midori-websettings.c:861 +msgid "Only accept Cookies from sites you visit" +msgstr "방문한 사이트의 쿠키만을 허용" + +#: ../midori/midori-websettings.c:862 +msgid "Block cookies sent by third-party websites" +msgstr "서드 파티 웹 사이트가 보낸 쿠키 막기" + +#: ../midori/midori-websettings.c:876 +msgid "Delete pages from history after:" +msgstr "기록에 페이지를 보존할 기간:" + +#: ../midori/midori-websettings.c:877 +msgid "The maximum number of days to save the history for" +msgstr "방문 기록을 저장할 최대 기간을 설정합니다" + +#: ../midori/midori-websettings.c:892 +msgid "Proxy server" +msgstr "프록시 서버" + +#: ../midori/midori-websettings.c:893 +msgid "The type of proxy server to use" +msgstr "사용할 프록시 서버의 종류" + +#: ../midori/midori-websettings.c:902 +msgid "HTTP Proxy Server" +msgstr "HTTP 프록시 서버" + +#: ../midori/midori-websettings.c:903 +msgid "The proxy server used for HTTP connections" +msgstr "HTTP 연결에 사용하는 프록시 서버" + +#: ../midori/midori-websettings.c:918 +msgid "Port" +msgstr "포트" + +#: ../midori/midori-websettings.c:919 +msgid "The proxy server port used for HTTP connections" +msgstr "HTTP 연결에 사용하는 프록시 서버 포트" + +#: ../midori/midori-websettings.c:937 +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:954 +msgid "Identify as" +msgstr "식별 명" + +#: ../midori/midori-websettings.c:955 +msgid "What to identify as to web pages" +msgstr "웹 페이지에 보낼 식별 명을 지정합니다." + +#: ../midori/midori-websettings.c:971 +msgid "Identification string" +msgstr "식별 문자열" + +#: ../midori/midori-websettings.c:972 +msgid "The application identification string" +msgstr "응용 프로그램 식별 문자열" + +#: ../midori/midori-websettings.c:988 +msgid "Preferred languages" +msgstr "우선할 인코딩" + +#: ../midori/midori-websettings.c:989 +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:1004 +msgid "Clear private data" +msgstr "개인 데이터 지우기" + +#: ../midori/midori-websettings.c:1005 +msgid "The private data selected for deletion" +msgstr "삭제하기 위해 선택한 개인 데이터" + +#: ../midori/midori-websettings.c:1020 +msgid "Clear data" +msgstr "데이터 지우기" + +#: ../midori/midori-websettings.c:1021 +msgid "The data selected for deletion" +msgstr "삭제할 데이터를 선택했습니다" + +#. i18n: Reworded: Shorten details propagated when going to another page +#: ../midori/midori-websettings.c:1054 +msgid "Strip referrer details sent to websites" +msgstr "외부 사이트에 보낼 리퍼러의 자세한 내용을 제거" + +#. i18n: Referer here is not a typo but a technical term +#: ../midori/midori-websettings.c:1056 +msgid "Whether the \"Referer\" header should be shortened to the hostname" +msgstr "\"리퍼러\" 헤더를 호스트 이름으로 줄이기" + +#: ../midori/midori-websettings.c:1070 +msgid "Always use my font choices" +msgstr "항상 사용자가 선택한 글꼴을 사용" + +#: ../midori/midori-websettings.c:1071 +msgid "Override fonts picked by websites with user preferences" +msgstr "웹 사이트에 설정된 글꼴을 사용자 기본 설정으로 대체" + +#: ../midori/midori-view.c:1343 #, c-format -msgid "%d hour" -msgid_plural "%d hours" -msgstr[0] "%d 시간" +msgid "%s wants to save an HTML5 database." +msgstr "%s이(가) HTML5 데이터 베이스를 저장하려 합니다." + +#: ../midori/midori-view.c:1347 ../midori/midori-view.c:1377 +msgid "_Deny" +msgstr "거부(_D)" -#: ../midori/midori-download.vala:65 +#: ../midori/midori-view.c:1347 ../midori/midori-view.c:1377 +msgid "_Allow" +msgstr "허용(_A)" + +#: ../midori/midori-view.c:1373 #, c-format -msgid "%d minute" -msgid_plural "%d minutes" -msgstr[0] "%d 분" +msgid "%s wants to know your location." +msgstr "%s이(가) 위치를 알고 싶어합니다." -#: ../midori/midori-download.vala:66 +#: ../midori/midori-view.c:1461 #, c-format -msgid "%d second" -msgid_plural "%d seconds" -msgstr[0] "%d 초" +msgid "Error - %s" +msgstr "오류 - %s" -#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning -#: ../midori/midori-download.vala:82 +#: ../midori/midori-view.c:1462 #, c-format -msgid " - %s remaining" -msgstr "- %s 남음" +msgid "The page '%s' couldn't be loaded." +msgstr "페이지 '%s'을(를) 불러올 수 없습니다." -#. i18n: Unknown number of bytes, used for transfer rate like ?B/s -#: ../midori/midori-download.vala:92 -msgid "?B" -msgstr "?B" +#: ../midori/midori-view.c:1464 +msgid "Try again" +msgstr "다시 시도하십시오" -#. i18n: Download tooltip (transfer rate): (130KB/s) -#: ../midori/midori-download.vala:94 +#: ../midori/midori-view.c:1626 ../midori/midori-view.c:2471 #, c-format -msgid " (%s/s)" -msgstr "(%s/초)" +msgid "Send a message to %s" +msgstr "%s에 메시지 보내기" -#: ../midori/midori-download.vala:188 -msgid "The downloaded file is erroneous." -msgstr "다운로드한 파일에 오류가 있습니다." +#: ../midori/midori-view.c:2313 ../midori/midori-view.c:2624 +msgid "Inspect _Element" +msgstr "요소 검사(_E)" -#: ../midori/midori-download.vala:189 -msgid "" -"The checksum provided with the link did not match. This means the file is " -"probably incomplete or was modified afterwards." -msgstr "" -"링크가 가리키고 있는 체크섬과 일치하지 않습니다. 이 것은 파일을 온전하게 다운" -"로드하지 못했거나 다운로드한 후 수정했다는 것을 의미합니다." +#: ../midori/midori-view.c:2363 +msgid "Open Link in New _Tab" +msgstr "새 탭에 링크 열기(_T)" + +#: ../midori/midori-view.c:2367 +msgid "Open Link in _Foreground Tab" +msgstr "새 탭에 링크 열고 전환(_F)" + +#: ../midori/midori-view.c:2368 +msgid "Open Link in _Background Tab" +msgstr "새 탭에 링크 열고 전환 안 함(_B)" + +#: ../midori/midori-view.c:2371 +msgid "Open Link in New _Window" +msgstr "새 창에 링크 열기(_W)" + +#: ../midori/midori-view.c:2374 +msgid "Open Link as Web A_pplication" +msgstr "웹 응용 프로그램으로 링크 열기(_P)" + +#: ../midori/midori-view.c:2377 +msgid "Copy Link de_stination" +msgstr "링크 위치 복사(_S)" + +#: ../midori/midori-view.c:2389 +msgid "Open _Image in New Tab" +msgstr "그림 새 탭에서 열기(_I)" + +#: ../midori/midori-view.c:2392 +msgid "Copy Image _Address" +msgstr "그림 주소 복사(_A)" + +#: ../midori/midori-view.c:2395 +msgid "Save I_mage" +msgstr "그림 저장(_M)" -#: ../midori/midori-download.vala:302 +#: ../midori/midori-view.c:2402 +msgid "Copy Video _Address" +msgstr "비디오 주소 복사(_A)" + +#: ../midori/midori-view.c:2405 +msgid "Save _Video" +msgstr "비디오 저장(_V)" + +#: ../midori/midori-view.c:2405 +msgid "Download _Video" +msgstr "비디오 다운로드(_V)" + +#: ../midori/midori-view.c:2431 +msgid "Search _with" +msgstr "다음으로 검색(_W)" + +#: ../midori/midori-view.c:2463 +msgid "_Search the Web" +msgstr "웹 검색(_S)" + +#: ../midori/midori-view.c:2479 +msgid "Open Address in New _Tab" +msgstr "주소 새 탭에서 열기(_T)" + +#: ../midori/midori-view.c:2775 +msgid "Open or download file" +msgstr "파일을 열거나 다운로드 합니다" + +#: ../midori/midori-view.c:2794 #, c-format -msgid "The file \"%s\" can't be saved in this folder." -msgstr "이 폴더에 파일 \"%s\"을(를) 저장할 수 없습니다." +msgid "File Type: '%s'" +msgstr "파일 종류: '%s'" -#: ../midori/midori-download.vala:304 -msgid "You don't have permission to write in this location." -msgstr "이 위치에 쓸 수 있는 권한을 가지고 있지 않습니다." +#: ../midori/midori-view.c:2796 +#, c-format +msgid "File Type: %s ('%s')" +msgstr "파일 종류: %s ('%s')" -#: ../midori/midori-download.vala:307 +#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" +#: ../midori/midori-view.c:2813 #, c-format -msgid "There is not enough free space to download \"%s\"." -msgstr "\"%s\"을(를) 다운로드 할 빈 공간이 부족합니다." +msgid "Open %s" +msgstr "%s 열기" -#: ../midori/midori-download.vala:309 +#: ../midori/midori-view.c:3405 #, c-format -msgid "The file needs %s but only %s are left." -msgstr "파일 다운로드에는 %s이(가) 필요합니다 만 %s 만이 남아있습니다." +msgid "Inspect page - %s" +msgstr "페이지 살피기 - %s" -#: ../midori/midori-speeddial.vala:180 +#: ../midori/midori-view.c:3692 msgid "Speed Dial" msgstr "단축 번호" -#: ../midori/midori-speeddial.vala:181 ../midori/midori-speeddial.vala:261 +#: ../midori/midori-view.c:3693 ../midori/midori-view.c:3789 msgid "Click to add a shortcut" msgstr "바로 가기를 더하려면 누르십시오" -#: ../midori/midori-speeddial.vala:182 +#: ../midori/midori-view.c:3694 msgid "Enter shortcut address" msgstr "바로 가기 주소 입력" -#: ../midori/midori-speeddial.vala:183 +#: ../midori/midori-view.c:3695 msgid "Enter shortcut title" msgstr "바로 가기 제목 입력" -#: ../midori/midori-speeddial.vala:184 +#: ../midori/midori-view.c:3696 msgid "Are you sure you want to delete this shortcut?" msgstr "이 바로 가기를 정말로 삭제하시겠습니까?" -#: ../midori/midori-preferences.c:299 -msgid "Startup" -msgstr "시작" - -#: ../midori/midori-preferences.c:305 -msgid "Homepage:" -msgstr "홈페이지:" - -#: ../midori/midori-preferences.c:313 -msgid "Use _current page" -msgstr "현재 페이지를 사용(_C)" - -#: ../midori/midori-preferences.c:317 -msgid "Use current page as homepage" -msgstr "현재 페이지를 홈 페이지로 사용" - -#. Page "Appearance" -#: ../midori/midori-preferences.c:326 -msgid "Fonts" -msgstr "글꼴" - -#: ../midori/midori-preferences.c:329 -msgid "Proportional Font Family" -msgstr "가변 폭 글꼴 계열" - -#: ../midori/midori-preferences.c:333 -msgid "The default font family used to display text" -msgstr "텍스트를 표시할 기본 글꼴 계열" - -#: ../midori/midori-preferences.c:336 -msgid "The default font size used to display text" -msgstr "텍스트를 표시할 기본 글꼴 크기" - -#: ../midori/midori-preferences.c:338 -msgid "Fixed-width Font Family" -msgstr "고정 폭 글꼴 계열" +#: ../midori/midori-view.c:3860 +#, c-format +msgid "No documentation installed" +msgstr "설치한 문서 도구가 없습니다" -#: ../midori/midori-preferences.c:342 -msgid "The font family used to display fixed-width text" -msgstr "고정 폭 텍스트를 표시할 글꼴 계열" +#: ../midori/midori-view.c:3910 +msgid "Version numbers in brackets show the version used at runtime." +msgstr "괄호 안의 버전 번호는 실행 중인 미도리가 사용하고 있는 버전입니다." -#: ../midori/midori-preferences.c:345 -msgid "The font size used to display fixed-width text" -msgstr "고정 폭 텍스트를 표시할 글꼴 크기" +#: ../midori/midori-view.c:3955 +msgid "Page loading delayed" +msgstr "페이지 불러오기 연기" -#: ../midori/midori-preferences.c:347 -msgid "Minimum Font Size" -msgstr "최소 글꼴 크기" +#: ../midori/midori-view.c:3956 +msgid "Loading delayed either due to a recent crash or startup preferences." +msgstr "" +"최근 발생한 충돌이나 기본 설정 내 시작 페이지 설정으로 인해 페이지 불러오기" +"를 연기합니다." -#: ../midori/midori-preferences.c:351 -msgid "The minimum font size used to display text" -msgstr "문자를 표시할 최소 글꼴 크기" +#: ../midori/midori-view.c:3957 +msgid "Load Page" +msgstr "페이지 불러오기" -#: ../midori/midori-preferences.c:356 -msgid "Preferred Encoding" -msgstr "우선할 인코딩" +#: ../midori/midori-view.c:4097 +msgid "Blank page" +msgstr "빈 페이지" -#. Page "Behavior" -#: ../midori/midori-preferences.c:363 -msgid "Behavior" -msgstr "행동" +#: ../midori/midori-view.c:4361 +msgid "_Duplicate Tab" +msgstr "탭 복제(_D)" -#: ../midori/midori-preferences.c:367 ../extensions/statusbar-features.c:155 -msgid "Load images automatically" -msgstr "자동으로 그림 읽기" +#: ../midori/midori-view.c:4366 +msgid "Show Tab _Label" +msgstr "탭 이름 보이기(_L)" -#: ../midori/midori-preferences.c:370 -msgid "Enable Spell Checking" -msgstr "맞춤법 검사 사용" +#: ../midori/midori-view.c:4366 +msgid "Show Tab _Icon Only" +msgstr "탭 아이콘만 보이기(_I)" -#: ../midori/midori-preferences.c:384 ../extensions/statusbar-features.c:165 -msgid "Enable scripts" -msgstr "스크립트 사용" +#: ../midori/midori-view.c:4372 +msgid "Close ot_her Tabs" +msgstr "다른 탭 닫기(_H)" -#: ../midori/midori-preferences.c:387 ../extensions/statusbar-features.c:177 -msgid "Enable Netscape plugins" -msgstr "넷스케이프 플러그인 사용" +#. i18n: word stem of "previous page" type links, case is not important +#: ../midori/midori-view.c:4989 +msgid "previous" +msgstr "이전" -#: ../midori/midori-preferences.c:392 -msgid "Zoom Text and Images" -msgstr "문자와 그림 확대" +#. i18n: word stem of "next page" type links, case is not important +#: ../midori/midori-view.c:5008 +msgid "next" +msgstr "다음" -#: ../midori/midori-preferences.c:395 -msgid "Allow scripts to open popups" -msgstr "팝업 열기 스크립트 허용" +#: ../midori/midori-view.c:5021 +msgid "Print background images" +msgstr "배경 그림 인쇄" -#: ../midori/midori-preferences.c:396 -msgid "Whether scripts are allowed to open popup windows automatically" -msgstr "스크립트가 팝업 창을 자동으로 열 수 있게 할지 선택합니다." +#: ../midori/midori-view.c:5022 +msgid "Whether background images should be printed" +msgstr "배경 그림을 인쇄할 지 결정합니다" -#: ../midori/midori-preferences.c:402 -msgid "Kinetic scrolling" -msgstr "동역학 스크롤" +#: ../midori/midori-view.c:5054 +msgid "Features" +msgstr "기능" -#: ../midori/midori-preferences.c:403 -msgid "Whether scrolling should kinetically move according to speed" -msgstr "속도에 따라 관성이 걸린 것처럼 스크롤 합니다." +#: ../midori/midori-preferences.c:297 +msgid "Startup" +msgstr "시작" -#: ../midori/midori-preferences.c:408 -msgid "Middle click opens Selection" -msgstr "가운데 버튼 클릭으로 선택한 주소 열기" +#: ../midori/midori-preferences.c:310 +msgid "Use _current page" +msgstr "현재 페이지를 사용(_C)" -#: ../midori/midori-preferences.c:409 -msgid "Load an address from the selection via middle click" -msgstr "선택 후 마우스 가운데 버튼 클릭으로 주소를 불러옵니다." +#: ../midori/midori-preferences.c:314 +msgid "Use current page as homepage" +msgstr "현재 페이지를 홈 페이지로 사용" -#: ../midori/midori-preferences.c:415 -msgid "Enable WebGL support" -msgstr "웹GL 지원 사용" +#. Page "Appearance" +#: ../midori/midori-preferences.c:323 +msgid "Fonts" +msgstr "글꼴" -#: ../midori/midori-preferences.c:420 -msgid "Flash window on background tabs" -msgstr "배경 탭에 있는 창 반짝거리게 하기" +#: ../midori/midori-preferences.c:326 +msgid "Proportional Font Family" +msgstr "가변 폭 글꼴 계열" -#: ../midori/midori-preferences.c:425 -msgid "Preferred languages" -msgstr "우선할 인코딩" +#: ../midori/midori-preferences.c:330 +msgid "The default font family used to display text" +msgstr "텍스트를 표시할 기본 글꼴 계열" -#: ../midori/midori-preferences.c:429 -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-preferences.c:333 +msgid "The default font size used to display text" +msgstr "텍스트를 표시할 기본 글꼴 크기" -#: ../midori/midori-preferences.c:431 -msgid "Save downloaded files to:" -msgstr "다운로드한 파일을 저장할 경로:" +#: ../midori/midori-preferences.c:335 +msgid "Fixed-width Font Family" +msgstr "고정 폭 글꼴 계열" -#. Page "Interface" -#: ../midori/midori-preferences.c:438 -msgid "Browsing" -msgstr "탐색" +#: ../midori/midori-preferences.c:339 +msgid "The font family used to display fixed-width text" +msgstr "고정 폭 텍스트를 표시할 글꼴 계열" -#: ../midori/midori-preferences.c:454 -msgid "Close Buttons on Tabs" -msgstr "탭에 닫기 단추 표시" +#: ../midori/midori-preferences.c:342 +msgid "The font size used to display fixed-width text" +msgstr "고정 폭 텍스트를 표시할 글꼴 크기" -#: ../midori/midori-preferences.c:458 -msgid "Always Show Tabbar" -msgstr "탭 모음 항상 보기" +#: ../midori/midori-preferences.c:344 +msgid "Minimum Font Size" +msgstr "최소 글꼴 크기" -#: ../midori/midori-preferences.c:462 -msgid "Open Tabs next to Current" -msgstr "탭을 현재 탭 옆에 열기" +#: ../midori/midori-preferences.c:348 +msgid "The minimum font size used to display text" +msgstr "문자를 표시할 최소 글꼴 크기" -#: ../midori/midori-preferences.c:463 -msgid "Whether to open new tabs next to the current tab or after the last one" -msgstr "새 탭을 현재 탭의 옆에 열지 마지막 탭 다음에 열지 결정합니다." +#. Page "Behavior" +#: ../midori/midori-preferences.c:359 +msgid "Behavior" +msgstr "행동" -#: ../midori/midori-preferences.c:466 -msgid "Open tabs in the background" -msgstr "탭을 연 후 바로 전환하지 않음" +#: ../midori/midori-preferences.c:385 +msgid "Allow scripts to open popups" +msgstr "팝업 열기 스크립트 허용" -#: ../midori/midori-preferences.c:470 -msgid "Text Editor" -msgstr "텍스트 편집기" +#: ../midori/midori-preferences.c:386 +msgid "Whether scripts are allowed to open popup windows automatically" +msgstr "스크립트가 팝업 창을 자동으로 열 수 있게 할지 선택합니다." -#: ../midori/midori-preferences.c:475 -msgid "News Aggregator" -msgstr "뉴스 수집기" +#. Page "Interface" +#: ../midori/midori-preferences.c:409 +msgid "Browsing" +msgstr "탐색" #. Page "Network" -#: ../midori/midori-preferences.c:482 +#: ../midori/midori-preferences.c:447 msgid "Network" msgstr "네트워크" -#: ../midori/midori-preferences.c:484 -msgid "Proxy server" -msgstr "프록시 서버" - -#: ../midori/midori-preferences.c:489 +#: ../midori/midori-preferences.c:454 msgid "Hostname" msgstr "호스트 이름" -#: ../midori/midori-preferences.c:497 -msgid "Port" -msgstr "포트" - -#: ../midori/midori-preferences.c:509 ../midori/midori-preferences.c:512 -msgid "The maximum size of cached pages on disk" -msgstr "디스크에 페이지를 저장할 최대 공간" - -#: ../midori/midori-preferences.c:514 +#: ../midori/midori-preferences.c:478 msgid "MB" msgstr "MB" -#: ../midori/midori-searchaction.c:1074 +#: ../midori/midori-searchaction.c:907 msgid "Add search engine" msgstr "검색 엔진 더하기" -#: ../midori/midori-searchaction.c:1074 +#: ../midori/midori-searchaction.c:907 msgid "Edit search engine" msgstr "검색 엔진 편집" -#: ../midori/midori-searchaction.c:1102 +#: ../midori/midori-searchaction.c:936 msgid "_Name:" msgstr "이름(_N):" -#: ../midori/midori-searchaction.c:1117 +#: ../midori/midori-searchaction.c:952 msgid "_Description:" msgstr "설명(_D):" -#: ../midori/midori-searchaction.c:1130 ../extensions/feed-panel/main.c:377 -msgid "_Address:" -msgstr "주소(_A):" +#: ../midori/midori-searchaction.c:985 +msgid "_Icon:" +msgstr "아이콘(_I):" -#: ../midori/midori-searchaction.c:1149 +#: ../midori/midori-searchaction.c:999 msgid "_Token:" msgstr "토큰(_T):" -#: ../midori/midori-searchaction.c:1447 +#: ../midori/midori-searchaction.c:1299 msgid "Manage Search Engines" msgstr "검색 엔진 관리" -#: ../midori/midori-searchaction.c:1549 +#: ../midori/midori-searchaction.c:1399 msgid "Use as _default" msgstr "기본 값으로 사용(_D)" -#: ../midori/sokoke.c:355 +#: ../midori/sokoke.c:410 msgid "Open with" msgstr "다음으로 열기" -#: ../midori/sokoke.c:363 +#: ../midori/sokoke.c:418 #, c-format msgid "Choose an application or command to open \"%s\":" msgstr "\"%s\"을(를) 열기 위한 응용 프로그램 또는 명령어를 선택해 주십시오:" -#: ../midori/sokoke.c:478 ../midori/sokoke.c:492 +#: ../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 시간" + +#: ../midori/sokoke.c:1678 +#, c-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "%d 분" + +#: ../midori/sokoke.c:1679 +#, c-format +msgid "%d second" +msgid_plural "%d seconds" +msgstr[0] "%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/초)" + +#. 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:265 +#: ../toolbars/midori-findbar.c:264 msgid "_Inline Find:" msgstr "바로 찾기(_I):" -#: ../toolbars/midori-findbar.c:287 +#: ../toolbars/midori-findbar.c:291 msgid "Previous" msgstr "이전" -#: ../toolbars/midori-findbar.c:293 +#: ../toolbars/midori-findbar.c:297 msgid "Next" msgstr "다음" -#: ../toolbars/midori-findbar.c:297 +#: ../toolbars/midori-findbar.c:301 msgid "Match Case" msgstr "대소문자 일치" -#: ../toolbars/midori-findbar.c:306 +#: ../toolbars/midori-findbar.c:310 msgid "Highlight Matches" msgstr "일치하는 단어 강조 표시" -#: ../toolbars/midori-findbar.c:317 +#: ../toolbars/midori-findbar.c:321 msgid "Close Findbar" msgstr "찾기 줄 닫기" -#: ../toolbars/midori-transferbar.c:109 +#: ../toolbars/midori-transferbar.c:122 #, c-format msgid "The file '%s' has been downloaded." msgstr "파일 '%s'을(를) 다운로드 했습니다." -#: ../toolbars/midori-transferbar.c:114 +#: ../toolbars/midori-transferbar.c:125 msgid "Transfer completed" msgstr "전송이 끝났습니다" -#: ../toolbars/midori-transferbar.c:239 ../panels/midori-transfers.c:139 +#: ../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:272 ../toolbars/midori-transferbar.c:274 +#: ../toolbars/midori-transferbar.c:368 ../toolbars/midori-transferbar.c:370 msgid "Some files are being downloaded" msgstr "파일을 다운로드 하고 있습니다" -#: ../toolbars/midori-transferbar.c:278 +#: ../toolbars/midori-transferbar.c:374 msgid "_Quit Midori" msgstr "미도리 종료(_Q)" -#: ../toolbars/midori-transferbar.c:280 +#: ../toolbars/midori-transferbar.c:376 msgid "The transfers will be cancelled if Midori quits." msgstr "미도리를 종료하시면 파일 다운로드를 취소합니다." -#: ../panels/midori-bookmarks.c:308 +#: ../panels/midori-bookmarks.c:113 +msgid "Bookmarks" +msgstr "책갈피" + +#: ../panels/midori-bookmarks.c:260 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "책갈피 항목을 추가하지 못했습니다: %s\n" -#: ../panels/midori-bookmarks.c:475 -#, c-format -msgid "Failed to update bookmark : %s\n" -msgstr "책갈피를 업데이트할 수 없습니다: %s\n" - -#: ../panels/midori-bookmarks.c:535 +#: ../panels/midori-bookmarks.c:440 msgid "Edit the selected bookmark" msgstr "선택한 책갈피를 편집합니다" -#: ../panels/midori-bookmarks.c:543 +#: ../panels/midori-bookmarks.c:448 msgid "Delete the selected bookmark" msgstr "선택한 책갈피를 지웁니다" -#: ../panels/midori-bookmarks.c:558 +#: ../panels/midori-bookmarks.c:463 msgid "Add a new folder" msgstr "새 폴더를 더합니다" -#: ../panels/midori-bookmarks.c:697 ../panels/midori-history.c:638 +#: ../panels/midori-bookmarks.c:597 ../panels/midori-history.c:579 msgid "Separator" msgstr "구분선" -#. Create the filter entry -#: ../panels/midori-bookmarks.c:1027 -msgid "Search Bookmarks" -msgstr "책갈피 검색" - -#: ../panels/midori-history.c:111 +#: ../panels/midori-history.c:110 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:142 +msgid "A week ago" +msgstr "일 주 전" -#: ../panels/midori-history.c:162 ../panels/midori-history.c:186 +#: ../panels/midori-history.c:144 #, 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:147 +msgid "Today" +msgstr "오늘" -#: ../panels/midori-history.c:232 -#, c-format -msgid "Failed to remove history item: %s\n" -msgstr "기록 항목을 제거할 수 없습니다: %s\n" +#: ../panels/midori-history.c:149 +msgid "Yesterday" +msgstr "어제" -#: ../panels/midori-history.c:360 +#: ../panels/midori-history.c:317 msgid "Are you sure you want to remove all history items?" msgstr "정말 모든 기록 항목을 지우시겠습니까?" -#: ../panels/midori-history.c:407 +#: ../panels/midori-history.c:363 msgid "Bookmark the selected history item" msgstr "선택한 기록 항목을 책갈피에 더합니다" -#: ../panels/midori-history.c:416 +#: ../panels/midori-history.c:372 msgid "Delete the selected history item" msgstr "선택한 기록 항목을 지웁니다" -#: ../panels/midori-history.c:424 +#: ../panels/midori-history.c:380 msgid "Clear the entire history" msgstr "모든 기록 제거" -#. Create the filter entry -#: ../panels/midori-history.c:997 -msgid "Search History" -msgstr "기록 검색" - -#: ../panels/midori-transfers.c:87 +#: ../panels/midori-transfers.c:86 msgid "Transfers" msgstr "전송" -#: ../panels/midori-transfers.c:435 +#: ../panels/midori-transfers.c:467 msgid "Open Destination _Folder" msgstr "다운로드 폴더 열기(_F)" -#: ../panels/midori-transfers.c:438 +#: ../panels/midori-transfers.c:470 msgid "Copy Link Loc_ation" msgstr "링크 위치 복사(_A)" @@ -2075,76 +2155,68 @@ msgstr "암호" msgid "_Remember password" msgstr "암호 저장(_R)" -#: ../katze/katze-throbber.c:949 +#: ../katze/katze-throbber.c:942 #, c-format msgid "Named icon '%s' couldn't be loaded" msgstr "'%s'(이)라는 이름을 가진 아이콘을 열 수 없습니다." -#: ../katze/katze-throbber.c:962 +#: ../katze/katze-throbber.c:955 #, c-format msgid "Stock icon '%s' couldn't be loaded" msgstr "보관한 아이콘 '%s'을(를) 열 수 없습니다." -#: ../katze/katze-throbber.c:1042 +#: ../katze/katze-throbber.c:1035 msgid "Animation frames are broken" msgstr "애니메이션 프레임이 망가졌습니다" -#: ../katze/katze-utils.c:443 ../katze/katze-utils.c:866 +#: ../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:489 ../katze/katze-utils.c:518 -#: ../extensions/addons.c:309 +#: ../katze/katze-utils.c:485 ../katze/katze-utils.c:514 +#: ../extensions/addons.c:308 msgid "Choose file" msgstr "파일 선택" -#: ../katze/katze-utils.c:504 +#: ../katze/katze-utils.c:500 msgid "Choose folder" msgstr "폴더 선택" -#: ../katze/katze-utils.c:602 +#: ../katze/katze-utils.c:604 msgid "None" msgstr "없음" -#: ../katze/katze-utils.c:717 +#: ../katze/katze-utils.c:719 msgid "1 hour" msgstr "한 시간" -#: ../katze/katze-utils.c:718 +#: ../katze/katze-utils.c:720 msgid "1 day" msgstr "하루" -#: ../katze/katze-utils.c:719 +#: ../katze/katze-utils.c:721 msgid "1 week" msgstr "일 주" -#: ../katze/katze-utils.c:720 +#: ../katze/katze-utils.c:722 msgid "1 month" msgstr "한 달" -#: ../katze/katze-utils.c:721 +#: ../katze/katze-utils.c:723 msgid "1 year" msgstr "일 년" -#: ../katze/katze-preferences.c:98 ../extensions/history-list.vala:235 +#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235 #, c-format msgid "Preferences for %s" msgstr "%s을(를) 위한 기본 설정" -#: ../katze/midori-uri.vala:168 -msgid "MD5-Checksum:" -msgstr "MD5 체크섬:" - -#: ../katze/midori-uri.vala:175 -msgid "SHA1-Checksum:" -msgstr "SHA1 체크섬:" - -#: ../extensions/adblock.c:495 +#: ../extensions/adblock.c:434 msgid "Configure Advertisement filters" msgstr "광고 필터 설정" -#: ../extensions/adblock.c:528 +#: ../extensions/adblock.c:465 #, c-format msgid "" "Type the address of a preconfigured filter list in the text entry and click " @@ -2153,130 +2225,130 @@ msgstr "" "텍스트 항목에 미리 설정한 필터 목록의 주소를 입력하시고, \"추가\"를 눌러 목록" "에 추가해주십시오. 더 많은 목록은 %s에서 찾을 수 있습니다." -#: ../extensions/adblock.c:944 +#: ../extensions/adblock.c:816 msgid "Edit rule" msgstr "규칙 편집" -#: ../extensions/adblock.c:958 +#: ../extensions/adblock.c:830 msgid "_Rule:" msgstr "규칙(_R):" -#: ../extensions/adblock.c:1012 +#: ../extensions/adblock.c:884 msgid "Bl_ock image" msgstr "그림 막기(_O)" -#: ../extensions/adblock.c:1017 +#: ../extensions/adblock.c:889 msgid "Bl_ock link" msgstr "링크 막기(_O)" -#: ../extensions/adblock.c:1915 +#: ../extensions/adblock.c:1483 msgid "Advertisement blocker" msgstr "광고 막기" -#: ../extensions/adblock.c:1916 +#: ../extensions/adblock.c:1484 msgid "Block advertisements according to a filter list" msgstr "필터 목록에 따라 광고를 막습니다" #. i18n: An infobar shows up when viewing a script on userscripts.org -#: ../extensions/addons.c:222 +#: ../extensions/addons.c:221 msgid "This page appears to contain a user script. Do you wish to install it?" msgstr "이 페이지는 사용자 스크립트를 포함하고 있습니다. 설치하시겠습니까?" -#: ../extensions/addons.c:223 +#: ../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:228 +#: ../extensions/addons.c:227 msgid "This page appears to contain a user style. Do you wish to install it?" msgstr "이 페이지는 사용자 스타일을 포함하고 있습니다. 설치하시겠습니까?" -#: ../extensions/addons.c:229 +#: ../extensions/addons.c:228 msgid "_Install user style" msgstr "사용자 스타일 설치(_I)" -#: ../extensions/addons.c:237 +#: ../extensions/addons.c:236 msgid "Don't install" msgstr "설치 안 함" -#: ../extensions/addons.c:320 ../extensions/addons.c:675 +#: ../extensions/addons.c:319 ../extensions/addons.c:681 msgid "Userscripts" msgstr "사용자 스크립트" -#: ../extensions/addons.c:325 ../extensions/addons.c:677 +#: ../extensions/addons.c:324 ../extensions/addons.c:683 msgid "Userstyles" msgstr "사용자 스타일" -#: ../extensions/addons.c:371 ../extensions/addons.c:450 +#: ../extensions/addons.c:380 ../extensions/addons.c:459 #: ../extensions/feed-panel/main.c:129 msgid "Error" msgstr "오류" -#: ../extensions/addons.c:412 +#: ../extensions/addons.c:421 #, c-format msgid "Do you want to delete '%s'?" msgstr "'%s'을(를) 삭제하시겠습니까?" -#: ../extensions/addons.c:418 +#: ../extensions/addons.c:427 msgid "Delete user script" msgstr "사용자 스크립트 삭제" -#: ../extensions/addons.c:419 +#: ../extensions/addons.c:428 msgid "Delete user style" msgstr "사용자 스타일 삭제" -#: ../extensions/addons.c:422 +#: ../extensions/addons.c:431 #, c-format msgid "The file %s will be permanently deleted." msgstr "파일 '%s'을(를) 영구적으로 삭제합니다." -#: ../extensions/addons.c:564 ../extensions/addons.c:641 +#: ../extensions/addons.c:570 ../extensions/addons.c:647 msgid "Open in Text Editor" msgstr "텍스트 편집기로 열기" -#: ../extensions/addons.c:566 ../extensions/addons.c:650 +#: ../extensions/addons.c:572 ../extensions/addons.c:656 msgid "Open Target Folder" msgstr "대상 폴더 열기" -#: ../extensions/addons.c:632 +#: ../extensions/addons.c:638 msgid "Add new addon" msgstr "새 추가 기능 추가" -#: ../extensions/addons.c:658 +#: ../extensions/addons.c:664 msgid "Remove selected addon" msgstr "선택한 추가 기능 제거" -#: ../extensions/addons.c:1687 ../extensions/addons.c:1905 +#: ../extensions/addons.c:1691 ../extensions/addons.c:1909 msgid "User addons" msgstr "사용자 추가 기능" -#: ../extensions/addons.c:1817 +#: ../extensions/addons.c:1821 #, c-format msgid "Can't monitor folder '%s': %s" msgstr "폴더 '%s'을(를) 감시할 수 없습니다: %s" -#: ../extensions/addons.c:1906 +#: ../extensions/addons.c:1910 msgid "Support for userscripts and userstyles" msgstr "사용자 스크립트와 사용자 스타일을 지원합니다." -#: ../extensions/colorful-tabs.c:201 +#: ../extensions/colorful-tabs.c:202 msgid "Colorful Tabs" msgstr "색이 칠해진 탭" -#: ../extensions/colorful-tabs.c:202 +#: ../extensions/colorful-tabs.c:203 msgid "Tint each tab distinctly" msgstr "각 탭을 구분하기 쉽게 색을 칠합니다" -#: ../extensions/cookie-manager/cookie-manager-page.c:73 +#: ../extensions/cookie-manager/cookie-manager-page.c:80 #: ../extensions/cookie-manager/main.c:35 msgid "Cookie Manager" msgstr "쿠키 관리자" -#: ../extensions/cookie-manager/cookie-manager-page.c:103 +#: ../extensions/cookie-manager/cookie-manager-page.c:110 msgid "Delete All" msgstr "모두 삭제" -#: ../extensions/cookie-manager/cookie-manager-page.c:105 +#: ../extensions/cookie-manager/cookie-manager-page.c:112 msgid "" "Deletes all shown cookies. If a filter is set, only those cookies are " "deleted which match the filter." @@ -2284,31 +2356,31 @@ msgstr "" "보이는 모든 쿠키를 지웁니다. 필터를 설정한 경우 필터와 일치하는 쿠키만 지웁니" "다." -#: ../extensions/cookie-manager/cookie-manager-page.c:120 +#: ../extensions/cookie-manager/cookie-manager-page.c:127 msgid "Expand All" msgstr "모두 펴기" -#: ../extensions/cookie-manager/cookie-manager-page.c:127 +#: ../extensions/cookie-manager/cookie-manager-page.c:134 msgid "Collapse All" msgstr "모두 접기" -#: ../extensions/cookie-manager/cookie-manager-page.c:572 +#: ../extensions/cookie-manager/cookie-manager-page.c:576 msgid "Do you really want to delete all cookies?" msgstr "정말 모든 쿠키를 삭제하시겠습니까?" -#: ../extensions/cookie-manager/cookie-manager-page.c:574 +#: ../extensions/cookie-manager/cookie-manager-page.c:578 msgid "Question" msgstr "물음" -#: ../extensions/cookie-manager/cookie-manager-page.c:583 +#: ../extensions/cookie-manager/cookie-manager-page.c:587 msgid "Only cookies which match the filter will be deleted." msgstr "이 필터와 맞는 쿠키만 지워집니다." -#: ../extensions/cookie-manager/cookie-manager-page.c:671 +#: ../extensions/cookie-manager/cookie-manager-page.c:675 msgid "At the end of the session" msgstr "현재 세션의 끝" -#: ../extensions/cookie-manager/cookie-manager-page.c:674 +#: ../extensions/cookie-manager/cookie-manager-page.c:678 #, c-format msgid "" "Host: %s\n" @@ -2325,15 +2397,15 @@ msgstr "" "확인: %s\n" "만료: %s" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:684 msgid "Yes" msgstr "예" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:684 msgid "No" msgstr "아니요" -#: ../extensions/cookie-manager/cookie-manager-page.c:694 +#: ../extensions/cookie-manager/cookie-manager-page.c:698 #, c-format msgid "" "Domain: %s\n" @@ -2342,21 +2414,29 @@ msgstr "" "도메인: %s\n" "쿠키: %d" -#: ../extensions/cookie-manager/cookie-manager-page.c:1017 +#: ../extensions/cookie-manager/cookie-manager-page.c:1028 msgid "Name" msgstr "이름" -#: ../extensions/cookie-manager/cookie-manager-page.c:1069 +#: ../extensions/cookie-manager/cookie-manager-page.c:1081 msgid "_Expand All" msgstr "모두 펴기(_E)" -#: ../extensions/cookie-manager/cookie-manager-page.c:1077 +#: ../extensions/cookie-manager/cookie-manager-page.c:1089 msgid "_Collapse All" msgstr "모두 접기(_C)" -#: ../extensions/cookie-manager/cookie-manager-page.c:1129 -msgid "Search Cookies by Name or Domain" -msgstr "이름 또는 도메인으로 쿠키 검색" +#: ../extensions/cookie-manager/cookie-manager-page.c:1142 +msgid "Filter:" +msgstr "필터:" + +#: ../extensions/cookie-manager/cookie-manager-page.c:1147 +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" @@ -2454,71 +2534,44 @@ msgstr "피드 패널" msgid "Read Atom/ RSS feeds" msgstr "Atom/RSS 피드를 읽습니다" -#: ../extensions/formhistory/formhistory.c:39 +#: ../extensions/formhistory.c:143 #, 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 +#: ../extensions/formhistory.c:295 msgid "Toggle form history state" msgstr "폼 기록 상태 켜고 끄기" -#: ../extensions/formhistory/formhistory.c:438 +#: ../extensions/formhistory.c:296 msgid "Activate or deactivate form history for the current tab." msgstr "현재 탭의 폼 기록을 사용하거나 사용하지 않습니다." -#: ../extensions/formhistory/formhistory.c:549 -#: ../extensions/formhistory/formhistory.c:553 +#: ../extensions/formhistory.c:432 ../extensions/formhistory.c:436 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "데이터 베이스 문(statement)을 실행할 수 없습니다: %s\n" -#: ../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.c:511 +msgid "only activate form history via hotkey (Ctrl+Shift+F) per tab" +msgstr "각 탭 별로 단축 키 만을 이용해서 폼 기록을 사용할 수 있게 합니다" -#: ../extensions/formhistory/formhistory.c:669 +#: ../extensions/formhistory.c:570 msgid "Stores history of entered form data" msgstr "입력한 폼 데이터 기록을 보존합니다" -#: ../extensions/formhistory/formhistory-gdom-frontend.c:225 -#: ../extensions/formhistory/formhistory-js-frontend.c:106 +#: ../extensions/formhistory.c:574 #, c-format -msgid "Failed to select suggestions\n" -msgstr "제안을 선택할 수 없습니다\n" +msgid "Not available: %s" +msgstr "사용 불가: %s" + +#: ../extensions/formhistory.c:575 +msgid "Resource files not installed" +msgstr "리소스 파일을 설치하지 않음" + +#: ../extensions/formhistory.c:581 +msgid "Form history filler" +msgstr "입력 폼 기록 필터" #: ../extensions/history-list.vala:197 msgid "There are no unvisited tabs" @@ -2547,7 +2600,7 @@ msgstr "최근 연 탭으로 전환" #: ../extensions/history-list.vala:423 msgid "Next new Tab (History List)" -msgstr "다음 새 탭(기록 목록)" +msgstr "다음 새 탭 (기록 목록)" #: ../extensions/history-list.vala:424 msgid "Next new tab from history" @@ -2555,7 +2608,7 @@ msgstr "기록 목록에서 다음 새 탭으로 전환합니다" #: ../extensions/history-list.vala:433 msgid "Previous new Tab (History List)" -msgstr "이전 새 탭(기록 목록)" +msgstr "이전 새 탭 (기록 목록)" #: ../extensions/history-list.vala:434 msgid "Previous new tab from history" @@ -2563,17 +2616,17 @@ msgstr "기록 목록에서 이전 새 탭으로 전환합니다" #: ../extensions/history-list.vala:443 msgid "Display tab in background (History List)" -msgstr "배경에 탭 표시(기록 목록)" +msgstr "배경에 탭 표시 (기록 목록)" #: ../extensions/history-list.vala:444 msgid "Display the current selected tab in background" msgstr "지금 선택한 탭을 배경에 표시" -#: ../extensions/history-list.vala:566 +#: ../extensions/history-list.vala:569 msgid "History List" msgstr "기록 목록" -#: ../extensions/history-list.vala:567 +#: ../extensions/history-list.vala:570 msgid "Move to the last used tab when switching or closing tabs" msgstr "탭을 닫거나 전환할 때 마지막에 사용한 탭으로 이동합니다" @@ -2593,15 +2646,15 @@ msgstr "페이지를 다시 불러오거나 불러오는 것을 멈춥니다" msgid "Customize Keyboard shortcuts" msgstr "키보드 바로 가기 설정" -#: ../extensions/shortcuts.c:283 +#: ../extensions/shortcuts.c:285 msgid "Customize Sh_ortcuts..." -msgstr "사용자 설정 바로 가기(_O)..." +msgstr "바로 가기 사용자 설정(_O)..." -#: ../extensions/shortcuts.c:320 +#: ../extensions/shortcuts.c:322 msgid "Shortcuts" msgstr "바로 가기" -#: ../extensions/shortcuts.c:321 +#: ../extensions/shortcuts.c:323 msgid "View and edit keyboard shortcuts" msgstr "키보드 바로 가기를 보고 편집합니다" @@ -2613,35 +2666,35 @@ msgstr "상태 표시줄에 시계 표시" msgid "Display date and time in the statusbar" msgstr "상태 표시줄에 시간과 날짜를 표시합니다" -#: ../extensions/statusbar-features.c:152 +#: ../extensions/statusbar-features.c:128 msgid "Images" msgstr "그림" -#: ../extensions/statusbar-features.c:162 +#: ../extensions/statusbar-features.c:137 msgid "Scripts" msgstr "스크립트" -#: ../extensions/statusbar-features.c:174 +#: ../extensions/statusbar-features.c:146 msgid "Netscape plugins" msgstr "넷스케이프 플러그인" -#: ../extensions/statusbar-features.c:259 +#: ../extensions/statusbar-features.c:192 msgid "Statusbar Features" msgstr "상태 표시줄 기능" -#: ../extensions/statusbar-features.c:260 +#: ../extensions/statusbar-features.c:193 msgid "Easily toggle features on web pages on and off" msgstr "웹 페이지의 기능을 쉽게 켜고 끕니다" -#: ../extensions/tab-panel.c:589 ../extensions/tab-panel.c:676 +#: ../extensions/tab-panel.c:596 ../extensions/tab-panel.c:683 msgid "Tab Panel" msgstr "탭 패널" -#: ../extensions/tab-panel.c:659 +#: ../extensions/tab-panel.c:666 msgid "T_ab Panel" msgstr "탭 패널(_A)" -#: ../extensions/tab-panel.c:677 +#: ../extensions/tab-panel.c:684 msgid "Show tabs in a vertical panel" msgstr "탭을 수직 패널에서 보여줍니다" @@ -2653,282 +2706,524 @@ msgstr "기본으로 탭에 아이콘만 표시" msgid "New tabs have no label by default" msgstr "기본으로 새 탭에 이름을 보이지 않습니다." -#: ../extensions/toolbar-editor.c:395 +#: ../extensions/toolbar-editor.c:393 msgid "Customize Toolbar" msgstr "도구 모음 사용자 설정" -#: ../extensions/toolbar-editor.c:411 +#: ../extensions/toolbar-editor.c:413 msgid "" -"Select items to be displayed on the toolbar. Items can be reordered by drag " +"Select items to be displayed on the toolbar. Items can be reodered by drag " "and drop." msgstr "" "도구 모음에 표시할 항목을 설정합니다. 끌어다 놓기로 항목을 다시 배치할 수 있" "습니다." -#: ../extensions/toolbar-editor.c:427 +#: ../extensions/toolbar-editor.c:429 msgid "Available Items" msgstr "가능한 항목" -#: ../extensions/toolbar-editor.c:448 +#: ../extensions/toolbar-editor.c:450 msgid "Displayed Items" msgstr "표시한 항목" -#: ../extensions/toolbar-editor.c:588 -msgid "_Customize Toolbar…" -msgstr "사용자 설정 도구 모음(_C)…" +#: ../extensions/toolbar-editor.c:585 +msgid "Customize _Toolbar..." +msgstr "도구 모음 사용자 설정(_T)..." + +#: ../extensions/toolbar-editor.c:601 +msgid "_Customize..." +msgstr "사용자 지정(_C)..." -#: ../extensions/toolbar-editor.c:617 +#: ../extensions/toolbar-editor.c:631 msgid "Toolbar Editor" msgstr "도구 모음 편집기" -#: ../extensions/toolbar-editor.c:618 +#: ../extensions/toolbar-editor.c:632 msgid "Easily edit the toolbar layout" msgstr "도구 모음 배치를 쉽게 편집합니다" -#: ../extensions/web-cache.c:462 +#: ../extensions/web-cache.c:463 msgid "Cache HTTP communication on disk" msgstr "디스크에 HTTP 통신을 저장합니다." -#~ msgid "Remember last window size" -#~ 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 "Whether to save the last window size" -#~ msgstr "마지막에 연 창의 크기를 저장할지 결정합니다." +#~ msgid "Scroll down" +#~ msgstr "아래쪽으로 스크롤 합니다" -#~ msgid "Last window width" -#~ msgstr "마지막에 연 창 너비" +#~ msgid "Scroll up" +#~ msgstr "위쪽으로 스크롤 합니다" -#~ msgid "The last saved window width" -#~ msgstr "마지막에 저장한 창의 너비" +#~ msgid "Scroll to the right" +#~ msgstr "오른쪽으로 스크롤 합니다" -#~ msgid "Last window height" -#~ msgstr "마지막에 연 창 높이" +#~ msgid "Delete the contents of the trash" +#~ msgstr "휴지통에 있는 모든 항목을 지웁니다" -#~ msgid "The last saved window height" -#~ msgstr "마지막에 저장한 창의 높이" +#~ msgid "Open the last closed tab" +#~ msgstr "마지막에 닫은 탭을 엽니다." -#~ msgid "Last panel position" -#~ msgstr "마지막에 연 패널 위치" +#~ msgid "Add a new bookmark folder" +#~ msgstr "새 책갈피 폴더를 더합니다" -#~ msgid "The last saved panel position" -#~ msgstr "마지막에 저장한 연 패널의 위치" +#~ msgid "Add, edit and remove search engines..." +#~ msgstr "검색 엔진을 더하고 편집, 제거합니다..." -#~ msgid "Last panel page" -#~ msgstr "마지막 패널 페이지" +#~ msgid "Clear private data..." +#~ msgstr "개인 데이터를 지웁니다..." -#~ msgid "The last saved panel page" -#~ msgstr "마지막에 저장한 연 패널 페이지" +#~ msgid "Inspect page details and access developer tools..." +#~ msgstr "페이지의 세부 사항을 검사하고 개발자 도구에 접근..." -#~ msgid "Last Web search" -#~ msgstr "마지막 웹 검색" +#~ msgid "Switch to the previous tab" +#~ msgstr "이전 탭으로 이동합니다" -#~ msgid "The last saved Web search" -#~ msgstr "마지막에 저장한 한 검색" +#~ msgid "Switch to the next tab" +#~ msgstr "다음 탭으로 전환합니다" -#~ msgid "Show Menubar" -#~ msgstr "메뉴 모음 표시" +#~ msgid "Move tab behind the previous tab" +#~ msgstr "탭을 이전 탭의 뒤로 옮깁니다" -#~ msgid "Whether to show the menubar" -#~ msgstr "메뉴 모음을 표시할 지 결정합니다." +#~ msgid "Move tab in front of the next tab" +#~ msgstr "탭을 다음 탭의 앞으로 옮깁니다" -#~ msgid "Show Navigationbar" -#~ msgstr "내비게이션 바 표시" +#~ msgid "Focus the current tab" +#~ msgstr "현재 탭에 포커스를 맞춥니다" -#~ msgid "Whether to show the navigationbar" -#~ msgstr "내비게이션 바를 표시할지 결정합니다." +#~ msgid "Cycle focus between views" +#~ msgstr "보기 간 포커스 전환" -#~ msgid "Show Bookmarkbar" -#~ msgstr "책갈피 모음 표시" +#~ msgid "Only show the icon of the current tab" +#~ msgstr "현재 탭의 아이콘 만을 보여줍니다" -#~ msgid "Whether to show the bookmarkbar" -#~ msgstr "책갈피 모음을 표시할 지 결정합니다." +#~ msgid "Duplicate the current tab" +#~ msgstr "현재 탭 복제" -#~ msgid "Show Panel" -#~ msgstr "패널 표시" +#~ msgid "Close all tabs except the current tab" +#~ msgstr "현재 탭 이외의 모든 탭을 닫습니다" -#~ msgid "Whether to show the panel" -#~ msgstr "패널을 표시할 지 결정합니다." +#~ msgid "Open the tabs saved in the last session" +#~ msgstr "마지막 세션에서 저장한 탭 엽니다" -#~ msgid "Show Statusbar" -#~ msgstr "상태 표시줄을 보기" +#~ msgid "Show the Frequently Asked Questions" +#~ msgstr "자주 하는 질문의 답변 보기" -#~ msgid "Whether to show the statusbar" -#~ msgstr "상태를 표시할 지 결정합니다." +#~ msgid "Open Midori's bug tracker" +#~ msgstr "미도리의 버그 트래커를 엽니다" -#~ msgid "Toolbar Items" -#~ msgstr "도구 모음 항목" +#~ msgid "Show information about the program" +#~ msgstr "프로그램 정보를 보여줍니다" -#~ msgid "The items to show on the toolbar" -#~ msgstr "도구 모음에 보일 항목" +#~ msgid "Show menubar" +#~ msgstr "메뉴 모음 보기" -#~ msgid "Compact Sidepanel" -#~ msgstr "간략한 사이드 패널(_C)" +#~ msgid "Show navigationbar" +#~ msgstr "내비게이션 줄 보기" -#~ msgid "Whether to make the sidepanel compact" -#~ msgstr "사이드 패널을 간단하게 표시할지 결정합니다." +#~ msgid "Show sidepanel" +#~ msgstr "가장자리 패널 보기" -#~ msgid "Align sidepanel on the right" -#~ msgstr "사이드 표시 줄을 오른쪽에" +#~ msgid "Show bookmarkbar" +#~ msgstr "책갈피 모음 보기" -#~ msgid "Whether to align the sidepanel on the right" -#~ msgstr "오른쪽에 사이드 패널을 보여줄 지 결정합니다." +#~ msgid "Show statusbar" +#~ msgstr "상태 표시줄을 봅니다" -#~ msgid "Open panels in separate windows" -#~ msgstr "패널 별도의 창에 열기" +#~ msgid "MD5-Checksum:" +#~ msgstr "MD5 체크섬:" -#~ msgid "Whether to always open panels in separate windows" -#~ msgstr "패널을 항상 별도의 창에 보일지 선택합니다." +#~ msgid "SHA1-Checksum:" +#~ msgstr "SHA1 체크섬:" -#~ msgid "What to do when Midori starts" -#~ msgstr "미도리를 시작할 때 실행할 동작을 설정합니다." +#~ msgid "No filename specified" +#~ msgstr "파일 이름을 지정하지 않았습니다." -#~ msgid "The homepage" -#~ msgstr "홈페이지" +#~ msgid "Set number of columns and rows" +#~ msgstr "행과 열 개수 설정," -#~ msgid "Show crash dialog" -#~ msgstr "충돌 대화 상자 보기" +#~ msgid "Enter number of columns and rows:" +#~ msgstr "행과 열 개수를 입력하세요:" -#~ msgid "The folder downloaded files are saved to" -#~ msgstr "다운로드한 파일을 저장하는 폴더" +#~ msgid "Invalid input for the size of the speed dial" +#~ msgstr "유효하지 않은 단축 번호 크기 입력" -#~ msgid "An external text editor" -#~ msgstr "외부 텍스트 편집기" +#~ msgid "Thumb size:" +#~ msgstr "미리 보기 크기:" -#~ msgid "An external news aggregator" -#~ msgstr "외부 뉴스 수집기" +#~ msgid "Small" +#~ msgstr "작게" -#~ msgid "Location entry Search" -#~ msgstr "위치 항목에서 검색" +#~ msgid "Medium" +#~ msgstr "중간" -#~ msgid "The search to perform inside the location entry" -#~ msgstr "위치 항목 안에서 검색을 실행합니다." +#~ msgid "Big" +#~ msgstr "크게" -#~ msgid "The preferred character encoding" -#~ msgstr "우선할 문자 인코딩" +#~ msgid "Reset the last _session" +#~ msgstr "마지막 세션 초기화(_S)" -#~ msgid "Always show the tabbar" -#~ msgstr "탭 모음을 항상 볼 수 있게 합니다." +#~ msgid "Configure _Advertisement filters..." +#~ msgstr "광고 필터 설정(_A)..." -#~ msgid "Whether tabs have close buttons" -#~ msgstr "탭에 닫기 단추를 표시할지 결정합니다." +#~ msgid "Not found - %s" +#~ msgstr "%s이(가) 발견되지 않았습니다" -#~ msgid "Where to open new pages" -#~ msgstr "새 페이지를 어디에서 열지 결정합니다." +#~ msgid "Document cannot be displayed" +#~ msgstr "문서를 표시할 수 없습니다." -#~ msgid "Whether to open new tabs in the background" -#~ msgstr "탭이 열렸을 때 바로 전환할지 결정합니다" +#~ msgid "Enforce 96 dots per inch" +#~ msgstr "96DPI 강제 지정" -#~ msgid "Open popups in tabs" -#~ msgstr "팝업 창을 탭에 열기" +#~ msgid "Enforce a video dot density of 96 DPI" +#~ msgstr "해상도를 96DPI로 강제합니다" -#~ msgid "Whether to open popup windows in tabs" -#~ msgstr "팝업 창을 탭에 열지 결정합니다." +#~ msgid "Switch tabs with Ctrl+Tab sorted by last usage" +#~ msgstr "컨트롤 + 탭 키로 최근 사용한 순으로 정리된 탭들을 전환합니다" -#~ msgid "Load and display images automatically" -#~ msgstr "그림을 자동으로 읽고 표시합니다." +#~ msgid "_Form History" +#~ msgstr "폼 기록(_F)" -#~ msgid "Enable embedded scripting languages" -#~ msgstr "스크립트 언어를 사용합니다." +#~ msgid "Delete old cookies after 1 hour" +#~ msgstr "저장한 후 한 시간 이상 지난 쿠키 삭제" -#~ msgid "Enable embedded Netscape plugin objects" -#~ msgstr "넷스케이프 플러그인 개체를 사용합니다." +#~ msgid "Delete old cookies after 1 week" +#~ msgstr "저장한 후 한 주 이상 지난 쿠키 삭제" -#~ msgid "Enable spell checking while typing" -#~ msgstr "입력 중 맞춤법 검사를 사용합니다." +#~ msgid "Delete old cookies after 1 month" +#~ msgstr "저장한 후 한 달 이상 지난 쿠키 삭제" -#~ msgid "Enable HTML5 database support" -#~ msgstr "HTML5 데이터 베이스 지원 사용" +#~ msgid "Delete old cookies after 1 year" +#~ msgstr "저장한 후 일 년 이상 지난 쿠키 삭제" -#~ msgid "Whether to enable HTML5 database support" -#~ msgstr "HTML5 데이터 베이스 지원을 사용할지 결정합니다." +#~ msgid "days" +#~ msgstr "일" -#~ msgid "Whether to enable HTML5 local storage support" -#~ msgstr "HTML5 로컬 기억 장치 지원을 사용할지 결정합니다." +#~ msgid "All cookies" +#~ msgstr "모든 쿠키" -#~ msgid "Whether to enable offline web application cache" -#~ msgstr "오프라인 웹 응용 프로그램 캐시를 사용할지 결정합니다." +#~ msgid "Session cookies" +#~ msgstr "세션 쿠키" -#~ msgid "Flash the browser window if a new tab was opened in the background" -#~ msgstr "배경에 새 탭이 열리면 브라우저 창을 반짝거리게 합니다" +#~ msgid "Show Transferbar" +#~ msgstr "전송 줄 표시" -#~ msgid "Allow websites to use OpenGL rendering" -#~ msgstr "웹페이지를 오픈GL을 사용해 표현할 수 있도록 합니다." +#~ msgid "Whether to show the transferbar" +#~ msgstr "전송 줄을 표시할 지 결정합니다." -#~ msgid "Whether to zoom text and images" -#~ msgstr "글자와 그림을 확대할지 결정합니다." +#~ msgid "Search engines in location completion" +#~ msgstr "위치를 완성하는데 검색 엔진 사용" -#~ msgid "Find inline while typing" -#~ msgstr "주소 창에 입력할 때 바로 찾기" +#~ msgid "Whether to show search engines in the location completion" +#~ msgstr "위치 입력을 완성하는데 검색 엔진을 사용할지 선택합니다." -#~ msgid "Whether to automatically find inline while typing" -#~ msgstr "입력 중 자동으로 찾을지 결정합니다." +#~ msgid "Show operating controls of the panel" +#~ msgstr "기능 조정 콘드롤 패널에 보기" -#~ msgid "The type of proxy server to use" -#~ msgstr "사용할 프록시 서버의 종류" +#~ msgid "Whether to show the operating controls of the panel" +#~ msgstr "기능 조절 콘트롤을 패널에 보일지 결정합니다." -#~ msgid "HTTP Proxy Server" -#~ msgstr "HTTP 프록시 서버" +#~ msgid "Show speed dial in new tabs" +#~ msgstr "단축 번호를 새 탭에 보기" -#~ msgid "The proxy server used for HTTP connections" -#~ msgstr "HTTP 연결에 사용하는 프록시 서버" +#~ msgid "Show speed dial in newly opened tabs" +#~ msgstr "단축 번호를 새로 열린 탭에 표시합니다." -#~ msgid "The proxy server port used for HTTP connections" -#~ msgstr "HTTP 연결에 사용하는 프록시 서버 포트" +#~ msgid "Download Manager" +#~ msgstr "다운로드 관리자" -#~ msgid "Identification string" -#~ msgstr "식별 문자열" +#~ msgid "An external download manager" +#~ msgstr "외부 다운로드 관리자" -#~ msgid "The application identification string" -#~ msgstr "응용 프로그램 식별 문자열" +#~ msgid "Open external pages in:" +#~ msgstr "외부 페이지 다음에 열기:" -#~ msgid "Clear private data" -#~ msgstr "개인 데이터 지우기" +#~ msgid "Where to open externally opened pages" +#~ msgstr "외부적으로 열린 페이지를 어디에 열지 결정합니다." -#~ msgid "The private data selected for deletion" -#~ msgstr "삭제하기 위해 선택한 개인 데이터" +#~ msgid "Accept cookies" +#~ msgstr "허용할 쿠키" -#~ msgid "Clear data" -#~ msgstr "데이터 지우기" +#~ msgid "What type of cookies to accept" +#~ msgstr "허용할 쿠키의 종류를 결정합니다" -#~ msgid "The data selected for deletion" -#~ msgstr "삭제할 데이터를 선택했습니다" +#~ msgid "Maximum cookie age" +#~ msgstr "쿠키를 보존할 최장 기간" -#~ msgid "Close ot_her Tabs" -#~ msgstr "다른 탭 닫기(_H)" +#~ msgid "Maximum history age" +#~ msgstr "기록을 저장할 최대 기간" -#~ msgid "_Icon:" -#~ msgstr "아이콘(_I):" +#~ msgid "Remember last downloaded files" +#~ msgstr "마지막에 다운로드한 파일 기억" -#~ msgid "Filter:" -#~ 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 "데이터 베이스 문(statement)을 실행 실패\n" + +#~ msgid "Download with Download _Manager" +#~ msgstr "다운로드 관리자로 다운로드(_M)" + +#~ msgid "External applications" +#~ msgstr "외부 프로그램" + +#~ msgid "%s of %s, %s/s" +#~ msgstr "전체 %2$s 중 %1$s 다운로드, %3$s/초" + +#~ msgid "Open target folder for selected addon" +#~ msgstr "선택한 추가 기능의 대상 폴더 열기" + +#~ msgid "Pageholder" +#~ msgstr "페이지 보관함" + +#~ msgid "_Pageholder" +#~ msgstr "페이지 보관함(_P)" + +#~ 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 "차례(_C)" + +#~ msgid "Show the documentation" +#~ msgstr "문서 보기" + +#~ msgid "_Save Link destination" +#~ msgstr "링크 다른 이름으로 저장(_S)" + +#~ msgid "_Download Link destination" +#~ msgstr "링크 다운로드(_D)" + +#~ msgid "%d%% loaded" +#~ msgstr "%d%% 불러옴" + +#~ msgid "_Transferbar" +#~ msgstr "전송 줄(_T)" + +#~ 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 "그림 다운로드(_M)" + +#~ msgid "Failed to clear search history: %s\n" +#~ msgstr "검색 기록을 제거할 수 없습니다: %s\n" + +#~ msgid "Detach chosen panel from the window" +#~ msgstr "선택한 패널 창에서 분리" + +#~ msgid "Hide operating controls" +#~ msgstr "조작 컨트롤 감추기(_C)" + +#~ 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_GB,de_DE\"" + +#~ msgid "Minimize _Current Tab" +#~ msgstr "현재 탭 최소화(_C)" + +#~ msgid "Minimize the current tab" +#~ msgstr "현재 탭 최소화" + +#~ msgid "External Applications" +#~ msgstr "외부 응용 프로그램" + +#~ msgid "Associate URL schemes with external commands" +#~ msgstr "웹 주소를 관련된 외부 명령어와 연결합니다" + +#~ msgid "_Accept" +#~ msgstr "허가(_A)" + +#~ msgid "Spelling dictionaries:" +#~ msgstr "맞춤법 검사에 사용할 사전:" + +#~ msgid "Console" +#~ msgstr "콘솔" + +#~ msgid "Copy _All" +#~ msgstr "모두 복사(_A)" + +#~ msgid "Copy All" +#~ msgstr "모두 복사" + +#~ msgid "_Cookie Manager" +#~ msgstr "쿠키 관리자(_C)" #~ msgid "" -#~ "Enter a filter string to show only cookies whose name or domain field " -#~ "match the entered filter" +#~ "Do you really want to remove '%s'?\n" +#~ "\n" +#~ "The file '%s' will be permanently lost.\n" #~ msgstr "" -#~ "이름 또는 도메인 필드가 입력한 필터와 맞는 쿠키만 보려면 필터 문자열을 입" -#~ "력하세요" +#~ "정말 '%s'을(를) 제거하시겠습니까?\n" +#~ "\n" +#~ "파일 '%s'은(는) 영구적으로 제거될 것입니다.\n" + +#~ msgid "Copy %s to the folder %s." +#~ msgstr "%1$s을(를) 폴더 %2$s(으)로 복사합니다." + +#~ msgid "_Restore Tab" +#~ msgstr "탭 되돌리기(_R)" + +#~ msgid "_Minimize Tab" +#~ msgstr "탭 최소화(_M)" + +#~ msgid "Minimize new Tabs" +#~ msgstr "새 탭 최소화" + +#~ msgid "New tabs open minimized" +#~ msgstr "새 탭을 열 때 탭 막대를 최소화하여 표시합니다" -#~ msgid "_Bookmark" -#~ msgstr "책갈피(_B)" +#~ msgid "Erroneous clock time" +#~ msgstr "잘못된 시간" -#~ msgid "_Console" -#~ msgstr "콘솔(_C)" +#~ 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 "Toplevel folder" -#~ msgstr "최상위 폴더" +#~ msgid "Remember last visited pages" +#~ msgstr "마지막으로 방문한 페이지 기억" -#~ msgid "_Title:" -#~ msgstr "제목(_T):" +#~ msgid "Whether the last visited pages are saved" +#~ msgstr "마지막으로 방문한 페이지를 저장할지 결정합니다." -#~ msgid "_Folder:" -#~ msgstr "폴더(_F):" +#~ msgid "Detect proxy server automatically" +#~ msgstr "프록시 서버 자동으로 검색" -#~ msgid "_Customize…" -#~ msgstr "사용자 지정(_C)…" +#~ msgid "" +#~ "Whether to detect the proxy server automatically from the environment" +#~ msgstr "현재 환경에서 자동으로 프록시 서버를 검색할지 결정합니다." + +#~ msgid "Set number of shortcuts" +#~ msgstr "바로 가기 번호 설정" -#~ msgid "The bookmarks couldn't be saved. %s" -#~ msgstr "책갈피를 저장할 수 없습니다.%s" +#~ msgid "Enter number of shortcuts:" +#~ msgstr "바로 가기 번호를 입력하세요:" -#~ msgid "The specified configuration folder is invalid." -#~ msgstr "지정한 설정 폴더가 올바르지 않습니다." +#~ msgid "" +#~ "Copy userscripts to the folder %s and copy userstyles to the folder %s." +#~ msgstr "" +#~ "사용자 스크립트를 폴더%s(으)로 복사하고 사용자 스타일을 폴더 %s(으)로 복사" +#~ "합니다." diff --git a/po/lt.po b/po/lt.po index ac035ff1..ee305e44 100644 --- a/po/lt.po +++ b/po/lt.po @@ -2,481 +2,453 @@ # 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.4\n" "Report-Msgid-Bugs-To: \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" +"POT-Creation-Date: 2011-10-15 04:10+0000\n" +"PO-Revision-Date: 2011-11-01 21:42+0300\n" +"Last-Translator: Ričardas V. \n" +"Language-Team: Lithuanian\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\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" +"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 "Browse the Web" -msgstr "Naršyti internete" +msgid "Lightweight web browser" +msgstr "Paprasta žiniatinklio naršyklė" #: ../data/midori.desktop.in.h:2 -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 +#: ../midori/main.c:1448 +#: ../midori/main.c:2031 +#: ../midori/main.c:2055 +#: ../midori/main.c:2071 +#: ../midori/midori-websettings.c:294 msgid "Midori" msgstr "Midori" -#: ../data/midori.desktop.in.h:4 +#: ../data/midori.desktop.in.h:3 msgid "Web Browser" 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:96 ../midori/main.c:102 +#: ../midori/main.c:106 +#: ../midori/main.c:112 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Nepavyko įkelti konfigūracijos: %s\n" -#: ../midori/main.c:150 +#: ../midori/main.c:160 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Reikšmė „%s” yra netinkama su %s " -#: ../midori/main.c:155 ../midori/main.c:259 +#: ../midori/main.c:165 +#: ../midori/main.c:258 #, c-format msgid "Invalid configuration value '%s'" msgstr "Netinkama konfigūracijos reikšmė: „%s”" -#: ../midori/main.c:380 +#: ../midori/main.c:363 #, c-format msgid "The search engines couldn't be loaded. %s\n" -msgstr "Paieškos sistemos įkelti nepavyko. %s\n" +msgstr "Paieškos sistemos nepavyko įkelti. %s\n" -#: ../midori/main.c:434 +#: ../midori/main.c:417 #, 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 +#: ../midori/main.c:437 +#: ../midori/main.c:558 +#: ../extensions/formhistory.c:423 #, c-format msgid "Failed to open database: %s\n" -msgstr "Nepavyko atverti duomenų bazės: %s\n" +msgstr "Nepavyko atverti duombaze: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:524 +#: ../midori/main.c:501 #, c-format msgid "Failed to remove old history items: %s\n" -msgstr "Nepavyko pašalinti senų žurnalo įrašų: %s\n" +msgstr "Nepavyko pašalinti senus žurnalo įrašus: %s\n" -#: ../midori/main.c:564 ../panels/midori-history.c:232 +#: ../midori/main.c:541 +#: ../panels/midori-history.c:194 #, c-format msgid "Failed to remove history item: %s\n" -msgstr "Nepavyko pašalinti žurnalo įrašo: %s\n" +msgstr "Nepavyko pašalinti žurnalo įrašą: %s\n" -#: ../midori/main.c:611 +#: ../midori/main.c:588 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Adresyno įrašų nepavyko išsaugoti. %s" -#: ../midori/main.c:633 +#: ../midori/main.c:622 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Konfigūracijos nepavyko išsaugoti. %s" -#: ../midori/main.c:668 +#: ../midori/main.c:657 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Paieškos sistemos nepavyko išsaugoti. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:705 +#: ../midori/main.c:683 +#: ../midori/main.c:703 #, 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 +#: ../midori/main.c:737 +#: ../panels/midori-extensions.c:93 msgid "Extensions" msgstr "Plėtiniai" -#: ../midori/main.c:760 +#: ../midori/main.c:751 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:759 +#, fuzzy +msgid "Cookies store login data, saved games, or user profiles for advertisement purposes." +msgstr "Slapukai kaupia prisijungimo duomenis, išsaugotus žaidimus ar vartotojo profili reklamos reikmėms." -#: ../midori/main.c:828 +#: ../midori/main.c:823 #, c-format msgid "The session couldn't be saved. %s" msgstr "Sesijos nepavyko išsaugoti. %s" -#: ../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:1017 +#, fuzzy +msgid "No root certificate file is available. SSL certificates cannot be verified." +msgstr "Neturi šaknies sertifikato failas. SSL sertifikatai negali būti patikrinta." -#: ../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:1079 +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š parinkčių, kad išspręsti problemą." -#: ../midori/main.c:1134 +#: ../midori/main.c:1098 msgid "Modify _preferences" msgstr "Keisti _nustatymus" -#: ../midori/main.c:1138 +#: ../midori/main.c:1102 msgid "Disable all _extensions" msgstr "Išjungti _visus plėtinius" -#: ../midori/main.c:1151 +#: ../midori/main.c:1115 msgid "Discard old tabs" msgstr "Naikinti ankstesnes korteles" -#: ../midori/main.c:1152 ../midori/midori-websettings.c:221 +#: ../midori/main.c:1116 +#: ../midori/midori-websettings.c:203 msgid "Show last tabs without loading" msgstr "Rodyti ankstesnes korteles neįkeliant" -#: ../midori/main.c:1153 ../midori/midori-websettings.c:220 +#: ../midori/main.c:1117 +#: ../midori/midori-websettings.c:202 msgid "Show last open tabs" msgstr "Rodyti ankstesnes korteles" -#: ../midori/main.c:1400 ../midori/main.c:2464 -#, c-format +#: ../midori/main.c:1327 +#: ../midori/main.c:2408 +#, fuzzy, c-format msgid "The session couldn't be loaded: %s\n" -msgstr "Sesija negali būti įkelta: %s\n" +msgstr "Sesijos negali būti įkeltas:% s \\ n" -#: ../midori/main.c:1538 -#, c-format +#: ../midori/main.c:1448 +msgid "No filename specified" +msgstr "Nėra nurodytas failo pavadinimas" + +#: ../midori/main.c:1467 +#, fuzzy +msgid "An unknown error occured." +msgstr "Įvyko nežinoma klaida." + +#: ../midori/main.c:1505 +#, fuzzy, c-format msgid "Snapshot saved to: %s\n" -msgstr "Momentinė nuotrauka išsaugota: %s\n" +msgstr "Fotografiją išsaugotas:% s \\ n" -#: ../midori/main.c:1951 +#: ../midori/main.c:1915 +#, fuzzy msgid "Run ADDRESS as a web application" -msgstr "Vykdyti ADRESĄ kaip interneto programą" +msgstr "Vykdyti adresą kaip interneto programa" -#: ../midori/main.c:1951 +#: ../midori/main.c:1915 +#, fuzzy msgid "ADDRESS" msgstr "ADRESAS" -#: ../midori/main.c:1954 +#: ../midori/main.c:1918 +#, fuzzy msgid "Use FOLDER as configuration folder" -msgstr "Naudokite APLANKĄ kaip konfigūracijos aplanką" +msgstr "Naudokite konfigūracijos aplanką aplanke kaip" -#: ../midori/main.c:1954 +#: ../midori/main.c:1918 +#, fuzzy msgid "FOLDER" msgstr "APLANKAS" -#: ../midori/main.c:1957 +#: ../midori/main.c:1921 msgid "Private browsing, no changes are saved" msgstr "Privatus naršymas, jokie pakeitimai nesaugomi" -#: ../midori/main.c:1959 +#: ../midori/main.c:1923 msgid "Show a diagnostic dialog" -msgstr "Rodyti diagnostikos dialogą" +msgstr "Rodyti diagnostikos dialogo langą" -#: ../midori/main.c:1961 +#: ../midori/main.c:1925 msgid "Run the specified filename as javascript" msgstr "Vykdyti nurodyto pavadinimo failą, kaip JavaScript" -#: ../midori/main.c:1963 +#: ../midori/main.c:1927 +#, fuzzy msgid "Take a snapshot of the specified URI" -msgstr "Padaryti nurodyto URI momentinę nuotrauką" +msgstr "Paimkite fotografiją nurodytą URI" -#: ../midori/main.c:1965 +#: ../midori/main.c:1929 msgid "Execute the specified command" msgstr "Vykdyti nurodytą komandą" -#: ../midori/main.c:1967 +#: ../midori/main.c:1931 +#, fuzzy msgid "List available commands to execute with -e/ --execute" -msgstr "Parodyti visas komandas, kurias galima vykdyti su e-/ --execute" +msgstr "Sąrašas galimas komandas vykdyti su e-/ - vykdyti" -#: ../midori/main.c:1969 +#: ../midori/main.c:1933 msgid "Display program version" msgstr "Rodyti programos versiją" -#: ../midori/main.c:1971 +#: ../midori/main.c:1935 msgid "Addresses" msgstr "Adresai" -#: ../midori/main.c:1973 +#: ../midori/main.c:1937 +#, fuzzy msgid "Block URIs according to regular expression PATTERN" -msgstr "Blokuoti URI pagal reguliariųjų išraiškų MODELĮ" +msgstr "Blokuoti URI pagal reguliaraus išraiška modelis" -#: ../midori/main.c:1973 +#: ../midori/main.c:1937 msgid "PATTERN" -msgstr "MODELIS" +msgstr "" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1977 +#: ../midori/main.c:1941 +#, fuzzy msgid "Reset Midori after SECONDS seconds of inactivity" -msgstr "Atstatyti Midori po SEKUNDŽIŲ neaktyvumo" +msgstr "Atstatyti Daniela prastovos sekundžių, po sekundės" -#: ../midori/main.c:1977 +#: ../midori/main.c:1941 msgid "SECONDS" -msgstr "SEKUNDĖS" +msgstr "" -#: ../midori/main.c:1980 +#: ../midori/main.c:1944 +#, fuzzy msgid "Redirects console warnings to the specified FILENAME" -msgstr "Nukreipia konsolės įspėjimus į nurodytą FAILO VARDĄ" +msgstr "Nukreipimus konsolės įspėjimų nurodyta FILENAME" -#: ../midori/main.c:1980 +#: ../midori/main.c:1944 msgid "FILENAME" -msgstr "FAILO VARDAS" +msgstr "" -#: ../midori/main.c:2045 +#: ../midori/main.c:2028 +#, fuzzy msgid "[Addresses]" msgstr "[Adresai]" -#: ../midori/main.c:2087 +#: ../midori/main.c:2042 +msgid "The specified configuration folder is invalid." +msgstr "Nurodytos konfigūracijos aplankas yra netinkamas." + +#: ../midori/main.c:2072 msgid "Please report comments, suggestions and bugs to:" msgstr "Prašome siųsti komentarus, pasiūlymus ir klaidas:" -#: ../midori/main.c:2089 +#: ../midori/main.c:2074 msgid "Check for new versions at:" msgstr "Ieškoti naujų versijų:" +#: ../midori/main.c:2157 +msgid "Website icons" +msgstr "Svetainės piktogramos" + #. i18n: Logins and passwords in websites and web forms -#: ../midori/main.c:2173 +#: ../midori/main.c:2160 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" +#: ../midori/main.c:2162 +msgid "Cookies" +msgstr "Slapukai" -#. 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 +#: ../midori/main.c:2165 +msgid "'Flash' Cookies" +msgstr "„Flash” Slapukai" + +#: ../midori/main.c:2168 +msgid "HTML5 _Databases" +msgstr "" + +#: ../midori/main.c:2171 +#: ../midori/midori-websettings.c:888 +#: ../extensions/web-cache.c:470 +#: ../extensions/web-cache.c:479 msgid "Web Cache" msgstr "Žiniatinklio podėlis" -#: ../midori/main.c:2182 -msgid "Website icons" -msgstr "Svetainės piktogramos" - -#: ../midori/main.c:2288 -msgid "An unknown error occured" -msgstr "Įvyko nežinoma klaida" +#: ../midori/main.c:2173 +msgid "Offline Application Cache" +msgstr "Atsijungusių programų podėlis" -#: ../midori/main.c:2395 +#: ../midori/main.c:2339 msgid "An instance of Midori is already running but not responding.\n" msgstr "Midori egzempliorius jau veikia, tačiau neatsako.\n" -#: ../midori/main.c:2431 +#: ../midori/main.c:2375 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Adresyno nepavyksta įkelti: %s\n" -#: ../midori/main.c:2479 -#, c-format +#: ../midori/main.c:2423 +#, fuzzy, c-format msgid "The trash couldn't be loaded: %s\n" -msgstr "Šiukšlinės įkelti nepavyko: %s\n" +msgstr "Trash negalėjo būti įkeltas:% s \\ n" -#: ../midori/main.c:2492 +#: ../midori/main.c:2436 #, c-format msgid "The history couldn't be loaded: %s\n" -msgstr "Žurnalo įkelti nepavyko: %s\n" +msgstr "Žurnalo nepavyko įkelti: %s\n" -#: ../midori/main.c:2508 +#: ../midori/main.c:2452 msgid "The following errors occured:" msgstr "Įvyko šios klaidos:" -#: ../midori/main.c:2524 +#: ../midori/main.c:2468 msgid "_Ignore" -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-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" +msgstr "" #: ../midori/midori-array.c:522 msgid "File not found." msgstr "Failas nerastas." -#: ../midori/midori-array.c:547 ../midori/midori-array.c:586 -#: ../midori/midori-array.c:609 ../midori/midori-array.c:619 +#: ../midori/midori-array.c:547 +#: ../midori/midori-array.c:586 +#: ../midori/midori-array.c:609 +#: ../midori/midori-array.c:619 msgid "Malformed document." msgstr "Klaidingas dokumentas." #: ../midori/midori-array.c:628 msgid "Unrecognized bookmark format." -msgstr "Neatpažintas adresyno formatas." +msgstr "Neatpažįnatas adresyno formatas." -#: ../midori/midori-array.c:915 +#: ../midori/midori-array.c:916 msgid "Writing failed." msgstr "Rašymas nepavyko." -#: ../midori/midori-browser.c:350 ../midori/midori-browser.c:5298 -#: ../midori/midori-browser.c:5307 +#: ../midori/midori-browser.c:332 +#: ../midori/midori-browser.c:5242 +#: ../midori/midori-browser.c:5251 msgid "Reload the current page" msgstr "Perkrauti šį puslapį" -#: ../midori/midori-browser.c:359 ../midori/midori-browser.c:5304 +#: ../midori/midori-browser.c:343 +#: ../midori/midori-browser.c:5248 msgid "Stop loading the current page" msgstr "Sustabdyti šį puslapį" -#: ../midori/midori-browser.c:476 +#: ../midori/midori-browser.c:470 #, c-format msgid "Failed to update title: %s\n" msgstr "Nepavyko atnaujinti antraštės: %s\n" -#: ../midori/midori-browser.c:489 +#: ../midori/midori-browser.c:483 #, c-format msgid "Unexpected action '%s'." msgstr "Nenumatytas veiksmas „%s”." -#: ../midori/midori-browser.c:569 +#: ../midori/midori-browser.c:584 #, 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:774 +#: ../midori/midori-browser.c:724 msgid "New folder" msgstr "Naujas aplankas" -#: ../midori/midori-browser.c:774 +#: ../midori/midori-browser.c:724 msgid "Edit folder" msgstr "Redaguoti aplanką" -#: ../midori/midori-browser.c:776 +#: ../midori/midori-browser.c:726 msgid "New bookmark" msgstr "Naujas adresyno įrašas" -#: ../midori/midori-browser.c:776 +#: ../midori/midori-browser.c:726 msgid "Edit bookmark" msgstr "Taisyti adresyno įrašą" -#: ../midori/midori-browser.c:818 +#: ../midori/midori-browser.c:761 msgid "_Title:" msgstr "_Pavadinimas:" -#: ../midori/midori-browser.c:838 ../midori/midori-searchaction.c:961 -#: ../extensions/feed-panel/main.c:377 +#: ../midori/midori-browser.c:781 +#: ../midori/midori-searchaction.c:973 +#: ../extensions/feed-panel/main.c:385 msgid "_Address:" msgstr "_Adresas:" -#: ../midori/midori-browser.c:861 ../midori/midori-browser.c:4326 +#: ../midori/midori-browser.c:814 +#: ../midori/midori-browser.c:4275 msgid "_Folder:" msgstr "Ap_lankas:" -#: ../midori/midori-browser.c:877 +#: ../midori/midori-browser.c:824 +#: ../midori/midori-browser.c:913 +#: ../midori/midori-browser.c:4281 +#: ../midori/midori-browser.c:4310 +msgid "Toplevel folder" +msgstr "Aukščiausiojo lygio aplankas" + +#: ../midori/midori-browser.c:855 msgid "Add to _Speed Dial" -msgstr "Pridėti į _spartųjį rinkimą" +msgstr "Pridėti Sparčiojon _rinktin " -#: ../midori/midori-browser.c:890 +#: ../midori/midori-browser.c:868 msgid "Show in the tool_bar" -msgstr "Rodyti įrankių _juostoj" +msgstr "" -#: ../midori/midori-browser.c:905 +#: ../midori/midori-browser.c:883 msgid "Run as _web application" -msgstr "Veikia kaip _interneto programa" +msgstr "" -#: ../midori/midori-browser.c:976 +#: ../midori/midori-browser.c:957 #, 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 +#: ../midori/midori-browser.c:959 #, 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:985 +#: ../midori/midori-browser.c:966 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Čia nepakanka laisvos vietos atsisiųsti „%s”." -#: ../midori/midori-browser.c:988 +#: ../midori/midori-browser.c:969 #, c-format msgid "The file needs %s but only %s are left." -msgstr "Failui reikia %s bet liko tik %s." +msgstr "" -#: ../midori/midori-browser.c:1026 ../midori/midori-browser.c:4395 +#: ../midori/midori-browser.c:1011 +#: ../midori/midori-browser.c:4361 msgid "Save file as" msgstr "Išsaugokite failą kaip" @@ -496,1532 +468,1704 @@ msgstr "Nauja kortelė" 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 +#: ../midori/midori-browser.c:1360 msgid "Save file" msgstr "Išsaugoti failą" -#: ../midori/midori-browser.c:2367 +#: ../midori/midori-browser.c:2243 msgid "Open file" -msgstr "Atverti failą" +msgstr "Atidaryti failą" -#: ../midori/midori-browser.c:2499 +#: ../midori/midori-browser.c:2373 +#, fuzzy 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 "" -"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:2505 ../extensions/feed-panel/main.c:365 +"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 "Naudoti aukščiau URI atidaryti naujienos agregatora. Paprastai yra meniu arba mygtuką \\ \"Nauja prenumerata \", \\ \"Nauja Naujienų \" ar panašios \\ nAlternatively lengvatoms, Programos, Daniela, ir pasirinkite Naujienos agregatora. Kitą kartą spustelėjus naujienų piktogramą, ji bus pridėtas automatiškai." + +#: ../midori/midori-browser.c:2379 +#: ../extensions/feed-panel/main.c:365 msgid "New feed" -msgstr "Naujas kanalas" +msgstr "" -#: ../midori/midori-browser.c:2548 ../midori/midori-browser.c:5367 -#: ../panels/midori-bookmarks.c:427 +#: ../midori/midori-browser.c:2422 +#: ../midori/midori-browser.c:5311 +#: ../panels/midori-bookmarks.c:467 msgid "Add a new bookmark" msgstr "Pridėti naują įrašą į adresyną" -#: ../midori/midori-browser.c:3047 ../midori/midori-searchaction.c:488 +#: ../midori/midori-browser.c:2985 +#: ../midori/midori-searchaction.c:490 msgid "Empty" msgstr "Tuščias" -#: ../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 +#: ../midori/midori-browser.c:3773 +#: ../midori/midori-browser.c:5721 #, c-format msgid "Failed to insert new history item: %s\n" -msgstr "Nepavyko įterpti naujo žurnalo įrašo: %s\n" +msgstr "Nepavyko įterpti naują žurnalo įrašą: %s\n" -#: ../midori/midori-browser.c:4114 ../panels/midori-bookmarks.c:743 -#: ../panels/midori-history.c:801 +#: ../midori/midori-browser.c:4103 +#: ../panels/midori-bookmarks.c:783 +#: ../panels/midori-history.c:752 msgid "Open all in _Tabs" -msgstr "Atverti viską _kortelėse" +msgstr "" -#: ../midori/midori-browser.c:4121 ../panels/midori-bookmarks.c:749 -#: ../panels/midori-history.c:807 ../extensions/feed-panel/feed-panel.c:528 +#: ../midori/midori-browser.c:4110 +#: ../panels/midori-bookmarks.c:789 +#: ../panels/midori-history.c:758 +#: ../extensions/feed-panel/feed-panel.c:533 msgid "Open in New _Tab" -msgstr "Atidaryti naujoje _kortelėje" +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 +#: ../midori/midori-browser.c:4113 +#: ../midori/midori-view.c:2553 +#: ../midori/midori-view.c:4398 +#: ../panels/midori-bookmarks.c:791 +#: ../panels/midori-history.c:760 +#: ../extensions/feed-panel/feed-panel.c:535 msgid "Open in New _Window" -msgstr "Atverti _naujame lange" +msgstr "" -#: ../midori/midori-browser.c:4213 +#: ../midori/midori-browser.c:4193 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4214 +#: ../midori/midori-browser.c:4194 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4215 +#: ../midori/midori-browser.c:4195 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4216 +#: ../midori/midori-browser.c:4196 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4217 +#: ../midori/midori-browser.c:4197 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4218 -#, c-format -msgid "Firefox (%s)" -msgstr "Firefox (%s)" - -#: ../midori/midori-browser.c:4239 -msgid "Import bookmarks…" -msgstr "Importuoti adresyną …" +#: ../midori/midori-browser.c:4222 +msgid "Import bookmarks..." +msgstr "Importuoti adresyną ..." -#: ../midori/midori-browser.c:4242 ../midori/midori-browser.c:5372 +#: ../midori/midori-browser.c:4229 +#: ../midori/midori-browser.c:5316 msgid "_Import bookmarks" msgstr "_Importuoti adresyną" -#: ../midori/midori-browser.c:4253 +#: ../midori/midori-browser.c:4240 msgid "_Application:" msgstr "_Programa:" -#: ../midori/midori-browser.c:4318 +#: ../midori/midori-browser.c:4267 +#, fuzzy msgid "Import from XBEL or HTML file" -msgstr "Importuoti iš XBEL ar HTML failo" +msgstr "Importas iš failo" -#: ../midori/midori-browser.c:4353 +#: ../midori/midori-browser.c:4318 msgid "Import from a file" -msgstr "Importuoti iš failo" +msgstr "Importas iš failo" -#: ../midori/midori-browser.c:4365 +#: ../midori/midori-browser.c:4330 msgid "Failed to import bookmarks" msgstr "Adresyno importas nepavyko" -#: ../midori/midori-browser.c:4400 +#: ../midori/midori-browser.c:4366 msgid "XBEL Bookmarks" msgstr "XBEL adresynas" -#: ../midori/midori-browser.c:4405 +#: ../midori/midori-browser.c:4371 msgid "Netscape Bookmarks" msgstr "Netscape adresynas" -#: ../midori/midori-browser.c:4419 +#: ../midori/midori-browser.c:4385 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 +#: ../midori/midori-browser.c:4401 msgid "Failed to export bookmarks" msgstr "Adresyno eksportas nepavyko" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4556 +#: ../midori/midori-browser.c:4527 msgid "Clear Private Data" msgstr "Pašalinti asmeninius duomenis" -#: ../midori/midori-browser.c:4560 +#: ../midori/midori-browser.c:4535 msgid "_Clear private data" msgstr "Šalinti _asmeninius duomenis" -#: ../midori/midori-browser.c:4573 +#: ../midori/midori-browser.c:4548 msgid "Clear the following data:" msgstr "Šalinti šiuos duomenis:" -#: ../midori/midori-browser.c:4583 +#: ../midori/midori-browser.c:4558 msgid "Last open _tabs" msgstr "Paskutinės atvertos _kortelės" -#: ../midori/midori-browser.c:4609 +#. i18n: Browsing history, visited web pages +#: ../midori/midori-browser.c:4564 +#: ../midori/sokoke.c:1521 +msgid "_History" +msgstr "_Žurnalas" + +#: ../midori/midori-browser.c:4569 +#: ../midori/sokoke.c:1527 +msgid "_Closed Tabs" +msgstr "Už_vertos kortelės" + +#: ../midori/midori-browser.c:4589 msgid "Clear private data when _quitting Midori" msgstr "Šalinti asmeninius duomenis _uždarant Midori" -#: ../midori/midori-browser.c:4804 +#: ../midori/midori-browser.c:4765 msgid "A lightweight web browser." msgstr "Paprasta naršyklė." -#: ../midori/midori-browser.c:4805 +#: ../midori/midori-browser.c:4766 +#, fuzzy msgid "See about:version for version info." -msgstr "Norėdami pamatyti versijos informaciją pažiūrėkite about:version ." +msgstr "See apie: redakcija versija 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 "" -"Š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:4768 +#, fuzzy +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 ji ˛ platinti ir / arba modifikuoti pagal GNU Lesser General Public License paskelbė Free Software Foundation; arba versija 2.1 licencija, arba (Jūsų pasirinkimu) bet kuria vėlesne versija." -#: ../midori/midori-browser.c:4828 +#: ../midori/midori-browser.c:4789 msgid "translator-credits" msgstr "" -"Ričardas Vasiulis \n" -"Algimantas Margevičius " -#: ../midori/midori-browser.c:5214 +#: ../midori/midori-browser.c:5155 msgid "_File" msgstr "_Failas" -#: ../midori/midori-browser.c:5217 +#: ../midori/midori-browser.c:5157 +#: ../midori/sokoke.c:1528 +msgid "New _Window" +msgstr "Naujas _langas" + +#: ../midori/midori-browser.c:5158 msgid "Open a new window" msgstr "Atverti naują langą" -#: ../midori/midori-browser.c:5220 +#: ../midori/midori-browser.c:5161 msgid "Open a new tab" msgstr "Atverti naują kortelę" -#: ../midori/midori-browser.c:5222 +#: ../midori/midori-browser.c:5163 msgid "New P_rivate Browsing Window" msgstr "Naujas _privataus naršymo langas" -#: ../midori/midori-browser.c:5226 +#: ../midori/midori-browser.c:5164 +msgid "Don't save any private data while browsing" +msgstr "Naršymo metu nesaugoti jokių duomenų " + +#: ../midori/midori-browser.c:5168 msgid "Open a file" msgstr "Atverti failą" -#: ../midori/midori-browser.c:5228 -msgid "_Save Page As…" -msgstr "_Išsaugoti tinklapį kaip…" +#: ../midori/midori-browser.c:5170 +msgid "_Save Page As..." +msgstr "Išsaugoti tinklapį kaip..." -#: ../midori/midori-browser.c:5229 +#: ../midori/midori-browser.c:5171 msgid "Save to a file" msgstr "Išsaugoti faile" -#: ../midori/midori-browser.c:5231 +#: ../midori/midori-browser.c:5173 msgid "Add to Speed _dial" -msgstr "Pridėti į spartųjį _rinkimą" +msgstr "Pridėti Sparčiojon _rinktin" -#: ../midori/midori-browser.c:5235 +#: ../midori/midori-browser.c:5174 +msgid "Add shortcut to speed dial" +msgstr "Pridėti nuorodą sparčiojoj rinkti" + +#: ../midori/midori-browser.c:5177 msgid "Add Shortcut to the _desktop" -msgstr "Įdėti nuorodą į _darbastalį" +msgstr "" + +#: ../midori/midori-browser.c:5178 +msgid "Add shortcut to the desktop" +msgstr "Pridėti nuorodą darbalauki" -#: ../midori/midori-browser.c:5237 +#: ../midori/midori-browser.c:5180 msgid "Create _Launcher" -msgstr "Sukurti _leistuką" +msgstr "" + +#: ../midori/midori-browser.c:5181 +msgid "Create a launcher" +msgstr "" -#: ../midori/midori-browser.c:5241 +#: ../midori/midori-browser.c:5184 msgid "Subscribe to News _feed" -msgstr "_Užsisakyti šį kanalą" +msgstr "" + +#: ../midori/midori-browser.c:5185 +msgid "Subscribe to this news feed" +msgstr "" -#: ../midori/midori-browser.c:5247 +#: ../midori/midori-browser.c:5190 msgid "_Close Tab" msgstr "_Užverti kortelę" -#: ../midori/midori-browser.c:5248 +#: ../midori/midori-browser.c:5191 msgid "Close the current tab" msgstr "Užverti šią kortelę" -#: ../midori/midori-browser.c:5250 +#: ../midori/midori-browser.c:5193 msgid "C_lose Window" -msgstr "Užverti _langą" +msgstr "Užverti langą" -#: ../midori/midori-browser.c:5254 +#: ../midori/midori-browser.c:5194 +msgid "Close this window" +msgstr "Užverti šį langą" + +#: ../midori/midori-browser.c:5197 msgid "Print the current page" msgstr "Spausdinti šį puslapį " -#: ../midori/midori-browser.c:5256 +#: ../midori/midori-browser.c:5199 +#, fuzzy msgid "Close a_ll Windows" -msgstr "Užverti _visus langus" +msgstr "Užverti langą" -#: ../midori/midori-browser.c:5259 +#: ../midori/midori-browser.c:5200 +msgid "Close all open windows" +msgstr "Užverti visus atvertus langus" + +#: ../midori/midori-browser.c:5202 msgid "_Edit" -msgstr "K_eisti" +msgstr "_Taisa" -#: ../midori/midori-browser.c:5282 -msgid "_Find…" -msgstr "Iešk_oti …" +#: ../midori/midori-browser.c:5205 +msgid "Undo the last modification" +msgstr "Anuliuoti paskutinį pakeitimą" + +#: ../midori/midori-browser.c:5208 +msgid "Redo the last modification" +msgstr "Pakartoti paskutinį pakeitimą" + +#: ../midori/midori-browser.c:5211 +msgid "Cut the selected text" +msgstr "Iškirpti pažymėtą tekstą" + +#: ../midori/midori-browser.c:5214 +msgid "Copy the selected text" +msgstr "Kopijuoti pažymėtą tekstą" + +#: ../midori/midori-browser.c:5217 +msgid "Paste text from the clipboard" +msgstr "Įdėti tekstą iš iškarpinės" + +#: ../midori/midori-browser.c:5220 +msgid "Delete the selected text" +msgstr "Ištrinti pažymėtą tekstą" + +#: ../midori/midori-browser.c:5223 +msgid "Select all text" +msgstr "Pažymėti visą tekstą" + +#: ../midori/midori-browser.c:5225 +msgid "_Find..." +msgstr "Iešk_oti ..." -#: ../midori/midori-browser.c:5283 +#: ../midori/midori-browser.c:5226 msgid "Find a word or phrase in the page" -msgstr "Surasti žodį arba frazę puslapyje" +msgstr "Surasti žodį arba frazę puslapi" -#: ../midori/midori-browser.c:5285 +#: ../midori/midori-browser.c:5228 msgid "Find _Next" -msgstr "Ieškoti _kito" +msgstr "Ieškoti to_lesnio" + +#: ../midori/midori-browser.c:5229 +msgid "Find the next occurrence of a word or phrase" +msgstr "Surasti vėlesnį žodį ar frazę" -#: ../midori/midori-browser.c:5288 +#: ../midori/midori-browser.c:5231 msgid "Find _Previous" -msgstr "Ieškoti _ankstesnio" +msgstr "Rasti _ankstesnį" + +#: ../midori/midori-browser.c:5232 +msgid "Find the previous occurrence of a word or phrase" +msgstr "Surasti ankstesnį žodį ar frazę" -#: ../midori/midori-browser.c:5292 +#: ../midori/midori-browser.c:5236 msgid "Configure the application preferences" msgstr "Konfigūruoti programos nuostatas" -#: ../midori/midori-browser.c:5294 +#: ../midori/midori-browser.c:5238 msgid "_View" msgstr "_Rodymas" -#: ../midori/midori-browser.c:5295 +#: ../midori/midori-browser.c:5239 msgid "_Toolbars" msgstr "Įrankių _juostos" -#: ../midori/midori-browser.c:5300 +#: ../midori/midori-browser.c:5244 +#: ../midori/midori-browser.c:5245 msgid "Reload page without caching" -msgstr "Perkrauti puslapį be spartinimo" +msgstr "" -#: ../midori/midori-browser.c:5310 +#: ../midori/midori-browser.c:5254 msgid "Increase the zoom level" msgstr "Didinti mastelį" -#: ../midori/midori-browser.c:5313 +#: ../midori/midori-browser.c:5257 msgid "Decrease the zoom level" msgstr "Sumažinti mastelį" -#: ../midori/midori-browser.c:5317 +#: ../midori/midori-browser.c:5260 +msgid "Reset the zoom level" +msgstr "Atstatyti mastelį" + +#: ../midori/midori-browser.c:5261 msgid "_Encoding" msgstr "_Kodavimas" -#: ../midori/midori-browser.c:5319 +#: ../midori/midori-browser.c:5263 msgid "View So_urce" -msgstr "Rodyti pirminį _kodą" +msgstr "Pamatyti pirminį _tekstą" -#: ../midori/midori-browser.c:5322 +#: ../midori/midori-browser.c:5264 +msgid "View the source code of the page" +msgstr "Peržiūrėti puslapio pirminį programos tektą" + +#: ../midori/midori-browser.c:5266 +#, fuzzy msgid "Ca_ret Browsing" -msgstr "_Privatus naršymas" +msgstr "P_rivatus naršymas" -#: ../midori/midori-browser.c:5326 +#: ../midori/midori-browser.c:5267 +msgid "Toggle text cursor navigation" +msgstr "" + +#: ../midori/midori-browser.c:5270 msgid "Toggle fullscreen view" -msgstr "Perjungti viso ekrano veikseną" +msgstr "Keisti viso ekrano vaizdas" -#: ../midori/midori-browser.c:5328 +#: ../midori/midori-browser.c:5272 msgid "Scroll _Left" -msgstr "Slinkti _kairėn" +msgstr "" -#: ../midori/midori-browser.c:5331 +#: ../midori/midori-browser.c:5273 +msgid "Scroll to the left" +msgstr "Slinkti kairėn" + +#: ../midori/midori-browser.c:5275 msgid "Scroll _Down" -msgstr "Slinkti _žemyn" +msgstr "" + +#: ../midori/midori-browser.c:5276 +msgid "Scroll down" +msgstr "Slinkti žemyn" -#: ../midori/midori-browser.c:5334 +#: ../midori/midori-browser.c:5278 msgid "Scroll _Up" -msgstr "Slinkti _aukštyn" +msgstr "" -#: ../midori/midori-browser.c:5337 +#: ../midori/midori-browser.c:5279 +msgid "Scroll up" +msgstr "Slinkti aukštyn" + +#: ../midori/midori-browser.c:5281 msgid "Scroll _Right" -msgstr "Slinkti _dešinėn" +msgstr "" -#: ../midori/midori-browser.c:5340 +#: ../midori/midori-browser.c:5282 +msgid "Scroll to the right" +msgstr "Slinkti dešinėn" + +#: ../midori/midori-browser.c:5284 msgid "_Go" msgstr "_Eiti" -#: ../midori/midori-browser.c:5343 +#: ../midori/midori-browser.c:5287 msgid "Go back to the previous page" msgstr "Grįžti į ankstesnį puslapį" -#: ../midori/midori-browser.c:5346 +#: ../midori/midori-browser.c:5290 msgid "Go forward to the next page" -msgstr "Eiti į tolimesnį puslapį" +msgstr "Eiti pirmyn į paskesnį puslapį" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5350 +#: ../midori/midori-browser.c:5294 +#, fuzzy msgid "Go to the previous sub-page" msgstr "Eiti į ankstesnį popuslapį" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5354 +#: ../midori/midori-browser.c:5298 msgid "Go to the next sub-page" msgstr "Eiti į kitą popuslapį" -#: ../midori/midori-browser.c:5357 +#: ../midori/midori-browser.c:5301 msgid "Go to your homepage" msgstr "Eiti į jūsų pradžios tinklapį" -#: ../midori/midori-browser.c:5359 +#: ../midori/midori-browser.c:5303 msgid "Empty Trash" msgstr "Išvalyti šiukšlinę" -#: ../midori/midori-browser.c:5362 +#: ../midori/midori-browser.c:5304 +msgid "Delete the contents of the trash" +msgstr "Ištrinti iš šiukšlinės turinį" + +#: ../midori/midori-browser.c:5306 msgid "Undo _Close Tab" -msgstr "_Atšaukti kortelės užvėrimą" +msgstr "" -#: ../midori/midori-browser.c:5369 +#: ../midori/midori-browser.c:5307 +msgid "Open the last closed tab" +msgstr "Atidaryti paskutinę uždarytą kortelę" + +#: ../midori/midori-browser.c:5313 msgid "Add a new _folder" -msgstr "Pridėti naują _aplanką" +msgstr "" + +#: ../midori/midori-browser.c:5314 +msgid "Add a new bookmark folder" +msgstr "Pridėti naują aplanką į adresyną" -#: ../midori/midori-browser.c:5375 +#: ../midori/midori-browser.c:5319 msgid "_Export bookmarks" msgstr "_Eksportuoti adresyną" -#: ../midori/midori-browser.c:5378 ../midori/midori-searchaction.c:497 +#: ../midori/midori-browser.c:5322 +#: ../midori/midori-searchaction.c:499 msgid "_Manage Search Engines" -msgstr "_Tvarkyti paieškos variklius" +msgstr "_Tvarkyti ieškykles:" -#: ../midori/midori-browser.c:5381 +#: ../midori/midori-browser.c:5323 +msgid "Add, edit and remove search engines..." +msgstr "Pridėti, redaguoti ir ištrinti paieškos sistemas..." + +#: ../midori/midori-browser.c:5326 msgid "_Clear Private Data" msgstr "Šalinti _asmeninius duomenis" -#: ../midori/midori-browser.c:5384 +#: ../midori/midori-browser.c:5327 +msgid "Clear private data..." +msgstr "Šalinti asmeninius duomenis ..." + +#: ../midori/midori-browser.c:5330 msgid "_Inspect Page" msgstr "Apžiūrėti _tinklapį" -#: ../midori/midori-browser.c:5388 +#: ../midori/midori-browser.c:5331 +#, fuzzy +msgid "Inspect page details and access developer tools..." +msgstr "Apžiūrėti tinklapio detales ir prieiti prie tobulinimo įrankių..." + +#: ../midori/midori-browser.c:5335 msgid "_Previous Tab" msgstr "_Ankstesnė kortelė" -#: ../midori/midori-browser.c:5391 +#: ../midori/midori-browser.c:5336 +msgid "Switch to the previous tab" +msgstr "Perjungti į ankstesnę kortelę" + +#: ../midori/midori-browser.c:5338 msgid "_Next Tab" -msgstr "_Sekanti kortelė" +msgstr "_Tolesnė kortelė" -#: ../midori/midori-browser.c:5393 +#: ../midori/midori-browser.c:5339 +msgid "Switch to the next tab" +msgstr "Perjungti į tolesnę kortelę" + +#: ../midori/midori-browser.c:5340 msgid "Move Tab _Backward" -msgstr "Perkelti kortelę į _atgal" +msgstr "" -#: ../midori/midori-browser.c:5395 +#: ../midori/midori-browser.c:5341 +#, fuzzy +msgid "Move tab behind the previous tab" +msgstr "Perjungti į ankstesnį skirtuką" + +#: ../midori/midori-browser.c:5342 msgid "_Move Tab Forward" -msgstr "Perkelti kortelę į _pirmyn" +msgstr "" + +#: ../midori/midori-browser.c:5343 +#, fuzzy +msgid "Move tab in front of the next tab" +msgstr "Perjungti į kitą skirtuką" -#: ../midori/midori-browser.c:5398 +#: ../midori/midori-browser.c:5345 msgid "Focus _Current Tab" -msgstr "Fokusuoti dabartinę _kortelę" +msgstr "" + +#: ../midori/midori-browser.c:5346 +#, fuzzy +msgid "Focus the current tab" +msgstr "Focus dabartinį skirtuką" -#: ../midori/midori-browser.c:5401 +#: ../midori/midori-browser.c:5348 msgid "Focus _Next view" -msgstr "Fokusuoti _sekantį rodinį" +msgstr "" + +#: ../midori/midori-browser.c:5349 +msgid "Cycle focus between views" +msgstr "" -#: ../midori/midori-browser.c:5404 +#: ../midori/midori-browser.c:5351 msgid "Only show the Icon of the _Current Tab" -msgstr "Rodyti tik dabartinės _kortelės piktogramą" +msgstr "" + +#: ../midori/midori-browser.c:5352 +msgid "Only show the icon of the current tab" +msgstr "Rodyti tik dabartinės kortelės piktogramą" -#: ../midori/midori-browser.c:5407 +#: ../midori/midori-browser.c:5354 msgid "_Duplicate Current Tab" -msgstr "_Dubliuoti dabartinę kortelę" +msgstr "" + +#: ../midori/midori-browser.c:5355 +msgid "Duplicate the current tab" +msgstr "Dubliuoti veikiamą kortelę" -#: ../midori/midori-browser.c:5410 +#: ../midori/midori-browser.c:5357 msgid "Close Ot_her Tabs" -msgstr "Užverti _kitas korteles" +msgstr "" + +#: ../midori/midori-browser.c:5358 +msgid "Close all tabs except the current tab" +msgstr "Uždaryti visas korteles išskyrus veikiamą" -#: ../midori/midori-browser.c:5413 +#: ../midori/midori-browser.c:5360 msgid "Open last _session" -msgstr "Atverti paskutinį _seansą" +msgstr "" -#: ../midori/midori-browser.c:5416 +#: ../midori/midori-browser.c:5361 +msgid "Open the tabs saved in the last session" +msgstr "" + +#: ../midori/midori-browser.c:5363 msgid "_Help" msgstr "_Žinynas" -#: ../midori/midori-browser.c:5418 +#: ../midori/midori-browser.c:5365 msgid "_Frequent Questions" msgstr "_Klausimai ir atsakymai" -#: ../midori/midori-browser.c:5421 -msgid "_Report a Problem…" -msgstr "Pranešti apie pro_blemą…" +#: ../midori/midori-browser.c:5366 +msgid "Show the Frequently Asked Questions" +msgstr "Rodyti dažnai užduodamus klausimus" + +#: ../midori/midori-browser.c:5368 +msgid "_Report a Problem..." +msgstr "Pranešti apie pro_blemą..." + +#: ../midori/midori-browser.c:5369 +msgid "Open Midori's bug tracker" +msgstr "" -#: ../midori/midori-browser.c:5433 +#: ../midori/midori-browser.c:5372 +msgid "Show information about the program" +msgstr "" + +#: ../midori/midori-browser.c:5380 msgid "_Menubar" -msgstr "_Meniu juosta" +msgstr "_Menių juosta" + +#: ../midori/midori-browser.c:5381 +msgid "Show menubar" +msgstr "Rodyti menių juostą" -#: ../midori/midori-browser.c:5437 +#: ../midori/midori-browser.c:5384 msgid "_Navigationbar" msgstr "_Naršymo juosta" -#: ../midori/midori-browser.c:5441 +#: ../midori/midori-browser.c:5385 +msgid "Show navigationbar" +msgstr "Rodyti naršymo juosta" + +#: ../midori/midori-browser.c:5388 msgid "Side_panel" msgstr "Š_oninis skydelis" -#: ../midori/midori-browser.c:5442 -msgid "Sidepanel" -msgstr "Šoninis skydelis" +#: ../midori/midori-browser.c:5389 +msgid "Show sidepanel" +msgstr "Rodyti šoninį skydelį" -#: ../midori/midori-browser.c:5445 +#: ../midori/midori-browser.c:5392 msgid "_Bookmarkbar" msgstr "_Adresų juosta" -#: ../midori/midori-browser.c:5449 +#: ../midori/midori-browser.c:5393 +msgid "Show bookmarkbar" +msgstr "Rodyti adresų juostą" + +#: ../midori/midori-browser.c:5396 msgid "_Statusbar" msgstr "_Būsenos juosta" -#: ../midori/midori-browser.c:5458 ../midori/midori-websettings.c:311 +#: ../midori/midori-browser.c:5397 +msgid "Show statusbar" +msgstr "Rodyti būsenos juostą" + +#: ../midori/midori-browser.c:5405 +#: ../midori/midori-websettings.c:293 msgid "_Automatic" -msgstr "_Automatiškai" +msgstr "" -#: ../midori/midori-browser.c:5461 ../midori/midori-websettings.c:236 +#: ../midori/midori-browser.c:5408 +#: ../midori/midori-websettings.c:218 msgid "Chinese (BIG5)" msgstr "Kinų (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5465 +#: ../midori/midori-browser.c:5412 msgid "Japanese (SHIFT__JIS)" msgstr "Japonų (SHIFT__JIS)" -#: ../midori/midori-browser.c:5468 ../midori/midori-websettings.c:238 +#: ../midori/midori-browser.c:5415 +#: ../midori/midori-websettings.c:220 msgid "Korean (EUC-KR)" msgstr "Korėjiečių (EUC-KR)" -#: ../midori/midori-browser.c:5471 ../midori/midori-websettings.c:239 +#: ../midori/midori-browser.c:5418 +#: ../midori/midori-websettings.c:221 msgid "Russian (KOI8-R)" msgstr "Rusų (KOI8-R)" -#: ../midori/midori-browser.c:5474 ../midori/midori-websettings.c:240 +#: ../midori/midori-browser.c:5421 +#: ../midori/midori-websettings.c:222 msgid "Unicode (UTF-8)" msgstr "Unikodas (UTF-8)" -#: ../midori/midori-browser.c:5477 ../midori/midori-websettings.c:241 +#: ../midori/midori-browser.c:5424 +#: ../midori/midori-websettings.c:223 msgid "Western (ISO-8859-1)" msgstr "Vakarų (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 "Pasirinktas…" +#: ../midori/midori-browser.c:5427 +#: ../midori/midori-websettings.c:224 +#: ../midori/midori-websettings.c:299 +#: ../katze/katze-utils.c:735 +msgid "Custom..." +msgstr "Savas ..." -#: ../midori/midori-browser.c:5985 +#: ../midori/midori-browser.c:5957 msgid "_Separator" -msgstr "_Skirtukas" +msgstr "" -#: ../midori/midori-browser.c:5992 -msgid "_Location…" -msgstr "_Vieta…" +#: ../midori/midori-browser.c:5964 +msgid "_Location..." +msgstr "Ad_resas ..." -#: ../midori/midori-browser.c:5994 +#: ../midori/midori-browser.c:5966 msgid "Open a particular location" msgstr "Atverti tam tikrą adresą" -#: ../midori/midori-browser.c:6016 -msgid "_Web Search…" -msgstr "_Paieška žiniatinklyje …" +#: ../midori/midori-browser.c:5988 +msgid "_Web Search..." +msgstr "_Paieška žiniatinklyje ..." -#: ../midori/midori-browser.c:6018 +#: ../midori/midori-browser.c:5990 msgid "Run a web search" msgstr "Vykdyti paiešką žiniatinklyje" -#: ../midori/midori-browser.c:6045 +#: ../midori/midori-browser.c:6011 msgid "Reopen a previously closed tab or window" msgstr "Atverti ankščiau užvertas korteles ar langus" -#: ../midori/midori-browser.c:6062 +#: ../midori/midori-browser.c:6024 +#: ../midori/sokoke.c:1517 +msgid "_Bookmarks" +msgstr "_Adresynas" + +#: ../midori/midori-browser.c:6026 msgid "Show the saved bookmarks" -msgstr "Rodyti išsaugotas žymeles" +msgstr "" -#: ../midori/midori-browser.c:6079 +#: ../midori/midori-browser.c:6040 msgid "_Tools" -msgstr "Įra_nkiai" +msgstr "_Priemonės" -#: ../midori/midori-browser.c:6095 +#: ../midori/midori-browser.c:6055 msgid "_Window" -msgstr "_Langas" +msgstr "_Kortelės" -#: ../midori/midori-browser.c:6097 +#: ../midori/midori-browser.c:6057 msgid "Show a list of all open tabs" -msgstr "Rodyti atvertų kortelių sąrašą" +msgstr "" -#: ../midori/midori-browser.c:6111 +#: ../midori/midori-browser.c:6071 msgid "_Menu" msgstr "_Meniu" -#: ../midori/midori-browser.c:6113 +#: ../midori/midori-browser.c:6073 msgid "Menu" msgstr "Meniu" -#: ../midori/midori-browser.c:6927 +#: ../midori/midori-browser.c:6640 #, c-format msgid "Unexpected setting '%s'" -msgstr "Netikėtas nustatymas „%s“" +msgstr "" -#: ../midori/midori-extension.c:329 +#: ../midori/midori-extension.c:305 #, c-format msgid "The configuration of the extension '%s' couldn't be loaded: %s\n" -msgstr "Konfigūracijos su plėtiniu „%s“ negalima įkelti: %s\n" +msgstr "Konfigūracijos su išplėtimu '%s' negalima įkelti: %s\n" -#: ../midori/midori-extension.c:747 ../midori/midori-extension.c:844 -#: ../midori/midori-extension.c:941 ../midori/midori-extension.c:1053 -#: ../extensions/addons.c:1695 +#: ../midori/midori-extension.c:703 +#: ../midori/midori-extension.c:800 +#: ../midori/midori-extension.c:897 +#: ../midori/midori-extension.c:1009 +#: ../extensions/addons.c:1649 #, c-format 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:394 -#, c-format -msgid "Search with %s" -msgstr "Ieškoti su %s" - -#: ../midori/midori-locationaction.c:412 -msgid "Search with…" -msgstr "Ieškoti su…" +msgstr "" -#: ../midori/midori-locationaction.c:537 +#: ../midori/midori-locationaction.c:402 #, c-format msgid "Failed to select from history\n" -msgstr "Nepavyko pažymėti žurnalo įrašo\n" +msgstr "Nepavyko pažymėti žurnalo įrašą\n" -#: ../midori/midori-locationaction.c:624 +#: ../midori/midori-locationaction.c:486 #, c-format msgid "Search for %s" -msgstr "Ieškoti %s" +msgstr "" + +#: ../midori/midori-locationaction.c:512 +#, c-format +msgid "Search with %s" +msgstr "" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1398 +#: ../midori/midori-locationaction.c:1259 msgid "Paste and p_roceed" -msgstr "Įdėti ir _tęsti" +msgstr "" -#: ../midori/midori-locationaction.c:1739 +#: ../midori/midori-locationaction.c:1654 msgid "Not verified" -msgstr "Nepatvirtinta" +msgstr "" -#: ../midori/midori-locationaction.c:1759 +#: ../midori/midori-locationaction.c:1669 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:397 ../midori/midori-panel.c:399 -#: ../midori/midori-panel.c:562 ../midori/midori-panel.c:565 +#: ../midori/midori-panel.c:399 +#: ../midori/midori-panel.c:401 +#: ../midori/midori-panel.c:564 +#: ../midori/midori-panel.c:567 msgid "Align sidepanel to the right" msgstr "Lygiuoti šoninį skydelį dešinėn" -#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410 +#: ../midori/midori-panel.c:411 +#: ../midori/midori-panel.c:412 msgid "Close panel" msgstr "Užverti skydelį" -#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566 +#: ../midori/midori-panel.c:565 +#: ../midori/midori-panel.c:568 msgid "Align sidepanel to the left" msgstr "Lygiuoti šoninį skydelį kairėn" -#: ../midori/midori-websettings.c:218 +#: ../midori/midori-websettings.c:200 msgid "Show Speed Dial" msgstr "Rodyti Sparčiąją rinktį" -#: ../midori/midori-websettings.c:219 +#: ../midori/midori-websettings.c:201 msgid "Show Homepage" msgstr "Rodyti pradžios tinklapį" -#: ../midori/midori-websettings.c:237 +#: ../midori/midori-websettings.c:219 msgid "Japanese (SHIFT_JIS)" -msgstr "Japonų (Shift_JIS)" +msgstr "" -#: ../midori/midori-websettings.c:257 +#: ../midori/midori-websettings.c:239 msgid "New tab" -msgstr "Nauja kortelė" +msgstr "naujoje kortelėje" -#: ../midori/midori-websettings.c:258 +#: ../midori/midori-websettings.c:240 msgid "New window" -msgstr "Naujas langas" +msgstr "naujame lange" -#: ../midori/midori-websettings.c:259 +#: ../midori/midori-websettings.c:241 msgid "Current tab" -msgstr "Dabartinė kortelė" +msgstr "veikiamoj kortelėje" -#: ../midori/midori-websettings.c:274 +#: ../midori/midori-websettings.c:256 msgid "Default" -msgstr "Numatyta" +msgstr "" -#: ../midori/midori-websettings.c:275 +#: ../midori/midori-websettings.c:257 msgid "Icons" -msgstr "Piktogramos" +msgstr "" -#: ../midori/midori-websettings.c:276 +#: ../midori/midori-websettings.c:258 msgid "Small icons" -msgstr "Mažos piktogramos" +msgstr "" -#: ../midori/midori-websettings.c:277 +#: ../midori/midori-websettings.c:259 msgid "Text" -msgstr "Tekstas" +msgstr "" -#: ../midori/midori-websettings.c:278 +#: ../midori/midori-websettings.c:260 msgid "Icons and text" -msgstr "Piktogramos ir tekstas" +msgstr "" -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-websettings.c:261 msgid "Text beside icons" -msgstr "Tekstas šalia piktogramų" +msgstr "" -#: ../midori/midori-websettings.c:294 +#: ../midori/midori-websettings.c:276 msgid "Automatic (GNOME or environment)" msgstr "Automatinis (GNOME ar aplinkos)" -#: ../midori/midori-websettings.c:295 +#: ../midori/midori-websettings.c:277 msgid "HTTP proxy server" msgstr "HTTP įgaliotasis serveris" -#: ../midori/midori-websettings.c:296 +#: ../midori/midori-websettings.c:278 msgid "No proxy server" msgstr "Nėra įgaliotojo serverio" -#: ../midori/midori-websettings.c:313 +#: ../midori/midori-websettings.c:295 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:314 +#: ../midori/midori-websettings.c:296 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:315 +#: ../midori/midori-websettings.c:297 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:316 +#: ../midori/midori-websettings.c:298 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:400 +#: ../midori/midori-websettings.c:351 msgid "Remember last window size" -msgstr "Įsiminti paskutini lango dydį" +msgstr "" -#: ../midori/midori-websettings.c:401 +#: ../midori/midori-websettings.c:352 msgid "Whether to save the last window size" -msgstr "Ar išsaugoti paskutinio lango dydį" +msgstr "" -#: ../midori/midori-websettings.c:409 +#: ../midori/midori-websettings.c:360 msgid "Last window width" -msgstr "Paskutinio lango plotis" +msgstr "" -#: ../midori/midori-websettings.c:410 +#: ../midori/midori-websettings.c:361 msgid "The last saved window width" -msgstr "Paskutinio išsaugoto lango plotis" +msgstr "" -#: ../midori/midori-websettings.c:418 +#: ../midori/midori-websettings.c:369 msgid "Last window height" -msgstr "Paskutinio lango aukštis" +msgstr "" -#: ../midori/midori-websettings.c:419 +#: ../midori/midori-websettings.c:370 msgid "The last saved window height" -msgstr "Paskutinio išsaugoto lango aukštis" +msgstr "" -#: ../midori/midori-websettings.c:444 +#: ../midori/midori-websettings.c:395 msgid "Last panel position" msgstr "Ankstesnė skydelio padėtis" -#: ../midori/midori-websettings.c:445 +#: ../midori/midori-websettings.c:396 msgid "The last saved panel position" msgstr "Paskutinė išsaugota skydelio padėtis" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:454 +#: ../midori/midori-websettings.c:405 msgid "Last panel page" -msgstr "Paskutinis skydelio puslapis" +msgstr "" -#: ../midori/midori-websettings.c:455 +#: ../midori/midori-websettings.c:406 msgid "The last saved panel page" -msgstr "Paskutinis išsaugotas skydelio puslapis" +msgstr "" -#: ../midori/midori-websettings.c:463 +#: ../midori/midori-websettings.c:414 msgid "Last Web search" -msgstr "Paskutinė interneto paieška" +msgstr "" -#: ../midori/midori-websettings.c:464 +#: ../midori/midori-websettings.c:415 msgid "The last saved Web search" -msgstr "Paskutinė išsaugota interneto paieška" +msgstr "" -#: ../midori/midori-websettings.c:473 +#: ../midori/midori-websettings.c:424 msgid "Show Menubar" -msgstr "Rodyti meniu juostą" +msgstr "" -#: ../midori/midori-websettings.c:474 +#: ../midori/midori-websettings.c:425 msgid "Whether to show the menubar" -msgstr "Ar rodyti meniu juostą" +msgstr "" -#: ../midori/midori-websettings.c:482 +#: ../midori/midori-websettings.c:433 msgid "Show Navigationbar" -msgstr "Rodyti naršymo juostą" +msgstr "" -#: ../midori/midori-websettings.c:483 +#: ../midori/midori-websettings.c:434 msgid "Whether to show the navigationbar" -msgstr "Ar rodyti naršymo juostą" +msgstr "" -#: ../midori/midori-websettings.c:491 +#: ../midori/midori-websettings.c:442 msgid "Show Bookmarkbar" -msgstr "Rodyti žymelių juostą" +msgstr "" -#: ../midori/midori-websettings.c:492 +#: ../midori/midori-websettings.c:443 msgid "Whether to show the bookmarkbar" -msgstr "Ar rodyti žymelių juostą" +msgstr "" -#: ../midori/midori-websettings.c:500 +#: ../midori/midori-websettings.c:451 msgid "Show Panel" msgstr "Rodyti skydelį" -#: ../midori/midori-websettings.c:501 +#: ../midori/midori-websettings.c:452 msgid "Whether to show the panel" msgstr "Ar rodyti skydelį" -#: ../midori/midori-websettings.c:509 +#: ../midori/midori-websettings.c:460 msgid "Show Statusbar" msgstr "Rodyti būsenos juostą" -#: ../midori/midori-websettings.c:510 +#: ../midori/midori-websettings.c:461 msgid "Whether to show the statusbar" msgstr "Ar rodyti būsenos juostą" -#: ../midori/midori-websettings.c:519 +#: ../midori/midori-websettings.c:470 msgid "Toolbar Style:" -msgstr "Įrankių juostos stilius:" +msgstr "Įrankių juostoje stilius:" -#: ../midori/midori-websettings.c:520 +#: ../midori/midori-websettings.c:471 msgid "The style of the toolbar" msgstr "Įrankių juostos stilius" -#: ../midori/midori-websettings.c:529 +#: ../midori/midori-websettings.c:480 msgid "Toolbar Items" -msgstr "Įrankinės elementai" +msgstr "" -#: ../midori/midori-websettings.c:530 +#: ../midori/midori-websettings.c:481 +#, fuzzy msgid "The items to show on the toolbar" -msgstr "Elementai rodomi įrankių juostoje" +msgstr "Elementus rodyti įrankių juostą" -#: ../midori/midori-websettings.c:538 +#: ../midori/midori-websettings.c:489 msgid "Compact Sidepanel" msgstr "Suspaustas šoninis skydelis" -#: ../midori/midori-websettings.c:539 +#: ../midori/midori-websettings.c:490 msgid "Whether to make the sidepanel compact" msgstr "Ar suspausti šoninį skydelį" -#: ../midori/midori-websettings.c:554 +#: ../midori/midori-websettings.c:505 msgid "Align sidepanel on the right" msgstr "Lygiuoti šoninį skydelį dešinėn" -#: ../midori/midori-websettings.c:555 +#: ../midori/midori-websettings.c:506 msgid "Whether to align the sidepanel on the right" -msgstr "Ar lygiuoti šoninį skydelį dešinėn" +msgstr "" -#: ../midori/midori-websettings.c:570 +#: ../midori/midori-websettings.c:521 msgid "Open panels in separate windows" -msgstr "Atverti skydelius atskiruose languose" +msgstr "" -#: ../midori/midori-websettings.c:571 +#: ../midori/midori-websettings.c:522 msgid "Whether to always open panels in separate windows" -msgstr "Ar visada atverti skydelius atskiruose languose" +msgstr "" -#: ../midori/midori-websettings.c:580 +#: ../midori/midori-websettings.c:531 msgid "When Midori starts:" -msgstr "Paleidžiant „Midori”:" +msgstr "Paleidžiant „Midori”" -#: ../midori/midori-websettings.c:581 +#: ../midori/midori-websettings.c:532 msgid "What to do when Midori starts" msgstr "Ką daryti paleidžiant „Midori”" -#: ../midori/midori-websettings.c:590 +#: ../midori/midori-websettings.c:541 msgid "Homepage:" msgstr "Pradžios tinklapis:" -#: ../midori/midori-websettings.c:591 +#: ../midori/midori-websettings.c:542 msgid "The homepage" msgstr "Pradžios tinklapis" -#: ../midori/midori-websettings.c:606 +#: ../midori/midori-websettings.c:557 msgid "Show crash dialog" msgstr "Rodyti strigties dialogo langą" -#: ../midori/midori-websettings.c:607 +#: ../midori/midori-websettings.c:558 msgid "Show a dialog after Midori crashed" msgstr "Rodyti dialogo langą po „Midori” strigties" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:566 msgid "Save downloaded files to:" msgstr "Išsaugoti atsiųstus failus į:" -#: ../midori/midori-websettings.c:616 +#: ../midori/midori-websettings.c:567 msgid "The folder downloaded files are saved to" msgstr "Aplankas atsiųstų failų išsaugojimui" -#: ../midori/midori-websettings.c:624 +#: ../midori/midori-websettings.c:575 msgid "Text Editor" -msgstr "Teksto redaktorius" +msgstr "Rašyklė" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:576 msgid "An external text editor" msgstr "Išorinė rašyklė" -#: ../midori/midori-websettings.c:640 +#: ../midori/midori-websettings.c:591 msgid "News Aggregator" -msgstr "Naujienų skaityklė" +msgstr "" -#: ../midori/midori-websettings.c:641 +#: ../midori/midori-websettings.c:592 msgid "An external news aggregator" -msgstr "Išorinė naujienų skaityklė" +msgstr "" -#: ../midori/midori-websettings.c:649 +#: ../midori/midori-websettings.c:600 msgid "Location entry Search" -msgstr "Vietos įvesties paieška" +msgstr "" -#: ../midori/midori-websettings.c:650 +#: ../midori/midori-websettings.c:601 msgid "The search to perform inside the location entry" -msgstr "Paieška kuri bus vykdoma vietos įvestyje" +msgstr "" -#: ../midori/midori-websettings.c:658 +#: ../midori/midori-websettings.c:609 msgid "Preferred Encoding" msgstr "Pageidautina koduotė" -#: ../midori/midori-websettings.c:659 +#: ../midori/midori-websettings.c:610 msgid "The preferred character encoding" -msgstr "Pageidautina simbolių koduotė" +msgstr "Pageidautina ženklų koduotė" -#: ../midori/midori-websettings.c:669 +#: ../midori/midori-websettings.c:620 msgid "Always Show Tabbar" msgstr "Visada rodyti ąseles" -#: ../midori/midori-websettings.c:670 +#: ../midori/midori-websettings.c:621 msgid "Always show the tabbar" msgstr "Visada rodyti kortelių ąseles" -#: ../midori/midori-websettings.c:683 +#: ../midori/midori-websettings.c:629 msgid "Close Buttons on Tabs" msgstr "Uždarymo mygtukai ant kortelių " -#: ../midori/midori-websettings.c:684 +#: ../midori/midori-websettings.c:630 msgid "Whether tabs have close buttons" msgstr "Ar kortelės turi uždarymo mygtukus" -#: ../midori/midori-websettings.c:709 +#: ../midori/midori-websettings.c:655 msgid "Open new pages in:" msgstr "Atverti naujus tinklapius:" -#: ../midori/midori-websettings.c:710 +#: ../midori/midori-websettings.c:656 msgid "Where to open new pages" -msgstr "Kur atverti naujus tinklapius" +msgstr "Kame atverti naujus tinklapius" -#: ../midori/midori-websettings.c:719 +#: ../midori/midori-websettings.c:665 msgid "Middle click opens Selection" -msgstr "Vidurinis klavišas atveria pasirinkimą" +msgstr "Paspaudus per vidurį atverti parinkimą" -#: ../midori/midori-websettings.c:720 +#: ../midori/midori-websettings.c:666 msgid "Load an address from the selection via middle click" msgstr "Įkelti pasirinktą adresą paspaudus per vidurį" -#: ../midori/midori-websettings.c:728 +#: ../midori/midori-websettings.c:674 msgid "Open tabs in the background" msgstr "Atverti korteles antrame plane" -#: ../midori/midori-websettings.c:729 +#: ../midori/midori-websettings.c:675 msgid "Whether to open new tabs in the background" msgstr "Ar atverti naują kortelę antrajam plane" -#: ../midori/midori-websettings.c:737 +#: ../midori/midori-websettings.c:683 msgid "Open Tabs next to Current" -msgstr "Atverti kortelę šalia dabartinės" +msgstr "Atverti kortelę šalia veikiamos" -#: ../midori/midori-websettings.c:738 +#: ../midori/midori-websettings.c:684 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Atverti naujas korteles toliau už veikiamos kortelės, ar už paskutinės" -#: ../midori/midori-websettings.c:746 +#: ../midori/midori-websettings.c:692 msgid "Open popups in tabs" msgstr "Atverti iškylančius langus kaip korteles" -#: ../midori/midori-websettings.c:747 +#: ../midori/midori-websettings.c:693 msgid "Whether to open popup windows in tabs" -msgstr "Ar atverti iškylančius langus kaip korteles" +msgstr "" -#: ../midori/midori-websettings.c:757 ../extensions/statusbar-features.c:134 +#: ../midori/midori-websettings.c:703 +#: ../extensions/statusbar-features.c:132 msgid "Load images automatically" -msgstr "Automatiškai įkelti paveikslus" +msgstr "Įkelti paveikslus" -#: ../midori/midori-websettings.c:758 +#: ../midori/midori-websettings.c:704 msgid "Load and display images automatically" msgstr "Įkelti ir atvaizduoti paveikslus automatiškai" -#: ../midori/midori-websettings.c:765 ../extensions/statusbar-features.c:143 +#: ../midori/midori-websettings.c:711 +#: ../extensions/statusbar-features.c:141 msgid "Enable scripts" msgstr "Leisti scenarijus" -#: ../midori/midori-websettings.c:766 +#: ../midori/midori-websettings.c:712 msgid "Enable embedded scripting languages" -msgstr "Leisti įstatytas scenarijų kalbas" +msgstr "Leisti įstatytas\tscenarijų kalbas" -#: ../midori/midori-websettings.c:773 ../extensions/statusbar-features.c:154 +#: ../midori/midori-websettings.c:719 +#: ../extensions/statusbar-features.c:150 msgid "Enable Netscape plugins" -msgstr "Naudoti „Netscape” įskiepius" +msgstr "Naudoti „Netscape” papildinius" -#: ../midori/midori-websettings.c:774 +#: ../midori/midori-websettings.c:720 +#, fuzzy msgid "Enable embedded Netscape plugin objects" -msgstr "Naudoti įmontuotus „Netscape” įskiepius" +msgstr "Leisti įstatytus „Netscape” papildinius" -#: ../midori/midori-websettings.c:789 +#: ../midori/midori-websettings.c:740 msgid "Enable Spell Checking" msgstr "Leisti tikrinti rašybą" -#: ../midori/midori-websettings.c:790 +#: ../midori/midori-websettings.c:741 msgid "Enable spell checking while typing" msgstr "Leisti tikrinti rašybą berašant" -#: ../midori/midori-websettings.c:796 +#: ../midori/midori-websettings.c:747 msgid "Enable HTML5 database support" -msgstr "Įjungti HTML5 duomenų bazės palaikymą" +msgstr "" -#: ../midori/midori-websettings.c:797 +#: ../midori/midori-websettings.c:748 msgid "Whether to enable HTML5 database support" -msgstr "Ar įjungti HTML5 duomenų bazės palaikymą" +msgstr "" -#: ../midori/midori-websettings.c:803 +#: ../midori/midori-websettings.c:754 msgid "Enable HTML5 local storage support" -msgstr "Įjungti HTML 5 vietinio kaupimo funkcijos palaikymą" +msgstr "" -#: ../midori/midori-websettings.c:804 +#: ../midori/midori-websettings.c:755 msgid "Whether to enable HTML5 local storage support" -msgstr "Ar įjungti HTML5 vietinės saugyklos palaikymą" +msgstr "" -#: ../midori/midori-websettings.c:810 +#: ../midori/midori-websettings.c:761 msgid "Enable offline web application cache" -msgstr "Įjungti žiniatinklio programų podėlį darbui neprisijungus" +msgstr "" -#: ../midori/midori-websettings.c:811 +#: ../midori/midori-websettings.c:762 msgid "Whether to enable offline web application cache" -msgstr "Ar įjungti žiniatinklio programų podėlį darbui neprisijungus" +msgstr "" -#: ../midori/midori-websettings.c:827 +#: ../midori/midori-websettings.c:778 msgid "Flash window on background tabs" -msgstr "Blykstelti langą atvėrus kortelę fone" +msgstr "" -#: ../midori/midori-websettings.c:828 +#: ../midori/midori-websettings.c:779 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ą" +msgstr "" -#: ../midori/midori-websettings.c:863 +#: ../midori/midori-websettings.c:794 msgid "Zoom Text and Images" msgstr "Keisti teksto ir paveikslų mastelį" -#: ../midori/midori-websettings.c:864 +#: ../midori/midori-websettings.c:795 msgid "Whether to zoom text and images" msgstr "Ar keisti teksto ir paveikslų mastelį" -#: ../midori/midori-websettings.c:879 +#: ../midori/midori-websettings.c:810 msgid "Find inline while typing" -msgstr "Ieškoti rašant" +msgstr "" -#: ../midori/midori-websettings.c:880 +#: ../midori/midori-websettings.c:811 msgid "Whether to automatically find inline while typing" -msgstr "Ar automatiškai ieškoti rašant" +msgstr "" -#: ../midori/midori-websettings.c:895 +#: ../midori/midori-websettings.c:826 msgid "Kinetic scrolling" -msgstr "Kinetinis slinkimas" +msgstr "" -#: ../midori/midori-websettings.c:896 +#: ../midori/midori-websettings.c:827 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:904 +#: ../midori/midori-websettings.c:835 msgid "Delete old Cookies after:" msgstr "Šalinti slapukus senesnius nei:" -#: ../midori/midori-websettings.c:905 +#: ../midori/midori-websettings.c:836 msgid "The maximum number of days to save cookies for" msgstr "Didžiausias dienų skaičius slapukams saugoti " -#: ../midori/midori-websettings.c:921 -msgid "Only accept Cookies from sites you visit" -msgstr "Slapukus priimti tik iš aplankytų puslapių" - -#: ../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:936 +#: ../midori/midori-websettings.c:845 msgid "Delete pages from history after:" -msgstr "Iš žurnalo šalinti tinklapius senesnius nei:" +msgstr "Šalinti iš žurnalo tinklapius senesnius nei:" -#: ../midori/midori-websettings.c:937 +#: ../midori/midori-websettings.c:846 msgid "The maximum number of days to save the history for" -msgstr "Didžiausias dienų skaičius tinklapiams žurnale saugoti" +msgstr "Didžiausias dienų skaičius tinklapiams žurnale saugoti " -#: ../midori/midori-websettings.c:952 +#: ../midori/midori-websettings.c:861 msgid "Proxy server" msgstr "Įgaliotasis serveris" -#: ../midori/midori-websettings.c:953 +#: ../midori/midori-websettings.c:862 msgid "The type of proxy server to use" -msgstr "Naudojamo įgaliotojo serverio tipas" +msgstr "Vartojamo įgaliotojo serverio tipas" -#: ../midori/midori-websettings.c:962 +#: ../midori/midori-websettings.c:871 msgid "HTTP Proxy Server" -msgstr "HTTP tarpinis serveris" +msgstr "" -#: ../midori/midori-websettings.c:963 +#: ../midori/midori-websettings.c:872 msgid "The proxy server used for HTTP connections" -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" +msgstr "" -#: ../midori/midori-websettings.c:997 +#: ../midori/midori-websettings.c:889 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:1014 +#: ../midori/midori-websettings.c:906 msgid "Identify as" msgstr "Prisistatyti kaip" -#: ../midori/midori-websettings.c:1015 +#: ../midori/midori-websettings.c:907 msgid "What to identify as to web pages" -msgstr "Kaip prisistatyti tinklalapiams" +msgstr "" -#: ../midori/midori-websettings.c:1031 +#: ../midori/midori-websettings.c:923 msgid "Identification string" -msgstr "Atpažinimo eilutė" +msgstr "" -#: ../midori/midori-websettings.c:1032 +#: ../midori/midori-websettings.c:924 msgid "The application identification string" -msgstr "Programos atpažinimo eilutė" +msgstr "" -#: ../midori/midori-websettings.c:1048 +#: ../midori/midori-websettings.c:940 msgid "Preferred languages" -msgstr "Pageidaujamos kalbos" +msgstr "Pageidautinos kalbos" -#: ../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:941 +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\" or \"en-us;q=1.0, fr-fr;q=0.667\"" -#: ../midori/midori-websettings.c:1064 +#: ../midori/midori-websettings.c:956 msgid "Clear private data" msgstr "Šalinti asmeninius duomenis" -#: ../midori/midori-websettings.c:1065 +#: ../midori/midori-websettings.c:957 msgid "The private data selected for deletion" msgstr "Asmeniniai duomenys pažymėti šalinimui" -#: ../midori/midori-websettings.c:1080 +#: ../midori/midori-websettings.c:972 msgid "Clear data" -msgstr "Išvalyti duomenis" +msgstr "" -#: ../midori/midori-websettings.c:1081 +#: ../midori/midori-websettings.c:973 msgid "The data selected for deletion" -msgstr "Duomenys pasirinkti šalinimui" +msgstr "" #. i18n: Reworded: Shorten details propagated when going to another page -#: ../midori/midori-websettings.c:1130 +#: ../midori/midori-websettings.c:1006 msgid "Strip referrer details sent to websites" -msgstr "Apkarpyti „referrer“ detales siunčiamas tinklapiams" +msgstr "" #. i18n: Referer here is not a typo but a technical term -#: ../midori/midori-websettings.c:1132 +#: ../midori/midori-websettings.c:1008 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" +msgstr "" -#: ../midori/midori-view.c:1360 +#: ../midori/midori-view.c:1363 #, c-format msgid "%s wants to save an HTML5 database." -msgstr "%s nori išsaugoti HTML5 duomenų bazę." +msgstr "" -#: ../midori/midori-view.c:1364 ../midori/midori-view.c:1396 +#: ../midori/midori-view.c:1367 +#: ../midori/midori-view.c:1396 msgid "_Deny" -msgstr "_Neleisti" +msgstr "" -#: ../midori/midori-view.c:1364 ../midori/midori-view.c:1396 +#: ../midori/midori-view.c:1367 +#: ../midori/midori-view.c:1396 msgid "_Allow" -msgstr "_Leisti" +msgstr "" #: ../midori/midori-view.c:1392 #, c-format msgid "%s wants to know your location." -msgstr "%s nori žinoti jūsų vietą." +msgstr "" -#: ../midori/midori-view.c:1485 +#: ../midori/midori-view.c:1481 #, c-format msgid "Error - %s" -msgstr "Klaida - %s" +msgstr "" -#: ../midori/midori-view.c:1486 +#: ../midori/midori-view.c:1482 #, c-format msgid "The page '%s' couldn't be loaded." -msgstr "Puslapio „%s“ įkelti nepavyko." +msgstr "" -#: ../midori/midori-view.c:1488 +#: ../midori/midori-view.c:1484 msgid "Try again" -msgstr "Bandyti dar kartą" +msgstr "" -#: ../midori/midori-view.c:1685 ../midori/midori-view.c:2598 +#: ../midori/midori-view.c:1646 +#: ../midori/midori-view.c:2494 #, c-format msgid "Send a message to %s" -msgstr "Siųsti laišką į %s" +msgstr "" -#: ../midori/midori-view.c:2428 ../midori/midori-view.c:2747 +#: ../midori/midori-view.c:2333 +#: ../midori/midori-view.c:2647 msgid "Inspect _Element" -msgstr "Apžiūrėti _elementą" +msgstr "" -#: ../midori/midori-view.c:2480 +#: ../midori/midori-view.c:2383 msgid "Open Link in New _Tab" -msgstr "Atverti nuorodą naujoje _kortelėje" +msgstr "" -#: ../midori/midori-view.c:2484 +#: ../midori/midori-view.c:2387 msgid "Open Link in _Foreground Tab" -msgstr "Atverti nuorodą priekinėje _kortelėje" +msgstr "" -#: ../midori/midori-view.c:2485 +#: ../midori/midori-view.c:2388 msgid "Open Link in _Background Tab" -msgstr "Atverti nuorodą fono _kortelėje" +msgstr "" -#: ../midori/midori-view.c:2488 +#: ../midori/midori-view.c:2391 msgid "Open Link in New _Window" -msgstr "Atverti nuorodą _naujame lange" +msgstr "" -#: ../midori/midori-view.c:2491 +#: ../midori/midori-view.c:2394 msgid "Open Link as Web A_pplication" -msgstr "Atverti nuorodą kaip _interneto programą" +msgstr "" -#: ../midori/midori-view.c:2496 +#: ../midori/midori-view.c:2397 msgid "Copy Link de_stination" -msgstr "Kopijuoti nuorodos pa_skirtį" +msgstr "" -#: ../midori/midori-view.c:2512 +#: ../midori/midori-view.c:2409 msgid "Open _Image in New Tab" -msgstr "Paveikslėlį atverti naujoje k_ortelėje" +msgstr "" -#: ../midori/midori-view.c:2515 +#: ../midori/midori-view.c:2412 msgid "Copy Image _Address" -msgstr "_Kopijuoti paveikslėlio adresą" +msgstr "" -#: ../midori/midori-view.c:2518 +#: ../midori/midori-view.c:2415 msgid "Save I_mage" -msgstr " Išsaugoti p_aveikslėlį" - -#: ../midori/midori-view.c:2521 -msgid "Open in Image _Viewer" -msgstr "Atverti _paveikslėlių žiūryklėje" +msgstr "" -#: ../midori/midori-view.c:2528 +#: ../midori/midori-view.c:2422 msgid "Copy Video _Address" -msgstr "Kopijuoti video _adresą" +msgstr "" -#: ../midori/midori-view.c:2531 +#: ../midori/midori-view.c:2425 msgid "Save _Video" -msgstr "Išsaugoti _video" +msgstr "" -#: ../midori/midori-view.c:2531 +#: ../midori/midori-view.c:2425 msgid "Download _Video" -msgstr "Parsiųsti _video" +msgstr "" -#: ../midori/midori-view.c:2557 +#: ../midori/midori-view.c:2451 msgid "Search _with" -msgstr "Ieškoti _su" +msgstr "" -#: ../midori/midori-view.c:2589 +#: ../midori/midori-view.c:2485 msgid "_Search the Web" -msgstr "_Ieškoti žiniatinklyje" +msgstr "" -#: ../midori/midori-view.c:2606 +#: ../midori/midori-view.c:2502 msgid "Open Address in New _Tab" -msgstr "Atverti adresą naujoje _kortelėje" +msgstr "" -#: ../midori/midori-view.c:2909 +#: ../midori/midori-view.c:2786 msgid "Open or download file" -msgstr "Atverti arba parsiųsti failą" +msgstr "" -#: ../midori/midori-view.c:2929 +#: ../midori/midori-view.c:2805 #, c-format msgid "File Type: '%s'" -msgstr "Failo tipas: „%s“" +msgstr "" -#: ../midori/midori-view.c:2931 +#: ../midori/midori-view.c:2807 #, c-format msgid "File Type: %s ('%s')" -msgstr "Failo tipas: %s („%s“)" +msgstr "" -#: ../midori/midori-view.c:2935 -#, c-format -msgid "File Name: %s" -msgstr "Failo vardas: „%s“" +#: ../midori/midori-view.c:2818 +msgid "MD5-Checksum:" +msgstr "" + +#: ../midori/midori-view.c:2825 +msgid "SHA1-Checksum:" +msgstr "" -#: ../midori/midori-view.c:2955 +#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" +#: ../midori/midori-view.c:2835 #, c-format msgid "Open %s" -msgstr "Atverti %s" +msgstr "" -#: ../midori/midori-view.c:3576 +#: ../midori/midori-view.c:3416 #, c-format msgid "Inspect page - %s" -msgstr "Apžiūrėti puslapį - %s" +msgstr "" -#: ../midori/midori-view.c:3923 +#: ../midori/midori-view.c:3708 msgid "Speed Dial" msgstr "Sparčioji rinktis" -#: ../midori/midori-view.c:3924 ../midori/midori-view.c:4020 +#: ../midori/midori-view.c:3709 +#: ../midori/midori-view.c:3802 msgid "Click to add a shortcut" msgstr "Bakstelkit nuorodai pridėti" -#: ../midori/midori-view.c:3925 +#: ../midori/midori-view.c:3710 msgid "Enter shortcut address" msgstr "Įveskit nuorodos adresą" -#: ../midori/midori-view.c:3926 +#: ../midori/midori-view.c:3711 msgid "Enter shortcut title" msgstr "Įveskit nuorodos pavadinimą" -#: ../midori/midori-view.c:3927 +#: ../midori/midori-view.c:3712 msgid "Are you sure you want to delete this shortcut?" msgstr "Ar tikrai norite pašalinti šią nuorodą?" -#: ../midori/midori-view.c:4089 -#, c-format -msgid "No documentation installed" -msgstr "Dokumentacija neįdiegta" - -#: ../midori/midori-view.c:4165 -msgid "Midori doesn't store any personal data:" -msgstr "Midori nesaugo asmeninių duomenų:" +#: ../midori/midori-view.c:3713 +msgid "Set number of columns and rows" +msgstr "Nustatyti eilučių ir stulpelių skaičių" -#: ../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:3714 +msgid "Enter number of columns and rows:" +msgstr "Įveskit stulpelių ir eilučių skaičių:" -#: ../midori/midori-view.c:4167 -msgid "Extensions are disabled." -msgstr "Plėtiniai išjungti." +#: ../midori/midori-view.c:3715 +msgid "Invalid input for the size of the speed dial" +msgstr "Klaidingai įvesti sparčiosios rinkties išmatavimai" -#: ../midori/midori-view.c:4168 -msgid "HTML5 storage, local database and application caches are disabled." +#: ../midori/midori-view.c:3879 +#, c-format +msgid "No documentation installed" msgstr "" -"HTML5 saugykla, vietinė duomenų bazė ir programos podėlis yra išjungti." -#: ../midori/midori-view.c:4169 -msgid "Midori prevents websites from tracking the user:" -msgstr "Midori neleidžia tinklalapiams sekti naudotojo:" - -#: ../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:4171 -msgid "DNS prefetching is disabled." -msgstr "DNS išankstinis gavimas išjungtas." - -#: ../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: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 +#: ../midori/midori-view.c:3945 msgid "Version numbers in brackets show the version used at runtime." -msgstr "Versijų numeriai skliaustuose rodo naudojamas versijas." +msgstr "" -#: ../midori/midori-view.c:4278 +#: ../midori/midori-view.c:3994 msgid "Page loading delayed" -msgstr "Puslapio įkrovimas uždelstas" +msgstr "" -#: ../midori/midori-view.c:4279 +#: ../midori/midori-view.c:3995 msgid "Loading delayed either due to a recent crash or startup preferences." -msgstr "Įkrovimas uždelstas, dėl neseno lūžio arba dėl paleidimo nustatymų." +msgstr "" -#: ../midori/midori-view.c:4280 +#: ../midori/midori-view.c:3996 msgid "Load Page" -msgstr "Įkrauti puslapį" +msgstr "" -#: ../midori/midori-view.c:4446 +#: ../midori/midori-view.c:4139 msgid "Blank page" -msgstr "Išvalyti puslapį" +msgstr "" -#: ../midori/midori-view.c:4708 +#: ../midori/midori-view.c:4402 msgid "_Duplicate Tab" -msgstr "_Dubliuoti kortelę" +msgstr "" -#: ../midori/midori-view.c:4713 +#: ../midori/midori-view.c:4407 msgid "Show Tab _Label" -msgstr "Rodyti kortelės _antraštę" +msgstr "" -#: ../midori/midori-view.c:4713 +#: ../midori/midori-view.c:4407 msgid "Show Tab _Icon Only" -msgstr "Rodyti tik kortelės _piktogramą" +msgstr "" -#: ../midori/midori-view.c:4719 +#: ../midori/midori-view.c:4413 msgid "Close ot_her Tabs" -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" +msgstr "" -#: ../midori/midori-view.c:5564 +#: ../midori/midori-view.c:5037 msgid "Print background images" -msgstr "Spausdinti fono paveikslėlius" +msgstr "" -#: ../midori/midori-view.c:5565 +#: ../midori/midori-view.c:5038 msgid "Whether background images should be printed" -msgstr "Ar spausdinti fono piešinius" +msgstr "" -#: ../midori/midori-view.c:5597 +#: ../midori/midori-view.c:5070 msgid "Features" -msgstr "Galimybės" +msgstr "" -#: ../midori/midori-preferences.c:297 +#: ../midori/midori-preferences.c:301 msgid "Startup" msgstr "Paleistis" -#: ../midori/midori-preferences.c:310 +#: ../midori/midori-preferences.c:314 +#, fuzzy msgid "Use _current page" -msgstr "Naudoti _dabartinį puslapį" +msgstr "Spausdinti šį puslapį " -#: ../midori/midori-preferences.c:314 +#: ../midori/midori-preferences.c:318 msgid "Use current page as homepage" -msgstr "Naudoti dabartinį tinklapį kaip pradžios" +msgstr "Naudoti veikiamą tinklapį kaip pradžios" #. Page "Appearance" -#: ../midori/midori-preferences.c:323 +#: ../midori/midori-preferences.c:327 msgid "Fonts" msgstr "Šriftai" -#: ../midori/midori-preferences.c:326 +#: ../midori/midori-preferences.c:330 msgid "Proportional Font Family" msgstr "Įvairiaplotė garnitūra" -#: ../midori/midori-preferences.c:330 +#: ../midori/midori-preferences.c:334 msgid "The default font family used to display text" -msgstr "Numatytoji tekstui atvaizduoti naudojama šriftų šeima" +msgstr "" -#: ../midori/midori-preferences.c:333 +#: ../midori/midori-preferences.c:337 msgid "The default font size used to display text" -msgstr "Numatytasis tekstui atvaizduoti naudojamas šriftas" +msgstr "" -#: ../midori/midori-preferences.c:335 +#: ../midori/midori-preferences.c:339 msgid "Fixed-width Font Family" msgstr "Lygiaplotė garnitūra" -#: ../midori/midori-preferences.c:339 +#: ../midori/midori-preferences.c:343 msgid "The font family used to display fixed-width text" -msgstr "Numatytoji tekstui atvaizduoti naudojama lygiapločių šriftų šeima" +msgstr "" -#: ../midori/midori-preferences.c:342 +#: ../midori/midori-preferences.c:346 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:344 +#: ../midori/midori-preferences.c:348 msgid "Minimum Font Size" msgstr "Mažiausias galimas šrifto dydis" -#: ../midori/midori-preferences.c:348 +#: ../midori/midori-preferences.c:352 msgid "The minimum font size used to display text" -msgstr "Mažiausias leistinas tekstui atvaizduoti naudojamo šrifto dydis" +msgstr "" #. Page "Behavior" -#: ../midori/midori-preferences.c:359 +#: ../midori/midori-preferences.c:361 msgid "Behavior" msgstr "Elgsena" -#: ../midori/midori-preferences.c:385 +#: ../midori/midori-preferences.c:387 msgid "Allow scripts to open popups" msgstr "Leisti iškylančius langus" -#: ../midori/midori-preferences.c:386 +#: ../midori/midori-preferences.c:388 msgid "Whether scripts are allowed to open popup windows automatically" msgstr "Ar leisti scenarijams atverti iškylančius langus automatiškai" #. Page "Interface" -#: ../midori/midori-preferences.c:416 +#: ../midori/midori-preferences.c:411 msgid "Browsing" msgstr "Naršymas" #. Page "Network" -#: ../midori/midori-preferences.c:456 +#: ../midori/midori-preferences.c:449 msgid "Network" msgstr "Tinklas" -#: ../midori/midori-preferences.c:463 +#: ../midori/midori-preferences.c:456 msgid "Hostname" msgstr "Pagrindinio kompiuterio vardas" -#: ../midori/midori-preferences.c:487 +#: ../midori/midori-preferences.c:472 msgid "MB" -msgstr "MB" +msgstr "" -#: ../midori/midori-searchaction.c:902 +#: ../midori/midori-searchaction.c:910 msgid "Add search engine" -msgstr "Pridėti paieškos variklį" +msgstr "Pridėti ieškyklę" -#: ../midori/midori-searchaction.c:902 +#: ../midori/midori-searchaction.c:910 msgid "Edit search engine" -msgstr "Taisyti paieškos variklį" +msgstr "Taisyti ieškyklę" -#: ../midori/midori-searchaction.c:931 +#: ../midori/midori-searchaction.c:943 msgid "_Name:" msgstr "_Pavadinimas:" -#: ../midori/midori-searchaction.c:947 +#: ../midori/midori-searchaction.c:959 msgid "_Description:" msgstr "Ap_rašas:" -#: ../midori/midori-searchaction.c:981 +#: ../midori/midori-searchaction.c:992 msgid "_Icon:" msgstr "Pikto_grama:" -#: ../midori/midori-searchaction.c:995 +#: ../midori/midori-searchaction.c:1006 msgid "_Token:" -msgstr "Ž_ymė:" +msgstr "Žen_klas:" -#: ../midori/midori-searchaction.c:1295 +#: ../midori/midori-searchaction.c:1306 msgid "Manage Search Engines" msgstr "Tvarkyti ieškykles" -#: ../midori/midori-searchaction.c:1395 +#: ../midori/midori-searchaction.c:1410 msgid "Use as _default" msgstr "Naudoti kaip _numatytą" -#: ../midori/sokoke.c:354 +#: ../midori/sokoke.c:453 msgid "Open with" -msgstr "Atverti su" +msgstr "" -#: ../midori/sokoke.c:362 +#: ../midori/sokoke.c:461 #, c-format msgid "Choose an application or command to open \"%s\":" -msgstr "Pasirinkite programą ar komandą „%s“ atvėrimui:" +msgstr "" -#: ../midori/sokoke.c:403 ../midori/sokoke.c:413 ../midori/sokoke.c:441 -#: ../midori/sokoke.c:470 ../midori/sokoke.c:484 +#: ../midori/sokoke.c:502 +#: ../midori/sokoke.c:512 +#: ../midori/sokoke.c:540 +#: ../midori/sokoke.c:569 +#: ../midori/sokoke.c:583 msgid "Could not run external program." msgstr "Nepavyksta paleisti išorinės programos." -#: ../midori/sokoke.c:1595 +#: ../midori/sokoke.c:1516 +msgid "_Bookmark" +msgstr "" + +#: ../midori/sokoke.c:1518 +msgid "Add Boo_kmark" +msgstr "" + +#: ../midori/sokoke.c:1519 +msgid "_Console" +msgstr "" + +#: ../midori/sokoke.c:1520 +msgid "_Extensions" +msgstr "" + +#: ../midori/sokoke.c:1522 +msgid "_Homepage" +msgstr "_Pradžios tinklalapis" + +#: ../midori/sokoke.c:1523 +msgid "_Userscripts" +msgstr "" + +#: ../midori/sokoke.c:1524 +msgid "New _Tab" +msgstr "Nauja _kortelė" + +#: ../midori/sokoke.c:1525 +msgid "_Transfers" +msgstr "" + +#: ../midori/sokoke.c:1526 +msgid "Netscape p_lugins" +msgstr "" + +#: ../midori/sokoke.c:1529 +msgid "New _Folder" +msgstr "" + +#: ../midori/sokoke.c:2229 #, c-format msgid "%d hour" msgid_plural "%d hours" @@ -2029,7 +2173,7 @@ msgstr[0] "%d valanda" msgstr[1] "%d valandos" msgstr[2] "%d valandų" -#: ../midori/sokoke.c:1596 +#: ../midori/sokoke.c:2230 #, c-format msgid "%d minute" msgid_plural "%d minutes" @@ -2037,7 +2181,7 @@ msgstr[0] "%d minutė" msgstr[1] "%d minutės" msgstr[2] "%d minučių" -#: ../midori/sokoke.c:1597 +#: ../midori/sokoke.c:2231 #, c-format msgid "%d second" msgid_plural "%d seconds" @@ -2046,128 +2190,124 @@ msgstr[1] "%d sekundės" msgstr[2] "%d sekundžių" #. i18n: Download tooltip (size): 4KB of 43MB -#: ../midori/sokoke.c:1605 ../panels/midori-transfers.c:268 +#: ../midori/sokoke.c:2239 +#: ../panels/midori-transfers.c:268 #, c-format msgid "%s of %s" -msgstr "%s iš %s" +msgstr "" #. i18n: Unknown number of bytes, used for transfer rate like ?B/s -#: ../midori/sokoke.c:1614 +#: ../midori/sokoke.c:2248 msgid "?B" -msgstr "?B" +msgstr "" #. i18n: Download tooltip (transfer rate): (130KB/s) -#: ../midori/sokoke.c:1617 +#: ../midori/sokoke.c:2251 #, c-format msgid " (%s/s)" -msgstr " (%s/s)" +msgstr "" #. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning -#: ../midori/sokoke.c:1634 +#: ../midori/sokoke.c:2268 #, c-format msgid " - %s remaining" -msgstr " - %s liko" +msgstr "" #. i18n: A panel at the bottom, to search text in pages -#: ../toolbars/midori-findbar.c:291 +#: ../toolbars/midori-findbar.c:264 msgid "_Inline Find:" msgstr "_Paieška tinklapyje:" -#: ../toolbars/midori-findbar.c:317 +#: ../toolbars/midori-findbar.c:291 msgid "Previous" msgstr "Ankstesnis" -#: ../toolbars/midori-findbar.c:323 +#: ../toolbars/midori-findbar.c:297 msgid "Next" -msgstr "Kitas" +msgstr "Tolesnis" -#: ../toolbars/midori-findbar.c:327 +#: ../toolbars/midori-findbar.c:301 msgid "Match Case" msgstr "Skirti dydį" -#: ../toolbars/midori-findbar.c:336 +#: ../toolbars/midori-findbar.c:310 msgid "Highlight Matches" msgstr "Paryškinti surastus" -#: ../toolbars/midori-findbar.c:347 +#: ../toolbars/midori-findbar.c:321 msgid "Close Findbar" -msgstr "Užverti paieškos juostą" +msgstr "" -#: ../toolbars/midori-transferbar.c:122 +#: ../toolbars/midori-transferbar.c:120 #, c-format msgid "The file '%s' has been downloaded." -msgstr "Failas „%s“ parsiųstas." +msgstr "" -#: ../toolbars/midori-transferbar.c:125 +#: ../toolbars/midori-transferbar.c:123 msgid "Transfer completed" msgstr "Siuntimas baigtas" -#: ../toolbars/midori-transferbar.c:193 +#: ../toolbars/midori-transferbar.c:209 msgid "The downloaded file is erroneous." -msgstr "Parsiųstas failas yra klaidingas." +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." +#: ../toolbars/midori-transferbar.c:210 +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:334 ../panels/midori-transfers.c:141 +#: ../toolbars/midori-transferbar.c:318 +#: ../panels/midori-transfers.c:142 msgid "Clear All" -msgstr "Išvalyti visus" +msgstr "" -#: ../toolbars/midori-transferbar.c:371 ../toolbars/midori-transferbar.c:373 +#: ../toolbars/midori-transferbar.c:355 +#: ../toolbars/midori-transferbar.c:357 msgid "Some files are being downloaded" -msgstr "Kai kurie failai parsiunčiami" +msgstr "" -#: ../toolbars/midori-transferbar.c:377 +#: ../toolbars/midori-transferbar.c:361 msgid "_Quit Midori" msgstr "_Baigti darbą su Midori" -#: ../toolbars/midori-transferbar.c:379 +#: ../toolbars/midori-transferbar.c:363 msgid "The transfers will be cancelled if Midori quits." msgstr "Visi siuntimai nutrūks jei baigsit darbą su Midori." -#: ../panels/midori-bookmarks.c:114 +#: ../panels/midori-bookmarks.c:117 msgid "Bookmarks" msgstr "Adresynas" -#: ../panels/midori-bookmarks.c:257 +#: ../panels/midori-bookmarks.c:295 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "Nepavyko pridėti adresynan: %s\n" -#: ../panels/midori-bookmarks.c:435 +#: ../panels/midori-bookmarks.c:475 msgid "Edit the selected bookmark" msgstr "Taisyti pažymėtą adresyno įrašą" -#: ../panels/midori-bookmarks.c:443 +#: ../panels/midori-bookmarks.c:483 msgid "Delete the selected bookmark" msgstr "Pašalinti pažymėta adresyno įrašą" -#: ../panels/midori-bookmarks.c:458 +#: ../panels/midori-bookmarks.c:498 msgid "Add a new folder" msgstr "Pridėti naują aplanką" -#: ../panels/midori-bookmarks.c:592 ../panels/midori-history.c:633 +#: ../panels/midori-bookmarks.c:632 +#: ../panels/midori-history.c:584 msgid "Separator" -msgstr "Skirtukas" +msgstr "" -#: ../panels/midori-history.c:111 +#: ../panels/midori-history.c:115 msgid "History" msgstr "Žurnalas" -#: ../panels/midori-history.c:158 ../panels/midori-history.c:189 -msgid "Today" -msgstr "Šiandien" - -#: ../panels/midori-history.c:160 ../panels/midori-history.c:191 -msgid "Yesterday" -msgstr "Vakar" +#: ../panels/midori-history.c:147 +msgid "A week ago" +msgstr "Prieš savaitę" -#: ../panels/midori-history.c:162 ../panels/midori-history.c:186 +#: ../panels/midori-history.c:149 #, c-format msgid "%d day ago" msgid_plural "%d days ago" @@ -2175,288 +2315,291 @@ msgstr[0] "Prieš %d dieną" msgstr[1] "Prieš %d dienas" msgstr[2] "Prieš %d dienų" -#: ../panels/midori-history.c:165 ../panels/midori-history.c:184 -msgid "A week ago" -msgstr "Prieš savaitę" +#: ../panels/midori-history.c:152 +msgid "Today" +msgstr "Šiandien" + +#: ../panels/midori-history.c:154 +msgid "Yesterday" +msgstr "Vakar" -#: ../panels/midori-history.c:360 +#: ../panels/midori-history.c:322 msgid "Are you sure you want to remove all history items?" msgstr "Ar tikrai norite pašalinti visus žurnalo įrašus?" -#: ../panels/midori-history.c:407 +#: ../panels/midori-history.c:368 msgid "Bookmark the selected history item" -msgstr "Įtraukti į adresyną pažymėtą žurnalo įrašą" +msgstr "Įtraukti į adresyną pažymėta žurnalo įrašą" -#: ../panels/midori-history.c:416 +#: ../panels/midori-history.c:377 msgid "Delete the selected history item" -msgstr "Ištrinti pažymėtą žurnalo įrašą" +msgstr "Ištrinti pažymėta žurnalo įrašą" -#: ../panels/midori-history.c:424 +#: ../panels/midori-history.c:385 msgid "Clear the entire history" msgstr "Pašalinti žurnalo įrašus" -#: ../panels/midori-transfers.c:86 +#: ../panels/midori-transfers.c:87 msgid "Transfers" msgstr "Siuntimai" -#: ../panels/midori-transfers.c:469 +#: ../panels/midori-transfers.c:468 msgid "Open Destination _Folder" -msgstr "Atverti paskirties _aplanką" +msgstr "" -#: ../panels/midori-transfers.c:472 +#: ../panels/midori-transfers.c:471 msgid "Copy Link Loc_ation" -msgstr "Kopijuoti saito _adresą" +msgstr "" -#: ../katze/katze-http-auth.c:210 +#: ../katze/katze-http-auth.c:213 msgid "Authentication Required" -msgstr "Reikia nustatyti tapatybę" +msgstr "" -#: ../katze/katze-http-auth.c:226 +#: ../katze/katze-http-auth.c:233 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:240 +#: ../katze/katze-http-auth.c:247 msgid "Username" msgstr "Naudotojo vardas" -#: ../katze/katze-http-auth.c:253 +#: ../katze/katze-http-auth.c:260 msgid "Password" msgstr "Slaptažodis" -#: ../katze/katze-http-auth.c:267 +#: ../katze/katze-http-auth.c:274 msgid "_Remember password" -msgstr "P_risiminti slaptažodį" +msgstr "" #: ../katze/katze-throbber.c:949 #, c-format msgid "Named icon '%s' couldn't be loaded" -msgstr "Pavadintos piktogramos „%s“ įkelti nepavyko" +msgstr "" #: ../katze/katze-throbber.c:962 #, c-format msgid "Stock icon '%s' couldn't be loaded" -msgstr "Piktogramos „%s“ įkelti nepavyko" +msgstr "" #: ../katze/katze-throbber.c:1042 msgid "Animation frames are broken" -msgstr "Animuoti kadrai sugadinti" +msgstr "" -#: ../katze/katze-utils.c:445 ../katze/katze-utils.c:879 +#: ../katze/katze-utils.c:539 +#: ../katze/katze-utils.c:976 #, c-format msgid "Property '%s' is invalid for %s" -msgstr "Savybė „%s“ netinka %s" +msgstr "" -#: ../katze/katze-utils.c:491 ../katze/katze-utils.c:520 -#: ../extensions/addons.c:308 +#: ../katze/katze-utils.c:585 +#: ../katze/katze-utils.c:614 +#: ../extensions/addons.c:309 msgid "Choose file" -msgstr "Pasirinkite failą" +msgstr "" -#: ../katze/katze-utils.c:506 +#: ../katze/katze-utils.c:600 msgid "Choose folder" -msgstr "Pasirinkite aplanką" +msgstr "" -#: ../katze/katze-utils.c:610 +#: ../katze/katze-utils.c:704 msgid "None" -msgstr "Joks" +msgstr "" -#: ../katze/katze-utils.c:725 +#: ../katze/katze-utils.c:822 msgid "1 hour" msgstr "1 valanda" -#: ../katze/katze-utils.c:726 +#: ../katze/katze-utils.c:823 msgid "1 day" msgstr "1 diena" -#: ../katze/katze-utils.c:727 +#: ../katze/katze-utils.c:824 msgid "1 week" msgstr "1 savaitė" -#: ../katze/katze-utils.c:728 +#: ../katze/katze-utils.c:825 msgid "1 month" msgstr "1 mėnuo" -#: ../katze/katze-utils.c:729 +#: ../katze/katze-utils.c:826 msgid "1 year" msgstr "1 metai" -#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235 +#: ../katze/katze-preferences.c:95 +#: ../extensions/history-list.vala:235 #, c-format msgid "Preferences for %s" msgstr "%s nustatymai" -#: ../extensions/adblock.c:473 +#: ../extensions/adblock.c:418 msgid "Configure Advertisement filters" -msgstr "Konfigūruoti reklamų filtrus" +msgstr "" -#: ../extensions/adblock.c:504 +#: ../extensions/adblock.c:462 #, 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 "" -"Į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:882 +#: ../extensions/adblock.c:843 msgid "Edit rule" -msgstr "Keisti taisyklę" +msgstr "" -#: ../extensions/adblock.c:896 +#: ../extensions/adblock.c:864 msgid "_Rule:" -msgstr "_Taisyklė:" +msgstr "" -#: ../extensions/adblock.c:950 +#: ../extensions/adblock.c:926 msgid "Bl_ock image" -msgstr "B_lokuoti paveikslėlį" +msgstr "" -#: ../extensions/adblock.c:955 +#: ../extensions/adblock.c:931 msgid "Bl_ock link" -msgstr "_Blokuoti nuorodą" +msgstr "" -#: ../extensions/adblock.c:1670 +#: ../extensions/adblock.c:1518 msgid "Advertisement blocker" -msgstr "Reklamų blokavimas" +msgstr "" -#: ../extensions/adblock.c:1671 +#: ../extensions/adblock.c:1519 msgid "Block advertisements according to a filter list" -msgstr "Blokuoti reklamas remiantis filtrų sąrašu" +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į?" +msgstr "" #: ../extensions/addons.c:222 msgid "_Install user script" -msgstr "Įdiegti naudotojo _scenarijų" +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 "Šis puslapis turėtų turėti naudotojo stilių. Ar norite įdiegti jį?" +msgstr "" #: ../extensions/addons.c:228 msgid "_Install user style" -msgstr "_Įdiegti naudotojo stilių" +msgstr "" #: ../extensions/addons.c:236 msgid "Don't install" -msgstr "Nediegti" +msgstr "" -#: ../extensions/addons.c:319 ../extensions/addons.c:681 +#: ../extensions/addons.c:320 +#: ../extensions/addons.c:682 msgid "Userscripts" -msgstr "Naudotojo scenarijai" +msgstr "" -#: ../extensions/addons.c:324 ../extensions/addons.c:683 +#: ../extensions/addons.c:325 +#: ../extensions/addons.c:684 msgid "Userstyles" -msgstr "Naudotojo stiliai" +msgstr "" -#: ../extensions/addons.c:380 ../extensions/addons.c:459 +#: ../extensions/addons.c:381 +#: ../extensions/addons.c:460 #: ../extensions/feed-panel/main.c:129 msgid "Error" -msgstr "Klaida" +msgstr "" -#: ../extensions/addons.c:421 +#: ../extensions/addons.c:422 #, c-format msgid "Do you want to delete '%s'?" -msgstr "Ar norite ištrinti „%s“?" +msgstr "" -#: ../extensions/addons.c:427 +#: ../extensions/addons.c:428 msgid "Delete user script" -msgstr "Ištrinti naudotojo scenarijų" +msgstr "" -#: ../extensions/addons.c:428 +#: ../extensions/addons.c:429 msgid "Delete user style" -msgstr "Ištrinti naudotojo stilių" +msgstr "" -#: ../extensions/addons.c:431 +#: ../extensions/addons.c:432 #, c-format msgid "The file %s will be permanently deleted." -msgstr "Failas %s bus ištrintas visam laikui." +msgstr "" -#: ../extensions/addons.c:570 ../extensions/addons.c:647 +#: ../extensions/addons.c:571 +#: ../extensions/addons.c:648 msgid "Open in Text Editor" -msgstr "Atverti teksto redaktoriuje" +msgstr "" -#: ../extensions/addons.c:572 ../extensions/addons.c:656 +#: ../extensions/addons.c:573 +#: ../extensions/addons.c:657 msgid "Open Target Folder" -msgstr "Atverti paskirties aplankką" +msgstr "" -#: ../extensions/addons.c:638 +#: ../extensions/addons.c:639 msgid "Add new addon" -msgstr "Pridėti naują papildinį" +msgstr "" -#: ../extensions/addons.c:664 +#: ../extensions/addons.c:665 msgid "Remove selected addon" -msgstr "Pašalinti pasirinktą papildinį" +msgstr "" -#: ../extensions/addons.c:1696 ../extensions/addons.c:1914 +#: ../extensions/addons.c:1650 +#: ../extensions/addons.c:1812 msgid "User addons" -msgstr "Naudotojo papildiniai" +msgstr "" -#: ../extensions/addons.c:1826 +#: ../extensions/addons.c:1771 #, c-format msgid "Can't monitor folder '%s': %s" -msgstr "Negaliu stebėti aplanko „%s“: %s" +msgstr "" -#: ../extensions/addons.c:1915 +#: ../extensions/addons.c:1813 msgid "Support for userscripts and userstyles" -msgstr "Naudotojo stilių ir naudotojo scenarijų palaikymas" +msgstr "" #: ../extensions/colorful-tabs.c:201 msgid "Colorful Tabs" -msgstr "Spalvotos kortelės" +msgstr "" #: ../extensions/colorful-tabs.c:202 msgid "Tint each tab distinctly" -msgstr "Kiekvienos kortelės atspalvį keisti aiškiai" +msgstr "" -#: ../extensions/cookie-manager/cookie-manager-page.c:73 +#: ../extensions/cookie-manager/cookie-manager-page.c:83 #: ../extensions/cookie-manager/main.c:35 msgid "Cookie Manager" msgstr "Slapukų tvarkytuvė" -#: ../extensions/cookie-manager/cookie-manager-page.c:103 +#: ../extensions/cookie-manager/cookie-manager-page.c:113 msgid "Delete All" msgstr "Ištrinti viską" -#: ../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:115 +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:120 +#: ../extensions/cookie-manager/cookie-manager-page.c:130 msgid "Expand All" msgstr "Išskleisti viską" -#: ../extensions/cookie-manager/cookie-manager-page.c:127 +#: ../extensions/cookie-manager/cookie-manager-page.c:137 msgid "Collapse All" msgstr "Suskleisti viską" -#: ../extensions/cookie-manager/cookie-manager-page.c:572 +#: ../extensions/cookie-manager/cookie-manager-page.c:579 msgid "Do you really want to delete all cookies?" msgstr "Ar tikrai norite ištrinti visus slapukus?" -#: ../extensions/cookie-manager/cookie-manager-page.c:574 +#: ../extensions/cookie-manager/cookie-manager-page.c:581 msgid "Question" -msgstr "Klausimas" +msgstr "" -#: ../extensions/cookie-manager/cookie-manager-page.c:583 +#: ../extensions/cookie-manager/cookie-manager-page.c:590 msgid "Only cookies which match the filter will be deleted." -msgstr "Bus ištrinti tik tie slapukai kurie atitiks filtrą." +msgstr "" -#: ../extensions/cookie-manager/cookie-manager-page.c:671 +#: ../extensions/cookie-manager/cookie-manager-page.c:678 msgid "At the end of the session" -msgstr "Seanso pabaigoje" +msgstr "" -#: ../extensions/cookie-manager/cookie-manager-page.c:674 +#: ../extensions/cookie-manager/cookie-manager-page.c:681 #, c-format msgid "" "Host: %s\n" @@ -2466,402 +2609,403 @@ msgid "" "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:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:687 msgid "Yes" msgstr "Taip" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:687 msgid "No" msgstr "Ne" -#: ../extensions/cookie-manager/cookie-manager-page.c:694 +#: ../extensions/cookie-manager/cookie-manager-page.c:701 #, c-format msgid "" "Domain: %s\n" "Cookies: %d" msgstr "" -"Domenas: %s\n" -"Slapukai: %d" -#: ../extensions/cookie-manager/cookie-manager-page.c:1024 +#: ../extensions/cookie-manager/cookie-manager-page.c:1031 msgid "Name" -msgstr "Pavadinimas" +msgstr "" -#: ../extensions/cookie-manager/cookie-manager-page.c:1077 +#: ../extensions/cookie-manager/cookie-manager-page.c:1084 msgid "_Expand All" -msgstr "_Išskleisti visus" +msgstr "" -#: ../extensions/cookie-manager/cookie-manager-page.c:1085 +#: ../extensions/cookie-manager/cookie-manager-page.c:1092 msgid "_Collapse All" -msgstr "_Suskleisti visus" +msgstr "" -#: ../extensions/cookie-manager/cookie-manager-page.c:1139 +#: ../extensions/cookie-manager/cookie-manager-page.c:1145 msgid "Filter:" msgstr "Filtras:" -#: ../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" +#: ../extensions/cookie-manager/cookie-manager-page.c:1150 +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:36 msgid "List, view and delete cookies" -msgstr "Parodyti ir ištrinti slapukus" +msgstr "" -#: ../extensions/copy-tabs.c:38 +#: ../extensions/copy-tabs.c:39 msgid "Copy Tab _Addresses" -msgstr "Kopijuoti kortelių _adresus" +msgstr "" -#: ../extensions/copy-tabs.c:95 +#: ../extensions/copy-tabs.c:96 msgid "Copy Addresses of Tabs" -msgstr "Kopijuoti kortelių adresus" +msgstr "" -#: ../extensions/copy-tabs.c:96 +#: ../extensions/copy-tabs.c:97 msgid "Copy the addresses of all tabs to the clipboard" -msgstr "Kopijuoti visų kortelių adresus į iškarpinę" +msgstr "" #: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." -msgstr "XML duomenyse nepavyko rasti Atom „entry“ elementų." +msgstr "" #: ../extensions/feed-panel/feed-atom.c:315 msgid "Failed to find required Atom \"feed\" elements in XML data." -msgstr "XML duomenyse nepavyko rasti Atom „feed“ elementų." +msgstr "" #. i18n: The local date a feed was last updated -#: ../extensions/feed-panel/feed-panel.c:387 +#: ../extensions/feed-panel/feed-panel.c:392 #, c-format msgctxt "Feed" msgid "Last updated: %s." -msgstr "Paskutinis atnaujinimas: %s." +msgstr "" -#: ../extensions/feed-panel/feed-panel.c:653 +#: ../extensions/feed-panel/feed-panel.c:658 msgid "Feeds" -msgstr "Kanalai" +msgstr "" -#: ../extensions/feed-panel/feed-panel.c:706 +#: ../extensions/feed-panel/feed-panel.c:711 msgid "Add new feed" -msgstr "Pridėti naują kanalą" +msgstr "" -#: ../extensions/feed-panel/feed-panel.c:713 +#: ../extensions/feed-panel/feed-panel.c:718 msgid "Delete feed" -msgstr "Ištrinti kanalą" +msgstr "" -#: ../extensions/feed-panel/feed-panel.c:795 +#: ../extensions/feed-panel/feed-panel.c:800 msgid "_Feeds" -msgstr "_Kanalai" +msgstr "" #: ../extensions/feed-panel/feed-parse.c:195 #, c-format msgid "Failed to find root element in feed XML data." -msgstr "Kanalo XML duomenyse nepavyko rasti šakninio elemento." +msgstr "" #: ../extensions/feed-panel/feed-parse.c:235 #, c-format msgid "Unsupported feed format." -msgstr "Kanalo formatas nepalaikomas." +msgstr "" #: ../extensions/feed-panel/feed-parse.c:265 #, c-format msgid "Failed to parse XML feed: %s" -msgstr "Nepavyko apdoroti XML kanalo: %s" +msgstr "" #: ../extensions/feed-panel/feed-rss.c:46 msgid "Failed to find \"channel\" element in RSS XML data." -msgstr "RSS XML duomenų „channel“ elementas nerastas." +msgstr "" #: ../extensions/feed-panel/feed-rss.c:51 msgid "Unsupported RSS version found." -msgstr "Rasta nepalaikoma RSS versija." +msgstr "" #: ../extensions/feed-panel/feed-rss.c:148 msgid "Failed to find required RSS \"item\" elements in XML data." -msgstr "Nepavyko rasti reikiamo RSS „item“ XML duomenų elemento." +msgstr "" #: ../extensions/feed-panel/feed-rss.c:248 msgid "Failed to find required RSS \"channel\" elements in XML data." -msgstr "Nepavyko rasti reikiamo RSS „channel“ XML duomenų elemento." +msgstr "" #: ../extensions/feed-panel/main.c:131 #, c-format msgid "Feed '%s' already exists" -msgstr "Kanalas „%s“ jau yra" +msgstr "" #: ../extensions/feed-panel/main.c:208 #, c-format msgid "Error loading feed '%s'" -msgstr "Klaida įkraunant kanalą „%s“" +msgstr "" -#: ../extensions/feed-panel/main.c:518 +#: ../extensions/feed-panel/main.c:530 msgid "Feed Panel" -msgstr "Kanalų skydelis" +msgstr "" -#: ../extensions/feed-panel/main.c:519 +#: ../extensions/feed-panel/main.c:531 msgid "Read Atom/ RSS feeds" -msgstr "Skaityti Atom/RSS kanalus" +msgstr "" -#: ../extensions/formhistory/formhistory.c:39 +#: ../extensions/formhistory.c:151 #, 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/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 +#: ../extensions/formhistory.c:303 msgid "Toggle form history state" -msgstr "Perjungti formų istorijos būseną" +msgstr "" -#: ../extensions/formhistory/formhistory.c:438 +#: ../extensions/formhistory.c:304 msgid "Activate or deactivate form history for the current tab." -msgstr "Aktyvuoti ar deaktyvuoti formų istoriją dabartinei kortelei." +msgstr "" -#: ../extensions/formhistory/formhistory.c:549 -#: ../extensions/formhistory/formhistory.c:553 +#: ../extensions/formhistory.c:438 +#: ../extensions/formhistory.c:442 #, 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:517 +msgid "only activate form history via hotkey (Ctrl+Shift+F) per tab" +msgstr "" -#: ../extensions/formhistory/formhistory.c:669 +#: ../extensions/formhistory.c:576 msgid "Stores history of entered form data" -msgstr "Saugo įvestų duomenų istoriją" +msgstr "" -#: ../extensions/formhistory/formhistory-gdom-frontend.c:225 -#: ../extensions/formhistory/formhistory-js-frontend.c:106 +#: ../extensions/formhistory.c:580 #, c-format -msgid "Failed to select suggestions\n" -msgstr "Nepavyko pasirinkti pasiūlymų\n" +msgid "Not available: %s" +msgstr "" + +#: ../extensions/formhistory.c:581 +msgid "Resource files not installed" +msgstr "" + +#: ../extensions/formhistory.c:587 +msgid "Form history filler" +msgstr "" #: ../extensions/history-list.vala:197 msgid "There are no unvisited tabs" -msgstr "Nėra neaplankytų kortelių" +msgstr "" #: ../extensions/history-list.vala:235 -#, c-format +#, fuzzy, c-format msgid "History-List" -msgstr "Istorijos sąrašas" +msgstr "Žurnalas" -#: ../extensions/history-list.vala:275 +#: ../extensions/history-list.vala:276 msgid "Tab closing behavior" -msgstr "Kortelės užvėrimo elgsena" +msgstr "" -#: ../extensions/history-list.vala:283 +#: ../extensions/history-list.vala:284 msgid "Do nothing" -msgstr "Nieko nedaryti" +msgstr "" -#: ../extensions/history-list.vala:289 +#: ../extensions/history-list.vala:290 +#, fuzzy msgid "Switch to last viewed tab" -msgstr "Persijungti į paskutinę žiūrėtą kortelę" +msgstr "Perjungti į kitą skirtuką" -#: ../extensions/history-list.vala:295 +#: ../extensions/history-list.vala:296 +#, fuzzy msgid "Switch to newest tab" -msgstr "Persijungti į naujausią kortelę" +msgstr "Perjungti į kitą skirtuką" -#: ../extensions/history-list.vala:423 +#: ../extensions/history-list.vala:424 msgid "Next new Tab (History List)" -msgstr "Sekanti nauja kortelė iš istorijos (Istorijos sąrašas)" +msgstr "" -#: ../extensions/history-list.vala:424 +#: ../extensions/history-list.vala:425 +#, fuzzy msgid "Next new tab from history" -msgstr "Sekanti nauja kortelė iš istorijos" +msgstr "Nepavyko pažymėti žurnalo įrašą\n" -#: ../extensions/history-list.vala:433 +#: ../extensions/history-list.vala:434 msgid "Previous new Tab (History List)" -msgstr "Ankstesnė nauja kortelė iš istorijos (Istorijos sąrašas)" +msgstr "" -#: ../extensions/history-list.vala:434 +#: ../extensions/history-list.vala:435 +#, fuzzy msgid "Previous new tab from history" -msgstr "Ankstesnė nauja kortelė iš istorijos" +msgstr "Nepavyko pažymėti žurnalo įrašą\n" -#: ../extensions/history-list.vala:443 +#: ../extensions/history-list.vala:444 msgid "Display tab in background (History List)" -msgstr "Kortelę rodyti fone (Istorijos sąrašas)" +msgstr "" -#: ../extensions/history-list.vala:444 +#: ../extensions/history-list.vala:445 msgid "Display the current selected tab in background" -msgstr "Rodyti dabartinę pasirinktą kortelę fone" +msgstr "" -#: ../extensions/history-list.vala:569 +#: ../extensions/history-list.vala:570 msgid "History List" -msgstr "Istorijos sąrašas" +msgstr "" -#: ../extensions/history-list.vala:570 +#: ../extensions/history-list.vala:571 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:301 msgid "Mouse Gestures" -msgstr "Pelės gestai" +msgstr "" #: ../extensions/mouse-gestures.c:302 msgid "Control Midori by moving the mouse" -msgstr "Valdykite Midori stumdami pelę" +msgstr "" -#: ../extensions/shortcuts.c:109 +#: ../extensions/shortcuts.c:110 msgid "Reload page or stop loading" -msgstr "Perkrauti puslapį arba sustabdyti krovimą" +msgstr "" -#: ../extensions/shortcuts.c:176 +#: ../extensions/shortcuts.c:177 msgid "Customize Keyboard shortcuts" -msgstr "Derinti klaviatūros susiejimus" +msgstr "" -#: ../extensions/shortcuts.c:283 -msgid "Customize Sh_ortcuts…" -msgstr "Derinti _susiejimus…" +#: ../extensions/shortcuts.c:298 +msgid "Customize Sh_ortcuts..." +msgstr "" -#: ../extensions/shortcuts.c:320 +#: ../extensions/shortcuts.c:335 msgid "Shortcuts" -msgstr "Susiejimai" +msgstr "" -#: ../extensions/shortcuts.c:321 +#: ../extensions/shortcuts.c:336 msgid "View and edit keyboard shortcuts" -msgstr "Rodyti ir keisti klaviatūros susiejimus" +msgstr "" #: ../extensions/status-clock.c:174 msgid "Statusbar Clock" -msgstr "Būsenos juostos laikrodis" +msgstr "" #: ../extensions/status-clock.c:175 msgid "Display date and time in the statusbar" -msgstr "Būsenos juostoje rodyti datą ir laiką" +msgstr "" -#: ../extensions/statusbar-features.c:131 +#: ../extensions/statusbar-features.c:129 msgid "Images" -msgstr "Paveikslėliai" +msgstr "" -#: ../extensions/statusbar-features.c:140 +#: ../extensions/statusbar-features.c:138 msgid "Scripts" -msgstr "Scenarijai" +msgstr "" -#: ../extensions/statusbar-features.c:151 +#: ../extensions/statusbar-features.c:147 msgid "Netscape plugins" msgstr "Netscape papildiniai" -#: ../extensions/statusbar-features.c:199 +#: ../extensions/statusbar-features.c:193 msgid "Statusbar Features" -msgstr "Būsenos juostos galimybės" +msgstr "" -#: ../extensions/statusbar-features.c:200 +#: ../extensions/statusbar-features.c:194 msgid "Easily toggle features on web pages on and off" -msgstr "Interneto puslapiuose lengvai įjunkite ar išjunkite galimybes" +msgstr "" -#: ../extensions/tab-panel.c:593 ../extensions/tab-panel.c:680 +#: ../extensions/tab-panel.c:597 +#: ../extensions/tab-panel.c:684 msgid "Tab Panel" -msgstr "Kortelių skydelis" +msgstr "" -#: ../extensions/tab-panel.c:663 +#: ../extensions/tab-panel.c:667 msgid "T_ab Panel" -msgstr "_Kortelių skydelis" +msgstr "" -#: ../extensions/tab-panel.c:681 +#: ../extensions/tab-panel.c:685 msgid "Show tabs in a vertical panel" -msgstr "Korteles rodo vertikaliame skydelyje" +msgstr "" -#: ../extensions/tabs-minimized.c:76 +#: ../extensions/tabs-minimized.c:77 msgid "Only Icons on Tabs by default" -msgstr "Pagal nutylėjimą ant kortelių tik piktogramos" +msgstr "" -#: ../extensions/tabs-minimized.c:77 +#: ../extensions/tabs-minimized.c:78 msgid "New tabs have no label by default" -msgstr "Pagal nutylėjimą kortelės neturi etikečių" +msgstr "" #: ../extensions/toolbar-editor.c:393 msgid "Customize Toolbar" -msgstr "Įrankių juostos derinimas" +msgstr "" -#: ../extensions/toolbar-editor.c:409 -msgid "" -"Select items to be displayed on the toolbar. Items can be reordered by drag " -"and drop." +#: ../extensions/toolbar-editor.c:413 +msgid "Select items to be displayed on the toolbar. Items can be reodered 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:425 +#: ../extensions/toolbar-editor.c:429 msgid "Available Items" -msgstr "Prieinami elementai" +msgstr "" -#: ../extensions/toolbar-editor.c:446 +#: ../extensions/toolbar-editor.c:450 msgid "Displayed Items" -msgstr "Rodomi elementai" +msgstr "" -#: ../extensions/toolbar-editor.c:581 -msgid "Customize _Toolbar…" -msgstr "Įrankių juostos _derinimas" +#: ../extensions/toolbar-editor.c:585 +msgid "Customize _Toolbar..." +msgstr "" -#: ../extensions/toolbar-editor.c:597 -msgid "_Customize…" -msgstr "_Derinti…" +#: ../extensions/toolbar-editor.c:601 +#, fuzzy +msgid "_Customize..." +msgstr "Pasirinktinis ..." -#: ../extensions/toolbar-editor.c:627 +#: ../extensions/toolbar-editor.c:631 msgid "Toolbar Editor" -msgstr "Įrankinės redaktorius" +msgstr "" -#: ../extensions/toolbar-editor.c:628 +#: ../extensions/toolbar-editor.c:632 msgid "Easily edit the toolbar layout" -msgstr "Lengvai pakeiskite įrankinės išdėstymą" +msgstr "" -#: ../extensions/web-cache.c:463 +#: ../extensions/web-cache.c:471 msgid "Cache HTTP communication on disk" -msgstr "Podėlio HTTP bendravimas su disku" +msgstr "" + +#~ msgid "Thumb size:" +#~ msgstr "Miniatiūros dydis:" + +#~ msgid "Small" +#~ msgstr "Maža" + +#~ msgid "Medium" +#~ msgstr "Vidutinė" + +#~ msgid "Big" +#~ msgstr "Didelė" + +#~ msgid "%d%% loaded" +#~ msgstr "%d%% pakrauta" -#~ msgid "The specified configuration folder is invalid." -#~ msgstr "Nurodytos konfigūracijos aplankas yra netinkamas." +#~ msgid "Failed to clear search history: %s\n" +#~ msgstr "Nepavyko ištrinti paieškų žurnalą: %s\n" -#~ msgid "Cookies" +#~ msgid "Quit the application" +#~ msgstr "Uždaryti programą" + +#~ msgid "Show the documentation" +#~ msgstr "Rodyti dokumentaciją" + +#~ msgid "Maximum history age" +#~ msgstr "Seniausiems žurnalo įrašams" + +#~ msgid "Appearance" +#~ msgstr "Išvaizda" + +#~ msgid "Font settings" +#~ msgstr "Šriftų nustatymas" + +#~ msgid "Web Cookies" #~ msgstr "Slapukai" -#~ msgid "'Flash' Cookies" -#~ msgstr "„Flash” Slapukai" +#~ msgid "Delete cookies when quitting Midori" +#~ msgstr "Ištrinti slapukus uždarant „Midori”" + +#~ msgid "Delete old cookies after 1 hour" +#~ msgstr "Šalinti slapukus senesnius nei 1 valanda" + +#~ msgid "Delete old cookies after 1 week" +#~ msgstr "Šalinti slapukus senesnius nei 1 savaitė" + +#~ msgid "Delete old cookies after 1 month" +#~ msgstr "Šalinti slapukus senesnius nei 1 mėnuo" -#~ msgid "HTML5 _Databases" -#~ msgstr "HTML5 _duomenų bazės" +#~ msgid "Delete old cookies after 1 year" +#~ msgstr "Šalinti slapukus senesnius nei 1 metai" -#~ msgid "Offline Application Cache" -#~ msgstr "Atsijungusių programų podėlis" +#~ msgid "days" +#~ msgstr "dienos" diff --git a/po/nl.po b/po/nl.po index c8124924..730a2cbc 100644 --- a/po/nl.po +++ b/po/nl.po @@ -2,14 +2,14 @@ # Copyright (C) The Xfce development team. # This file is distributed under the same license as the midori package. # Vincent Tunru 2008 -# Emmo, 2011-2012 (assisted by Pjotr). +# Emmo, 2011 (assisted by Pjotr). # msgid "" msgstr "" "Project-Id-Version: midori\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-19 11:45+0000\n" -"PO-Revision-Date: 2012-07-25 12:02+0200\n" +"POT-Creation-Date: 2011-11-25 10:42+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" @@ -19,35 +19,19 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../data/midori.desktop.in.h:1 -msgid "Browse the Web" -msgstr "Blader door het Web" - -#: ../data/midori.desktop.in.h:2 msgid "Internet;WWW;Explorer" msgstr "Internet;WWW;Verkenner" -#: ../data/midori.desktop.in.h:3 ../midori/main.c:1921 ../midori/main.c:1936 -#: ../midori/main.c:1949 ../midori/midori-websettings.c:200 +#: ../data/midori.desktop.in.h:2 +msgid "Lightweight web browser" +msgstr "Lichtgewicht webbrowser" + +#: ../data/midori.desktop.in.h:3 ../midori/main.c:2009 ../midori/main.c:2029 +#: ../midori/main.c:2045 ../midori/midori-websettings.c:303 msgid "Midori" msgstr "Midori" #: ../data/midori.desktop.in.h:4 -msgid "Midori Web Browser" -msgstr "Webbrowser Midori" - -#: ../data/midori.desktop.in.h:5 -msgid "New Private Browsing Window" -msgstr "Nieuw privé-surfvenster" - -#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1326 -msgid "New Tab" -msgstr "Nieuw tabblad" - -#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1323 -msgid "New Window" -msgstr "Nieuw venster" - -#: ../data/midori.desktop.in.h:8 msgid "Web Browser" msgstr "Webbrowser" @@ -59,87 +43,81 @@ msgstr "Midori Privé-surfen" msgid "Open a new private browsing window" msgstr "Open een nieuw privé-surfvenster" -#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4307 +#: ../data/midori-private.desktop.in.h:3 msgid "Private Browsing" msgstr "Privé-surfen" -#: ../midori/main.c:84 ../midori/main.c:90 +#: ../midori/main.c:96 ../midori/main.c:102 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Configuratie kon niet geladen worden: %s\n" -#: ../midori/main.c:138 +#: ../midori/main.c:150 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Waarde '%s' is ongeldig voor %s" -#: ../midori/main.c:143 ../midori/main.c:247 +#: ../midori/main.c:155 ../midori/main.c:261 #, c-format msgid "Invalid configuration value '%s'" msgstr "Ongeldige configuratiewaarde '%s'" -#: ../midori/main.c:357 +#: ../midori/main.c:366 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "De zoekmachines konden niet worden geladen. %s\n" -#: ../midori/main.c:411 +#: ../midori/main.c:420 #, c-format msgid "Failed to clear history: %s\n" msgstr "Niet gelukt om geschiedenis te verwijderen: %s\n" -#: ../midori/main.c:433 ../extensions/formhistory/formhistory.c:531 +#: ../midori/main.c:440 ../midori/main.c:561 ../extensions/formhistory.c:417 #, c-format msgid "Failed to open database: %s\n" msgstr "Kon gegevensbank niet openen: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:505 +#: ../midori/main.c:504 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Kon oude elementen in geschiedenis niet verwijderen: %s\n" -#: ../midori/main.c:527 +#: ../midori/main.c:544 ../panels/midori-history.c:189 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "Kon element in geschiedenis niet verwijderen: %s\n" + +#: ../midori/main.c:591 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "De bladwijzers konden niet opgeslagen worden. %s" + +#: ../midori/main.c:624 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "De instellingen konden niet worden opgeslagen. %s" -#: ../midori/main.c:553 +#: ../midori/main.c:659 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "De zoekmachines konden niet opgeslagen worden. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:590 +#: ../midori/main.c:685 ../midori/main.c:705 #, c-format msgid "The trash couldn't be saved. %s" msgstr "De prullenbak kon niet worden opgeslagen. %s" -#: ../midori/main.c:663 ../panels/midori-extensions.c:90 +#: ../midori/main.c:739 ../panels/midori-extensions.c:91 msgid "Extensions" msgstr "Extensies" -#: ../midori/main.c:677 +#: ../midori/main.c:753 msgid "Privacy" msgstr "Privacy" -#: ../midori/main.c:679 -msgid "Delete old Cookies after:" -msgstr "Verwijder oude koekjes na:" - -#: ../midori/main.c:681 ../midori/main.c:684 -msgid "The maximum number of days to save cookies for" -msgstr "Hoeveel dagen een koekje maximaal bewaard mag worden" - -#: ../midori/main.c:688 -msgid "Only accept Cookies from sites you visit" -msgstr "Alleen koekjes aanvaarden van websites die u bezoekt" - -#: ../midori/main.c:689 -msgid "Block cookies sent by third-party websites" -msgstr "Blokkeer koekjes verzonden door derden" - -#: ../midori/main.c:694 +#: ../midori/main.c:765 msgid "" "Cookies store login data, saved games, or user profiles for advertisement " "purposes." @@ -147,45 +125,19 @@ msgstr "" "Koekjes slaan aanmeldgegevens, opgeslagen spelletjes of gebruikerprofielen " "op voor adverteerdoeleinden." -#: ../midori/main.c:701 -msgid "Enable offline web application cache" -msgstr "Offline webtoepassingsopslag gebruiken" - -#: ../midori/main.c:704 -msgid "Enable HTML5 local storage support" -msgstr "HTML5 lokale opslagondersteuning activeren" - -#. i18n: Reworded: Shorten details propagated when going to another page -#: ../midori/main.c:708 -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/main.c:710 -msgid "Whether the \"Referer\" header should be shortened to the hostname" -msgstr "Of de 'Referer'-koptekst moet worden verkort tot de hostnaam" - -#: ../midori/main.c:713 -msgid "Delete pages from history after:" -msgstr "Verwijder pagina's uit de geschiedenis na:" - -#: ../midori/main.c:715 ../midori/main.c:718 -msgid "The maximum number of days to save the history for" -msgstr "Hoeveel dagen de geschiedenis bewaard moeten blijven" - -#: ../midori/main.c:759 +#: ../midori/main.c:821 #, c-format msgid "The session couldn't be saved. %s" msgstr "De sessie kon niet worden opgeslagen. %s" -#: ../midori/main.c:981 +#: ../midori/main.c:1031 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:1076 +#: ../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." @@ -194,240 +146,245 @@ msgstr "" "Als dit herhaaldelijk gebeurt, probeer dan een van de volgende opties om het " "probleem op te lossen." -#: ../midori/main.c:1095 +#: ../midori/main.c:1118 msgid "Modify _preferences" msgstr "_Voorkeuren wijzigen" -#: ../midori/main.c:1099 +#: ../midori/main.c:1122 msgid "Disable all _extensions" msgstr "Schakel alle _extensies uit" -#: ../midori/main.c:1108 -msgid "Show a dialog after Midori crashed" -msgstr "Toon een dialoogvenster nadat Midori is vastgelopen" - -#: ../midori/main.c:1113 +#: ../midori/main.c:1135 msgid "Discard old tabs" msgstr "Verwijder oude tabbladen" -#: ../midori/main.c:1114 ../midori/midori-websettings.c:108 +#: ../midori/main.c:1136 ../midori/midori-websettings.c:212 msgid "Show last tabs without loading" msgstr "Toon laatste tabbladen zonder te laden" -#: ../midori/main.c:1115 ../midori/midori-websettings.c:107 +#: ../midori/main.c:1137 ../midori/midori-websettings.c:211 msgid "Show last open tabs" msgstr "Toon laatst geopende tabbladen" -#: ../midori/main.c:1362 ../midori/main.c:2377 +#: ../midori/main.c:1347 ../midori/main.c:2417 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "De sessie kon niet geladen worden: %s\n" -#: ../midori/main.c:1500 +#: ../midori/main.c:1488 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Momentopname opgeslagen in: %s\n" -#: ../midori/main.c:1836 +#: ../midori/main.c:1912 msgid "Run ADDRESS as a web application" msgstr "ADRES uitvoeren als een webtoepassing" -#: ../midori/main.c:1836 +#: ../midori/main.c:1912 msgid "ADDRESS" msgstr "ADRES" -#: ../midori/main.c:1839 +#: ../midori/main.c:1915 msgid "Use FOLDER as configuration folder" msgstr "Gebruik MAP als configuratiemap" -#: ../midori/main.c:1839 +#: ../midori/main.c:1915 msgid "FOLDER" msgstr "MAP" -#: ../midori/main.c:1842 +#: ../midori/main.c:1918 msgid "Private browsing, no changes are saved" msgstr "Privé-surfen, veranderingen worden niet opgeslagen." -#: ../midori/main.c:1845 -msgid "Portable mode, all runtime files are stored in one place" -msgstr "" -"Draagbare modus, alle uitvoeringsbestanden worden opgeslagen op één plek" - -#: ../midori/main.c:1848 -msgid "Plain GTK+ window with WebKit, akin to GtkLauncher" -msgstr "Standaardvenster van GTK+ met WebKit, lijkend op GtkLauncher" - -#: ../midori/main.c:1850 +#: ../midori/main.c:1920 msgid "Show a diagnostic dialog" msgstr "Toon een diagnostisch venster" -#: ../midori/main.c:1852 +#: ../midori/main.c:1922 msgid "Run the specified filename as javascript" msgstr "Voer de opgegeven bestandnaam uit als javascript" -#: ../midori/main.c:1854 +#: ../midori/main.c:1924 msgid "Take a snapshot of the specified URI" msgstr "Maak een momentopname van de opgegeven URI" -#: ../midori/main.c:1856 +#: ../midori/main.c:1926 msgid "Execute the specified command" msgstr "Voer de opgegeven opdracht uit" -#: ../midori/main.c:1858 +#: ../midori/main.c:1928 msgid "List available commands to execute with -e/ --execute" msgstr "Lijst beschikbare opdrachten uit te voeren met -e/ --execute" -#: ../midori/main.c:1860 +#: ../midori/main.c:1930 msgid "Display program version" msgstr "Versie-informatie weergeven" -#: ../midori/main.c:1862 +#: ../midori/main.c:1932 msgid "Addresses" msgstr "Adressen" -#: ../midori/main.c:1864 +#: ../midori/main.c:1934 msgid "Block URIs according to regular expression PATTERN" msgstr "Blokkeer URIs die overeenstemmen met reguliere expressie PATROON" -#: ../midori/main.c:1864 +#: ../midori/main.c:1934 msgid "PATTERN" msgstr "PATROON" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1868 +#: ../midori/main.c:1938 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "" "Zet Midori na SECONDEN seconden van inactiviteit, terug op de " "standaardwaarden" -#: ../midori/main.c:1868 +#: ../midori/main.c:1938 msgid "SECONDS" msgstr "SECONDEN" -#: ../midori/main.c:1871 +#: ../midori/main.c:1941 msgid "Redirects console warnings to the specified FILENAME" msgstr "Verwijst terminalwaarschuwingen naar de opgegeven BESTANDNAAM" -#: ../midori/main.c:1871 +#: ../midori/main.c:1941 msgid "FILENAME" msgstr "BESTANDNAAM" -#: ../midori/main.c:1950 +#: ../midori/main.c:2006 +msgid "[Addresses]" +msgstr "[Adressen]" + +#: ../midori/main.c:2016 +msgid "The specified configuration folder is invalid." +msgstr "De gespecifieerde configuratiemap is ongeldig." + +#: ../midori/main.c:2046 msgid "Please report comments, suggestions and bugs to:" msgstr "Gelieve commentaar, suggesties en fouten te melden bij:" -#: ../midori/main.c:1952 +#: ../midori/main.c:2048 msgid "Check for new versions at:" msgstr "Controleer op nieuwe versies op:" +#: ../midori/main.c:2131 +msgid "Website icons" +msgstr "Website-pictogrammen" + #. i18n: Logins and passwords in websites and web forms -#: ../midori/main.c:2091 +#: ../midori/main.c:2134 msgid "Saved logins and _passwords" msgstr "Opgeslagen aanmeldingen en _wachtwoorden" -#: ../midori/main.c:2093 -msgid "Cookies and Website data" -msgstr "Koekjes en websitegegevens" +#: ../midori/main.c:2136 +msgid "Cookies" +msgstr "Koekjes" -#. TODO: Preserve page icons of search engines and merge privacy items -#: ../midori/main.c:2097 ../midori/midori-preferences.c:508 -#: ../extensions/web-cache.c:461 ../extensions/web-cache.c:470 +#: ../midori/main.c:2139 +msgid "'Flash' Cookies" +msgstr "'Flits'-koekjes" + +#: ../midori/main.c:2142 +msgid "HTML5 _Databases" +msgstr "HTML5 _gegevensbanken" + +#: ../midori/main.c:2145 ../midori/midori-websettings.c:936 +#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471 msgid "Web Cache" msgstr "Webopslag" -#: ../midori/main.c:2100 -msgid "Website icons" -msgstr "Website-pictogrammen" +#: ../midori/main.c:2147 +msgid "Offline Application Cache" +msgstr "Offline toepassingopslag" -#: ../midori/main.c:2210 +#: ../midori/main.c:2250 msgid "An unknown error occured" msgstr "Er is een onbekende fout opgetreden" -#: ../midori/main.c:2325 +#: ../midori/main.c:2348 msgid "An instance of Midori is already running but not responding.\n" msgstr "Midori is al actief maar reageert niet.\n" -#: ../midori/main.c:2359 +#: ../midori/main.c:2384 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "De bladwijzers konden niet worden geladen: %s\n" -#: ../midori/main.c:2392 +#: ../midori/main.c:2432 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "De prullenbak kon niet geladen worden: %s\n" -#: ../midori/main.c:2405 +#: ../midori/main.c:2445 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "De geschiedenis kon niet geladen worden: %s\n" -#: ../midori/main.c:2420 +#: ../midori/main.c:2461 msgid "The following errors occured:" msgstr "De volgende fouten hebben plaatsgevonden:" -#: ../midori/main.c:2436 +#: ../midori/main.c:2477 msgid "_Ignore" msgstr "_Negeren" -#: ../midori/midori-app.c:1156 ../midori/midori-browser.c:534 -#, c-format -msgid "Unexpected action '%s'." -msgstr "Onverwachte actie '%s'." +#: ../midori/midori-app.c:1329 +msgid "_Bookmark" +msgstr "_Bladwijzer" -#: ../midori/midori-app.c:1372 ../midori/midori-browser.c:6251 +#: ../midori/midori-app.c:1330 ../midori/midori-browser.c:5980 msgid "_Bookmarks" msgstr "_Bladwijzers" -#: ../midori/midori-app.c:1373 +#: ../midori/midori-app.c:1331 msgid "Add Boo_kmark" msgstr "Bladwijzer _toevoegen" -#: ../midori/midori-app.c:1374 +#: ../midori/midori-app.c:1332 +msgid "_Console" +msgstr "Terminalvenster" + +#: ../midori/midori-app.c:1333 msgid "_Extensions" msgstr "_Extensies" #. i18n: Browsing history, visited web pages, closed tabs -#: ../midori/midori-app.c:1375 ../midori/midori-browser.c:4700 +#: ../midori/midori-app.c:1334 ../midori/midori-browser.c:4575 msgid "_History" msgstr "_Geschiedenis" -#: ../midori/midori-app.c:1376 +#: ../midori/midori-app.c:1335 +msgid "_Homepage" +msgstr "_Thuispagina" + +#: ../midori/midori-app.c:1336 msgid "_Userscripts" msgstr "Gebruikers_scripts" -#: ../midori/midori-app.c:1377 -msgid "User_styles" -msgstr "Gebruikers_stijlen" - -#: ../midori/midori-app.c:1378 +#: ../midori/midori-app.c:1337 msgid "New _Tab" msgstr "Nieuw _tabblad" -#: ../midori/midori-app.c:1379 +#: ../midori/midori-app.c:1338 msgid "_Transfers" msgstr "Bestand_overdrachten" -#: ../midori/midori-app.c:1380 +#: ../midori/midori-app.c:1339 msgid "Netscape p_lugins" -msgstr "Netscape-invoegtoepassingen" +msgstr "Netscape p_lugins" -#: ../midori/midori-app.c:1381 +#: ../midori/midori-app.c:1340 msgid "_Closed Tabs" msgstr "Ge_sloten tabbladen" -#: ../midori/midori-app.c:1382 ../midori/midori-browser.c:5387 +#: ../midori/midori-app.c:1341 ../midori/midori-browser.c:5163 msgid "New _Window" msgstr "Nieuw _venster" -#: ../midori/midori-app.c:1383 +#: ../midori/midori-app.c:1342 msgid "New _Folder" msgstr "Nieuwe _map" -#: ../midori/midori-app.c:1437 -msgid "[Addresses]" -msgstr "[Adressen]" - #: ../midori/midori-array.c:522 msgid "File not found." msgstr "Bestand niet gevonden." @@ -445,114 +402,124 @@ msgstr "Onbekende bladwijzeropmaak." msgid "Writing failed." msgstr "Schrijven is mislukt." -#: ../midori/midori-browser.c:347 ../midori/midori-browser.c:5526 -msgid "Go forward to the next page" -msgstr "Ga naar de volgende pagina" - -#. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:354 ../midori/midori-browser.c:5534 -#: ../midori/midori-browser.c:5537 -msgid "Go to the next sub-page" -msgstr "Ga naar de volgende subpagina" - -#: ../midori/midori-browser.c:441 ../midori/midori-browser.c:5475 -#: ../midori/midori-browser.c:5484 +#: ../midori/midori-browser.c:329 ../midori/midori-browser.c:5245 +#: ../midori/midori-browser.c:5254 msgid "Reload the current page" msgstr "De huidige pagina opnieuw laden" -#: ../midori/midori-browser.c:449 ../midori/midori-browser.c:5481 +#: ../midori/midori-browser.c:337 ../midori/midori-browser.c:5251 msgid "Stop loading the current page" msgstr "Stop met het laden van de huidige pagina" -#: ../midori/midori-browser.c:519 +#: ../midori/midori-browser.c:462 #, c-format msgid "Failed to update title: %s\n" msgstr "Kon titel niet aanpassen: %s\n" -#: ../midori/midori-browser.c:614 +#: ../midori/midori-browser.c:475 +#, c-format +msgid "Unexpected action '%s'." +msgstr "Onverwachte actie '%s'." + +#: ../midori/midori-browser.c:576 #, c-format msgid "%s (Private Browsing)" msgstr "%s (Privé-surfen)" -#: ../midori/midori-browser.c:724 ../midori/midori-browser.c:766 -#: ../panels/midori-bookmarks.c:114 -msgid "Bookmarks" -msgstr "Bladwijzers" +#: ../midori/midori-browser.c:687 ../midori/midori-browser.c:720 +msgid "Toplevel folder" +msgstr "Hoofdmap" -#: ../midori/midori-browser.c:826 +#: ../midori/midori-browser.c:777 msgid "New folder" msgstr "Nieuwe map" -#: ../midori/midori-browser.c:826 +#: ../midori/midori-browser.c:777 msgid "Edit folder" msgstr "Map bewerken" -#: ../midori/midori-browser.c:828 +#: ../midori/midori-browser.c:779 msgid "New bookmark" msgstr "Nieuwe bladwijzer" -#: ../midori/midori-browser.c:828 +#: ../midori/midori-browser.c:779 msgid "Edit bookmark" msgstr "Bladwijzer bewerken" -#: ../midori/midori-browser.c:862 -msgid "Type a name for this bookmark and choose where to keep it." -msgstr "" -"Tik een naam voor deze bladwijzer en kies waar die bewaard moet worden." +#: ../midori/midori-browser.c:810 +msgid "_Title:" +msgstr "_Titel:" + +#: ../midori/midori-browser.c:830 ../midori/midori-searchaction.c:966 +#: ../extensions/feed-panel/main.c:377 +msgid "_Address:" +msgstr "_Adres:" -#: ../midori/midori-browser.c:923 +#: ../midori/midori-browser.c:853 ../midori/midori-browser.c:4310 +msgid "_Folder:" +msgstr "_Map:" + +#: ../midori/midori-browser.c:869 msgid "Add to _Speed Dial" msgstr "Toevoegen aan _snelkiezen" -#: ../midori/midori-browser.c:929 +#: ../midori/midori-browser.c:882 msgid "Show in the tool_bar" msgstr "Laat in de werk_balk zien" -#: ../midori/midori-browser.c:937 +#: ../midori/midori-browser.c:897 msgid "Run as _web application" msgstr "Uitvoeren als _webtoepassing" -#: ../midori/midori-browser.c:1055 ../midori/midori-browser.c:4504 +#: ../midori/midori-browser.c:968 +#, 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:970 +#, 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:977 +#, c-format +msgid "There is not enough free space to download \"%s\"." +msgstr "Er is niet voldoende schijfruimte om \"%s\" binnen te halen." + +#: ../midori/midori-browser.c:980 +#, c-format +msgid "The file needs %s but only %s are left." +msgstr "Het bestand heeft %s nodig maar slechts %s is over." + +#: ../midori/midori-browser.c:1024 ../midori/midori-browser.c:4380 msgid "Save file as" msgstr "Bestand opslaan als" -#: ../midori/midori-browser.c:1065 -msgid "Save associated _resources" -msgstr "Geassocieerde hulpbronnen opslaan" +#: ../midori/midori-browser.c:1333 +msgid "New Window" +msgstr "Nieuw venster" -#: ../midori/midori-browser.c:1323 +#: ../midori/midori-browser.c:1333 msgid "A new window has been opened" msgstr "Er is een nieuw venster geopend" -#: ../midori/midori-browser.c:1326 +#: ../midori/midori-browser.c:1336 +msgid "New Tab" +msgstr "Nieuw tabblad" + +#: ../midori/midori-browser.c:1336 msgid "A new tab has been opened" msgstr "Er is een nieuw tabblad geopend" -#: ../midori/midori-browser.c:1343 -msgid "Error opening the image!" -msgstr "Fout bij het openen van de afbeelding." - -#: ../midori/midori-browser.c:1344 -msgid "Can not open selected image in a default viewer." -msgstr "Kan de gekozen afbeelding niet openen in een standaardkijker." - -#: ../midori/midori-browser.c:1350 -msgid "Error downloading the image!" -msgstr "Fout bij het binnenhalen van de afbeelding." - -#: ../midori/midori-browser.c:1351 -msgid "Can not download selected image." -msgstr "Kan de gekozen afbeelding niet binnenhalen." - -#: ../midori/midori-browser.c:1408 +#: ../midori/midori-browser.c:1373 msgid "Save file" msgstr "Bestand opslaan" -#: ../midori/midori-browser.c:2335 +#: ../midori/midori-browser.c:2263 msgid "Open file" msgstr "Bestand openen" -#: ../midori/midori-browser.c:2467 +#: ../midori/midori-browser.c:2394 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" @@ -561,161 +528,145 @@ msgid "" "automatically." msgstr "" "Om de bovenstaande URI te openen heeft u een nieuwsaggregator nodig. Daar is " -"meestal een menu of knop 'Nieuw abonnement', 'Nieuwe nieuwsvoeding' of " +"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:2473 ../extensions/feed-panel/main.c:365 +#: ../midori/midori-browser.c:2400 ../extensions/feed-panel/main.c:365 msgid "New feed" msgstr "Nieuwe voeding" -#: ../midori/midori-browser.c:2516 ../midori/midori-browser.c:5550 -#: ../panels/midori-bookmarks.c:527 +#: ../midori/midori-browser.c:2443 ../midori/midori-browser.c:5314 +#: ../panels/midori-bookmarks.c:432 msgid "Add a new bookmark" msgstr "Nieuwe bladwijzer toevoegen" -#: ../midori/midori-browser.c:3060 ../midori/midori-searchaction.c:487 +#: ../midori/midori-browser.c:2969 ../midori/midori-searchaction.c:487 msgid "Empty" msgstr "Leeg" -#: ../midori/midori-browser.c:3506 ../midori/midori-browser.c:3507 +#: ../midori/midori-browser.c:3459 msgid "Toggle text cursor navigation" msgstr "Schakel tekstaanwijzer-navigatie" -#: ../midori/midori-browser.c:3509 -msgid "" -"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in " -"all websites." -msgstr "" -"Het indrukken van F7 schakelt de cursormodus om. Wanneer deze actief is, " -"verschijnt er op alle websites een tekstcursor." - -#: ../midori/midori-browser.c:3512 -msgid "_Enable Caret Browsing" -msgstr "Cursormodus inschakelen" - -#: ../midori/midori-browser.c:3904 ../midori/midori-browser.c:5944 +#: ../midori/midori-browser.c:3771 ../midori/midori-browser.c:5721 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Kon nieuw element in geschiedenis niet toevoegen: %s\n" -#: ../midori/midori-browser.c:4230 ../panels/midori-bookmarks.c:850 -#: ../panels/midori-history.c:806 +#: ../midori/midori-browser.c:4107 ../panels/midori-bookmarks.c:748 +#: ../panels/midori-history.c:747 msgid "Open all in _Tabs" msgstr "Alles openen in _tabbladen" -#: ../midori/midori-browser.c:4237 ../panels/midori-bookmarks.c:856 -#: ../panels/midori-history.c:812 ../extensions/feed-panel/feed-panel.c:528 +#: ../midori/midori-browser.c:4114 ../panels/midori-bookmarks.c:754 +#: ../panels/midori-history.c:753 ../extensions/feed-panel/feed-panel.c:528 msgid "Open in New _Tab" msgstr "In nieuw _tabblad openen" -#: ../midori/midori-browser.c:4240 ../midori/midori-view.c:2904 -#: ../midori/midori-view.c:4880 ../panels/midori-bookmarks.c:858 -#: ../panels/midori-history.c:814 ../extensions/feed-panel/feed-panel.c:530 +#: ../midori/midori-browser.c:4117 ../midori/midori-view.c:2530 +#: ../midori/midori-view.c:4357 ../panels/midori-bookmarks.c:756 +#: ../panels/midori-history.c:755 ../extensions/feed-panel/feed-panel.c:530 msgid "Open in New _Window" msgstr "In nieuw _venster openen" -#: ../midori/midori-browser.c:4329 +#: ../midori/midori-browser.c:4197 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4330 +#: ../midori/midori-browser.c:4198 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4331 +#: ../midori/midori-browser.c:4199 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4332 +#: ../midori/midori-browser.c:4200 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4333 +#: ../midori/midori-browser.c:4201 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4334 +#: ../midori/midori-browser.c:4202 #, c-format msgid "Firefox (%s)" msgstr "Firefox (%s)" -#: ../midori/midori-browser.c:4335 -msgid "Midori 0.2.6" -msgstr "Midori 0.2.6" - -#: ../midori/midori-browser.c:4356 -msgid "Import bookmarks…" -msgstr "Bladwijzers invoeren…" +#: ../midori/midori-browser.c:4223 +msgid "Import bookmarks..." +msgstr "Bladwijzers invoeren..." -#: ../midori/midori-browser.c:4359 ../midori/midori-browser.c:5555 +#: ../midori/midori-browser.c:4226 ../midori/midori-browser.c:5319 msgid "_Import bookmarks" msgstr "Bladwijzers _invoeren" -#: ../midori/midori-browser.c:4370 +#: ../midori/midori-browser.c:4237 msgid "_Application:" msgstr "_Toepassing:" -#: ../midori/midori-browser.c:4435 +#: ../midori/midori-browser.c:4302 msgid "Import from XBEL or HTML file" msgstr "Invoeren vanuit een XBEL- of HTML-bestand" -#: ../midori/midori-browser.c:4463 +#: ../midori/midori-browser.c:4337 msgid "Import from a file" msgstr "Invoeren vanuit een bestand" -#: ../midori/midori-browser.c:4475 +#: ../midori/midori-browser.c:4349 msgid "Failed to import bookmarks" msgstr "Bladwijzers invoeren mislukt" -#: ../midori/midori-browser.c:4509 +#: ../midori/midori-browser.c:4385 msgid "XBEL Bookmarks" msgstr "XBEL-bladwijzers" -#: ../midori/midori-browser.c:4514 +#: ../midori/midori-browser.c:4390 msgid "Netscape Bookmarks" msgstr "Netscape-bladwijzers" -#: ../midori/midori-browser.c:4528 +#: ../midori/midori-browser.c:4404 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:4543 +#: ../midori/midori-browser.c:4420 msgid "Failed to export bookmarks" msgstr "Bladwijzers uitvoeren mislukt" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4665 +#: ../midori/midori-browser.c:4542 msgid "Clear Private Data" msgstr "Wis privégegevens" -#: ../midori/midori-browser.c:4669 +#: ../midori/midori-browser.c:4546 msgid "_Clear private data" msgstr "Privégegevens _wissen" -#: ../midori/midori-browser.c:4684 +#: ../midori/midori-browser.c:4559 msgid "Clear the following data:" msgstr "Wis de volgende gegevens:" -#: ../midori/midori-browser.c:4694 +#: ../midori/midori-browser.c:4569 msgid "Last open _tabs" msgstr "Laatst openstaande _tabbladen" -#: ../midori/midori-browser.c:4720 +#: ../midori/midori-browser.c:4595 msgid "Clear private data when _quitting Midori" msgstr "Privégegevens wissen bij het _afsluiten van Midori" -#: ../midori/midori-browser.c:4935 +#: ../midori/midori-browser.c:4771 msgid "A lightweight web browser." msgstr "Een lichtgewicht webbrowser." -#: ../midori/midori-browser.c:4936 +#: ../midori/midori-browser.c:4772 msgid "See about:version for version info." msgstr "Ga naar about:version voor informatie over de versie." -#: ../midori/midori-browser.c:4938 +#: ../midori/midori-browser.c:4774 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 " @@ -727,1346 +678,1477 @@ msgstr "" "zoals gepubliceerd door de Free Software Foundation; hetzij versie 2.1 van " "de licentie hetzij een latere versie (naar keuze)." -#: ../midori/midori-browser.c:4968 +#: ../midori/midori-browser.c:4795 msgid "translator-credits" msgstr "" "Timo Verbeek \n" "Pascal De Vuyst \n" "Emmo" -#: ../midori/midori-browser.c:5385 +#: ../midori/midori-browser.c:5161 msgid "_File" msgstr "_Bestand" -#: ../midori/midori-browser.c:5388 +#: ../midori/midori-browser.c:5164 msgid "Open a new window" msgstr "Nieuw venster openen" -#: ../midori/midori-browser.c:5391 +#: ../midori/midori-browser.c:5167 msgid "Open a new tab" msgstr "Nieuw tabblad openen" -#: ../midori/midori-browser.c:5393 +#: ../midori/midori-browser.c:5169 msgid "New P_rivate Browsing Window" msgstr "Nieuw p_rivé-surfvenster" -#: ../midori/midori-browser.c:5397 +#: ../midori/midori-browser.c:5173 msgid "Open a file" msgstr "Bestand openen" -#: ../midori/midori-browser.c:5399 -msgid "_Save Page As…" -msgstr "_Sla pagina op als…" +#: ../midori/midori-browser.c:5175 +msgid "_Save Page As..." +msgstr "_Sla pagina op als..." -#: ../midori/midori-browser.c:5400 +#: ../midori/midori-browser.c:5176 msgid "Save to a file" msgstr "Opslaan naar bestand" -#: ../midori/midori-browser.c:5402 +#: ../midori/midori-browser.c:5178 msgid "Add to Speed _dial" msgstr "Toevoegen aan _snelkiezen" -#: ../midori/midori-browser.c:5406 +#: ../midori/midori-browser.c:5182 msgid "Add Shortcut to the _desktop" msgstr "Voeg snelkoppeling toe op _bureaublad" -#: ../midori/midori-browser.c:5408 +#: ../midori/midori-browser.c:5184 msgid "Create _Launcher" msgstr "Maak _starter" -#: ../midori/midori-browser.c:5412 +#: ../midori/midori-browser.c:5188 msgid "Subscribe to News _feed" msgstr "Abonneren op nieuws_voeding" -#: ../midori/midori-browser.c:5418 +#: ../midori/midori-browser.c:5194 msgid "_Close Tab" msgstr "Tabblad _sluiten" -#: ../midori/midori-browser.c:5419 +#: ../midori/midori-browser.c:5195 msgid "Close the current tab" msgstr "Huidig tabblad sluiten" -#: ../midori/midori-browser.c:5421 +#: ../midori/midori-browser.c:5197 msgid "C_lose Window" msgstr "Venster _sluiten" -#: ../midori/midori-browser.c:5425 -msgid "_Share" -msgstr "Delen" - -#: ../midori/midori-browser.c:5430 +#: ../midori/midori-browser.c:5201 msgid "Print the current page" msgstr "Huidige pagina afdrukken" -#: ../midori/midori-browser.c:5433 +#: ../midori/midori-browser.c:5203 msgid "Close a_ll Windows" msgstr "A_lle Vensters Sluiten" -#: ../midori/midori-browser.c:5436 +#: ../midori/midori-browser.c:5206 msgid "_Edit" msgstr "_Bewerken" -#: ../midori/midori-browser.c:5459 -msgid "_Find…" -msgstr "_Zoek…" +#: ../midori/midori-browser.c:5229 +msgid "_Find..." +msgstr "_Zoek..." -#: ../midori/midori-browser.c:5460 +#: ../midori/midori-browser.c:5230 msgid "Find a word or phrase in the page" msgstr "Zoek naar een woord of zin in deze pagina" -#: ../midori/midori-browser.c:5462 +#: ../midori/midori-browser.c:5232 msgid "Find _Next" msgstr "Vo_lgende zoeken" -#: ../midori/midori-browser.c:5465 +#: ../midori/midori-browser.c:5235 msgid "Find _Previous" msgstr "Vo_rige zoeken" -#: ../midori/midori-browser.c:5469 +#: ../midori/midori-browser.c:5239 msgid "Configure the application preferences" msgstr "Toepassingsvoorkeuren instellen" -#: ../midori/midori-browser.c:5471 +#: ../midori/midori-browser.c:5241 msgid "_View" msgstr "_Beeld" -#: ../midori/midori-browser.c:5472 +#: ../midori/midori-browser.c:5242 msgid "_Toolbars" msgstr "_Werkbalken" -#: ../midori/midori-browser.c:5477 +#: ../midori/midori-browser.c:5247 msgid "Reload page without caching" msgstr "Vernieuw de pagina zonder gegevensopslag" -#: ../midori/midori-browser.c:5487 +#: ../midori/midori-browser.c:5257 msgid "Increase the zoom level" msgstr "Zoomniveau verhogen" -#: ../midori/midori-browser.c:5490 +#: ../midori/midori-browser.c:5260 msgid "Decrease the zoom level" msgstr "Zoomniveau verlagen" -#: ../midori/midori-browser.c:5494 +#: ../midori/midori-browser.c:5264 msgid "_Encoding" msgstr "_Codering" -#: ../midori/midori-browser.c:5496 +#: ../midori/midori-browser.c:5266 msgid "View So_urce" msgstr "_Bron bekijken" -#: ../midori/midori-browser.c:5499 +#: ../midori/midori-browser.c:5269 msgid "Ca_ret Browsing" -msgstr "Cursor-surfen" +msgstr "Be_schermd surfen" -#: ../midori/midori-browser.c:5503 +#: ../midori/midori-browser.c:5273 msgid "Toggle fullscreen view" msgstr "Schakel volledig-scherm-weergave" -#: ../midori/midori-browser.c:5505 +#: ../midori/midori-browser.c:5275 msgid "Scroll _Left" msgstr "Naar _links bladeren" -#: ../midori/midori-browser.c:5508 +#: ../midori/midori-browser.c:5278 msgid "Scroll _Down" msgstr "Naar _beneden bladeren" -#: ../midori/midori-browser.c:5511 +#: ../midori/midori-browser.c:5281 msgid "Scroll _Up" msgstr "Naar _omhoog bladeren" -#: ../midori/midori-browser.c:5514 +#: ../midori/midori-browser.c:5284 msgid "Scroll _Right" msgstr "Naar _rechts bladeren" -#: ../midori/midori-browser.c:5517 -msgid "_Readable" -msgstr "Leesbaar" - -#: ../midori/midori-browser.c:5520 +#: ../midori/midori-browser.c:5287 msgid "_Go" msgstr "_Ga" -#: ../midori/midori-browser.c:5523 +#: ../midori/midori-browser.c:5290 msgid "Go back to the previous page" msgstr "Ga terug naar de vorige pagina" +#: ../midori/midori-browser.c:5293 +msgid "Go forward to the next page" +msgstr "Ga naar de volgende pagina" + #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5530 +#: ../midori/midori-browser.c:5297 msgid "Go to the previous sub-page" msgstr "Ga naar de vorige subpagina" -#: ../midori/midori-browser.c:5539 -msgid "_Homepage" -msgstr "_Thuispagina" +#. i18n: Visit the following logical page, ie. in a forum or blog +#: ../midori/midori-browser.c:5301 +msgid "Go to the next sub-page" +msgstr "Ga naar de volgende subpagina" -#: ../midori/midori-browser.c:5540 +#: ../midori/midori-browser.c:5304 msgid "Go to your homepage" msgstr "Ga naar de thuispagina" -#: ../midori/midori-browser.c:5542 +#: ../midori/midori-browser.c:5306 msgid "Empty Trash" msgstr "Prullenbak leegmaken" -#: ../midori/midori-browser.c:5545 +#: ../midori/midori-browser.c:5309 msgid "Undo _Close Tab" msgstr "Tabblad _sluiten ongedaan maken" -#: ../midori/midori-browser.c:5552 +#: ../midori/midori-browser.c:5316 msgid "Add a new _folder" msgstr "Nieuwe _map toevoegen" -#: ../midori/midori-browser.c:5558 +#: ../midori/midori-browser.c:5322 msgid "_Export bookmarks" msgstr "Bladwijzers _exporteren" -#: ../midori/midori-browser.c:5561 ../midori/midori-searchaction.c:496 +#: ../midori/midori-browser.c:5325 ../midori/midori-searchaction.c:496 msgid "_Manage Search Engines" msgstr "_Zoekmachines beheren" -#: ../midori/midori-browser.c:5564 +#: ../midori/midori-browser.c:5328 msgid "_Clear Private Data" msgstr "Privé-gegevens _Wissen" -#: ../midori/midori-browser.c:5567 +#: ../midori/midori-browser.c:5331 msgid "_Inspect Page" msgstr "Pagina _inspecteren" -#: ../midori/midori-browser.c:5571 +#: ../midori/midori-browser.c:5335 msgid "_Previous Tab" msgstr "Vo_rig tabblad" -#: ../midori/midori-browser.c:5574 +#: ../midori/midori-browser.c:5338 msgid "_Next Tab" msgstr "Vo_lgend tabblad" -#: ../midori/midori-browser.c:5576 +#: ../midori/midori-browser.c:5340 msgid "Move Tab _Backward" msgstr "Verplaats tabblad naar _achteren" -#: ../midori/midori-browser.c:5578 +#: ../midori/midori-browser.c:5342 msgid "_Move Tab Forward" msgstr "_Verplaats tabblad naar voren" -#: ../midori/midori-browser.c:5581 +#: ../midori/midori-browser.c:5345 msgid "Focus _Current Tab" msgstr "Focus _huidig tabblad" -#: ../midori/midori-browser.c:5584 +#: ../midori/midori-browser.c:5348 msgid "Focus _Next view" msgstr "Focus _volgende weergave" -#: ../midori/midori-browser.c:5587 +#: ../midori/midori-browser.c:5351 msgid "Only show the Icon of the _Current Tab" msgstr "Toon alleen het Pictogram van het _Huidige Tabblad" -#: ../midori/midori-browser.c:5590 +#: ../midori/midori-browser.c:5354 msgid "_Duplicate Current Tab" msgstr "Huidig tabblad _dupliceren" -#: ../midori/midori-browser.c:5593 +#: ../midori/midori-browser.c:5357 msgid "Close Ot_her Tabs" msgstr "An_dere tabbladen sluiten" -#: ../midori/midori-browser.c:5596 +#: ../midori/midori-browser.c:5360 msgid "Open last _session" msgstr "Open laatste _sessie" -#: ../midori/midori-browser.c:5599 +#: ../midori/midori-browser.c:5363 msgid "_Help" msgstr "_Hulp" -#: ../midori/midori-browser.c:5601 +#: ../midori/midori-browser.c:5365 msgid "_Frequent Questions" msgstr "_Veelgestelde vragen" -#: ../midori/midori-browser.c:5604 -msgid "_Report a Problem…" -msgstr "_Meld een probleem…" +#: ../midori/midori-browser.c:5368 +msgid "_Report a Problem..." +msgstr "_Meld een probleem..." -#: ../midori/midori-browser.c:5609 ../midori/midori-browser.c:6270 -msgid "_Tools" -msgstr "_Hulpmiddelen" - -#: ../midori/midori-browser.c:5616 +#: ../midori/midori-browser.c:5380 msgid "_Menubar" msgstr "_Menubalk" -#: ../midori/midori-browser.c:5620 +#: ../midori/midori-browser.c:5384 msgid "_Navigationbar" msgstr "_Navigatiebalk" -#: ../midori/midori-browser.c:5624 +#: ../midori/midori-browser.c:5388 msgid "Side_panel" msgstr "_Zijbalk" -#: ../midori/midori-browser.c:5625 +#: ../midori/midori-browser.c:5389 msgid "Sidepanel" msgstr "Zijbalk" -#: ../midori/midori-browser.c:5628 +#: ../midori/midori-browser.c:5392 msgid "_Bookmarkbar" msgstr "_Bladwijzerbalk" -#: ../midori/midori-browser.c:5632 +#: ../midori/midori-browser.c:5396 msgid "_Statusbar" msgstr "_Statusbalk" -#: ../midori/midori-browser.c:5641 ../midori/midori-websettings.c:199 +#: ../midori/midori-browser.c:5405 ../midori/midori-websettings.c:302 msgid "_Automatic" msgstr "_Automatisch" -#: ../midori/midori-browser.c:5644 ../midori/midori-websettings.c:123 -msgid "Chinese Traditional (BIG5)" -msgstr "Chinees traditioneel (BIG5)" - -#: ../midori/midori-browser.c:5647 ../midori/midori-websettings.c:124 -msgid "Chinese Simplified (GB18030)" -msgstr "Chinees vereenvoudigd (GB18030)" +#: ../midori/midori-browser.c:5408 ../midori/midori-websettings.c:227 +msgid "Chinese (BIG5)" +msgstr "Chinees (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5651 +#: ../midori/midori-browser.c:5412 msgid "Japanese (SHIFT__JIS)" msgstr "Japans (SHIFT__JIS)" -#: ../midori/midori-browser.c:5654 ../midori/midori-websettings.c:126 +#: ../midori/midori-browser.c:5415 ../midori/midori-websettings.c:229 msgid "Korean (EUC-KR)" msgstr "Koreaans (EUC-KR)" -#: ../midori/midori-browser.c:5657 ../midori/midori-websettings.c:127 +#: ../midori/midori-browser.c:5418 ../midori/midori-websettings.c:230 msgid "Russian (KOI8-R)" msgstr "Russisch (KOI8-R)" -#: ../midori/midori-browser.c:5660 ../midori/midori-websettings.c:128 +#: ../midori/midori-browser.c:5421 ../midori/midori-websettings.c:231 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5663 ../midori/midori-websettings.c:129 +#: ../midori/midori-browser.c:5424 ../midori/midori-websettings.c:232 msgid "Western (ISO-8859-1)" msgstr "Westers (ISO-8859-1)" -#: ../midori/midori-browser.c:5666 -msgid "Custom…" -msgstr "Aangepast…" +#: ../midori/midori-browser.c:5427 ../midori/midori-websettings.c:233 +#: ../midori/midori-websettings.c:308 ../katze/katze-utils.c:635 +msgid "Custom..." +msgstr "Aangepast..." -#: ../midori/midori-browser.c:6176 +#: ../midori/midori-browser.c:5907 msgid "_Separator" msgstr "_Scheidingsteken" -#: ../midori/midori-browser.c:6183 -msgid "_Location…" -msgstr "_Locatie…" +#: ../midori/midori-browser.c:5914 +msgid "_Location..." +msgstr "_Locatie..." -#: ../midori/midori-browser.c:6185 +#: ../midori/midori-browser.c:5916 msgid "Open a particular location" msgstr "Open een specifieke locatie" -#: ../midori/midori-browser.c:6207 -msgid "_Web Search…" -msgstr "Zoeken op het _web…" +#: ../midori/midori-browser.c:5938 +msgid "_Web Search..." +msgstr "Zoeken op het _web..." -#: ../midori/midori-browser.c:6209 +#: ../midori/midori-browser.c:5940 msgid "Run a web search" msgstr "Doorzoek het web" -#: ../midori/midori-browser.c:6236 +#: ../midori/midori-browser.c:5967 msgid "Reopen a previously closed tab or window" msgstr "Heropen een eerder gesloten tabblad of venster" -#: ../midori/midori-browser.c:6253 +#: ../midori/midori-browser.c:5982 msgid "Show the saved bookmarks" msgstr "Opgeslagen bladwijzers weergeven" -#: ../midori/midori-browser.c:6286 +#: ../midori/midori-browser.c:5996 +msgid "_Tools" +msgstr "_Hulpmiddelen" + +#: ../midori/midori-browser.c:6011 msgid "_Window" msgstr "_Venster" -#: ../midori/midori-browser.c:6288 +#: ../midori/midori-browser.c:6013 msgid "Show a list of all open tabs" msgstr "Geef een lijst van alle open tabbladen weer" -#: ../midori/midori-browser.c:6302 +#: ../midori/midori-browser.c:6027 msgid "_Menu" msgstr "_Menu" -#: ../midori/midori-browser.c:6304 +#: ../midori/midori-browser.c:6029 msgid "Menu" msgstr "Menu" -#: ../midori/midori-browser.c:7134 +#: ../midori/midori-browser.c:6671 #, c-format msgid "Unexpected setting '%s'" msgstr "Onverwachte configuratie-optie '%s'" -#: ../midori/midori-extension.c:330 +#: ../midori/midori-extension.c:310 #, c-format 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-extension.c:752 ../midori/midori-extension.c:849 -#: ../midori/midori-extension.c:946 ../midori/midori-extension.c:1058 -#: ../extensions/addons.c:1686 +#: ../midori/midori-extension.c:721 ../midori/midori-extension.c:818 +#: ../midori/midori-extension.c:915 ../midori/midori-extension.c:1027 +#: ../extensions/addons.c:1690 #, c-format 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:398 -#, c-format -msgid "Search with %s" -msgstr "Zoek met %s" - -#: ../midori/midori-locationaction.c:418 -msgid "Search with…" -msgstr "Doorzoeken met…" - -#: ../midori/midori-locationaction.c:545 +#: ../midori/midori-locationaction.c:425 #, c-format msgid "Failed to select from history\n" msgstr "Kon niet kiezen uit geschiedenis\n" -#: ../midori/midori-locationaction.c:632 +#: ../midori/midori-locationaction.c:509 #, c-format msgid "Search for %s" msgstr "Zoek naar %s" -#: ../midori/midori-locationaction.c:1227 -msgid "Export certificate" -msgstr "Uitvoercertificaat" - -#: ../midori/midori-locationaction.c:1259 -msgid "The signing certificate authority is not known." -msgstr "De ondertekenende certificaatautoriteit is niet bekend." - -#: ../midori/midori-locationaction.c:1261 -msgid "" -"The certificate does not match the expected identity of the site that it was " -"retrieved from." -msgstr "" -"Het certificaat komt niet overeen met de verwachte identiteit van de webstek " -"waar hij van is opgehaald." - -#: ../midori/midori-locationaction.c:1263 -msgid "The certificate's activation time is still in the future." -msgstr "De activatietijd van het certificaat is nog steeds in de toekomst." - -#: ../midori/midori-locationaction.c:1265 -msgid "The certificate has expired" -msgstr "Het certificaat is verlopen" - -#: ../midori/midori-locationaction.c:1267 -msgid "" -"The certificate has been revoked according to the GTlsConnection's " -"certificate revocation list." -msgstr "" -"Het certificaat is ingetrokken volgens de intrekkingslijst voor certificaten " -"van GTlsConnection." - -#: ../midori/midori-locationaction.c:1269 -msgid "The certificate's algorithm is considered insecure." -msgstr "Het algoritme van het certificaat wordt beschouwd als onveilig." - -#: ../midori/midori-locationaction.c:1271 -msgid "Some other error occurred validating the certificate." -msgstr "Bij het valideren van het certificaat vond er een andere fout plaats." - -#: ../midori/midori-locationaction.c:1318 -msgid "_Export certificate" -msgstr "_Uitvoercertificaat" - -#: ../midori/midori-locationaction.c:1333 -msgid "Self-signed" -msgstr "Zelf-ondertekend" - -#: ../midori/midori-locationaction.c:1367 -msgid "Security details" -msgstr "Veiligheidsdetails" +#: ../midori/midori-locationaction.c:535 +#, c-format +msgid "Search with %s" +msgstr "Zoek met %s" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1650 +#: ../midori/midori-locationaction.c:1287 msgid "Paste and p_roceed" msgstr "Plakken en _doorgaan" -#: ../midori/midori-locationaction.c:1974 +#: ../midori/midori-locationaction.c:1656 msgid "Not verified" msgstr "Niet geverifieerd" -#: ../midori/midori-locationaction.c:1982 +#: ../midori/midori-locationaction.c:1671 msgid "Verified and encrypted connection" msgstr "Geverifieerde en versleutelde verbinding" -#: ../midori/midori-locationaction.c:1989 -msgid "Open, unencrypted connection" -msgstr "Open, niet-versleutelde verbinding" - -#: ../midori/midori-panel.c:317 ../midori/midori-panel.c:319 -#: ../midori/midori-panel.c:483 ../midori/midori-panel.c:486 +#: ../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 "Zijbalk rechts plaatsen" -#: ../midori/midori-panel.c:329 ../midori/midori-panel.c:330 +#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410 msgid "Close panel" msgstr "Balk sluiten" -#: ../midori/midori-panel.c:484 ../midori/midori-panel.c:487 +#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566 msgid "Align sidepanel to the left" msgstr "Zijbalk links plaatsen" -#: ../midori/midori-websettings.c:105 +#: ../midori/midori-websettings.c:209 msgid "Show Speed Dial" msgstr "Toon snelkeuzemenu" -#: ../midori/midori-websettings.c:106 +#: ../midori/midori-websettings.c:210 msgid "Show Homepage" msgstr "Toon startpagina" -#: ../midori/midori-websettings.c:125 +#: ../midori/midori-websettings.c:228 msgid "Japanese (SHIFT_JIS)" msgstr "Japans (SHIFT_JIS)" -#: ../midori/midori-websettings.c:130 ../midori/midori-websettings.c:206 -#: ../katze/katze-utils.c:633 -msgid "Custom..." -msgstr "Aangepast…" - -#: ../midori/midori-websettings.c:145 +#: ../midori/midori-websettings.c:248 msgid "New tab" msgstr "Nieuw tabblad" -#: ../midori/midori-websettings.c:146 +#: ../midori/midori-websettings.c:249 msgid "New window" msgstr "Nieuw venster" -#: ../midori/midori-websettings.c:147 +#: ../midori/midori-websettings.c:250 msgid "Current tab" msgstr "Huidig tabblad" -#: ../midori/midori-websettings.c:162 +#: ../midori/midori-websettings.c:265 msgid "Default" msgstr "Standaard" -#: ../midori/midori-websettings.c:163 +#: ../midori/midori-websettings.c:266 msgid "Icons" msgstr "Pictogrammen" -#: ../midori/midori-websettings.c:164 +#: ../midori/midori-websettings.c:267 msgid "Small icons" msgstr "Kleine pictogrammen" -#: ../midori/midori-websettings.c:165 +#: ../midori/midori-websettings.c:268 msgid "Text" msgstr "Tekst" -#: ../midori/midori-websettings.c:166 +#: ../midori/midori-websettings.c:269 msgid "Icons and text" msgstr "Pictogrammen en tekst" -#: ../midori/midori-websettings.c:167 +#: ../midori/midori-websettings.c:270 msgid "Text beside icons" msgstr "Tekst naast pictogrammen" -#: ../midori/midori-websettings.c:182 +#: ../midori/midori-websettings.c:285 msgid "Automatic (GNOME or environment)" msgstr "Automatisch (GNOME of omgeving)" -#: ../midori/midori-websettings.c:183 +#: ../midori/midori-websettings.c:286 msgid "HTTP proxy server" msgstr "HTTP proxy-server" -#: ../midori/midori-websettings.c:184 +#: ../midori/midori-websettings.c:287 msgid "No proxy server" msgstr "Geen proxy-server" -#: ../midori/midori-websettings.c:201 -msgid "Chrome" -msgstr "Chrome" - -#: ../midori/midori-websettings.c:202 +#: ../midori/midori-websettings.c:304 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:203 +#: ../midori/midori-websettings.c:305 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:306 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:307 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:278 -msgid "Toolbar Style:" -msgstr "Stijl van de werkbalk:" +#: ../midori/midori-websettings.c:360 +msgid "Remember last window size" +msgstr "Laatst gebruikte venstergrootte onthouden" -#: ../midori/midori-websettings.c:279 -msgid "The style of the toolbar" -msgstr "De stijl van de werkbalk" +#: ../midori/midori-websettings.c:361 +msgid "Whether to save the last window size" +msgstr "Al dan niet de laatst gebruikte venstergrootte opslaan" -#: ../midori/midori-websettings.c:288 -msgid "When Midori starts:" -msgstr "Bij starten van Midori:" +#: ../midori/midori-websettings.c:369 +msgid "Last window width" +msgstr "Laatst gebruikte vensterbreedte" -#: ../midori/midori-websettings.c:325 -msgid "Open new pages in:" -msgstr "Nieuwe pagina's openen in:" +#: ../midori/midori-websettings.c:370 +msgid "The last saved window width" +msgstr "De laatst opgeslagen vensterbreedte" -#. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:388 -msgid "Identify as" -msgstr "Identificeren als" +#: ../midori/midori-websettings.c:378 +msgid "Last window height" +msgstr "Laatst gebruikte vensterhoogte" -#: ../midori/midori-websettings.c:389 -msgid "What to identify as to web pages" -msgstr "Hoe zich te identificeren op webpagina's" +#: ../midori/midori-websettings.c:379 +msgid "The last saved window height" +msgstr "De laatste opgeslagen vensterhoogte" -#: ../midori/midori-websettings.c:472 -msgid "Always use my font choices" -msgstr "Altijd mijn lettertypekeuzes gebruiken" +#: ../midori/midori-websettings.c:404 +msgid "Last panel position" +msgstr "Laatst gebruikte positie van paneel" -#: ../midori/midori-websettings.c:473 -msgid "Override fonts picked by websites with user preferences" -msgstr "Lettertypes van websites vervangen door gebruikersvoorkeuren" +#: ../midori/midori-websettings.c:405 +msgid "The last saved panel position" +msgstr "De laatste opgeslagen positie van het paneel" -#: ../midori/midori-view.c:1012 ../midori/midori-view.c:1151 -msgid "Trust this website" -msgstr "Vertrouw deze website" +#. i18n: The internal index of the last opened panel +#: ../midori/midori-websettings.c:414 +msgid "Last panel page" +msgstr "Laatst geopende werkbalkpagina" -#: ../midori/midori-view.c:1149 -msgid "Security unknown" -msgstr "Veiligheid onbekend" +#: ../midori/midori-websettings.c:415 +msgid "The last saved panel page" +msgstr "De laatst opgeslagen werkbalkpagina" -#: ../midori/midori-view.c:1447 -#, c-format -msgid "%s wants to save an HTML5 database." -msgstr "%s wil een HTML5-gegevensbank opslaan." +#: ../midori/midori-websettings.c:423 +msgid "Last Web search" +msgstr "Laatste webzoekactie" -#: ../midori/midori-view.c:1451 ../midori/midori-view.c:1485 -msgid "_Deny" -msgstr "_Weigeren" +#: ../midori/midori-websettings.c:424 +msgid "The last saved Web search" +msgstr "De laatst bewaarde webzoekactie" -#: ../midori/midori-view.c:1451 ../midori/midori-view.c:1485 -msgid "_Allow" -msgstr "_Toestaan" +#: ../midori/midori-websettings.c:433 +msgid "Show Menubar" +msgstr "Menubalk weergeven" -#: ../midori/midori-view.c:1480 -#, c-format -msgid "%s wants to know your location." -msgstr "%s wil uw locatie weten." +#: ../midori/midori-websettings.c:434 +msgid "Whether to show the menubar" +msgstr "Menubalk weergeven" -#: ../midori/midori-view.c:1576 -#, c-format -msgid "Error - %s" -msgstr "Fout - %s" +#: ../midori/midori-websettings.c:442 +msgid "Show Navigationbar" +msgstr "Navigatiebalk weergeven" -#: ../midori/midori-view.c:1577 -#, c-format -msgid "The page '%s' couldn't be loaded." -msgstr "De pagina '%s' kan niet worden geladen" +#: ../midori/midori-websettings.c:443 +msgid "Whether to show the navigationbar" +msgstr "Al dan niet de navigatiebalk weergeven" -#: ../midori/midori-view.c:1579 -msgid "Try again" -msgstr "Probeer opnieuw" +#: ../midori/midori-websettings.c:451 +msgid "Show Bookmarkbar" +msgstr "Bladwijzerbalk weergeven" -#: ../midori/midori-view.c:1775 ../midori/midori-view.c:2839 -#, c-format -msgid "Send a message to %s" -msgstr "Stuur een bericht naar %s" +#: ../midori/midori-websettings.c:452 +msgid "Whether to show the bookmarkbar" +msgstr "Al dan niet bladwijzerbalk weergeven" -#: ../midori/midori-view.c:2622 -msgid "Add _search engine..." -msgstr "Zoekmachine toevoegen" +#: ../midori/midori-websettings.c:460 +msgid "Show Panel" +msgstr "Werkbalk weergeven" -#: ../midori/midori-view.c:2666 ../midori/midori-view.c:2995 -msgid "Inspect _Element" -msgstr "_Element inspecteren" +#: ../midori/midori-websettings.c:461 +msgid "Whether to show the panel" +msgstr "Al dan niet de werkbalk weergeven" -#: ../midori/midori-view.c:2718 -msgid "Open Link in New _Tab" -msgstr "Koppeling in nieuw _tabblad openen" +#: ../midori/midori-websettings.c:469 +msgid "Show Statusbar" +msgstr "Statusbalk weergeven" -#: ../midori/midori-view.c:2722 -msgid "Open Link in _Foreground Tab" -msgstr "Koppeling in nieuw tabblad op _voorgrond openen" +#: ../midori/midori-websettings.c:470 +msgid "Whether to show the statusbar" +msgstr "Al dan niet de statusbalk weergeven" -#: ../midori/midori-view.c:2723 -msgid "Open Link in _Background Tab" -msgstr "Koppeling in nieuw tabblad op _achtergrond openen" +#: ../midori/midori-websettings.c:479 +msgid "Toolbar Style:" +msgstr "Stijl van de werkbalk:" -#: ../midori/midori-view.c:2726 -msgid "Open Link in New _Window" -msgstr "Koppeling in nieuw _venster Openen" +#: ../midori/midori-websettings.c:480 +msgid "The style of the toolbar" +msgstr "De stijl van de werkbalk" -#: ../midori/midori-view.c:2729 -msgid "Open Link as Web A_pplication" -msgstr "Koppeling als webt_oepassing openen" +#: ../midori/midori-websettings.c:489 +msgid "Toolbar Items" +msgstr "Elementen in de werkbalk" -#: ../midori/midori-view.c:2734 -msgid "Copy Link de_stination" -msgstr "Koppelingbe_stemming kopiëren" +#: ../midori/midori-websettings.c:490 +msgid "The items to show on the toolbar" +msgstr "De elementen om weer te geven in de werkbalk" -#: ../midori/midori-view.c:2750 -msgid "Open _Image in New Tab" -msgstr "Open _afbeelding in nieuw tabblad" +#: ../midori/midori-websettings.c:498 +msgid "Compact Sidepanel" +msgstr "Compacte zijbalk" -#: ../midori/midori-view.c:2753 -msgid "Copy Im_age" -msgstr "Afbeelding kopiëren" +#: ../midori/midori-websettings.c:499 +msgid "Whether to make the sidepanel compact" +msgstr "Al dan niet de zijbalk compact weergeven" -#: ../midori/midori-view.c:2756 -msgid "Save I_mage" -msgstr "A_fbeelding opslaan" +#: ../midori/midori-websettings.c:514 +msgid "Align sidepanel on the right" +msgstr "Plaats zijbalk rechts" -#: ../midori/midori-view.c:2759 -msgid "Open in Image _Viewer" -msgstr "Openen in afbeeldingkijker." +#: ../midori/midori-websettings.c:515 +msgid "Whether to align the sidepanel on the right" +msgstr "Of de zijbalk aan de rechterkant dient te worden geplaatst" -#: ../midori/midori-view.c:2766 -msgid "Copy Video _Address" -msgstr "_Adres van video kopiëren" +#: ../midori/midori-websettings.c:530 +msgid "Open panels in separate windows" +msgstr "Open werkbalken in aparte vensters" -#: ../midori/midori-view.c:2769 -msgid "Save _Video" -msgstr "_Video opslaan" +#: ../midori/midori-websettings.c:531 +msgid "Whether to always open panels in separate windows" +msgstr "Of tabbladen altijd dienen te worden geopend in aparte vensters" -#: ../midori/midori-view.c:2769 -msgid "Download _Video" -msgstr "_Video binnenhalen" +#: ../midori/midori-websettings.c:540 +msgid "When Midori starts:" +msgstr "Bij starten van Midori:" -#: ../midori/midori-view.c:2795 -msgid "Search _with" -msgstr "Zoeken _met" +#: ../midori/midori-websettings.c:541 +msgid "What to do when Midori starts" +msgstr "Wat er dient te gebeuren bij starten van Midori" -#: ../midori/midori-view.c:2827 -msgid "_Search the Web" -msgstr "_Zoek op internet" +#: ../midori/midori-websettings.c:550 +msgid "Homepage:" +msgstr "Startpagina:" -#: ../midori/midori-view.c:2847 -msgid "Open Address in New _Tab" -msgstr "Adres in nieuw _tabblad openen" +#: ../midori/midori-websettings.c:551 +msgid "The homepage" +msgstr "De startpagina" -#: ../midori/midori-view.c:2900 -msgid "Open _Frame in New Tab" -msgstr "Open omlijsting in nieuw tabblad" +#: ../midori/midori-websettings.c:566 +msgid "Show crash dialog" +msgstr "Toon vastloopdialoogvenster" -#: ../midori/midori-view.c:3155 -#, c-format -msgid "Open or download file from %s" -msgstr "Bestand openen of binnenhalen vanaf %s" +#: ../midori/midori-websettings.c:567 +msgid "Show a dialog after Midori crashed" +msgstr "Toon een dialoogvenster nadat Midori is vastgelopen" -#: ../midori/midori-view.c:3168 -#, c-format -msgid "File Name: %s" -msgstr "Bestandnaam: %s" +#: ../midori/midori-websettings.c:575 +msgid "Save downloaded files to:" +msgstr "Bewaar binnengehaalde bestanden in:" -#: ../midori/midori-view.c:3173 -#, c-format +#: ../midori/midori-websettings.c:576 +msgid "The folder downloaded files are saved to" +msgstr "De map waarin binnengehaalde bestanden worden opgeslagen" + +#: ../midori/midori-websettings.c:584 +msgid "Text Editor" +msgstr "Tekstverwerker" + +#: ../midori/midori-websettings.c:585 +msgid "An external text editor" +msgstr "Een externe tekstverwerker" + +#: ../midori/midori-websettings.c:600 +msgid "News Aggregator" +msgstr "Nieuwsaggregator" + +#: ../midori/midori-websettings.c:601 +msgid "An external news aggregator" +msgstr "Een externe nieuwaggregator" + +#: ../midori/midori-websettings.c:609 +msgid "Location entry Search" +msgstr "Zoeken vanuit locatieveld" + +#: ../midori/midori-websettings.c:610 +msgid "The search to perform inside the location entry" +msgstr "Met welke website gezocht wordt vanuit het locatie-invoerveld" + +#: ../midori/midori-websettings.c:618 +msgid "Preferred Encoding" +msgstr "Voorkeurcodering" + +#: ../midori/midori-websettings.c:619 +msgid "The preferred character encoding" +msgstr "De voorkeurcodering van tekens" + +#: ../midori/midori-websettings.c:629 +msgid "Always Show Tabbar" +msgstr "Balk met tabbladen altijd weergeven" + +#: ../midori/midori-websettings.c:630 +msgid "Always show the tabbar" +msgstr "De balk met tabbladen altijd weergeven" + +#: ../midori/midori-websettings.c:638 +msgid "Close Buttons on Tabs" +msgstr "Sluitknoppen op tabbladen" + +#: ../midori/midori-websettings.c:639 +msgid "Whether tabs have close buttons" +msgstr "Of tabbladen sluitknoppen hebben" + +#: ../midori/midori-websettings.c:664 +msgid "Open new pages in:" +msgstr "Nieuwe pagina's openen in:" + +#: ../midori/midori-websettings.c:665 +msgid "Where to open new pages" +msgstr "Waar nieuwe pagina's geopend moeten worden" + +#: ../midori/midori-websettings.c:674 +msgid "Middle click opens Selection" +msgstr "Klikken met middelste muisknop opent selectie" + +#: ../midori/midori-websettings.c:675 +msgid "Load an address from the selection via middle click" +msgstr "Een adres vanuit de selectie laden met middelste muisknop" + +#: ../midori/midori-websettings.c:683 +msgid "Open tabs in the background" +msgstr "Tabbladen op de achtergrond openen" + +#: ../midori/midori-websettings.c:684 +msgid "Whether to open new tabs in the background" +msgstr "Of tabbladen op de achtergrond geopend dienen te worden" + +#: ../midori/midori-websettings.c:692 +msgid "Open Tabs next to Current" +msgstr "Tabbladen naast het huidige tabblad openen" + +#: ../midori/midori-websettings.c:693 +msgid "Whether to open new tabs next to the current tab or after the last one" +msgstr "" +"Of nieuwe tabbladen naast het huidige tabblad geopend dienen te worden of na " +"het laatste tabblad" + +#: ../midori/midori-websettings.c:701 +msgid "Open popups in tabs" +msgstr "Opduikvensters in tabbladen openen" + +#: ../midori/midori-websettings.c:702 +msgid "Whether to open popup windows in tabs" +msgstr "Of opduikvensters in tabbladen geopend dienen te worden" + +#: ../midori/midori-websettings.c:712 ../extensions/statusbar-features.c:131 +msgid "Load images automatically" +msgstr "Afbeeldingen automatisch laden" + +#: ../midori/midori-websettings.c:713 +msgid "Load and display images automatically" +msgstr "Afbeeldingen automatisch laden en weergeven" + +#: ../midori/midori-websettings.c:720 ../extensions/statusbar-features.c:140 +msgid "Enable scripts" +msgstr "Scripts aanzetten" + +#: ../midori/midori-websettings.c:721 +msgid "Enable embedded scripting languages" +msgstr "Ingebedde scripttalen uitvoeren" + +#: ../midori/midori-websettings.c:728 ../extensions/statusbar-features.c:149 +msgid "Enable Netscape plugins" +msgstr "Netscape-plugins uitvoeren" + +#: ../midori/midori-websettings.c:729 +msgid "Enable embedded Netscape plugin objects" +msgstr "Ingebedde Netscape-pluginobjecten uitvoeren" + +#: ../midori/midori-websettings.c:749 +msgid "Enable Spell Checking" +msgstr "Spellingscontrole aanzetten" + +#: ../midori/midori-websettings.c:750 +msgid "Enable spell checking while typing" +msgstr "Spellingscontrole tijdens het typen activeren" + +#: ../midori/midori-websettings.c:756 +msgid "Enable HTML5 database support" +msgstr "Ondersteuning van HTML5-gegevensbank activeren" + +#: ../midori/midori-websettings.c:757 +msgid "Whether to enable HTML5 database support" +msgstr "Of ondersteuning van de HTML5-gegevensbank dient te worden geactiveerd" + +#: ../midori/midori-websettings.c:763 +msgid "Enable HTML5 local storage support" +msgstr "HTML5 lokale opslagondersteuning activeren" + +#: ../midori/midori-websettings.c:764 +msgid "Whether to enable HTML5 local storage support" +msgstr "Of HTML5 locale opslagondersteuning dient te worden geactiveerd" + +#: ../midori/midori-websettings.c:770 +msgid "Enable offline web application cache" +msgstr "Offline webtoepassingsopslag gebruiken" + +#: ../midori/midori-websettings.c:771 +msgid "Whether to enable offline web application cache" +msgstr "Of offline webtoepassingsopslag dient te worden gebruikt" + +#: ../midori/midori-websettings.c:787 +msgid "Flash window on background tabs" +msgstr "Laat venster op achtergrond-tabbladen opflitsen" + +#: ../midori/midori-websettings.c:788 +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:803 +msgid "Zoom Text and Images" +msgstr "Tekst en afbeeldingen zoomen" + +#: ../midori/midori-websettings.c:804 +msgid "Whether to zoom text and images" +msgstr "Of tekst en afbeeldingen gezoomd dienen te worden" + +#: ../midori/midori-websettings.c:819 +msgid "Find inline while typing" +msgstr "Zoeken tijdens typen can regel" + +#: ../midori/midori-websettings.c:820 +msgid "Whether to automatically find inline while typing" +msgstr "Of automatisch gezocht moet worden tijdens typen van regel" + +#: ../midori/midori-websettings.c:835 +msgid "Kinetic scrolling" +msgstr "Kinetisch bladeren" + +#: ../midori/midori-websettings.c:836 +msgid "Whether scrolling should kinetically move according to speed" +msgstr "Of bladeren kinetisch dient te gebeuren volgens de snelheid" + +#: ../midori/midori-websettings.c:844 +msgid "Delete old Cookies after:" +msgstr "Verwijder oude koekjes na:" + +#: ../midori/midori-websettings.c:845 +msgid "The maximum number of days to save cookies for" +msgstr "Hoeveel dagen een koekje maximaal bewaard mag worden" + +#: ../midori/midori-websettings.c:861 +msgid "Only accept Cookies from sites you visit" +msgstr "Alleen koekjes aanvaarden van websites die u bezoekt" + +#: ../midori/midori-websettings.c:862 +msgid "Block cookies sent by third-party websites" +msgstr "Blokkeer koekjes verzonden door derden" + +#: ../midori/midori-websettings.c:876 +msgid "Delete pages from history after:" +msgstr "Verwijder pagina's uit de geschiedenis na:" + +#: ../midori/midori-websettings.c:877 +msgid "The maximum number of days to save the history for" +msgstr "Hoeveel dagen de geschiedenis bewaard moeten blijven" + +#: ../midori/midori-websettings.c:892 +msgid "Proxy server" +msgstr "Proxyserver" + +#: ../midori/midori-websettings.c:893 +msgid "The type of proxy server to use" +msgstr "De te gebruiken proxyserver" + +#: ../midori/midori-websettings.c:902 +msgid "HTTP Proxy Server" +msgstr "HTTP Proxyserver" + +#: ../midori/midori-websettings.c:903 +msgid "The proxy server used for HTTP connections" +msgstr "De proxyserver die gebruikt wordt voor HTTP-verbindingen" + +#: ../midori/midori-websettings.c:918 +msgid "Port" +msgstr "Poort" + +#: ../midori/midori-websettings.c:919 +msgid "The proxy server port used for HTTP connections" +msgstr "De proxyserver die gebruikt wordt voor HTTP-verbindingen" + +#: ../midori/midori-websettings.c:937 +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:954 +msgid "Identify as" +msgstr "Identificeren als" + +#: ../midori/midori-websettings.c:955 +msgid "What to identify as to web pages" +msgstr "Hoe zich te identificeren op webpagina's" + +#: ../midori/midori-websettings.c:971 +msgid "Identification string" +msgstr "Identificatie-tekstsnoer" + +#: ../midori/midori-websettings.c:972 +msgid "The application identification string" +msgstr "Het identificatie-tekstsnoer van de toepassing" + +#: ../midori/midori-websettings.c:988 +msgid "Preferred languages" +msgstr "Voorkeurstalen" + +#: ../midori/midori-websettings.c:989 +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:1004 +msgid "Clear private data" +msgstr "Privé-gegevens wissen" + +#: ../midori/midori-websettings.c:1005 +msgid "The private data selected for deletion" +msgstr "De te verwijderen privé-gegevens" + +#: ../midori/midori-websettings.c:1020 +msgid "Clear data" +msgstr "Gegevens wissen" + +#: ../midori/midori-websettings.c:1021 +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:1054 +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:1056 +msgid "Whether the \"Referer\" header should be shortened to the hostname" +msgstr "Of de \"Referer\" koptekst moet worden verkort tot de hostnaam" + +#: ../midori/midori-websettings.c:1070 +msgid "Always use my font choices" +msgstr "Altijd mijn lettertypekeuzes gebruiken" + +#: ../midori/midori-websettings.c:1071 +msgid "Override fonts picked by websites with user preferences" +msgstr "Lettertypes van websites vervangen door gebruikersvoorkeuren" + +#: ../midori/midori-view.c:1343 +#, c-format +msgid "%s wants to save an HTML5 database." +msgstr "%s wil een HTML5-gegevensbank opslaan." + +#: ../midori/midori-view.c:1347 ../midori/midori-view.c:1377 +msgid "_Deny" +msgstr "_Weigeren" + +#: ../midori/midori-view.c:1347 ../midori/midori-view.c:1377 +msgid "_Allow" +msgstr "_Toestaan" + +#: ../midori/midori-view.c:1373 +#, c-format +msgid "%s wants to know your location." +msgstr "%s wil uw locatie weten." + +#: ../midori/midori-view.c:1461 +#, c-format +msgid "Error - %s" +msgstr "Fout - %s" + +#: ../midori/midori-view.c:1462 +#, c-format +msgid "The page '%s' couldn't be loaded." +msgstr "De pagina '%s' kan niet worden geladen" + +#: ../midori/midori-view.c:1464 +msgid "Try again" +msgstr "Probeer opnieuw" + +#: ../midori/midori-view.c:1626 ../midori/midori-view.c:2471 +#, c-format +msgid "Send a message to %s" +msgstr "Stuur een bericht naar %s" + +#: ../midori/midori-view.c:2313 ../midori/midori-view.c:2624 +msgid "Inspect _Element" +msgstr "_Element inspecteren" + +#: ../midori/midori-view.c:2363 +msgid "Open Link in New _Tab" +msgstr "Koppeling in nieuw _tabblad openen" + +#: ../midori/midori-view.c:2367 +msgid "Open Link in _Foreground Tab" +msgstr "Koppeling in nieuw tabblad op _voorgrond openen" + +#: ../midori/midori-view.c:2368 +msgid "Open Link in _Background Tab" +msgstr "Koppeling in nieuw tabblad op _achtergrond openen" + +#: ../midori/midori-view.c:2371 +msgid "Open Link in New _Window" +msgstr "Koppeling in nieuw _venster Openen" + +#: ../midori/midori-view.c:2374 +msgid "Open Link as Web A_pplication" +msgstr "Koppeling als webt_oepassing openen" + +#: ../midori/midori-view.c:2377 +msgid "Copy Link de_stination" +msgstr "Koppelingbe_stemming kopiëren" + +#: ../midori/midori-view.c:2389 +msgid "Open _Image in New Tab" +msgstr "Open _afbeelding in nieuw tabblad" + +#: ../midori/midori-view.c:2392 +msgid "Copy Image _Address" +msgstr "_Adres van afbeelding kopiëren" + +#: ../midori/midori-view.c:2395 +msgid "Save I_mage" +msgstr "A_fbeelding opslaan" + +#: ../midori/midori-view.c:2402 +msgid "Copy Video _Address" +msgstr "_Adres van video kopiëren" + +#: ../midori/midori-view.c:2405 +msgid "Save _Video" +msgstr "_Video opslaan" + +#: ../midori/midori-view.c:2405 +msgid "Download _Video" +msgstr "_Video binnenhalen" + +#: ../midori/midori-view.c:2431 +msgid "Search _with" +msgstr "Zoeken _met" + +#: ../midori/midori-view.c:2463 +msgid "_Search the Web" +msgstr "_Zoek op internet" + +#: ../midori/midori-view.c:2479 +msgid "Open Address in New _Tab" +msgstr "Adres in nieuw _tabblad openen" + +#: ../midori/midori-view.c:2775 +msgid "Open or download file" +msgstr "Bestand openen of downloaden" + +#: ../midori/midori-view.c:2794 +#, c-format msgid "File Type: '%s'" msgstr "Bestandtype: '%s'" -#: ../midori/midori-view.c:3175 +#: ../midori/midori-view.c:2796 #, c-format msgid "File Type: %s ('%s')" msgstr "Bestandtype: %s ('%s')" -#: ../midori/midori-view.c:3212 -#, c-format -msgid "Size: %s" -msgstr "Grootte: %s" - #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:3223 +#: ../midori/midori-view.c:2813 #, c-format msgid "Open %s" msgstr "Openen %s" -#: ../midori/midori-view.c:3834 +#: ../midori/midori-view.c:3405 #, c-format msgid "Inspect page - %s" msgstr "Pagina analyseren - %s" -#: ../midori/midori-view.c:4231 -#, c-format -msgid "No documentation installed" -msgstr "Geen documentatie geïnstalleerd" - -#: ../midori/midori-view.c:4308 -msgid "Midori doesn't store any personal data:" -msgstr "Midori slaat geen persoonlijke gegevens op:" - -#: ../midori/midori-view.c:4309 -msgid "No history or web cookies are being saved." -msgstr "Webgeschiedenis en webkoekjes worden niet opgeslagen." - -#: ../midori/midori-view.c:4310 -msgid "Extensions are disabled." -msgstr "Extensies zijn uitgeschakeld." - -#: ../midori/midori-view.c:4311 -msgid "HTML5 storage, local database and application caches are disabled." -msgstr "" -"HTML5-opslag, plaatselijke gegevensbank en toepassingopslag zijn " -"uitgeschakeld." +#: ../midori/midori-view.c:3692 +msgid "Speed Dial" +msgstr "Snelkeuze" -#: ../midori/midori-view.c:4312 -msgid "Midori prevents websites from tracking the user:" -msgstr "Midori verhindert websites om de gebruiker te volgen:" +#: ../midori/midori-view.c:3693 ../midori/midori-view.c:3789 +msgid "Click to add a shortcut" +msgstr "Klik om een sneltoets toe te voegen" -#: ../midori/midori-view.c:4313 -msgid "Referrer URLs are stripped down to the hostname." -msgstr "Verwijzingskoppelingen worden teruggebracht tot de hostnaam." +#: ../midori/midori-view.c:3694 +msgid "Enter shortcut address" +msgstr "Voer adres voor sneltoets in" -#: ../midori/midori-view.c:4314 -msgid "DNS prefetching is disabled." -msgstr "Vooraf DNS binnenhalen is uitgeschakeld." +#: ../midori/midori-view.c:3695 +msgid "Enter shortcut title" +msgstr "Voer titel voor sneltoets in" -#: ../midori/midori-view.c:4315 -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:3696 +msgid "Are you sure you want to delete this shortcut?" +msgstr "Weet u zeker dat u deze sneltoets wilt wissen?" -#: ../midori/midori-view.c:4316 -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:3860 +#, c-format +msgid "No documentation installed" +msgstr "Geen documentatie geïnstalleerd" -#: ../midori/midori-view.c:4402 +#: ../midori/midori-view.c:3910 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:4451 +#: ../midori/midori-view.c:3955 msgid "Page loading delayed" msgstr "Het laden van de pagina is vertraagd" -#: ../midori/midori-view.c:4452 +#: ../midori/midori-view.c:3956 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "" "Het laden is vertraagd ofwel door een recente crash ofwel door " "opstartvoorkeuren." -#: ../midori/midori-view.c:4453 +#: ../midori/midori-view.c:3957 msgid "Load Page" msgstr "Pagina laden" -#: ../midori/midori-view.c:4620 +#: ../midori/midori-view.c:4097 msgid "Blank page" msgstr "Blanco pagina" -#: ../midori/midori-view.c:4884 +#: ../midori/midori-view.c:4361 msgid "_Duplicate Tab" msgstr "Tabblad _dupliceren" -#: ../midori/midori-view.c:4889 +#: ../midori/midori-view.c:4366 msgid "Show Tab _Label" msgstr "Toon tabblad_etiket" -#: ../midori/midori-view.c:4889 +#: ../midori/midori-view.c:4366 msgid "Show Tab _Icon Only" msgstr "Toon alleen tabblad_pictogram" -#: ../midori/midori-view.c:4896 -msgid "Close Ot_her Tab" -msgid_plural "Close Ot_her Tabs" -msgstr[0] "Andere tabblad sluiten" -msgstr[1] "Andere tabbladen sluiten" +#: ../midori/midori-view.c:4372 +msgid "Close ot_her Tabs" +msgstr "An_dere tabbladen sluiten" #. i18n: word stem of "previous page" type links, case is not important -#: ../midori/midori-view.c:5653 +#: ../midori/midori-view.c:4989 msgid "previous" msgstr "vorige" #. i18n: word stem of "next page" type links, case is not important -#: ../midori/midori-view.c:5672 +#: ../midori/midori-view.c:5008 msgid "next" msgstr "volgende" -#: ../midori/midori-view.c:5685 +#: ../midori/midori-view.c:5021 msgid "Print background images" msgstr "Achtergrondafbeeldingen meenemen in afdrukken" -#: ../midori/midori-view.c:5686 +#: ../midori/midori-view.c:5022 msgid "Whether background images should be printed" msgstr "Of achtergrondafbeeldingen dienen te worden afgedrukt" -#: ../midori/midori-view.c:5718 +#: ../midori/midori-view.c:5054 msgid "Features" msgstr "Opties" -#. i18n: Download tooltip (size): 4KB of 43MB -#: ../midori/midori-download.vala:48 -#, c-format -msgid "%s of %s" -msgstr "%s van %s" - -#: ../midori/midori-download.vala:64 -#, c-format -msgid "%d hour" -msgid_plural "%d hours" -msgstr[0] "%d uur" -msgstr[1] "%d uur" - -#: ../midori/midori-download.vala:65 -#, c-format -msgid "%d minute" -msgid_plural "%d minutes" -msgstr[0] "%d minuut" -msgstr[1] "%d minuten" - -#: ../midori/midori-download.vala:66 -#, c-format -msgid "%d second" -msgid_plural "%d seconds" -msgstr[0] "%d seconde" -msgstr[1] "%d seconden" - -#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning -#: ../midori/midori-download.vala:82 -#, c-format -msgid " - %s remaining" -msgstr " - %s over" - -#. i18n: Unknown number of bytes, used for transfer rate like ?B/s -#: ../midori/midori-download.vala:92 -msgid "?B" -msgstr "?B" - -#. i18n: Download tooltip (transfer rate): (130KB/s) -#: ../midori/midori-download.vala:94 -#, c-format -msgid " (%s/s)" -msgstr " (%s/s)" - -#: ../midori/midori-download.vala:188 -msgid "The downloaded file is erroneous." -msgstr "Het binnengehaalde bestand is foutief." - -#: ../midori/midori-download.vala:189 -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." - -#: ../midori/midori-download.vala:302 -#, 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-download.vala:304 -msgid "You don't have permission to write in this location." -msgstr "U heeft geen rechten om op deze plaats te schrijven." - -#: ../midori/midori-download.vala:307 -#, c-format -msgid "There is not enough free space to download \"%s\"." -msgstr "Er is niet voldoende schijfruimte om '%s' binnen te halen." - -#: ../midori/midori-download.vala:309 -#, c-format -msgid "The file needs %s but only %s are left." -msgstr "Het bestand heeft %s nodig maar slechts %s zijn over." - -#: ../midori/midori-speeddial.vala:180 -msgid "Speed Dial" -msgstr "Snelkeuze" - -#: ../midori/midori-speeddial.vala:181 ../midori/midori-speeddial.vala:261 -msgid "Click to add a shortcut" -msgstr "Klik om een sneltoets toe te voegen" - -#: ../midori/midori-speeddial.vala:182 -msgid "Enter shortcut address" -msgstr "Voer adres voor sneltoets in" - -#: ../midori/midori-speeddial.vala:183 -msgid "Enter shortcut title" -msgstr "Voer titel voor sneltoets in" - -#: ../midori/midori-speeddial.vala:184 -msgid "Are you sure you want to delete this shortcut?" -msgstr "Weet u zeker dat u deze sneltoets wilt wissen?" - -#: ../midori/midori-preferences.c:299 +#: ../midori/midori-preferences.c:297 msgid "Startup" msgstr "Opstarten" -#: ../midori/midori-preferences.c:305 -msgid "Homepage:" -msgstr "Startpagina:" - -#: ../midori/midori-preferences.c:313 +#: ../midori/midori-preferences.c:310 msgid "Use _current page" msgstr "Gebruik _huidige pagina" -#: ../midori/midori-preferences.c:317 +#: ../midori/midori-preferences.c:314 msgid "Use current page as homepage" msgstr "Gebruik de huidige pagina als startpagina" #. Page "Appearance" -#: ../midori/midori-preferences.c:326 +#: ../midori/midori-preferences.c:323 msgid "Fonts" msgstr "Lettertypes" -#: ../midori/midori-preferences.c:329 +#: ../midori/midori-preferences.c:326 msgid "Proportional Font Family" msgstr "Proportionele lettertypen-familie" -#: ../midori/midori-preferences.c:333 +#: ../midori/midori-preferences.c:330 msgid "The default font family used to display text" msgstr "De standaardlettertype-familie om tekst weer te geven" -#: ../midori/midori-preferences.c:336 +#: ../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:338 +#: ../midori/midori-preferences.c:335 msgid "Fixed-width Font Family" msgstr "Lettertype-familie met vaste breedte" -#: ../midori/midori-preferences.c:342 +#: ../midori/midori-preferences.c:339 msgid "The font family used to display fixed-width text" msgstr "De lettertype-familie om tekst met vaste breedte weer te geven" -#: ../midori/midori-preferences.c:345 +#: ../midori/midori-preferences.c:342 msgid "The font size used to display fixed-width text" -msgstr "De lettertypegrootte om tekst met vaste breedte weer te geven" - -#: ../midori/midori-preferences.c:347 -msgid "Minimum Font Size" -msgstr "Minimale lettertypegrootte" - -#: ../midori/midori-preferences.c:351 -msgid "The minimum font size used to display text" -msgstr "De minimale lettertypegrootte om tekst weer te geven" - -#: ../midori/midori-preferences.c:356 -msgid "Preferred Encoding" -msgstr "Voorkeurcodering" - -#. Page "Behavior" -#: ../midori/midori-preferences.c:363 -msgid "Behavior" -msgstr "Gedrag" - -#: ../midori/midori-preferences.c:367 ../extensions/statusbar-features.c:155 -msgid "Load images automatically" -msgstr "Afbeeldingen automatisch laden" - -#: ../midori/midori-preferences.c:370 -msgid "Enable Spell Checking" -msgstr "Spellingscontrole aanzetten" - -#: ../midori/midori-preferences.c:384 ../extensions/statusbar-features.c:165 -msgid "Enable scripts" -msgstr "Scripts aanzetten" - -#: ../midori/midori-preferences.c:387 ../extensions/statusbar-features.c:177 -msgid "Enable Netscape plugins" -msgstr "Netscape-plugins uitvoeren" - -#: ../midori/midori-preferences.c:392 -msgid "Zoom Text and Images" -msgstr "Tekst en afbeeldingen zoomen" - -#: ../midori/midori-preferences.c:395 -msgid "Allow scripts to open popups" -msgstr "Scripts toelaten om opduikvensters te openen" - -#: ../midori/midori-preferences.c:396 -msgid "Whether scripts are allowed to open popup windows automatically" -msgstr "" -"Of het toegelaten is voor scripts om opduikvensters automatisch te openen" - -#: ../midori/midori-preferences.c:402 -msgid "Kinetic scrolling" -msgstr "Kinetisch bladeren" - -#: ../midori/midori-preferences.c:403 -msgid "Whether scrolling should kinetically move according to speed" -msgstr "Of bladeren kinetisch dient te gebeuren volgens de snelheid" - -#: ../midori/midori-preferences.c:408 -msgid "Middle click opens Selection" -msgstr "Klikken met middelste muisknop opent selectie" - -#: ../midori/midori-preferences.c:409 -msgid "Load an address from the selection via middle click" -msgstr "Een adres vanuit de selectie laden met middelste muisknop" - -#: ../midori/midori-preferences.c:415 -msgid "Enable WebGL support" -msgstr "WebGL-ondersteuning inschakelen" - -#: ../midori/midori-preferences.c:420 -msgid "Flash window on background tabs" -msgstr "Laat venster op achtergrond-tabbladen opflitsen" - -#: ../midori/midori-preferences.c:425 -msgid "Preferred languages" -msgstr "Voorkeurstalen" - -#: ../midori/midori-preferences.c:429 -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-preferences.c:431 -msgid "Save downloaded files to:" -msgstr "Bewaar binnengehaalde bestanden in:" - -#. Page "Interface" -#: ../midori/midori-preferences.c:438 -msgid "Browsing" -msgstr "Surfen" - -#: ../midori/midori-preferences.c:454 -msgid "Close Buttons on Tabs" -msgstr "Sluitknoppen op tabbladen" +msgstr "De lettertypegrootte om tekst met vaste breedte weer te geven" -#: ../midori/midori-preferences.c:458 -msgid "Always Show Tabbar" -msgstr "Balk met tabbladen altijd weergeven" +#: ../midori/midori-preferences.c:344 +msgid "Minimum Font Size" +msgstr "Minimale lettertypegrootte" -#: ../midori/midori-preferences.c:462 -msgid "Open Tabs next to Current" -msgstr "Tabbladen naast het huidige tabblad openen" +#: ../midori/midori-preferences.c:348 +msgid "The minimum font size used to display text" +msgstr "De minimale lettertypegrootte om tekst weer te geven" -#: ../midori/midori-preferences.c:463 -msgid "Whether to open new tabs next to the current tab or after the last one" -msgstr "" -"Of nieuwe tabbladen naast het huidige tabblad geopend dienen te worden of na " -"het laatste tabblad" +#. Page "Behavior" +#: ../midori/midori-preferences.c:359 +msgid "Behavior" +msgstr "Gedrag" -#: ../midori/midori-preferences.c:466 -msgid "Open tabs in the background" -msgstr "Tabbladen op de achtergrond openen" +#: ../midori/midori-preferences.c:385 +msgid "Allow scripts to open popups" +msgstr "Scripts toelaten om opduikvensters te openen" -#: ../midori/midori-preferences.c:470 -msgid "Text Editor" -msgstr "Tekstverwerker" +#: ../midori/midori-preferences.c:386 +msgid "Whether scripts are allowed to open popup windows automatically" +msgstr "" +"Of het toegelaten is voor scripts om opduikvensters automatisch te openen" -#: ../midori/midori-preferences.c:475 -msgid "News Aggregator" -msgstr "Nieuwsaggregator" +#. Page "Interface" +#: ../midori/midori-preferences.c:409 +msgid "Browsing" +msgstr "Surfen" #. Page "Network" -#: ../midori/midori-preferences.c:482 +#: ../midori/midori-preferences.c:447 msgid "Network" msgstr "Netwerk" -#: ../midori/midori-preferences.c:484 -msgid "Proxy server" -msgstr "Proxyserver" - -#: ../midori/midori-preferences.c:489 +#: ../midori/midori-preferences.c:454 msgid "Hostname" msgstr "Hostnaam" -#: ../midori/midori-preferences.c:497 -msgid "Port" -msgstr "Poort" - -#: ../midori/midori-preferences.c:509 ../midori/midori-preferences.c:512 -msgid "The maximum size of cached pages on disk" -msgstr "De maximale grootte van opgeslagen pagina's op de harde schijf" - -#: ../midori/midori-preferences.c:514 +#: ../midori/midori-preferences.c:478 msgid "MB" msgstr "MB" -#: ../midori/midori-searchaction.c:1074 +#: ../midori/midori-searchaction.c:907 msgid "Add search engine" msgstr "Zoekmachine toevoegen" -#: ../midori/midori-searchaction.c:1074 +#: ../midori/midori-searchaction.c:907 msgid "Edit search engine" msgstr "Zoekmachine bewerken" -#: ../midori/midori-searchaction.c:1102 +#: ../midori/midori-searchaction.c:936 msgid "_Name:" msgstr "_Naam:" -#: ../midori/midori-searchaction.c:1117 +#: ../midori/midori-searchaction.c:952 msgid "_Description:" msgstr "_Beschrijving:" -#: ../midori/midori-searchaction.c:1130 ../extensions/feed-panel/main.c:377 -msgid "_Address:" -msgstr "_Adres:" +#: ../midori/midori-searchaction.c:985 +msgid "_Icon:" +msgstr "_Pictogram:" -#: ../midori/midori-searchaction.c:1149 +#: ../midori/midori-searchaction.c:999 msgid "_Token:" msgstr "_Trefwoord:" -#: ../midori/midori-searchaction.c:1447 +#: ../midori/midori-searchaction.c:1299 msgid "Manage Search Engines" msgstr "Zoekmachines beheren" -#: ../midori/midori-searchaction.c:1549 +#: ../midori/midori-searchaction.c:1399 msgid "Use as _default" msgstr "Als _standaard gebruiken" -#: ../midori/sokoke.c:355 +#: ../midori/sokoke.c:406 msgid "Open with" msgstr "Openen met" -#: ../midori/sokoke.c:363 +#: ../midori/sokoke.c:414 #, c-format msgid "Choose an application or command to open \"%s\":" msgstr "Kies een toepassing of opdracht om \"%s\" te openen:" -#: ../midori/sokoke.c:478 ../midori/sokoke.c:492 +#: ../midori/sokoke.c:455 ../midori/sokoke.c:465 ../midori/sokoke.c:493 +#: ../midori/sokoke.c:522 ../midori/sokoke.c:536 msgid "Could not run external program." msgstr "Kon extern programma niet uitvoeren." +#: ../midori/sokoke.c:1673 +#, c-format +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "%d uur" +msgstr[1] "%d uur" + +#: ../midori/sokoke.c:1674 +#, c-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "%d minuut" +msgstr[1] "%d minuten" + +#: ../midori/sokoke.c:1675 +#, c-format +msgid "%d second" +msgid_plural "%d seconds" +msgstr[0] "%d seconde" +msgstr[1] "%d seconden" + +#. i18n: Download tooltip (size): 4KB of 43MB +#: ../midori/sokoke.c:1683 ../panels/midori-transfers.c:267 +#, c-format +msgid "%s of %s" +msgstr "%s van %s" + +#. i18n: Unknown number of bytes, used for transfer rate like ?B/s +#: ../midori/sokoke.c:1692 +msgid "?B" +msgstr "?B" + +#. i18n: Download tooltip (transfer rate): (130KB/s) +#: ../midori/sokoke.c:1695 +#, c-format +msgid " (%s/s)" +msgstr " (%s/s)" + +#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning +#: ../midori/sokoke.c:1712 +#, c-format +msgid " - %s remaining" +msgstr " - %s over" + #. i18n: A panel at the bottom, to search text in pages -#: ../toolbars/midori-findbar.c:265 +#: ../toolbars/midori-findbar.c:264 msgid "_Inline Find:" msgstr "_Zoeken in regel:" -#: ../toolbars/midori-findbar.c:287 +#: ../toolbars/midori-findbar.c:291 msgid "Previous" msgstr "Vorig" -#: ../toolbars/midori-findbar.c:293 +#: ../toolbars/midori-findbar.c:297 msgid "Next" msgstr "Volgend" -#: ../toolbars/midori-findbar.c:297 +#: ../toolbars/midori-findbar.c:301 msgid "Match Case" msgstr "Hoofdlettergevoelig" -#: ../toolbars/midori-findbar.c:306 +#: ../toolbars/midori-findbar.c:310 msgid "Highlight Matches" msgstr "Overeenkomsten markeren" -#: ../toolbars/midori-findbar.c:317 +#: ../toolbars/midori-findbar.c:321 msgid "Close Findbar" msgstr "Zoekbalk sluiten" -#: ../toolbars/midori-transferbar.c:109 +#: ../toolbars/midori-transferbar.c:122 #, c-format msgid "The file '%s' has been downloaded." msgstr "Het bestand '%s' is binnengehaald." -#: ../toolbars/midori-transferbar.c:114 +#: ../toolbars/midori-transferbar.c:125 msgid "Transfer completed" msgstr "Overdracht compleet" -#: ../toolbars/midori-transferbar.c:239 ../panels/midori-transfers.c:139 +#: ../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:331 ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "Alles wissen" -#: ../toolbars/midori-transferbar.c:272 ../toolbars/midori-transferbar.c:274 +#: ../toolbars/midori-transferbar.c:368 ../toolbars/midori-transferbar.c:370 msgid "Some files are being downloaded" msgstr "Sommige bestanden worden binnengehaald" -#: ../toolbars/midori-transferbar.c:278 +#: ../toolbars/midori-transferbar.c:374 msgid "_Quit Midori" msgstr "Midori _afsluiten" -#: ../toolbars/midori-transferbar.c:280 +#: ../toolbars/midori-transferbar.c:376 msgid "The transfers will be cancelled if Midori quits." msgstr "" "De bestandoverdrachten zullen worden geannuleerd als Midori wordt afgesloten." -#: ../panels/midori-bookmarks.c:308 +#: ../panels/midori-bookmarks.c:113 +msgid "Bookmarks" +msgstr "Bladwijzers" + +#: ../panels/midori-bookmarks.c:260 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "Niet gelukt om bladwijzerelement toe te voegen: %s\n" -#: ../panels/midori-bookmarks.c:475 -#, c-format -msgid "Failed to update bookmark : %s\n" -msgstr "Kon bladwijzer niet bijwerken : %s\n" - -#: ../panels/midori-bookmarks.c:535 +#: ../panels/midori-bookmarks.c:440 msgid "Edit the selected bookmark" msgstr "Geselecteerde bladwijzer bewerken" -#: ../panels/midori-bookmarks.c:543 +#: ../panels/midori-bookmarks.c:448 msgid "Delete the selected bookmark" msgstr "Geselecteerde bladwijzer verwijderen" -#: ../panels/midori-bookmarks.c:558 +#: ../panels/midori-bookmarks.c:463 msgid "Add a new folder" msgstr "Een nieuwe map toevoegen" -#: ../panels/midori-bookmarks.c:697 ../panels/midori-history.c:638 +#: ../panels/midori-bookmarks.c:597 ../panels/midori-history.c:579 msgid "Separator" msgstr "Scheidingsteken" -#. Create the filter entry -#: ../panels/midori-bookmarks.c:1027 -msgid "Search Bookmarks" -msgstr "Bladwijzers zoeken" - -#: ../panels/midori-history.c:111 +#: ../panels/midori-history.c:110 msgid "History" msgstr "Geschiedenis" -#: ../panels/midori-history.c:158 ../panels/midori-history.c:189 -msgid "Today" -msgstr "Vandaag" - -#: ../panels/midori-history.c:160 ../panels/midori-history.c:191 -msgid "Yesterday" -msgstr "Gisteren" +#: ../panels/midori-history.c:142 +msgid "A week ago" +msgstr "Eén week geleden" -#: ../panels/midori-history.c:162 ../panels/midori-history.c:186 +#: ../panels/midori-history.c:144 #, 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:165 ../panels/midori-history.c:184 -msgid "A week ago" -msgstr "Eén week geleden" +#: ../panels/midori-history.c:147 +msgid "Today" +msgstr "Vandaag" -#: ../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:149 +msgid "Yesterday" +msgstr "Gisteren" -#: ../panels/midori-history.c:360 +#: ../panels/midori-history.c:317 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:407 +#: ../panels/midori-history.c:363 msgid "Bookmark the selected history item" msgstr "Geselecteerde element uit geschiedenis toevoegen als bladwijzer" -#: ../panels/midori-history.c:416 +#: ../panels/midori-history.c:372 msgid "Delete the selected history item" msgstr "Geselecteerde element uit geschiedenis verwijderen" -#: ../panels/midori-history.c:424 +#: ../panels/midori-history.c:380 msgid "Clear the entire history" msgstr "Volledige geschiedenis wissen" -#. Create the filter entry -#: ../panels/midori-history.c:997 -msgid "Search History" -msgstr "Zoekgeschiedenis" - -#: ../panels/midori-transfers.c:87 +#: ../panels/midori-transfers.c:86 msgid "Transfers" msgstr "Overdrachten" -#: ../panels/midori-transfers.c:435 +#: ../panels/midori-transfers.c:467 msgid "Open Destination _Folder" msgstr "Open bestemmings_map" -#: ../panels/midori-transfers.c:438 +#: ../panels/midori-transfers.c:470 msgid "Copy Link Loc_ation" msgstr "Kopieer _koppelingsverwijzing" @@ -2094,211 +2176,203 @@ msgstr "Wachtwoord" msgid "_Remember password" msgstr "Wachtwoord _onthouden" -#: ../katze/katze-throbber.c:949 +#: ../katze/katze-throbber.c:942 #, c-format msgid "Named icon '%s' couldn't be loaded" msgstr "Pictogram '%s' kon niet geladen worden" -#: ../katze/katze-throbber.c:962 +#: ../katze/katze-throbber.c:955 #, c-format msgid "Stock icon '%s' couldn't be loaded" msgstr "Standaardpictogram '%s' kon niet geladen worden" -#: ../katze/katze-throbber.c:1042 +#: ../katze/katze-throbber.c:1035 msgid "Animation frames are broken" msgstr "Animatiebeelden zijn gebroken" -#: ../katze/katze-utils.c:443 ../katze/katze-utils.c:866 +#: ../katze/katze-utils.c:439 ../katze/katze-utils.c:873 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Eigenschap '%s' is ongeldig voor %s" -#: ../katze/katze-utils.c:489 ../katze/katze-utils.c:518 -#: ../extensions/addons.c:309 +#: ../katze/katze-utils.c:485 ../katze/katze-utils.c:514 +#: ../extensions/addons.c:308 msgid "Choose file" msgstr "Bestand kiezen" -#: ../katze/katze-utils.c:504 +#: ../katze/katze-utils.c:500 msgid "Choose folder" msgstr "Map kiezen" -#: ../katze/katze-utils.c:602 +#: ../katze/katze-utils.c:604 msgid "None" msgstr "Geen" -#: ../katze/katze-utils.c:717 +#: ../katze/katze-utils.c:719 msgid "1 hour" msgstr "1 uur" -#: ../katze/katze-utils.c:718 +#: ../katze/katze-utils.c:720 msgid "1 day" msgstr "1 dag" -#: ../katze/katze-utils.c:719 +#: ../katze/katze-utils.c:721 msgid "1 week" msgstr "1 week" -#: ../katze/katze-utils.c:720 +#: ../katze/katze-utils.c:722 msgid "1 month" msgstr "1 maand" -#: ../katze/katze-utils.c:721 +#: ../katze/katze-utils.c:723 msgid "1 year" msgstr "1 jaar" -#: ../katze/katze-preferences.c:98 ../extensions/history-list.vala:235 +#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235 #, c-format msgid "Preferences for %s" msgstr "Voorkeuren voor %s" -#: ../katze/midori-uri.vala:168 -msgid "MD5-Checksum:" -msgstr "MD5-Controlesom:" - -#: ../katze/midori-uri.vala:175 -msgid "SHA1-Checksum:" -msgstr "SHA1-Controlesom:" - -#: ../extensions/adblock.c:495 +#: ../extensions/adblock.c:434 msgid "Configure Advertisement filters" msgstr "Configureer advertentiefilters" -#: ../extensions/adblock.c:528 +#: ../extensions/adblock.c:465 #, 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 "" "Tik het adres van een voorgeconfigureerde filterlijst in het tekstvak en " -"klik op 'Toevoegen' om het aan de lijst toe te voegen. Meer lijsten zijn " +"klik \"\\Toevoegen\" om het aan de lijst toe te voegen. Meer lijsten zijn " "beschikbaar op %s." -#: ../extensions/adblock.c:944 +#: ../extensions/adblock.c:831 msgid "Edit rule" msgstr "Regel bewerken" -#: ../extensions/adblock.c:958 +#: ../extensions/adblock.c:845 msgid "_Rule:" msgstr "_Regel:" -#: ../extensions/adblock.c:1012 +#: ../extensions/adblock.c:899 msgid "Bl_ock image" msgstr "Afbeelding bl_okkeren" -#: ../extensions/adblock.c:1017 +#: ../extensions/adblock.c:904 msgid "Bl_ock link" msgstr "Koppeling bl_okkeren" -#: ../extensions/adblock.c:1915 +#: ../extensions/adblock.c:1495 msgid "Advertisement blocker" msgstr "Advertentieblokkeerder" -#: ../extensions/adblock.c:1916 +#: ../extensions/adblock.c:1496 msgid "Block advertisements according to a filter list" msgstr "Blokkeer advertenties volgens filterlijst" #. i18n: An infobar shows up when viewing a script on userscripts.org -#: ../extensions/addons.c:222 +#: ../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:223 +#: ../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:228 +#: ../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:229 +#: ../extensions/addons.c:228 msgid "_Install user style" msgstr "Gebruikersstijl _installeren" -#: ../extensions/addons.c:237 +#: ../extensions/addons.c:236 msgid "Don't install" msgstr "Niet installeren" -#: ../extensions/addons.c:320 ../extensions/addons.c:675 +#: ../extensions/addons.c:319 ../extensions/addons.c:681 msgid "Userscripts" msgstr "Gebruikersscripts" -#: ../extensions/addons.c:325 ../extensions/addons.c:677 +#: ../extensions/addons.c:324 ../extensions/addons.c:683 msgid "Userstyles" msgstr "Gebruikersopmaakprofielen" -#: ../extensions/addons.c:371 ../extensions/addons.c:450 +#: ../extensions/addons.c:380 ../extensions/addons.c:459 #: ../extensions/feed-panel/main.c:129 msgid "Error" msgstr "Fout" -#: ../extensions/addons.c:412 +#: ../extensions/addons.c:421 #, c-format msgid "Do you want to delete '%s'?" msgstr "Wilt u '%s' verwijderen?" -#: ../extensions/addons.c:418 +#: ../extensions/addons.c:427 msgid "Delete user script" msgstr "Gebruikersscript verwijderen" -#: ../extensions/addons.c:419 +#: ../extensions/addons.c:428 msgid "Delete user style" msgstr "Gebruikersstijl verwijderen" -#: ../extensions/addons.c:422 +#: ../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:564 ../extensions/addons.c:641 +#: ../extensions/addons.c:570 ../extensions/addons.c:647 msgid "Open in Text Editor" msgstr "In tekstbewerker openen" -#: ../extensions/addons.c:566 ../extensions/addons.c:650 +#: ../extensions/addons.c:572 ../extensions/addons.c:656 msgid "Open Target Folder" msgstr "Bestemmingsmap openen" -#: ../extensions/addons.c:632 +#: ../extensions/addons.c:638 msgid "Add new addon" msgstr "Nieuwe extensie toevoegen" -#: ../extensions/addons.c:658 +#: ../extensions/addons.c:664 msgid "Remove selected addon" msgstr "Geselecteerde extensie verwijderen" -#: ../extensions/addons.c:1687 ../extensions/addons.c:1905 +#: ../extensions/addons.c:1691 ../extensions/addons.c:1909 msgid "User addons" msgstr "Gebruikersextensies" -#: ../extensions/addons.c:1817 +#: ../extensions/addons.c:1821 #, c-format msgid "Can't monitor folder '%s': %s" msgstr "Kan map '%s': %s niet bewaken" -#: ../extensions/addons.c:1906 +#: ../extensions/addons.c:1910 msgid "Support for userscripts and userstyles" msgstr "Ondersteuning voor gebruikersscripts en -stijlen" -#: ../extensions/colorful-tabs.c:201 +#: ../extensions/colorful-tabs.c:202 msgid "Colorful Tabs" msgstr "Gekleurde tabbladen" -#: ../extensions/colorful-tabs.c:202 +#: ../extensions/colorful-tabs.c:203 msgid "Tint each tab distinctly" msgstr "Ieder tabblad verschillend tinten" -#: ../extensions/cookie-manager/cookie-manager-page.c:73 +#: ../extensions/cookie-manager/cookie-manager-page.c:80 #: ../extensions/cookie-manager/main.c:35 msgid "Cookie Manager" msgstr "Koekjesbeheerder" -#: ../extensions/cookie-manager/cookie-manager-page.c:103 +#: ../extensions/cookie-manager/cookie-manager-page.c:110 msgid "Delete All" msgstr "Alles wissen" -#: ../extensions/cookie-manager/cookie-manager-page.c:105 +#: ../extensions/cookie-manager/cookie-manager-page.c:112 msgid "" "Deletes all shown cookies. If a filter is set, only those cookies are " "deleted which match the filter." @@ -2306,31 +2380,31 @@ 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:120 +#: ../extensions/cookie-manager/cookie-manager-page.c:127 msgid "Expand All" msgstr "Alles uitvouwen" -#: ../extensions/cookie-manager/cookie-manager-page.c:127 +#: ../extensions/cookie-manager/cookie-manager-page.c:134 msgid "Collapse All" msgstr "Alles invouwen" -#: ../extensions/cookie-manager/cookie-manager-page.c:572 +#: ../extensions/cookie-manager/cookie-manager-page.c:576 msgid "Do you really want to delete all cookies?" msgstr "Weet u zeker dat u alle koekjes wil wissen?" -#: ../extensions/cookie-manager/cookie-manager-page.c:574 +#: ../extensions/cookie-manager/cookie-manager-page.c:578 msgid "Question" msgstr "Vraag" -#: ../extensions/cookie-manager/cookie-manager-page.c:583 +#: ../extensions/cookie-manager/cookie-manager-page.c:587 msgid "Only cookies which match the filter will be deleted." msgstr "Enkel koekjes die overeenkomen met de filter zullen worden gewist." -#: ../extensions/cookie-manager/cookie-manager-page.c:671 +#: ../extensions/cookie-manager/cookie-manager-page.c:675 msgid "At the end of the session" msgstr "Bij het beëindigen van de sessie" -#: ../extensions/cookie-manager/cookie-manager-page.c:674 +#: ../extensions/cookie-manager/cookie-manager-page.c:678 #, c-format msgid "" "Host: %s\n" @@ -2347,15 +2421,15 @@ msgstr "" "Beveiligd: %s\n" "Vervalt: %s" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:684 msgid "Yes" msgstr "Ja" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:684 msgid "No" msgstr "Nee" -#: ../extensions/cookie-manager/cookie-manager-page.c:694 +#: ../extensions/cookie-manager/cookie-manager-page.c:698 #, c-format msgid "" "Domain: %s\n" @@ -2364,21 +2438,29 @@ msgstr "" "Domein: %s\n" "Koekjes: %d" -#: ../extensions/cookie-manager/cookie-manager-page.c:1017 +#: ../extensions/cookie-manager/cookie-manager-page.c:1028 msgid "Name" msgstr "Naam" -#: ../extensions/cookie-manager/cookie-manager-page.c:1069 +#: ../extensions/cookie-manager/cookie-manager-page.c:1081 msgid "_Expand All" msgstr "Alles _uitvouwen" -#: ../extensions/cookie-manager/cookie-manager-page.c:1077 +#: ../extensions/cookie-manager/cookie-manager-page.c:1089 msgid "_Collapse All" msgstr "Alles _invouwen" -#: ../extensions/cookie-manager/cookie-manager-page.c:1129 -msgid "Search Cookies by Name or Domain" -msgstr "Zoek koekjes op naam of domein" +#: ../extensions/cookie-manager/cookie-manager-page.c:1142 +msgid "Filter:" +msgstr "Filter:" + +#: ../extensions/cookie-manager/cookie-manager-page.c:1147 +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:36 msgid "List, view and delete cookies" @@ -2398,18 +2480,18 @@ 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." -msgstr "Kan vereiste Atom 'entry'-elementen niet vinden in XML-gegevens." +msgstr "Kan vereiste Atom \"entry\" elementen niet vinden in XML data." #: ../extensions/feed-panel/feed-atom.c:315 msgid "Failed to find required Atom \"feed\" elements in XML data." -msgstr "Kan vereiste Atom 'feed'-elementen niet vinden in XML-gegevens." +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:387 #, c-format msgctxt "Feed" msgid "Last updated: %s." -msgstr "Laatst bijgewerkt: %s." +msgstr "Laatst aangepast: %s." #: ../extensions/feed-panel/feed-panel.c:653 msgid "Feeds" @@ -2444,7 +2526,7 @@ 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 'kanaal'-element in RSS XML-gegevens niet vinden." +msgstr "Kan \"kanaal\" element in RSS XML-gegevens niet vinden." #: ../extensions/feed-panel/feed-rss.c:51 msgid "Unsupported RSS version found." @@ -2452,11 +2534,11 @@ 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 'onderdeel'-elementen niet vinden in XML-gegevens." +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 'kanaal'-elementen niet vinden in XML-gegevens." +msgstr "Kan vereiste RSS \"kanaal\" elementen niet vinden in XML-gegevens." #: ../extensions/feed-panel/main.c:131 #, c-format @@ -2476,72 +2558,46 @@ msgstr "Werkbalk voor voedingen" msgid "Read Atom/ RSS feeds" msgstr "Lees Atom/RSS-voedingen" -#: ../extensions/formhistory/formhistory.c:39 +#: ../extensions/formhistory.c:143 #, c-format msgid "Failed to add form value: %s\n" msgstr "Fout bij toevoegen van formulierwaarde: %s\n" -#: ../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 +#: ../extensions/formhistory.c:295 msgid "Toggle form history state" msgstr "Schakel geschiedenis-status van formulier in of uit" -#: ../extensions/formhistory/formhistory.c:438 +#: ../extensions/formhistory.c:296 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 +#: ../extensions/formhistory.c:432 ../extensions/formhistory.c:436 #, 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" +#: ../extensions/formhistory.c:511 +msgid "only activate form history via hotkey (Ctrl+Shift+F) per tab" msgstr "" -"Activeer formuliergeschiedenis alleen via sneltoets (Ctrl+Shift+F) per " +"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 +#: ../extensions/formhistory.c:570 msgid "Stores history of entered form data" msgstr "Bewaart geschiedenis van ingegeven formuliergegevens" -#: ../extensions/formhistory/formhistory-gdom-frontend.c:225 -#: ../extensions/formhistory/formhistory-js-frontend.c:106 +#: ../extensions/formhistory.c:574 #, c-format -msgid "Failed to select suggestions\n" -msgstr "Kon geen suggesties kiezen\n" +msgid "Not available: %s" +msgstr "Niet beschikbaar: %s" + +#: ../extensions/formhistory.c:575 +msgid "Resource files not installed" +msgstr "Bronbestanden niet geïnstalleerd" + +#: ../extensions/formhistory.c:581 +msgid "Form history filler" +msgstr "Formuliergeschiedenis-invuller" #: ../extensions/history-list.vala:197 msgid "There are no unvisited tabs" @@ -2592,11 +2648,11 @@ msgstr "Toon tabblad in achtergrond (Geschiedenislijst)" msgid "Display the current selected tab in background" msgstr "Toon het thans gekozen tabblad in achtergrond" -#: ../extensions/history-list.vala:566 +#: ../extensions/history-list.vala:569 msgid "History List" msgstr "Geschiedenislijst" -#: ../extensions/history-list.vala:567 +#: ../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" @@ -2617,55 +2673,55 @@ msgstr "Pagina vernieuwen of stoppen met laden" msgid "Customize Keyboard shortcuts" msgstr "Sneltoetsen aanpassen" -#: ../extensions/shortcuts.c:283 +#: ../extensions/shortcuts.c:285 msgid "Customize Sh_ortcuts..." -msgstr "Sneltoetsen aanpassen…" +msgstr "Snelt_oetsen aanpassen..." -#: ../extensions/shortcuts.c:320 +#: ../extensions/shortcuts.c:322 msgid "Shortcuts" msgstr "Sneltoetsen" -#: ../extensions/shortcuts.c:321 +#: ../extensions/shortcuts.c:323 msgid "View and edit keyboard shortcuts" msgstr "Sneltoetsen tonen en bewerken" #: ../extensions/status-clock.c:174 msgid "Statusbar Clock" -msgstr "Statusbalk-klok" +msgstr "_Statusbalk-klok" #: ../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:152 +#: ../extensions/statusbar-features.c:128 msgid "Images" msgstr "Afbeeldingen" -#: ../extensions/statusbar-features.c:162 +#: ../extensions/statusbar-features.c:137 msgid "Scripts" msgstr "Scripts" -#: ../extensions/statusbar-features.c:174 +#: ../extensions/statusbar-features.c:146 msgid "Netscape plugins" msgstr "Netscape plugins" -#: ../extensions/statusbar-features.c:259 +#: ../extensions/statusbar-features.c:192 msgid "Statusbar Features" msgstr "Statusbalkfuncties" -#: ../extensions/statusbar-features.c:260 +#: ../extensions/statusbar-features.c:193 msgid "Easily toggle features on web pages on and off" msgstr "Eenvoudig schakelen van gedrag van webpagina's" -#: ../extensions/tab-panel.c:589 ../extensions/tab-panel.c:676 +#: ../extensions/tab-panel.c:596 ../extensions/tab-panel.c:683 msgid "Tab Panel" msgstr "Tabbladwerkbalk" -#: ../extensions/tab-panel.c:659 +#: ../extensions/tab-panel.c:666 msgid "T_ab Panel" msgstr "T_abbladwerkbalk" -#: ../extensions/tab-panel.c:677 +#: ../extensions/tab-panel.c:684 msgid "Show tabs in a vertical panel" msgstr "Tabbladen in een verticale werkbalk tonen" @@ -2677,310 +2733,46 @@ msgstr "Standaard alleen pictogrammen op tabbladen" msgid "New tabs have no label by default" msgstr "Nieuwe tabbladen hebben geen standaardetiket" -#: ../extensions/toolbar-editor.c:395 +#: ../extensions/toolbar-editor.c:393 msgid "Customize Toolbar" msgstr "Werkbalk aanpassen" -#: ../extensions/toolbar-editor.c:411 +#: ../extensions/toolbar-editor.c:413 msgid "" -"Select items to be displayed on the toolbar. Items can be reordered by drag " +"Select items to be displayed on the toolbar. Items can be reodered 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:427 +#: ../extensions/toolbar-editor.c:429 msgid "Available Items" msgstr "Beschikbare elementen" -#: ../extensions/toolbar-editor.c:448 +#: ../extensions/toolbar-editor.c:450 msgid "Displayed Items" msgstr "Weergegeven elementen" -#: ../extensions/toolbar-editor.c:588 -msgid "_Customize Toolbar…" -msgstr "Werkbalk aanpassen…" +#: ../extensions/toolbar-editor.c:585 +msgid "Customize _Toolbar..." +msgstr "_Werkbalk aanpassen..." -#: ../extensions/toolbar-editor.c:617 +#: ../extensions/toolbar-editor.c:601 +msgid "_Customize..." +msgstr "_Aanpassen..." + +#: ../extensions/toolbar-editor.c:631 msgid "Toolbar Editor" msgstr "Werkbalkbewerker" -#: ../extensions/toolbar-editor.c:618 +#: ../extensions/toolbar-editor.c:632 msgid "Easily edit the toolbar layout" msgstr "De werkbalkvormgeving eenvoudig aanpassen" -#: ../extensions/web-cache.c:462 +#: ../extensions/web-cache.c:463 msgid "Cache HTTP communication on disk" msgstr "HTTP-communicatie op schijf opslaan" -#~ msgid "Remember last window size" -#~ msgstr "Laatst gebruikte venstergrootte onthouden" - -#~ msgid "Whether to save the last window size" -#~ msgstr "Al dan niet de laatst gebruikte venstergrootte opslaan" - -#~ msgid "Last window width" -#~ msgstr "Laatst gebruikte vensterbreedte" - -#~ msgid "The last saved window width" -#~ msgstr "De laatst opgeslagen vensterbreedte" - -#~ msgid "Last window height" -#~ msgstr "Laatst gebruikte vensterhoogte" - -#~ msgid "The last saved window height" -#~ msgstr "De laatste opgeslagen vensterhoogte" - -#~ msgid "Last panel position" -#~ msgstr "Laatst gebruikte positie van paneel" - -#~ msgid "The last saved panel position" -#~ msgstr "De laatste opgeslagen positie van het paneel" - -#~ msgid "Last panel page" -#~ msgstr "Laatst geopende werkbalkpagina" - -#~ msgid "The last saved panel page" -#~ msgstr "De laatst opgeslagen werkbalkpagina" - -#~ msgid "Last Web search" -#~ msgstr "Laatste webzoekactie" - -#~ msgid "The last saved Web search" -#~ msgstr "De laatst bewaarde webzoekactie" - -#~ msgid "Show Menubar" -#~ msgstr "Menubalk weergeven" - -#~ msgid "Whether to show the menubar" -#~ msgstr "Menubalk weergeven" - -#~ msgid "Show Navigationbar" -#~ msgstr "Navigatiebalk weergeven" - -#~ msgid "Whether to show the navigationbar" -#~ msgstr "Al dan niet de navigatiebalk weergeven" - -#~ msgid "Show Bookmarkbar" -#~ msgstr "Bladwijzerbalk weergeven" - -#~ msgid "Whether to show the bookmarkbar" -#~ msgstr "Al dan niet bladwijzerbalk weergeven" - -#~ msgid "Show Panel" -#~ msgstr "Werkbalk weergeven" - -#~ msgid "Whether to show the panel" -#~ msgstr "Al dan niet de werkbalk weergeven" - -#~ msgid "Show Statusbar" -#~ msgstr "Statusbalk weergeven" - -#~ msgid "Whether to show the statusbar" -#~ msgstr "Al dan niet de statusbalk weergeven" - -#~ msgid "Toolbar Items" -#~ msgstr "Elementen in de werkbalk" - -#~ msgid "The items to show on the toolbar" -#~ msgstr "De elementen om weer te geven in de werkbalk" - -#~ msgid "Compact Sidepanel" -#~ msgstr "Compacte zijbalk" - -#~ msgid "Whether to make the sidepanel compact" -#~ msgstr "Al dan niet de zijbalk compact weergeven" - -#~ msgid "Align sidepanel on the right" -#~ msgstr "Plaats zijbalk rechts" - -#~ msgid "Whether to align the sidepanel on the right" -#~ msgstr "Of de zijbalk aan de rechterkant dient te worden geplaatst" - -#~ msgid "Open panels in separate windows" -#~ msgstr "Open werkbalken in aparte vensters" - -#~ msgid "Whether to always open panels in separate windows" -#~ msgstr "Of tabbladen altijd dienen te worden geopend in aparte vensters" - -#~ msgid "What to do when Midori starts" -#~ msgstr "Wat er dient te gebeuren bij starten van Midori" - -#~ msgid "The homepage" -#~ msgstr "De startpagina" - -#~ msgid "Show crash dialog" -#~ msgstr "Toon vastloopdialoogvenster" - -#~ msgid "The folder downloaded files are saved to" -#~ msgstr "De map waarin binnengehaalde bestanden worden opgeslagen" - -#~ msgid "An external text editor" -#~ msgstr "Een externe tekstverwerker" - -#~ msgid "An external news aggregator" -#~ msgstr "Een externe nieuwaggregator" - -#~ msgid "Location entry Search" -#~ msgstr "Zoeken vanuit locatieveld" - -#~ msgid "The search to perform inside the location entry" -#~ msgstr "Met welke website gezocht wordt vanuit het locatie-invoerveld" - -#~ msgid "The preferred character encoding" -#~ msgstr "De voorkeurcodering van tekens" - -#~ msgid "Always show the tabbar" -#~ msgstr "De balk met tabbladen altijd weergeven" - -#~ msgid "Whether tabs have close buttons" -#~ msgstr "Of tabbladen sluitknoppen hebben" - -#~ msgid "Where to open new pages" -#~ msgstr "Waar nieuwe pagina's geopend moeten worden" - -#~ msgid "Whether to open new tabs in the background" -#~ msgstr "Of tabbladen op de achtergrond geopend dienen te worden" - -#~ msgid "Open popups in tabs" -#~ msgstr "Opduikvensters in tabbladen openen" - -#~ msgid "Whether to open popup windows in tabs" -#~ msgstr "Of opduikvensters in tabbladen geopend dienen te worden" - -#~ msgid "Load and display images automatically" -#~ msgstr "Afbeeldingen automatisch laden en weergeven" - -#~ msgid "Enable embedded scripting languages" -#~ msgstr "Ingebedde scripttalen uitvoeren" - -#~ msgid "Enable embedded Netscape plugin objects" -#~ msgstr "Ingebedde Netscape-pluginobjecten uitvoeren" - -#~ msgid "Enable spell checking while typing" -#~ msgstr "Spellingscontrole tijdens het typen activeren" - -#~ msgid "Enable HTML5 database support" -#~ msgstr "Ondersteuning van HTML5-gegevensbank activeren" - -#~ msgid "Whether to enable HTML5 database support" -#~ msgstr "" -#~ "Of ondersteuning van de HTML5-gegevensbank dient te worden geactiveerd" - -#~ msgid "Whether to enable HTML5 local storage support" -#~ msgstr "Of HTML5 locale opslagondersteuning dient te worden geactiveerd" - -#~ msgid "Whether to enable offline web application cache" -#~ msgstr "Of offline webtoepassingsopslag dient te worden gebruikt" - -#~ 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" - -#~ msgid "Allow websites to use OpenGL rendering" -#~ msgstr "Sta websites toe om OpenGL-weergave te gebruiken" - -#~ msgid "Whether to zoom text and images" -#~ msgstr "Of tekst en afbeeldingen gezoomd dienen te worden" - -#~ msgid "Find inline while typing" -#~ msgstr "Zoeken tijdens typen can regel" - -#~ msgid "Whether to automatically find inline while typing" -#~ msgstr "Of automatisch gezocht moet worden tijdens typen van regel" - -#~ msgid "The type of proxy server to use" -#~ msgstr "De te gebruiken proxyserver" - -#~ msgid "HTTP Proxy Server" -#~ msgstr "HTTP Proxyserver" - -#~ msgid "The proxy server used for HTTP connections" -#~ msgstr "De proxyserver die gebruikt wordt voor HTTP-verbindingen" - -#~ msgid "The proxy server port used for HTTP connections" -#~ msgstr "De proxyserver die gebruikt wordt voor HTTP-verbindingen" - -#~ msgid "Identification string" -#~ msgstr "Identificatie-tekstsnoer" - -#~ msgid "The application identification string" -#~ msgstr "Het identificatie-tekstsnoer van de toepassing" - -#~ msgid "Clear private data" -#~ msgstr "Privé-gegevens wissen" - -#~ msgid "The private data selected for deletion" -#~ msgstr "De te verwijderen privé-gegevens" - -#~ msgid "Clear data" -#~ msgstr "Gegevens wissen" - -#~ msgid "The data selected for deletion" -#~ msgstr "De te verwijderen gegevens" - -#~ msgid "Close ot_her Tabs" -#~ msgstr "An_dere tabbladen sluiten" - -#~ msgid "Filter:" -#~ msgstr "Filter:" - -#~ 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." - -#~ msgid "_Icon:" -#~ msgstr "_Pictogram:" - -#~ msgid "_Bookmark" -#~ msgstr "_Bladwijzer" - -#~ msgid "_Console" -#~ msgstr "Terminalvenster" - -#~ msgid "Toplevel folder" -#~ msgstr "Hoofdmap" - -#~ msgid "_Customize…" -#~ msgstr "_Aanpassen…" - -#~ msgid "_Title:" -#~ msgstr "_Titel:" - -#~ msgid "_Folder:" -#~ msgstr "_Map:" - -#~ 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" @@ -3056,14 +2848,14 @@ msgstr "HTTP-communicatie op schijf opslaan" #~ msgid "Add a new bookmark folder" #~ msgstr "Nieuwe bladwijzermap toevoegen" -#~ msgid "Add, edit and remove search engines…" -#~ msgstr "Zoekmachines toevoegen, bewerken en verwijderen…" +#~ msgid "Add, edit and remove search engines..." +#~ msgstr "Zoekmachines toevoegen, bewerken en verwijderen..." -#~ msgid "Clear private data…" -#~ msgstr "Privé-gegevens wissen…" +#~ msgid "Clear private data..." +#~ msgstr "Privé-gegevens wissen..." -#~ msgid "Inspect page details and access developer tools…" -#~ msgstr "Inspecteer paginadetails en gebruik ontwikkelaarsgereedschappen…" +#~ 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" @@ -3119,6 +2911,12 @@ msgstr "HTTP-communicatie op schijf opslaan" #~ 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" @@ -3146,8 +2944,8 @@ msgstr "HTTP-communicatie op schijf opslaan" #~ msgid "Reset the last _session" #~ msgstr "Zet de laatste _sessie terug op de standaardwaarden" -#~ msgid "Configure _Advertisement filters…" -#~ msgstr "Configureer _advertentiefilters…" +#~ msgid "Configure _Advertisement filters..." +#~ msgstr "Configureer _advertentiefilters..." #~ msgid "Not found - %s" #~ msgstr "Niet gevonden - %s" @@ -3393,6 +3191,9 @@ msgstr "HTTP-communicatie op schijf opslaan" #~ msgid "Open Image in New Wi_ndow" #~ msgstr "Afbeelding in nieuw _venster openen" +#~ msgid "User_styles" +#~ msgstr "Gebruikers_stijlen" + #~ msgid "_Quick Find" #~ msgstr "_Snelzoeken" @@ -3459,6 +3260,9 @@ msgstr "HTTP-communicatie op schijf opslaan" #~ msgid "%s.%s cannot be accessed" #~ msgstr "%s.%s is niet toegankelijk" +#~ msgid "_Enable" +#~ msgstr "_Inschakelen" + #~ msgid "_Disable" #~ msgstr "_Uitschakelen" diff --git a/po/no.po b/po/no.po index e19ed819..beba003c 100644 --- a/po/no.po +++ b/po/no.po @@ -598,16 +598,16 @@ msgid "_Manage Search Engines" msgstr "_Håndter søkemotorer" #: ../midori/midori-browser.c:4282 -msgid "Add, edit and remove search engines…" -msgstr "Legg til, endre og fjern søkemotorer…" +msgid "Add, edit and remove search engines..." +msgstr "Legg til, endre og fjern søkemotorer..." #: ../midori/midori-browser.c:4285 msgid "_Clear Private Data" msgstr "_Slett private data" #: ../midori/midori-browser.c:4286 -msgid "Clear private data…" -msgstr "Slett private data…" +msgid "Clear private data..." +msgstr "Slett private data..." #: ../midori/midori-browser.c:4290 msgid "_Previous Tab" @@ -745,24 +745,24 @@ msgstr "Vestlig (ISO-8859-1)" #: ../midori/midori-browser.c:4368 #: ../midori/midori-websettings.c:219 #: ../midori/midori-websettings.c:291 -msgid "Custom…" -msgstr "Tilpasset…" +msgid "Custom..." +msgstr "Tilpasset..." #: ../midori/midori-browser.c:4806 msgid "_Separator" msgstr "_Separator" #: ../midori/midori-browser.c:4813 -msgid "_Location…" -msgstr "_Sted…" +msgid "_Location..." +msgstr "_Sted..." #: ../midori/midori-browser.c:4815 msgid "Open a particular location" msgstr "Åpne et gitt sted" #: ../midori/midori-browser.c:4839 -msgid "_Web Search…" -msgstr "_Nettsøk…" +msgid "_Web Search..." +msgstr "_Nettsøk..." #: ../midori/midori-browser.c:4841 msgid "Run a web search" @@ -1964,7 +1964,7 @@ msgid "Configure Advertisement filters" msgstr "Konfiguer annonsefiltre" #: ../extensions/adblock.c:304 -msgid "Configure _Advertisement filters…" +msgid "Configure _Advertisement filters..." msgstr "Konfiguer _annonsefiltre" #: ../extensions/adblock.c:562 @@ -2180,7 +2180,7 @@ msgid "Customize Keyboard shortcuts" msgstr "Tilpass tastatursnarveier" #: ../extensions/shortcuts.c:264 -msgid "Customize Sh_ortcuts…" +msgid "Customize Sh_ortcuts..." msgstr "Tilpass tastat_ursnarveier" #: ../extensions/shortcuts.c:303 @@ -2225,7 +2225,7 @@ msgid "Customize Toolbar" msgstr "Tilpass verktøylinje" #: ../extensions/toolbar-editor.c:407 -msgid "Select items to be displayed on the toolbar. Items can be reordered by drag and drop." +msgid "Select items to be displayed on the toolbar. Items can be reodered by drag and drop." msgstr "Velg elementer som skal vises på verktøylinjen. Elementer kan flyttes ved å dra og slippe." #: ../extensions/toolbar-editor.c:423 @@ -2237,7 +2237,7 @@ msgid "Displayed Items" msgstr "Viste elementer" #: ../extensions/toolbar-editor.c:579 -msgid "Customize _Toolbar…" +msgid "Customize _Toolbar..." msgstr "Tilpass _verktøylinje" #: ../extensions/toolbar-editor.c:611 diff --git a/po/pa.po b/po/pa.po index e99057b3..afb4452d 100644 --- a/po/pa.po +++ b/po/pa.po @@ -403,8 +403,8 @@ msgid "Epiphany" msgstr "ਏਪੀਫਨੀ" #: ../midori/midori-browser.c:4533 ../panels/midori-bookmarks.c:271 -msgid "Import bookmarks…" -msgstr "ਬੁੱਕਮਾਰਕ ਇੰਪੋਰਟ ਕਰੋ…" +msgid "Import bookmarks..." +msgstr "ਬੁੱਕਮਾਰਕ ਇੰਪੋਰਟ ਕਰੋ..." #: ../midori/midori-browser.c:4536 ../midori/midori-browser.c:5496 msgid "_Import bookmarks" @@ -417,8 +417,8 @@ msgstr "ਐਪਲੀਕੇਸ਼ਨ(_A):" #: ../midori/midori-browser.c:4574 ../midori/midori-browser.c:5600 #: ../midori/midori-websettings.c:232 ../midori/midori-websettings.c:323 #: ../katze/katze-utils.c:688 -msgid "Custom…" -msgstr "ਕਸਟਮ…" +msgid "Custom..." +msgstr "ਕਸਟਮ..." #: ../midori/midori-browser.c:4648 msgid "Failed to import bookmarks" @@ -749,7 +749,7 @@ msgid "_Manage Search Engines" msgstr "ਖੋਜ ਇੰਜਣ ਪਰਬੰਧ(_M)" #: ../midori/midori-browser.c:5503 -msgid "Add, edit and remove search engines…" +msgid "Add, edit and remove search engines..." msgstr "" #: ../midori/midori-browser.c:5506 @@ -757,15 +757,15 @@ msgid "_Clear Private Data" msgstr "ਪ੍ਰਾਈਵੇਟ ਡਾਟਾ ਸਾਫ਼ ਕਰੋ(_C)" #: ../midori/midori-browser.c:5507 -msgid "Clear private data…" -msgstr "ਪ੍ਰਾਈਵੇਟ ਡਾਟਾ ਸਾਫ਼ ਕਰੋ…" +msgid "Clear private data..." +msgstr "ਪ੍ਰਾਈਵੇਟ ਡਾਟਾ ਸਾਫ਼ ਕਰੋ..." #: ../midori/midori-browser.c:5511 msgid "_Inspect Page" msgstr "" #: ../midori/midori-browser.c:5512 -msgid "Inspect page details and access developer tools…" +msgid "Inspect page details and access developer tools..." msgstr "" #: ../midori/midori-browser.c:5517 @@ -914,16 +914,16 @@ msgid "_Separator" msgstr "" #: ../midori/midori-browser.c:6152 -msgid "_Location…" -msgstr "ਟਿਕਾਣਾ(_L)…" +msgid "_Location..." +msgstr "ਟਿਕਾਣਾ(_L)..." #: ../midori/midori-browser.c:6154 msgid "Open a particular location" msgstr "" #: ../midori/midori-browser.c:6178 -msgid "_Web Search…" -msgstr "ਵੈੱਬ ਖੋਜ(_W)…" +msgid "_Web Search..." +msgstr "ਵੈੱਬ ਖੋਜ(_W)..." #: ../midori/midori-browser.c:6180 msgid "Run a web search" @@ -2232,7 +2232,7 @@ msgid "" msgstr "" #: ../extensions/adblock.c:570 -msgid "Configure _Advertisement filters…" +msgid "Configure _Advertisement filters..." msgstr "" #: ../extensions/adblock.c:818 @@ -2490,7 +2490,7 @@ msgid "Customize Keyboard shortcuts" msgstr "" #: ../extensions/shortcuts.c:276 -msgid "Customize Sh_ortcuts…" +msgid "Customize Sh_ortcuts..." msgstr "" #: ../extensions/shortcuts.c:315 @@ -2547,7 +2547,7 @@ msgstr "" #: ../extensions/toolbar-editor.c:405 msgid "" -"Select items to be displayed on the toolbar. Items can be reordered by drag " +"Select items to be displayed on the toolbar. Items can be reodered by drag " "and drop." msgstr "" @@ -2560,7 +2560,7 @@ msgid "Displayed Items" msgstr "" #: ../extensions/toolbar-editor.c:577 -msgid "Customize _Toolbar…" +msgid "Customize _Toolbar..." msgstr "" #: ../extensions/toolbar-editor.c:608 diff --git a/po/pl.po b/po/pl.po index fba506b1..d78d08fd 100644 --- a/po/pl.po +++ b/po/pl.po @@ -3,14 +3,14 @@ # This file is distributed under the same license as the midori package. # Przemysław Sitek , 2008. # Łukasz Romanowicz , 2008. -# Piotr Sokół , 2010, 2011, 2012. +# Piotr Sokół , 2010, 2011. # msgid "" msgstr "" -"Project-Id-Version: midori 0.4.6\n" +"Project-Id-Version: midori 0.4.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-07-26 21:00+0000\n" -"PO-Revision-Date: 2012-07-27 10:08+0200\n" +"POT-Creation-Date: 2011-11-24 15:46+0000\n" +"PO-Revision-Date: 2011-11-24 17:37+0100\n" "Last-Translator: Piotr Sokół \n" "Language-Team: polski <>\n" "Language: pl\n" @@ -21,111 +21,101 @@ msgstr "" "%100<10 || n%100>=20)) ? 1 : 2));\n" #: ../data/midori.desktop.in.h:1 -msgid "Browse the Web" +msgid "Lightweight web browser" msgstr "Umożliwia przeglądanie zawartości sieci internetowej" -#: ../data/midori.desktop.in.h:2 -msgid "Internet;WWW;Explorer" -msgstr "Internet;WWW;Explorer" - -#: ../data/midori.desktop.in.h:3 ../midori/main.c:2028 ../midori/main.c:2052 -#: ../midori/main.c:2066 ../midori/midori-websettings.c:315 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:2009 ../midori/main.c:2029 +#: ../midori/main.c:2045 ../midori/midori-websettings.c:303 msgid "Midori" -msgstr "Midori" - -#: ../data/midori.desktop.in.h:4 -msgid "Midori Web Browser" msgstr "Przeglądarka internetowa Midori" -#: ../data/midori.desktop.in.h:5 -msgid "New Private Browsing Window" -msgstr "Nowe okno prywatne" - -#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1429 -msgid "New Tab" -msgstr "Nowa karta" - -#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1426 -msgid "New Window" -msgstr "Nowe okno" - -#: ../data/midori.desktop.in.h:8 +#: ../data/midori.desktop.in.h:3 msgid "Web Browser" msgstr "Przeglądarka internetowa" #: ../data/midori-private.desktop.in.h:1 msgid "Midori Private Browsing" -msgstr "Tryb prywatny Midori" +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:4481 +#: ../data/midori-private.desktop.in.h:3 msgid "Private Browsing" -msgstr "Przeglądanie w trybie prywatnym" +msgstr "Prywatne przeglądanie" -#: ../midori/main.c:91 ../midori/main.c:97 +#: ../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:145 +#: ../midori/main.c:150 #, c-format msgid "Value '%s' is invalid for %s" -msgstr "Wartość „%s” nie jest prawidłowa dla %s" +msgstr "Wartość „%s” nie jest poprawna dla %s" -#: ../midori/main.c:150 ../midori/main.c:254 +#: ../midori/main.c:155 ../midori/main.c:261 #, c-format msgid "Invalid configuration value '%s'" msgstr "Błędna wartość konfiguracyjna „%s”" -#: ../midori/main.c:375 +#: ../midori/main.c:366 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Nie można wczytać wyszukiwarek internetowych. %s\n" -#: ../midori/main.c:429 +#: ../midori/main.c:420 #, c-format msgid "Failed to clear history: %s\n" msgstr "Nie udało się wyczyścić historii: %s\n" -#: ../midori/main.c:451 ../extensions/formhistory/formhistory.c:531 +#: ../midori/main.c:440 ../midori/main.c:561 ../extensions/formhistory.c:417 #, 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:523 +#: ../midori/main.c:504 #, 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:545 +#: ../midori/main.c:544 ../panels/midori-history.c:189 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "Nie udało się usunąć elementu historii: %s\n" + +#: ../midori/main.c:591 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "Nie można zapisać zakładek. %s" + +#: ../midori/main.c:624 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Nie można zapisać ustawień. %s" -#: ../midori/main.c:571 +#: ../midori/main.c:659 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Nie można zapisać wyszukiwarek internetowych. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:608 +#: ../midori/main.c:685 ../midori/main.c:705 #, 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:681 ../panels/midori-extensions.c:90 +#: ../midori/main.c:739 ../panels/midori-extensions.c:91 msgid "Extensions" msgstr "Wtyczki" -#: ../midori/main.c:695 +#: ../midori/main.c:753 msgid "Privacy" msgstr "Prywatność" -#: ../midori/main.c:707 +#: ../midori/main.c:765 msgid "" "Cookies store login data, saved games, or user profiles for advertisement " "purposes." @@ -133,18 +123,18 @@ msgstr "" "Ciasteczka przechowują dane logowania, zapisane stany gier lub profile " "użytkownika używane w celach reklamowych." -#: ../midori/main.c:763 +#: ../midori/main.c:821 #, c-format msgid "The session couldn't be saved. %s" msgstr "Nie można zapisać sesji. %s" -#: ../midori/main.c:1001 +#: ../midori/main.c:1031 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:1093 +#: ../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." @@ -152,223 +142,242 @@ 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:1112 +#: ../midori/main.c:1118 msgid "Modify _preferences" msgstr "Zmodyfikuj p_referencje" -#: ../midori/main.c:1116 +#: ../midori/main.c:1122 msgid "Disable all _extensions" msgstr "Wyłącz wszystkie _wtyczki" -#: ../midori/main.c:1129 +#: ../midori/main.c:1135 msgid "Discard old tabs" msgstr "Porzucenie ostatnich kart" -#: ../midori/main.c:1130 ../midori/midori-websettings.c:223 +#: ../midori/main.c:1136 ../midori/midori-websettings.c:212 msgid "Show last tabs without loading" msgstr "Wyświetlenie ostatnich kart bez wczytywania" -#: ../midori/main.c:1131 ../midori/midori-websettings.c:222 +#: ../midori/main.c:1137 ../midori/midori-websettings.c:211 msgid "Show last open tabs" -msgstr "Wyświetlenie ostatnich kart" +msgstr "Wyświetlenie ostatnich\t kart" -#: ../midori/main.c:1379 ../midori/main.c:2436 +#: ../midori/main.c:1347 ../midori/main.c:2417 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Nie można wczytać sesji: %s\n" -#: ../midori/main.c:1517 +#: ../midori/main.c:1488 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Obraz strony internetowej zapisano do pliku %s\n" -#: ../midori/main.c:1933 +#: ../midori/main.c:1912 msgid "Run ADDRESS as a web application" msgstr "Otwiera ADRES jako stronę usługi internetowej" -#: ../midori/main.c:1933 +#: ../midori/main.c:1912 msgid "ADDRESS" msgstr "ADRES" -#: ../midori/main.c:1936 +#: ../midori/main.c:1915 msgid "Use FOLDER as configuration folder" msgstr "Używa KATALOGU do przechowywania konfiguracji programu" -#: ../midori/main.c:1936 +#: ../midori/main.c:1915 msgid "FOLDER" msgstr "KATALOG" -#: ../midori/main.c:1939 +#: ../midori/main.c:1918 msgid "Private browsing, no changes are saved" msgstr "" "Otwiera wystąpienie programu, które nie zapisuje żadnych prywatnych danych" -#: ../midori/main.c:1941 +#: ../midori/main.c:1920 msgid "Show a diagnostic dialog" msgstr "Wyświetla okno diagnostyczne po wystąpieniu awarii" -#: ../midori/main.c:1943 +#: ../midori/main.c:1922 msgid "Run the specified filename as javascript" msgstr "Uruchamia określony plik jako skrypt javascript" -#: ../midori/main.c:1945 +#: ../midori/main.c:1924 msgid "Take a snapshot of the specified URI" msgstr "Przechwytuje obraz strony określonej jako ADRES" -#: ../midori/main.c:1947 +#: ../midori/main.c:1926 msgid "Execute the specified command" msgstr "Wykonuje wprowadzone polecenie" -#: ../midori/main.c:1949 +#: ../midori/main.c:1928 msgid "List available commands to execute with -e/ --execute" -msgstr "Wypisuje polecenia dostępne z opcją -e lub --execute" +msgstr "Wypisuje polecenia dostępne z opcją -e/ --execute" -#: ../midori/main.c:1951 +#: ../midori/main.c:1930 msgid "Display program version" msgstr "Wypisuje wersję programu" -#: ../midori/main.c:1953 +#: ../midori/main.c:1932 msgid "Addresses" msgstr "Adresy" -#: ../midori/main.c:1955 +#: ../midori/main.c:1934 msgid "Block URIs according to regular expression PATTERN" msgstr "Blokuje adresy URI określone przez WZÓR" -#: ../midori/main.c:1955 +#: ../midori/main.c:1934 msgid "PATTERN" msgstr "WZÓR" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1959 +#: ../midori/main.c:1938 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "Resetuje działanie programu po czasie wyrażonym ilością SEKUND" -#: ../midori/main.c:1959 +#: ../midori/main.c:1938 msgid "SECONDS" msgstr "SEKUNDY" -#: ../midori/main.c:1962 +#: ../midori/main.c:1941 msgid "Redirects console warnings to the specified FILENAME" msgstr "Przekierowuje ostrzeżenia terminala do określonego PLIKU" -#: ../midori/main.c:1962 +#: ../midori/main.c:1941 msgid "FILENAME" msgstr "PLIK" -#: ../midori/main.c:2025 +#: ../midori/main.c:2006 msgid "[Addresses]" -msgstr "[ADRES…]" +msgstr "[ADRES...]" + +#: ../midori/main.c:2016 +msgid "The specified configuration folder is invalid." +msgstr "Podany katalog konfiguracyjny jest niepoprawny" -#: ../midori/main.c:2067 +#: ../midori/main.c:2046 msgid "Please report comments, suggestions and bugs to:" msgstr "Prosimy o zgłaszanie uwag, sugestii i błędów na adres:" -#: ../midori/main.c:2069 +#: ../midori/main.c:2048 +#, fuzzy msgid "Check for new versions at:" msgstr "Sprawdź nową wersję na:" +#: ../midori/main.c:2131 +msgid "Website icons" +msgstr "Ikony stron internetowych" + #. i18n: Logins and passwords in websites and web forms -#: ../midori/main.c:2164 +#: ../midori/main.c:2134 msgid "Saved logins and _passwords" msgstr "Zapisane nazwy użytkowników i _hasła" -#: ../midori/main.c:2166 -msgid "Cookies and Website data" -msgstr "Ciasteczka i dane witryn" +#: ../midori/main.c:2136 +msgid "Cookies" +msgstr "Ciasteczka" + +#: ../midori/main.c:2139 +msgid "'Flash' Cookies" +msgstr "Ciasteczka „Flash”" + +#: ../midori/main.c:2142 +msgid "HTML5 _Databases" +msgstr "_Bazy danych HTML5" -#. TODO: Preserve page icons of search engines and merge privacy items -#: ../midori/main.c:2170 ../midori/midori-websettings.c:1020 +#: ../midori/main.c:2145 ../midori/midori-websettings.c:936 #: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471 msgid "Web Cache" msgstr "Pamięć podręczna:" -#: ../midori/main.c:2173 -msgid "Website icons" -msgstr "Ikony stron internetowych" +#: ../midori/main.c:2147 +msgid "Offline Application Cache" +msgstr "Pamięć podręczna rozłączonych usług internetowych" -#: ../midori/main.c:2277 +#: ../midori/main.c:2250 msgid "An unknown error occured" msgstr "Wystąpił nieznany błąd." -#: ../midori/main.c:2384 +#: ../midori/main.c:2348 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:2418 +#: ../midori/main.c:2384 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Nie można wczytać zakładek: %s\n" -#: ../midori/main.c:2451 +#: ../midori/main.c:2432 #, 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:2464 +#: ../midori/main.c:2445 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Nie można wczytać historii: %s\n" -#: ../midori/main.c:2479 +#: ../midori/main.c:2461 msgid "The following errors occured:" msgstr "Napotkano błędy:" -#: ../midori/main.c:2495 +#: ../midori/main.c:2477 msgid "_Ignore" msgstr "_Ignoruj" -#: ../midori/midori-app.c:1155 ../midori/midori-browser.c:494 -#, c-format -msgid "Unexpected action '%s'." -msgstr "Niespodziewana czynność „%s”." +#: ../midori/midori-app.c:1329 +msgid "_Bookmark" +msgstr "_Zakładka" -#: ../midori/midori-app.c:1453 ../midori/midori-browser.c:6388 +#: ../midori/midori-app.c:1330 ../midori/midori-browser.c:5980 msgid "_Bookmarks" msgstr "_Zakładki" -#: ../midori/midori-app.c:1454 +#: ../midori/midori-app.c:1331 msgid "Add Boo_kmark" msgstr "_Dodaj zakładkę" -#: ../midori/midori-app.c:1455 +#: ../midori/midori-app.c:1332 +msgid "_Console" +msgstr "_Konsola" + +#: ../midori/midori-app.c:1333 msgid "_Extensions" msgstr "_Wtyczki" #. i18n: Browsing history, visited web pages, closed tabs -#: ../midori/midori-app.c:1456 ../midori/midori-browser.c:4834 +#: ../midori/midori-app.c:1334 ../midori/midori-browser.c:4575 msgid "_History" msgstr "_Historia" -#: ../midori/midori-app.c:1457 +#: ../midori/midori-app.c:1335 +msgid "_Homepage" +msgstr "_Strona główna" + +#: ../midori/midori-app.c:1336 msgid "_Userscripts" msgstr "Skrypty _użytkownika" -#: ../midori/midori-app.c:1458 -msgid "User_styles" -msgstr "_Style użytkownika" - -#: ../midori/midori-app.c:1459 +#: ../midori/midori-app.c:1337 msgid "New _Tab" msgstr "Nowa kar_ta" -#: ../midori/midori-app.c:1460 +#: ../midori/midori-app.c:1338 msgid "_Transfers" msgstr "_Pobieranie plików" -#: ../midori/midori-app.c:1461 +#: ../midori/midori-app.c:1339 msgid "Netscape p_lugins" msgstr "Wtyczki _Netscape" -#: ../midori/midori-app.c:1462 +#: ../midori/midori-app.c:1340 msgid "_Closed Tabs" msgstr "_Zamknięte karty" -#: ../midori/midori-app.c:1463 ../midori/midori-browser.c:5527 +#: ../midori/midori-app.c:1341 ../midori/midori-browser.c:5163 msgid "New _Window" msgstr "_Nowe okno" -#: ../midori/midori-app.c:1464 +#: ../midori/midori-app.c:1342 msgid "New _Folder" msgstr "Nowy _katalog" @@ -389,125 +398,125 @@ msgstr "Nierozpoznany format zakładek." msgid "Writing failed." msgstr "Zapisywanie nie udało się." -#: ../midori/midori-browser.c:355 ../midori/midori-browser.c:5615 -#: ../midori/midori-browser.c:5624 +#: ../midori/midori-browser.c:329 ../midori/midori-browser.c:5245 +#: ../midori/midori-browser.c:5254 msgid "Reload the current page" msgstr "Wczytuje ponownie bieżącą stronę" -#: ../midori/midori-browser.c:364 ../midori/midori-browser.c:5621 +#: ../midori/midori-browser.c:337 ../midori/midori-browser.c:5251 msgid "Stop loading the current page" msgstr "Zatrzymuje wczytywanie bieżącej strony" -#: ../midori/midori-browser.c:481 +#: ../midori/midori-browser.c:462 #, c-format msgid "Failed to update title: %s\n" msgstr "Nie udało się zaktualizować tytułu: %s\n" -#: ../midori/midori-browser.c:574 +#: ../midori/midori-browser.c:475 +#, c-format +msgid "Unexpected action '%s'." +msgstr "Niespodziewana czynność „%s”." + +#: ../midori/midori-browser.c:576 #, c-format msgid "%s (Private Browsing)" msgstr "%s (Tryb prywatny)" -#: ../midori/midori-browser.c:687 ../midori/midori-browser.c:729 -#: ../panels/midori-bookmarks.c:114 -msgid "Bookmarks" -msgstr "Zakładki" +#: ../midori/midori-browser.c:687 ../midori/midori-browser.c:720 +msgid "Toplevel folder" +msgstr "Katalog główny" -#: ../midori/midori-browser.c:789 +#: ../midori/midori-browser.c:777 msgid "New folder" msgstr "Nowy katalog" -#: ../midori/midori-browser.c:789 +#: ../midori/midori-browser.c:777 msgid "Edit folder" msgstr "Edytuj katalog" -#: ../midori/midori-browser.c:791 +#: ../midori/midori-browser.c:779 msgid "New bookmark" msgstr "Nowa zakładka" -#: ../midori/midori-browser.c:791 +#: ../midori/midori-browser.c:779 msgid "Edit bookmark" msgstr "Edytuj zakładkę" -#: ../midori/midori-browser.c:825 -msgid "Type a name for this bookmark and choose where to keep it." -msgstr "" -"Proszę wprowadzić nazwę zakładki i wybrać jej położenie przechowywania." +#: ../midori/midori-browser.c:810 +msgid "_Title:" +msgstr "_Tytuł:" + +#: ../midori/midori-browser.c:830 ../midori/midori-searchaction.c:966 +#: ../extensions/feed-panel/main.c:377 +msgid "_Address:" +msgstr "_Adres:" + +#: ../midori/midori-browser.c:853 ../midori/midori-browser.c:4310 +msgid "_Folder:" +msgstr "_Katalog:" -#: ../midori/midori-browser.c:886 +#: ../midori/midori-browser.c:869 msgid "Add to _Speed Dial" msgstr "Dodaj odnośnik _szybkiego wybierania" -#: ../midori/midori-browser.c:892 +#: ../midori/midori-browser.c:882 msgid "Show in the tool_bar" msgstr "Wyświetlanie na pasku _zakładek" -#: ../midori/midori-browser.c:900 +#: ../midori/midori-browser.c:897 msgid "Run as _web application" msgstr "Otwieranie jako stronę usługi _internetowej" -#: ../midori/midori-browser.c:970 +#: ../midori/midori-browser.c:968 #, 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:972 +#: ../midori/midori-browser.c:970 #, 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:979 +#: ../midori/midori-browser.c:977 #, 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:982 +#: ../midori/midori-browser.c:980 #, 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." -#: ../midori/midori-browser.c:1118 ../midori/midori-browser.c:4635 +#: ../midori/midori-browser.c:1024 ../midori/midori-browser.c:4380 msgid "Save file as" msgstr "Wybór pliku" -#: ../midori/midori-browser.c:1124 -msgid "Save associated _resources" -msgstr "Zapisz powiązane _zasoby" +#: ../midori/midori-browser.c:1333 +msgid "New Window" +msgstr "Nowe okno" -#: ../midori/midori-browser.c:1426 +#: ../midori/midori-browser.c:1333 msgid "A new window has been opened" msgstr "Otwarto nowe okno" -#: ../midori/midori-browser.c:1429 +#: ../midori/midori-browser.c:1336 +msgid "New Tab" +msgstr "Nowa karta" + +#: ../midori/midori-browser.c:1336 msgid "A new tab has been opened" msgstr "Otwarto nową kartę" -#: ../midori/midori-browser.c:1446 -msgid "Error opening the image!" -msgstr "Błąd przy otwieraniu obrazka!" - -#: ../midori/midori-browser.c:1447 -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:1453 -msgid "Error downloading the image!" -msgstr "Wystąpił błąd podczas pobierania obrazu!" - -#: ../midori/midori-browser.c:1454 -msgid "Can not download selected image." -msgstr "Nie można pobrać wybranego obrazu." - -#: ../midori/midori-browser.c:1575 +#: ../midori/midori-browser.c:1373 msgid "Save file" msgstr "Wybór pliku" -#: ../midori/midori-browser.c:2471 +#: ../midori/midori-browser.c:2263 msgid "Open file" msgstr "Wybór pliku" -#: ../midori/midori-browser.c:2603 +#: ../midori/midori-browser.c:2394 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" @@ -523,159 +532,143 @@ msgstr "" "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:2609 ../extensions/feed-panel/main.c:365 +#: ../midori/midori-browser.c:2400 ../extensions/feed-panel/main.c:365 msgid "New feed" msgstr "Nowe źródło wiadomości" -#: ../midori/midori-browser.c:2652 ../midori/midori-browser.c:5687 -#: ../panels/midori-bookmarks.c:527 +#: ../midori/midori-browser.c:2443 ../midori/midori-browser.c:5314 +#: ../panels/midori-bookmarks.c:432 msgid "Add a new bookmark" msgstr "Dodaje nową zakładkę" -#: ../midori/midori-browser.c:3196 ../midori/midori-searchaction.c:488 +#: ../midori/midori-browser.c:2969 ../midori/midori-searchaction.c:487 msgid "Empty" msgstr "Puste" -#: ../midori/midori-browser.c:3639 ../midori/midori-browser.c:3640 +#: ../midori/midori-browser.c:3459 msgid "Toggle text cursor navigation" msgstr "Przełącza przeglądanie kursorem klawiatury" -#: ../midori/midori-browser.c:3642 -msgid "" -"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in " -"all websites." -msgstr "" -"Naciśnięcie klawisza F7 przełącza przeglądanie kursorem klawiatury. Po " -"włączeniu kursor tekstowy pojawi się na wszystkich stronach internetowych." - -#: ../midori/midori-browser.c:3645 -msgid "_Enable Caret Browsing" -msgstr "Przeglądanie _kursorem klawiatury" - -#: ../midori/midori-browser.c:4035 ../midori/midori-browser.c:6081 +#: ../midori/midori-browser.c:3771 ../midori/midori-browser.c:5721 #, 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:4361 ../panels/midori-bookmarks.c:847 -#: ../panels/midori-history.c:803 +#: ../midori/midori-browser.c:4107 ../panels/midori-bookmarks.c:748 +#: ../panels/midori-history.c:747 msgid "Open all in _Tabs" msgstr "Otwórz wszystkie w nowych _kartach" -#: ../midori/midori-browser.c:4368 ../panels/midori-bookmarks.c:853 -#: ../panels/midori-history.c:809 ../extensions/feed-panel/feed-panel.c:528 +#: ../midori/midori-browser.c:4114 ../panels/midori-bookmarks.c:754 +#: ../panels/midori-history.c:753 ../extensions/feed-panel/feed-panel.c:528 msgid "Open in New _Tab" msgstr "Otwórz w nowej _karcie" -#: ../midori/midori-browser.c:4371 ../midori/midori-view.c:2940 -#: ../midori/midori-view.c:5058 ../panels/midori-bookmarks.c:855 -#: ../panels/midori-history.c:811 ../extensions/feed-panel/feed-panel.c:530 +#: ../midori/midori-browser.c:4117 ../midori/midori-view.c:2530 +#: ../midori/midori-view.c:4357 ../panels/midori-bookmarks.c:756 +#: ../panels/midori-history.c:755 ../extensions/feed-panel/feed-panel.c:530 msgid "Open in New _Window" msgstr "Otwórz w nowym _oknie" -#: ../midori/midori-browser.c:4460 +#: ../midori/midori-browser.c:4197 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4461 +#: ../midori/midori-browser.c:4198 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4462 +#: ../midori/midori-browser.c:4199 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4463 +#: ../midori/midori-browser.c:4200 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4464 +#: ../midori/midori-browser.c:4201 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4465 +#: ../midori/midori-browser.c:4202 #, c-format msgid "Firefox (%s)" msgstr "Firefox (%s)" -#: ../midori/midori-browser.c:4466 -msgid "Midori 0.2.6" -msgstr "Midori 0.2.6" - -#: ../midori/midori-browser.c:4487 -msgid "Import bookmarks…" +#: ../midori/midori-browser.c:4223 +msgid "Import bookmarks..." msgstr "Importowanie zakładek" -#: ../midori/midori-browser.c:4490 ../midori/midori-browser.c:5692 +#: ../midori/midori-browser.c:4226 ../midori/midori-browser.c:5319 msgid "_Import bookmarks" -msgstr "_Importuj zakładki…" +msgstr "_Importuj zakładki..." -#: ../midori/midori-browser.c:4501 +#: ../midori/midori-browser.c:4237 msgid "_Application:" msgstr "_Program:" -#: ../midori/midori-browser.c:4566 +#: ../midori/midori-browser.c:4302 msgid "Import from XBEL or HTML file" msgstr "Plik XBEL lub HTML" -#: ../midori/midori-browser.c:4594 +#: ../midori/midori-browser.c:4337 msgid "Import from a file" msgstr "Z pliku" -#: ../midori/midori-browser.c:4606 +#: ../midori/midori-browser.c:4349 msgid "Failed to import bookmarks" msgstr "Nie udało się zaimportować zakładek" -#: ../midori/midori-browser.c:4640 +#: ../midori/midori-browser.c:4385 msgid "XBEL Bookmarks" msgstr "Zakładki XBEL" -#: ../midori/midori-browser.c:4645 +#: ../midori/midori-browser.c:4390 msgid "Netscape Bookmarks" msgstr "Zakładki Netscape" -#: ../midori/midori-browser.c:4659 +#: ../midori/midori-browser.c:4404 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:4674 +#: ../midori/midori-browser.c:4420 msgid "Failed to export bookmarks" msgstr "Nie udało się wyeksportować zakładek" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4796 +#: ../midori/midori-browser.c:4542 msgid "Clear Private Data" msgstr "Usuwanie danych" -#: ../midori/midori-browser.c:4800 +#: ../midori/midori-browser.c:4546 msgid "_Clear private data" msgstr "_Usuń prywatne dane" -#: ../midori/midori-browser.c:4818 +#: ../midori/midori-browser.c:4559 msgid "Clear the following data:" msgstr "Prywatne dane:" -#: ../midori/midori-browser.c:4828 +#: ../midori/midori-browser.c:4569 msgid "Last open _tabs" msgstr "Ostatnio otwarte _karty" -#: ../midori/midori-browser.c:4854 +#: ../midori/midori-browser.c:4595 msgid "Clear private data when _quitting Midori" msgstr "Usunięcie danych podczas _kończenia programu" -#: ../midori/midori-browser.c:5069 +#: ../midori/midori-browser.c:4771 msgid "A lightweight web browser." -msgstr "Umożliwia przeglądanie zawartości sieci internetowej" +msgstr "Lekka przeglądarka internetowa." -#: ../midori/midori-browser.c:5070 +#: ../midori/midori-browser.c:4772 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:5072 +#: ../midori/midori-browser.c:4774 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 " @@ -687,1006 +680,919 @@ msgstr "" "Fundację Wolnego Oprogramowania - według wersji drugiej tej Licencji lub " "którejś z późniejszych wersji." -#: ../midori/midori-browser.c:5113 +#: ../midori/midori-browser.c:4795 msgid "translator-credits" msgstr "" "Przemysław Sitek , 2008.\n" "Łukasz Romanowicz , 2008.\n" -"Piotr Sokół , 2010, 2011, 2012." +"Piotr Sokół , 2010, 2011." -#: ../midori/midori-browser.c:5525 +#: ../midori/midori-browser.c:5161 msgid "_File" msgstr "_Plik" -#: ../midori/midori-browser.c:5528 +#: ../midori/midori-browser.c:5164 msgid "Open a new window" msgstr "Otwiera nowe okno programu" -#: ../midori/midori-browser.c:5531 +#: ../midori/midori-browser.c:5167 msgid "Open a new tab" msgstr "Otwiera nową kartę" -#: ../midori/midori-browser.c:5533 +#: ../midori/midori-browser.c:5169 msgid "New P_rivate Browsing Window" msgstr "Nowe okno p_rywatne" -#: ../midori/midori-browser.c:5537 +#: ../midori/midori-browser.c:5173 msgid "Open a file" msgstr "Otwiera plik strony" -#: ../midori/midori-browser.c:5539 -msgid "_Save Page As…" -msgstr "Zapisz j_ako…" +#: ../midori/midori-browser.c:5175 +msgid "_Save Page As..." +msgstr "Zapisz j_ako..." -#: ../midori/midori-browser.c:5540 +#: ../midori/midori-browser.c:5176 msgid "Save to a file" msgstr "Zapisuje stronę do pliku" -#: ../midori/midori-browser.c:5542 +#: ../midori/midori-browser.c:5178 msgid "Add to Speed _dial" msgstr "Utwórz odnośnik _szybkiego wybierania" -#: ../midori/midori-browser.c:5546 +#: ../midori/midori-browser.c:5182 msgid "Add Shortcut to the _desktop" msgstr "Utwórz odnośnik na _pulpicie" -#: ../midori/midori-browser.c:5548 +#: ../midori/midori-browser.c:5184 msgid "Create _Launcher" msgstr "Utwórz _aktywator" -#: ../midori/midori-browser.c:5552 +#: ../midori/midori-browser.c:5188 msgid "Subscribe to News _feed" msgstr "Zasubskrybuj _kanał wiadomości" -#: ../midori/midori-browser.c:5558 +#: ../midori/midori-browser.c:5194 msgid "_Close Tab" msgstr "_Zamknij kartę" -#: ../midori/midori-browser.c:5559 +#: ../midori/midori-browser.c:5195 msgid "Close the current tab" msgstr "Zamyka bieżącą kartę" -#: ../midori/midori-browser.c:5561 +#: ../midori/midori-browser.c:5197 msgid "C_lose Window" msgstr "Za_mknij okno" -#: ../midori/midori-browser.c:5565 -msgid "_Share" -msgstr "" - -#: ../midori/midori-browser.c:5570 +#: ../midori/midori-browser.c:5201 msgid "Print the current page" msgstr "Drukuje bieżącą stronę" -#: ../midori/midori-browser.c:5573 +#: ../midori/midori-browser.c:5203 msgid "Close a_ll Windows" msgstr "Za_mknij wszystkie okna" -#: ../midori/midori-browser.c:5576 +#: ../midori/midori-browser.c:5206 msgid "_Edit" msgstr "_Edycja" -#: ../midori/midori-browser.c:5599 -msgid "_Find…" -msgstr "_Wyszukaj…" +#: ../midori/midori-browser.c:5229 +msgid "_Find..." +msgstr "_Wyszukaj..." -#: ../midori/midori-browser.c:5600 +#: ../midori/midori-browser.c:5230 msgid "Find a word or phrase in the page" msgstr "Wyszukuje słowa lub wyrażenia na stronie" -#: ../midori/midori-browser.c:5602 +#: ../midori/midori-browser.c:5232 msgid "Find _Next" msgstr "Znajdź _następne" -#: ../midori/midori-browser.c:5605 +#: ../midori/midori-browser.c:5235 msgid "Find _Previous" msgstr "Znajdź _poprzednie" -#: ../midori/midori-browser.c:5609 +#: ../midori/midori-browser.c:5239 msgid "Configure the application preferences" msgstr "Otwiera okno preferencji programu" -#: ../midori/midori-browser.c:5611 +#: ../midori/midori-browser.c:5241 msgid "_View" msgstr "_Widok" -#: ../midori/midori-browser.c:5612 +#: ../midori/midori-browser.c:5242 msgid "_Toolbars" msgstr "Paski _narzędziowe" -#: ../midori/midori-browser.c:5617 +#: ../midori/midori-browser.c:5247 msgid "Reload page without caching" -msgstr "Wczytaj ponownie pomijając pamięć podręczną" +msgstr "Odśwież bez wczytywania pamięci podręcznej" -#: ../midori/midori-browser.c:5627 +#: ../midori/midori-browser.c:5257 msgid "Increase the zoom level" msgstr "Powiększa rozmiar strony" -#: ../midori/midori-browser.c:5630 +#: ../midori/midori-browser.c:5260 msgid "Decrease the zoom level" msgstr "Zmniejsza rozmiar strony" -#: ../midori/midori-browser.c:5634 +#: ../midori/midori-browser.c:5264 msgid "_Encoding" msgstr "_Kodowanie znaków" -#: ../midori/midori-browser.c:5636 +#: ../midori/midori-browser.c:5266 msgid "View So_urce" msgstr "Wyświetl ź_ródło" -#: ../midori/midori-browser.c:5639 +#: ../midori/midori-browser.c:5269 msgid "Ca_ret Browsing" msgstr "Przeglądanie _kursorem klawiatury" -#: ../midori/midori-browser.c:5643 +#: ../midori/midori-browser.c:5273 msgid "Toggle fullscreen view" msgstr "Przełącza widok trybu pełnoekranowego" -#: ../midori/midori-browser.c:5645 +#: ../midori/midori-browser.c:5275 msgid "Scroll _Left" msgstr "Przewiń w _lewo" -#: ../midori/midori-browser.c:5648 +#: ../midori/midori-browser.c:5278 msgid "Scroll _Down" msgstr "Przewiń w _dół" -#: ../midori/midori-browser.c:5651 +#: ../midori/midori-browser.c:5281 msgid "Scroll _Up" msgstr "Przewiń w _górę" -#: ../midori/midori-browser.c:5654 +#: ../midori/midori-browser.c:5284 msgid "Scroll _Right" msgstr "Przewiń w _prawo" -#: ../midori/midori-browser.c:5657 -msgid "_Readable" -msgstr "Tryb zwiększonej _czytelności" - -#: ../midori/midori-browser.c:5660 +#: ../midori/midori-browser.c:5287 msgid "_Go" msgstr "P_rzejdź" -#: ../midori/midori-browser.c:5663 +#: ../midori/midori-browser.c:5290 msgid "Go back to the previous page" msgstr "Przechodzi do poprzedniej odwiedzonej strony" -#: ../midori/midori-browser.c:5666 +#: ../midori/midori-browser.c:5293 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:5670 +#: ../midori/midori-browser.c:5297 msgid "Go to the previous sub-page" msgstr "Przechodzi do poprzedniej podstrony" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5674 +#: ../midori/midori-browser.c:5301 msgid "Go to the next sub-page" msgstr "Przechodzi do następnej podstrony" -#: ../midori/midori-browser.c:5676 -msgid "_Homepage" -msgstr "_Strona główna" - -#: ../midori/midori-browser.c:5677 +#: ../midori/midori-browser.c:5304 msgid "Go to your homepage" msgstr "Przechodzi do strony głównej" -#: ../midori/midori-browser.c:5679 +#: ../midori/midori-browser.c:5306 msgid "Empty Trash" msgstr "Wyczyść listę" -#: ../midori/midori-browser.c:5682 +#: ../midori/midori-browser.c:5309 msgid "Undo _Close Tab" msgstr "Przywróć _zamkniętą kartę" -#: ../midori/midori-browser.c:5689 +#: ../midori/midori-browser.c:5316 msgid "Add a new _folder" msgstr "Utwórz _katalog" -#: ../midori/midori-browser.c:5695 +#: ../midori/midori-browser.c:5322 msgid "_Export bookmarks" -msgstr "_Eksportuj zakładki…" +msgstr "_Eksportuj zakładki..." -#: ../midori/midori-browser.c:5698 ../midori/midori-searchaction.c:497 +#: ../midori/midori-browser.c:5325 ../midori/midori-searchaction.c:496 msgid "_Manage Search Engines" -msgstr "_Zarządzaj wyszukiwarkami…" +msgstr "_Zarządzaj wyszukiwarkami..." -#: ../midori/midori-browser.c:5701 +#: ../midori/midori-browser.c:5328 msgid "_Clear Private Data" -msgstr "_Usuń prywatne dane…" +msgstr "_Usuń prywatne dane..." -#: ../midori/midori-browser.c:5704 +#: ../midori/midori-browser.c:5331 msgid "_Inspect Page" -msgstr "_Zbadaj stronę…" +msgstr "_Zbadaj stronę..." -#: ../midori/midori-browser.c:5708 +#: ../midori/midori-browser.c:5335 msgid "_Previous Tab" msgstr "_Poprzednia karta" -#: ../midori/midori-browser.c:5711 +#: ../midori/midori-browser.c:5338 msgid "_Next Tab" msgstr "_Następna karta" -#: ../midori/midori-browser.c:5713 +#: ../midori/midori-browser.c:5340 msgid "Move Tab _Backward" msgstr "Przemieść kartę w _lewo" -#: ../midori/midori-browser.c:5715 +#: ../midori/midori-browser.c:5342 msgid "_Move Tab Forward" msgstr "Przemieść kartę w p_rawo" -#: ../midori/midori-browser.c:5718 +#: ../midori/midori-browser.c:5345 msgid "Focus _Current Tab" msgstr "Uaktywnij _zawartość" -#: ../midori/midori-browser.c:5721 +#: ../midori/midori-browser.c:5348 msgid "Focus _Next view" msgstr "Uaktywnij n_astępny element" -#: ../midori/midori-browser.c:5724 +#: ../midori/midori-browser.c:5351 msgid "Only show the Icon of the _Current Tab" msgstr "Ukryj etykietę _bieżącej karty" -#: ../midori/midori-browser.c:5727 +#: ../midori/midori-browser.c:5354 msgid "_Duplicate Current Tab" msgstr "_Powiel bieżącą kartę" -#: ../midori/midori-browser.c:5730 +#: ../midori/midori-browser.c:5357 msgid "Close Ot_her Tabs" msgstr "Zamknij pozo_stałe karty" -#: ../midori/midori-browser.c:5733 +#: ../midori/midori-browser.c:5360 msgid "Open last _session" msgstr "Przywróć ostatnią _sesję" -#: ../midori/midori-browser.c:5736 +#: ../midori/midori-browser.c:5363 msgid "_Help" msgstr "Pomo_c" -#: ../midori/midori-browser.c:5738 +#: ../midori/midori-browser.c:5365 msgid "_Frequent Questions" msgstr "_Często zadawane pytania" -#: ../midori/midori-browser.c:5741 -msgid "_Report a Problem…" +#: ../midori/midori-browser.c:5368 +msgid "_Report a Problem..." msgstr "_Zgłoś błąd w programie" -#: ../midori/midori-browser.c:5746 ../midori/midori-browser.c:6407 -msgid "_Tools" -msgstr "_Narzędzia" - -#: ../midori/midori-browser.c:5753 +#: ../midori/midori-browser.c:5380 msgid "_Menubar" msgstr "Pasek _menu" -#: ../midori/midori-browser.c:5757 +#: ../midori/midori-browser.c:5384 msgid "_Navigationbar" msgstr "Pasek _narzędzi nawigacyjnych" -#: ../midori/midori-browser.c:5761 +#: ../midori/midori-browser.c:5388 msgid "Side_panel" msgstr "Panel _boczny" -#: ../midori/midori-browser.c:5762 +#: ../midori/midori-browser.c:5389 msgid "Sidepanel" msgstr "Panel boczny" -#: ../midori/midori-browser.c:5765 +#: ../midori/midori-browser.c:5392 msgid "_Bookmarkbar" msgstr "Pasek _zakładek" -#: ../midori/midori-browser.c:5769 +#: ../midori/midori-browser.c:5396 msgid "_Statusbar" msgstr "Pasek stanu" -#: ../midori/midori-browser.c:5778 ../midori/midori-websettings.c:314 +#: ../midori/midori-browser.c:5405 ../midori/midori-websettings.c:302 msgid "_Automatic" msgstr "Wybór _automatyczny" -#: ../midori/midori-browser.c:5781 ../midori/midori-websettings.c:238 -msgid "Chinese Traditional (BIG5)" +#: ../midori/midori-browser.c:5408 ../midori/midori-websettings.c:227 +msgid "Chinese (BIG5)" msgstr "Chiński tradycyjny (BIG5)" -#: ../midori/midori-browser.c:5784 ../midori/midori-websettings.c:239 -msgid "Chinese Simplified (GB18030)" -msgstr "Chiński uproszczony (GB18030)" - #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5788 +#: ../midori/midori-browser.c:5412 msgid "Japanese (SHIFT__JIS)" msgstr "Japoński (SHIFT_JIS)" -#: ../midori/midori-browser.c:5791 ../midori/midori-websettings.c:241 +#: ../midori/midori-browser.c:5415 ../midori/midori-websettings.c:229 msgid "Korean (EUC-KR)" msgstr "Koreański (EUC-KR)" -#: ../midori/midori-browser.c:5794 ../midori/midori-websettings.c:242 +#: ../midori/midori-browser.c:5418 ../midori/midori-websettings.c:230 msgid "Russian (KOI8-R)" msgstr "Rosyjski (KOI8-R)" -#: ../midori/midori-browser.c:5797 ../midori/midori-websettings.c:243 +#: ../midori/midori-browser.c:5421 ../midori/midori-websettings.c:231 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5800 ../midori/midori-websettings.c:244 +#: ../midori/midori-browser.c:5424 ../midori/midori-websettings.c:232 msgid "Western (ISO-8859-1)" msgstr "Zachodni (ISO-8859-1)" -#: ../midori/midori-browser.c:5803 -msgid "Custom…" -msgstr "Dostosuj…" +#: ../midori/midori-browser.c:5427 ../midori/midori-websettings.c:233 +#: ../midori/midori-websettings.c:308 ../katze/katze-utils.c:635 +msgid "Custom..." +msgstr "Dostosuj..." -#: ../midori/midori-browser.c:6313 +#: ../midori/midori-browser.c:5907 msgid "_Separator" msgstr "_Separator" -#: ../midori/midori-browser.c:6320 -msgid "_Location…" +#: ../midori/midori-browser.c:5914 +msgid "_Location..." msgstr "_Pasek położenia" -#: ../midori/midori-browser.c:6322 +#: ../midori/midori-browser.c:5916 msgid "Open a particular location" msgstr "Wprowadza określone położenie" -#: ../midori/midori-browser.c:6344 -msgid "_Web Search…" +#: ../midori/midori-browser.c:5938 +msgid "_Web Search..." msgstr "_Wyszukiwarka" -#: ../midori/midori-browser.c:6346 +#: ../midori/midori-browser.c:5940 msgid "Run a web search" msgstr "Wyszukuje wyrażenia przy pomocy wyszukiwarki internetowej" -#: ../midori/midori-browser.c:6373 +#: ../midori/midori-browser.c:5967 msgid "Reopen a previously closed tab or window" msgstr "Wyświetla listę ostatnio zamkniętych kart i okien" -#: ../midori/midori-browser.c:6390 +#: ../midori/midori-browser.c:5982 msgid "Show the saved bookmarks" msgstr "Wyświetla zapisane zakładki" -#: ../midori/midori-browser.c:6423 +#: ../midori/midori-browser.c:5996 +msgid "_Tools" +msgstr "_Narzędzia" + +#: ../midori/midori-browser.c:6011 msgid "_Window" msgstr "_Okno" -#: ../midori/midori-browser.c:6425 +#: ../midori/midori-browser.c:6013 msgid "Show a list of all open tabs" msgstr "Wyświetla listę otwartych kart" -#: ../midori/midori-browser.c:6439 +#: ../midori/midori-browser.c:6027 msgid "_Menu" msgstr "_Menu" -#: ../midori/midori-browser.c:6441 +#: ../midori/midori-browser.c:6029 msgid "Menu" -msgstr "Wyświetla polecenia paska menu" +msgstr "Wyświetla listę poleceń paska menu" -#: ../midori/midori-browser.c:7271 +#: ../midori/midori-browser.c:6671 #, c-format msgid "Unexpected setting '%s'" msgstr "Niespodziewane ustawienie „%s”" -#: ../midori/midori-extension.c:329 +#: ../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-extension.c:747 ../midori/midori-extension.c:844 -#: ../midori/midori-extension.c:941 ../midori/midori-extension.c:1053 -#: ../extensions/addons.c:1688 +#: ../midori/midori-extension.c:721 ../midori/midori-extension.c:818 +#: ../midori/midori-extension.c:915 ../midori/midori-extension.c:1027 +#: ../extensions/addons.c:1690 #, c-format 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:394 -#, c-format -msgid "Search with %s" -msgstr "Wyszukaj za pomocą %s" - -#: ../midori/midori-locationaction.c:414 -msgid "Search with…" -msgstr "Wyszukaj za pomocą…" - -#: ../midori/midori-locationaction.c:541 +#: ../midori/midori-locationaction.c:425 #, c-format msgid "Failed to select from history\n" msgstr "Nie udało się wybrać z historii\n" -#: ../midori/midori-locationaction.c:628 +#: ../midori/midori-locationaction.c:509 #, c-format msgid "Search for %s" msgstr "Wyszukaj wyrażenie „%s”" -#: ../midori/midori-locationaction.c:1195 -msgid "Export certificate" -msgstr "" - -#: ../midori/midori-locationaction.c:1227 -msgid "The signing certificate authority is not known." -msgstr "" - -#: ../midori/midori-locationaction.c:1229 -msgid "" -"The certificate does not match the expected identity of the site that it was " -"retrieved from." -msgstr "" - -#: ../midori/midori-locationaction.c:1231 -msgid "The certificate's activation time is still in the future." -msgstr "" - -#: ../midori/midori-locationaction.c:1233 -msgid "The certificate has expired" -msgstr "Certyfikat wygasł" - -#: ../midori/midori-locationaction.c:1235 -msgid "" -"The certificate has been revoked according to the GTlsConnection's " -"certificate revocation list." -msgstr "" - -#: ../midori/midori-locationaction.c:1237 -msgid "The certificate's algorithm is considered insecure." -msgstr "Algorytm certyfikatu został oceniony jako niepewny." - -#: ../midori/midori-locationaction.c:1239 -msgid "Some other error occurred validating the certificate." -msgstr "Wystąpił błąd podczas próby sprawdzenia certyfikatu" - -#: ../midori/midori-locationaction.c:1286 -msgid "_Export certificate" -msgstr "_Wyeksportuj certyfikat" - -#: ../midori/midori-locationaction.c:1301 -msgid "Self-signed" -msgstr "" - -#: ../midori/midori-locationaction.c:1335 -msgid "Security details" -msgstr "Szczegóły zabezpieczeń" +#: ../midori/midori-locationaction.c:535 +#, c-format +msgid "Search with %s" +msgstr "Wyszukaj za pomocą %s" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1618 +#: ../midori/midori-locationaction.c:1287 msgid "Paste and p_roceed" msgstr "Wklej i p_rzejdź" -#: ../midori/midori-locationaction.c:1942 +#: ../midori/midori-locationaction.c:1656 msgid "Not verified" -msgstr "Nie zweryfikowane" +msgstr "Nie zweryfikowany" -#: ../midori/midori-locationaction.c:1950 +#: ../midori/midori-locationaction.c:1671 msgid "Verified and encrypted connection" msgstr "Zweryfikowane i szyfrowane połączenie" -#: ../midori/midori-locationaction.c:1957 -msgid "Open, unencrypted connection" -msgstr "Otwarte, nieszyfrowane połączenie" - -#: ../midori/midori-panel.c:316 ../midori/midori-panel.c:318 -#: ../midori/midori-panel.c:481 ../midori/midori-panel.c:484 +#: ../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:328 ../midori/midori-panel.c:329 +#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410 msgid "Close panel" msgstr "Zamyka panel" -#: ../midori/midori-panel.c:482 ../midori/midori-panel.c:485 +#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566 msgid "Align sidepanel to the left" msgstr "Przemieszcza panel boczny na lewą stronę okna" -#: ../midori/midori-websettings.c:220 +#: ../midori/midori-websettings.c:209 msgid "Show Speed Dial" msgstr "Wyświetlenie strony szybkiego wybierania" -#: ../midori/midori-websettings.c:221 +#: ../midori/midori-websettings.c:210 msgid "Show Homepage" msgstr "Wyświetlenie strony głównej" -#: ../midori/midori-websettings.c:240 +#: ../midori/midori-websettings.c:228 msgid "Japanese (SHIFT_JIS)" msgstr "Japoński (SHIFT_JIS)" -#: ../midori/midori-websettings.c:245 ../midori/midori-websettings.c:321 -#: ../katze/katze-utils.c:633 -msgid "Custom..." -msgstr "Własny..." - -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:248 msgid "New tab" msgstr "W nowej karcie" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:249 msgid "New window" msgstr "W nowym oknie" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:250 msgid "Current tab" msgstr "W bieżącej karcie" -#: ../midori/midori-websettings.c:277 +#: ../midori/midori-websettings.c:265 msgid "Default" msgstr "Domyślny" -#: ../midori/midori-websettings.c:278 +#: ../midori/midori-websettings.c:266 msgid "Icons" msgstr "Tylko ikony" -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-websettings.c:267 msgid "Small icons" msgstr "Małe ikony" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:268 msgid "Text" msgstr "Tylko etykiety" -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:269 msgid "Icons and text" msgstr "Etykiety poniżej ikon" -#: ../midori/midori-websettings.c:282 +#: ../midori/midori-websettings.c:270 msgid "Text beside icons" msgstr "Etykiety obok ikon" -#: ../midori/midori-websettings.c:297 +#: ../midori/midori-websettings.c:285 msgid "Automatic (GNOME or environment)" msgstr "Ustawienia środowiska" -#: ../midori/midori-websettings.c:298 +#: ../midori/midori-websettings.c:286 msgid "HTTP proxy server" msgstr "HTTP" -#: ../midori/midori-websettings.c:299 +#: ../midori/midori-websettings.c:287 msgid "No proxy server" msgstr "Brak" -#: ../midori/midori-websettings.c:316 -msgid "Chrome" -msgstr "Chrome" - -#: ../midori/midori-websettings.c:317 +#: ../midori/midori-websettings.c:304 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:318 +#: ../midori/midori-websettings.c:305 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:319 +#: ../midori/midori-websettings.c:306 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:320 +#: ../midori/midori-websettings.c:307 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:404 +#: ../midori/midori-websettings.c:360 msgid "Remember last window size" msgstr "Pamiętaj ostatni rozmiar okna" -#: ../midori/midori-websettings.c:405 +#: ../midori/midori-websettings.c:361 msgid "Whether to save the last window size" msgstr "Zapamiętuje ostatni rozmiar okna programu" -#: ../midori/midori-websettings.c:413 +#: ../midori/midori-websettings.c:369 msgid "Last window width" msgstr "Ostatnia szerokość okna" -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:370 msgid "The last saved window width" msgstr "Ostatnia zapisana szerokość okna" -#: ../midori/midori-websettings.c:422 +#: ../midori/midori-websettings.c:378 msgid "Last window height" msgstr "Ostatnia wysokość okna" -#: ../midori/midori-websettings.c:423 +#: ../midori/midori-websettings.c:379 msgid "The last saved window height" msgstr "Ostatnia zapisana wysokość okna" -#: ../midori/midori-websettings.c:448 +#: ../midori/midori-websettings.c:404 msgid "Last panel position" msgstr "Ostatnia pozycja panelu" -#: ../midori/midori-websettings.c:449 +#: ../midori/midori-websettings.c:405 msgid "The last saved panel position" msgstr "Ostatnio zapisana pozycja panelu" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:458 +#: ../midori/midori-websettings.c:414 msgid "Last panel page" -msgstr "Ostatni panel strony" +msgstr "" -#: ../midori/midori-websettings.c:459 +#: ../midori/midori-websettings.c:415 msgid "The last saved panel page" -msgstr "Ostatnio zapamiętany panel strony" +msgstr "" -#: ../midori/midori-websettings.c:467 +#: ../midori/midori-websettings.c:423 msgid "Last Web search" msgstr "Ostatnie wyszukiwanie" -#: ../midori/midori-websettings.c:468 +#: ../midori/midori-websettings.c:424 msgid "The last saved Web search" msgstr "Ostatnio zapisane wyszukiwanie" -#: ../midori/midori-websettings.c:492 +#: ../midori/midori-websettings.c:433 msgid "Show Menubar" msgstr "Przełącza widoczność paska poleceń" -#: ../midori/midori-websettings.c:493 +#: ../midori/midori-websettings.c:434 msgid "Whether to show the menubar" msgstr "Przełącza wyświetlanie paska poleceń" -#: ../midori/midori-websettings.c:501 +#: ../midori/midori-websettings.c:442 +#, fuzzy msgid "Show Navigationbar" -msgstr "Pokaż pasek nawigacji" +msgstr "Wyświetlanie paska nawigacji" -#: ../midori/midori-websettings.c:502 +#: ../midori/midori-websettings.c:443 msgid "Whether to show the navigationbar" msgstr "Przełącza wyświetlanie paska nawigacyjnego" -#: ../midori/midori-websettings.c:510 +#: ../midori/midori-websettings.c:451 msgid "Show Bookmarkbar" msgstr "Wyświetlanie paska zakładek" -#: ../midori/midori-websettings.c:511 +#: ../midori/midori-websettings.c:452 msgid "Whether to show the bookmarkbar" msgstr "Przełącza wyświetlanie paska zakładek" -#: ../midori/midori-websettings.c:519 +#: ../midori/midori-websettings.c:460 msgid "Show Panel" msgstr "Pokaż panel" -#: ../midori/midori-websettings.c:520 +#: ../midori/midori-websettings.c:461 msgid "Whether to show the panel" msgstr "Przełącza wyświetlanie panelu bocznego" -#: ../midori/midori-websettings.c:528 +#: ../midori/midori-websettings.c:469 msgid "Show Statusbar" msgstr "Pasek _stanu" -#: ../midori/midori-websettings.c:529 +#: ../midori/midori-websettings.c:470 msgid "Whether to show the statusbar" msgstr "Przełącza wyświetlanie paska stanu" -#: ../midori/midori-websettings.c:538 +#: ../midori/midori-websettings.c:479 msgid "Toolbar Style:" msgstr "Wygląd:" -#: ../midori/midori-websettings.c:539 +#: ../midori/midori-websettings.c:480 msgid "The style of the toolbar" msgstr "Określa styl paska narzędzi" -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:489 msgid "Toolbar Items" msgstr "Elementy paska narzędziowego" -#: ../midori/midori-websettings.c:549 +#: ../midori/midori-websettings.c:490 msgid "The items to show on the toolbar" msgstr "Określa wygląd paska narzędziowego" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:498 msgid "Compact Sidepanel" msgstr "Zwarty panel boczny" -#: ../midori/midori-websettings.c:558 +#: ../midori/midori-websettings.c:499 msgid "Whether to make the sidepanel compact" msgstr "Przełącza wyświetlanie panelu bocznego w trybie zwartym" -#: ../midori/midori-websettings.c:573 +#: ../midori/midori-websettings.c:514 msgid "Align sidepanel on the right" -msgstr "Przypnij panel boczny do prawej strony" +msgstr "" -#: ../midori/midori-websettings.c:574 +#: ../midori/midori-websettings.c:515 msgid "Whether to align the sidepanel on the right" msgstr "" -#: ../midori/midori-websettings.c:589 +#: ../midori/midori-websettings.c:530 msgid "Open panels in separate windows" msgstr "Otwieranie paneli w oddzielnych oknach" -#: ../midori/midori-websettings.c:590 +#: ../midori/midori-websettings.c:531 msgid "Whether to always open panels in separate windows" msgstr "Otwiera wszystkie panale w oddzielnych oknach" -#: ../midori/midori-websettings.c:599 +#: ../midori/midori-websettings.c:540 msgid "When Midori starts:" msgstr "Domyślna czynność:" -#: ../midori/midori-websettings.c:600 +#: ../midori/midori-websettings.c:541 msgid "What to do when Midori starts" msgstr "Określa domyślną czynność wykonywaną po uruchomieniu programu" -#: ../midori/midori-websettings.c:609 +#: ../midori/midori-websettings.c:550 msgid "Homepage:" msgstr "Strona główna:" -#: ../midori/midori-websettings.c:610 +#: ../midori/midori-websettings.c:551 msgid "The homepage" msgstr "Wprowadza adres strony głównej" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:566 msgid "Show crash dialog" msgstr "Wyświetlanie okna diagnostycznego po wystąpieniu awarii" -#: ../midori/midori-websettings.c:626 +#: ../midori/midori-websettings.c:567 msgid "Show a dialog after Midori crashed" msgstr "Wyświetla okno diagnostyczne po wystąpieniu awarii programu" -#: ../midori/midori-websettings.c:634 +#: ../midori/midori-websettings.c:575 msgid "Save downloaded files to:" msgstr "Położenie pobierania:" -#: ../midori/midori-websettings.c:635 +#: ../midori/midori-websettings.c:576 msgid "The folder downloaded files are saved to" msgstr "Określa katalog, w którym są zapisywane pobierane pliki" -#: ../midori/midori-websettings.c:643 +#: ../midori/midori-websettings.c:584 msgid "Text Editor" msgstr "Edytor tekstu:" -#: ../midori/midori-websettings.c:644 +#: ../midori/midori-websettings.c:585 msgid "An external text editor" msgstr "Określa zewnętrzny edytor tekstu" -#: ../midori/midori-websettings.c:659 +#: ../midori/midori-websettings.c:600 msgid "News Aggregator" msgstr "Czytnik wiadomości:" -#: ../midori/midori-websettings.c:660 +#: ../midori/midori-websettings.c:601 msgid "An external news aggregator" msgstr "Określa zewnętrzny czytnik wiadomości" -#: ../midori/midori-websettings.c:668 +#: ../midori/midori-websettings.c:609 msgid "Location entry Search" msgstr "Adres domyślnej wyszukiwarki internetowej" -#: ../midori/midori-websettings.c:669 +#: ../midori/midori-websettings.c:610 msgid "The search to perform inside the location entry" msgstr "" -#: ../midori/midori-websettings.c:677 +#: ../midori/midori-websettings.c:618 msgid "Preferred Encoding" msgstr "Kodowanie znaków:" -#: ../midori/midori-websettings.c:678 +#: ../midori/midori-websettings.c:619 msgid "The preferred character encoding" msgstr "Określa preferowane kodowanie znaków" -#: ../midori/midori-websettings.c:688 +#: ../midori/midori-websettings.c:629 msgid "Always Show Tabbar" msgstr "Zawsze widoczny pasek kart" -#: ../midori/midori-websettings.c:689 +#: ../midori/midori-websettings.c:630 msgid "Always show the tabbar" msgstr "Wyświetla pasek kart nawet gdy otwarto tylko jedną kartę" -#: ../midori/midori-websettings.c:702 +#: ../midori/midori-websettings.c:638 msgid "Close Buttons on Tabs" msgstr "Przyciski zamykania kart" -#: ../midori/midori-websettings.c:703 +#: ../midori/midori-websettings.c:639 msgid "Whether tabs have close buttons" msgstr "Wyświetla przyciski zamykania na kartach" -#: ../midori/midori-websettings.c:728 +#: ../midori/midori-websettings.c:664 msgid "Open new pages in:" msgstr "Otwieranie nowych stron:" -#: ../midori/midori-websettings.c:729 +#: ../midori/midori-websettings.c:665 msgid "Where to open new pages" msgstr "Określa sposób otwierania nowych stron" -#: ../midori/midori-websettings.c:738 +#: ../midori/midori-websettings.c:674 msgid "Middle click opens Selection" msgstr "" "Otwieranie odnośników zaznaczonych adresów URL\n" "kliknięciem środkowego przycisku myszy" -#: ../midori/midori-websettings.c:739 +#: ../midori/midori-websettings.c:675 msgid "Load an address from the selection via middle click" msgstr "Otwiera zaznaczony adres kliknięciem środkowego przycisku myszy" -#: ../midori/midori-websettings.c:747 +#: ../midori/midori-websettings.c:683 msgid "Open tabs in the background" msgstr "Otwieranie kart w tle" -#: ../midori/midori-websettings.c:748 +#: ../midori/midori-websettings.c:684 msgid "Whether to open new tabs in the background" msgstr "Otwiera karty w tle" -#: ../midori/midori-websettings.c:756 +#: ../midori/midori-websettings.c:692 msgid "Open Tabs next to Current" msgstr "Otwieranie kart za bieżącą kartą" -#: ../midori/midori-websettings.c:757 +#: ../midori/midori-websettings.c:693 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ą" -#: ../midori/midori-websettings.c:765 +#: ../midori/midori-websettings.c:701 msgid "Open popups in tabs" msgstr "Otwieranie wyskakującyh okienek jako karty" -#: ../midori/midori-websettings.c:766 +#: ../midori/midori-websettings.c:702 msgid "Whether to open popup windows in tabs" msgstr "Czy otwierać wyskakujące okienka jako karty" -#: ../midori/midori-websettings.c:776 ../extensions/statusbar-features.c:155 +#: ../midori/midori-websettings.c:712 ../extensions/statusbar-features.c:131 msgid "Load images automatically" msgstr "Wczytywanie obrazów" -#: ../midori/midori-websettings.c:777 +#: ../midori/midori-websettings.c:713 msgid "Load and display images automatically" msgstr "Wczytuje i wyświetla obrazy automatycznie" -#: ../midori/midori-websettings.c:784 ../extensions/statusbar-features.c:165 +#: ../midori/midori-websettings.c:720 ../extensions/statusbar-features.c:140 msgid "Enable scripts" msgstr "Wykonywanie skryptów" -#: ../midori/midori-websettings.c:785 +#: ../midori/midori-websettings.c:721 msgid "Enable embedded scripting languages" msgstr "Wykonuje osadzone skrypty" -#: ../midori/midori-websettings.c:792 ../extensions/statusbar-features.c:177 +#: ../midori/midori-websettings.c:728 ../extensions/statusbar-features.c:149 msgid "Enable Netscape plugins" msgstr "Obsługa wtyczek Netscape" -#: ../midori/midori-websettings.c:793 +#: ../midori/midori-websettings.c:729 msgid "Enable embedded Netscape plugin objects" msgstr "Używa wbudowanych wtyczek Netscape" -#: ../midori/midori-websettings.c:808 +#: ../midori/midori-websettings.c:749 msgid "Enable Spell Checking" msgstr "Sprawdzanie pisowni" -#: ../midori/midori-websettings.c:809 +#: ../midori/midori-websettings.c:750 msgid "Enable spell checking while typing" msgstr "Sprawdza pisownię podczas wprowadzania tekstu" -#: ../midori/midori-websettings.c:815 +#: ../midori/midori-websettings.c:756 msgid "Enable HTML5 database support" msgstr "Obsługa baz danych HTML5" -#: ../midori/midori-websettings.c:816 +#: ../midori/midori-websettings.c:757 msgid "Whether to enable HTML5 database support" msgstr "Przełącza obsługę baz danych HTML5" -#: ../midori/midori-websettings.c:822 +#: ../midori/midori-websettings.c:763 msgid "Enable HTML5 local storage support" msgstr "Obsługa lokalnego magazynu HTML5" -#: ../midori/midori-websettings.c:823 +#: ../midori/midori-websettings.c:764 msgid "Whether to enable HTML5 local storage support" msgstr "Przełącza obsługę lokalnych magazynów HTML5" -#: ../midori/midori-websettings.c:829 +#: ../midori/midori-websettings.c:770 msgid "Enable offline web application cache" msgstr "Pamięć podręczna rozłączonych usług internetowych" -#: ../midori/midori-websettings.c:830 +#: ../midori/midori-websettings.c:771 msgid "Whether to enable offline web application cache" msgstr "Włącza pamięć podręczną rozłączonych usług internetowych" -#: ../midori/midori-websettings.c:851 +#: ../midori/midori-websettings.c:787 msgid "Flash window on background tabs" msgstr "Miganie okna po otwarciu karty w tle" -#: ../midori/midori-websettings.c:852 +#: ../midori/midori-websettings.c:788 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:860 -msgid "Enable WebGL support" -msgstr "Obsługa WebGL" - -#: ../midori/midori-websettings.c:861 -msgid "Allow websites to use OpenGL rendering" -msgstr "Umożliwia używanie OpenGL do renderowania stron internetowych" - -#: ../midori/midori-websettings.c:887 +#: ../midori/midori-websettings.c:803 msgid "Zoom Text and Images" msgstr "Skalowanie tekstu i obrazów" -#: ../midori/midori-websettings.c:888 +#: ../midori/midori-websettings.c:804 msgid "Whether to zoom text and images" msgstr "Umożliwia skalowanie tekstu i obrazów" -#: ../midori/midori-websettings.c:903 +#: ../midori/midori-websettings.c:819 msgid "Find inline while typing" msgstr "Wyszukiwanie inkrementalne podczas wpisywania tekstu" -#: ../midori/midori-websettings.c:904 +#: ../midori/midori-websettings.c:820 msgid "Whether to automatically find inline while typing" msgstr "" "Wyszukuje tekst automatycznie podczas jego wpisywania w polu wyszukiwania" -#: ../midori/midori-websettings.c:919 +#: ../midori/midori-websettings.c:835 msgid "Kinetic scrolling" msgstr "Kinetyczne przewijanie" -#: ../midori/midori-websettings.c:920 +#: ../midori/midori-websettings.c:836 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:928 +#: ../midori/midori-websettings.c:844 msgid "Delete old Cookies after:" msgstr "Czas przechowywania ciasteczek:" -#: ../midori/midori-websettings.c:929 +#: ../midori/midori-websettings.c:845 msgid "The maximum number of days to save cookies for" msgstr "" "Określa maksymalny czas przechowywania ciasteczek dla stron internetowych" -#: ../midori/midori-websettings.c:945 +#: ../midori/midori-websettings.c:861 msgid "Only accept Cookies from sites you visit" msgstr "Akceptowanie ciasteczek pochodzących tylko z odwiedzonych stron" -#: ../midori/midori-websettings.c:946 +#: ../midori/midori-websettings.c:862 msgid "Block cookies sent by third-party websites" msgstr "Blokuje ciasteczka wysyłane przez nieodwiedzone strony" -#: ../midori/midori-websettings.c:960 +#: ../midori/midori-websettings.c:876 msgid "Delete pages from history after:" msgstr "Czas przechowywania historii:" -#: ../midori/midori-websettings.c:961 +#: ../midori/midori-websettings.c:877 msgid "The maximum number of days to save the history for" msgstr "Określa maksymalny czas przechowywania historii odwiedzonych stron" -#: ../midori/midori-websettings.c:976 +#: ../midori/midori-websettings.c:892 msgid "Proxy server" msgstr "Serwer pośredniczący:" -#: ../midori/midori-websettings.c:977 +#: ../midori/midori-websettings.c:893 msgid "The type of proxy server to use" msgstr "Określa typ używanego serwera pośredniczącego" -#: ../midori/midori-websettings.c:986 +#: ../midori/midori-websettings.c:902 msgid "HTTP Proxy Server" msgstr "Serwer pośredniczący HTTP:" -#: ../midori/midori-websettings.c:987 +#: ../midori/midori-websettings.c:903 msgid "The proxy server used for HTTP connections" msgstr "Określa serwer pośredniczący w połączeniach HTTP" -#: ../midori/midori-websettings.c:1002 +#: ../midori/midori-websettings.c:918 msgid "Port" msgstr "Port:" -#: ../midori/midori-websettings.c:1003 +#: ../midori/midori-websettings.c:919 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:1021 +#: ../midori/midori-websettings.c:937 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:1038 +#: ../midori/midori-websettings.c:954 msgid "Identify as" msgstr "Identyfikator:" -#: ../midori/midori-websettings.c:1039 +#: ../midori/midori-websettings.c:955 msgid "What to identify as to web pages" msgstr "" "Określa jak przeglądarka ma się identyfikować przed stronami internetowymi" -#: ../midori/midori-websettings.c:1055 +#: ../midori/midori-websettings.c:971 msgid "Identification string" msgstr "Identyfikacja" -#: ../midori/midori-websettings.c:1056 +#: ../midori/midori-websettings.c:972 msgid "The application identification string" msgstr "Ciąg indentyfikujący przeglądarkę" -#: ../midori/midori-websettings.c:1072 +#: ../midori/midori-websettings.c:988 msgid "Preferred languages" msgstr "Preferowane języki:" -#: ../midori/midori-websettings.c:1073 +#: ../midori/midori-websettings.c:989 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\"" @@ -1695,464 +1601,392 @@ msgstr "" "wielojęzycznych, rozdzielonych znakiem przecinka. Np.: „pl”, „ru,nl” or „en-" "us;q=1.0, fr-fr;q=0.667”." -#: ../midori/midori-websettings.c:1088 +#: ../midori/midori-websettings.c:1004 msgid "Clear private data" msgstr "Usuń prywatne dane" -#: ../midori/midori-websettings.c:1089 +#: ../midori/midori-websettings.c:1005 msgid "The private data selected for deletion" msgstr "Prywatne dane zaznaczone do usunięcia" -#: ../midori/midori-websettings.c:1104 +#: ../midori/midori-websettings.c:1020 +#, fuzzy msgid "Clear data" -msgstr "Usuń dane" +msgstr "_Usuń prywatne dane" -#: ../midori/midori-websettings.c:1105 +#: ../midori/midori-websettings.c:1021 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:1154 +#: ../midori/midori-websettings.c:1054 msgid "Strip referrer details sent to websites" msgstr "" -"Skracanie adresów przekierowanych stron internetowych w\n" -"nagłówkach HTTP" +"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:1156 +#: ../midori/midori-websettings.c:1056 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:1170 +#: ../midori/midori-websettings.c:1070 msgid "Always use my font choices" msgstr "Wymuszenie używania wybranej czcionki" -#: ../midori/midori-websettings.c:1171 +#: ../midori/midori-websettings.c:1071 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:1002 ../midori/midori-view.c:1140 -msgid "Trust this website" -msgstr "" - -#: ../midori/midori-view.c:1138 -msgid "Security unknown" -msgstr "Nieznany stan zabezpieczeń" - -#: ../midori/midori-view.c:1436 +#: ../midori/midori-view.c:1343 #, c-format msgid "%s wants to save an HTML5 database." msgstr "Strona „%s” chce zapisać bazę danych HTML5." -#: ../midori/midori-view.c:1440 ../midori/midori-view.c:1474 +#: ../midori/midori-view.c:1347 ../midori/midori-view.c:1377 msgid "_Deny" msgstr "_Odmów" -#: ../midori/midori-view.c:1440 ../midori/midori-view.c:1474 +#: ../midori/midori-view.c:1347 ../midori/midori-view.c:1377 msgid "_Allow" msgstr "_Zezwól" -#: ../midori/midori-view.c:1469 +#: ../midori/midori-view.c:1373 #, c-format msgid "%s wants to know your location." -msgstr "Strona „%s” chce poznać lokalizację użytkownika." +msgstr "Strona „%s” chce poznać położenie użytkownika." -#: ../midori/midori-view.c:1565 +#: ../midori/midori-view.c:1461 #, c-format msgid "Error - %s" msgstr "Błąd - %s" -#: ../midori/midori-view.c:1566 +#: ../midori/midori-view.c:1462 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "Nie można wczytać strony „%s”." -#: ../midori/midori-view.c:1568 +#: ../midori/midori-view.c:1464 msgid "Try again" msgstr "Wczytaj ponownie" -#: ../midori/midori-view.c:1766 ../midori/midori-view.c:2875 +#: ../midori/midori-view.c:1626 ../midori/midori-view.c:2471 #, c-format msgid "Send a message to %s" msgstr "Wyślij wiadomość na adres %s" -#: ../midori/midori-view.c:2661 -msgid "Add _search engine..." -msgstr "Dodaj _wyszukiwarkę..." - -#: ../midori/midori-view.c:2705 ../midori/midori-view.c:3031 +#: ../midori/midori-view.c:2313 ../midori/midori-view.c:2624 msgid "Inspect _Element" -msgstr "Zbadaj _element…" +msgstr "Zbadaj _element..." -#: ../midori/midori-view.c:2757 +#: ../midori/midori-view.c:2363 msgid "Open Link in New _Tab" msgstr "Otwórz w nowej _karcie" -#: ../midori/midori-view.c:2761 +#: ../midori/midori-view.c:2367 msgid "Open Link in _Foreground Tab" msgstr "Otwórz odnośnik w nowej karcie" -#: ../midori/midori-view.c:2762 +#: ../midori/midori-view.c:2368 msgid "Open Link in _Background Tab" msgstr "Otwórz w nowej karcie w _tle" -#: ../midori/midori-view.c:2765 +#: ../midori/midori-view.c:2371 msgid "Open Link in New _Window" msgstr "Otwórz w nowym _oknie" -#: ../midori/midori-view.c:2768 +#: ../midori/midori-view.c:2374 msgid "Open Link as Web A_pplication" msgstr "Otwórz jako stronę _usługi internetowej" -#: ../midori/midori-view.c:2773 +#: ../midori/midori-view.c:2377 msgid "Copy Link de_stination" msgstr "_Skopiuj adres odnośnika" -#: ../midori/midori-view.c:2789 +#: ../midori/midori-view.c:2389 msgid "Open _Image in New Tab" msgstr "Otwórz obraz w nowej _karcie" -#: ../midori/midori-view.c:2792 +#: ../midori/midori-view.c:2392 msgid "Copy Image _Address" msgstr "Skopiuj _adres obrazu" -#: ../midori/midori-view.c:2795 +#: ../midori/midori-view.c:2395 msgid "Save I_mage" msgstr "Zapisz _obraz" -#: ../midori/midori-view.c:2798 -msgid "Open in Image _Viewer" -msgstr "Otwórz w przeglądarce obrazów" - -#: ../midori/midori-view.c:2805 +#: ../midori/midori-view.c:2402 msgid "Copy Video _Address" msgstr "_Skopiuj adres nagrania wideo" -#: ../midori/midori-view.c:2808 +#: ../midori/midori-view.c:2405 msgid "Save _Video" msgstr "Zapisz nagranie _wideo" -#: ../midori/midori-view.c:2808 +#: ../midori/midori-view.c:2405 msgid "Download _Video" msgstr "Pobierz nagranie _wideo" -#: ../midori/midori-view.c:2834 +#: ../midori/midori-view.c:2431 msgid "Search _with" msgstr "Wyszukaj _za pomocą" -#: ../midori/midori-view.c:2866 +#: ../midori/midori-view.c:2463 msgid "_Search the Web" msgstr "_Wyszukaj w internecie" -#: ../midori/midori-view.c:2883 +#: ../midori/midori-view.c:2479 msgid "Open Address in New _Tab" msgstr "Otwórz adres w nowej _karcie" -#: ../midori/midori-view.c:2936 -msgid "Open _Frame in New Tab" -msgstr "Otwórz _ramkę w nowej karcie" - -#: ../midori/midori-view.c:3189 +#: ../midori/midori-view.c:2775 msgid "Open or download file" msgstr "Pobieranie pliku" -#: ../midori/midori-view.c:3213 -#, c-format -msgid "File Name: %s" -msgstr "Nazwa pliku: %s" - -#: ../midori/midori-view.c:3218 +#: ../midori/midori-view.c:2794 #, c-format msgid "File Type: '%s'" msgstr "Typ pliku: „%s”" -#: ../midori/midori-view.c:3220 +#: ../midori/midori-view.c:2796 #, c-format msgid "File Type: %s ('%s')" msgstr "Typ pliku: %s („%s”)" -#: ../midori/midori-view.c:3255 -#, c-format -msgid "Size: %s" -msgstr "Rozmiar: %s" - #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:3266 +#: ../midori/midori-view.c:2813 #, c-format msgid "Open %s" msgstr "Otwieranie %s" -#: ../midori/midori-view.c:3885 +#: ../midori/midori-view.c:3405 #, c-format msgid "Inspect page - %s" msgstr "Badanie - %s" -#: ../midori/midori-view.c:4239 +#: ../midori/midori-view.c:3692 msgid "Speed Dial" msgstr "Szybkie wybieranie" -#: ../midori/midori-view.c:4240 ../midori/midori-view.c:4336 +#: ../midori/midori-view.c:3693 ../midori/midori-view.c:3789 msgid "Click to add a shortcut" msgstr "Proszę kliknąć, aby dodać odnośnik" -#: ../midori/midori-view.c:4241 +#: ../midori/midori-view.c:3694 msgid "Enter shortcut address" msgstr "Proszę wprowadzić adres URL odnośnika:" -#: ../midori/midori-view.c:4242 +#: ../midori/midori-view.c:3695 msgid "Enter shortcut title" msgstr "Proszę wprowadzić nazwę odnośnika:" -#: ../midori/midori-view.c:4243 +#: ../midori/midori-view.c:3696 msgid "Are you sure you want to delete this shortcut?" msgstr "Usunąć odnośnik?" -#: ../midori/midori-view.c:4405 +#: ../midori/midori-view.c:3860 #, c-format msgid "No documentation installed" msgstr "Brak zainstalowanej dokumentacji" -#: ../midori/midori-view.c:4482 -msgid "Midori doesn't store any personal data:" -msgstr "Midori nie przechowuje żadnych danych osobistych:" - -#: ../midori/midori-view.c:4483 -msgid "No history or web cookies are being saved." -msgstr "historia i ciasteczka nie są zapisywane," - -#: ../midori/midori-view.c:4484 -msgid "Extensions are disabled." -msgstr "rozszerzenia są wyłączone," - -#: ../midori/midori-view.c:4485 -msgid "HTML5 storage, local database and application caches are disabled." -msgstr "" -"magazyn HTML5, lokalna baza danych i pamięć podręczna usług sieciowych są " -"wyłączone." - -#: ../midori/midori-view.c:4486 -msgid "Midori prevents websites from tracking the user:" -msgstr "Midori zapobiega śledzeniu użytkownika przez witryny:" - -#: ../midori/midori-view.c:4487 -msgid "Referrer URLs are stripped down to the hostname." -msgstr "" -"adresy przekierowywanych stron internetowych, wysyłane do serwerów w " -"nagłówkach HTTP są skracane do nazw komputerów," - -#: ../midori/midori-view.c:4488 -msgid "DNS prefetching is disabled." -msgstr "wczesne pobieranie wpisów DNS jest wyłączone," - -#: ../midori/midori-view.c:4489 -msgid "The language and timezone are not revealed to websites." -msgstr "" -"domyślny język oraz strefa czasowa nie są ujawniane stronom internetowym," - -#: ../midori/midori-view.c:4490 -msgid "Flash and other Netscape plugins cannot be listed by websites." -msgstr "" -"informacje o wtyczce Flash i innych wtyczkach Netscape nie są ujawniane " -"stronom internetowym." - -#: ../midori/midori-view.c:4579 +#: ../midori/midori-view.c:3910 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:4629 +#: ../midori/midori-view.c:3955 msgid "Page loading delayed" msgstr "Wstrzymano wczytywanie strony" -#: ../midori/midori-view.c:4630 +#: ../midori/midori-view.c:3956 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:4631 +#: ../midori/midori-view.c:3957 msgid "Load Page" msgstr "Wczytaj stronę" -#: ../midori/midori-view.c:4798 +#: ../midori/midori-view.c:4097 msgid "Blank page" msgstr "Pusta strona" -#: ../midori/midori-view.c:5062 +#: ../midori/midori-view.c:4361 msgid "_Duplicate Tab" msgstr "_Powiel kartę" -#: ../midori/midori-view.c:5067 +#: ../midori/midori-view.c:4366 msgid "Show Tab _Label" msgstr "Wyświetl _etykietę karty" -#: ../midori/midori-view.c:5067 +#: ../midori/midori-view.c:4366 msgid "Show Tab _Icon Only" msgstr "Ukryj _etykietę karty" -#: ../midori/midori-view.c:5074 -msgid "Close Ot_her Tab" -msgid_plural "Close Ot_her Tabs" -msgstr[0] "Zamknij pozo_stałą kartę" -msgstr[1] "Zamknij pozo_stałe karty" -msgstr[2] "Zamknij pozo_stałe karty" +#: ../midori/midori-view.c:4372 +msgid "Close ot_her Tabs" +msgstr "Zamknij pozo_stałe karty" #. i18n: word stem of "previous page" type links, case is not important -#: ../midori/midori-view.c:5910 +#: ../midori/midori-view.c:4989 +#, fuzzy msgid "previous" msgstr "Poprzednie" #. i18n: word stem of "next page" type links, case is not important -#: ../midori/midori-view.c:5929 +#: ../midori/midori-view.c:5008 msgid "next" msgstr "Następne" -#: ../midori/midori-view.c:5942 +#: ../midori/midori-view.c:5021 msgid "Print background images" msgstr "Drukowanie obrazów tła" -#: ../midori/midori-view.c:5943 +#: ../midori/midori-view.c:5022 msgid "Whether background images should be printed" msgstr "Drukuje obrazy tła stron" -#: ../midori/midori-view.c:5975 +#: ../midori/midori-view.c:5054 msgid "Features" msgstr "Treść" -#: ../midori/midori-preferences.c:298 +#: ../midori/midori-preferences.c:297 msgid "Startup" msgstr "Uruchamianie" -#: ../midori/midori-preferences.c:311 +#: ../midori/midori-preferences.c:310 msgid "Use _current page" msgstr "Wprowadza adres bieżącej strony jako adres strony głównej" -#: ../midori/midori-preferences.c:315 +#: ../midori/midori-preferences.c:314 msgid "Use current page as homepage" msgstr "Ustaw bieżącą stronę" #. Page "Appearance" -#: ../midori/midori-preferences.c:324 +#: ../midori/midori-preferences.c:323 msgid "Fonts" msgstr "Czcionki" -#: ../midori/midori-preferences.c:327 +#: ../midori/midori-preferences.c:326 msgid "Proportional Font Family" msgstr "Czcionka o zmiennej szerokości:" -#: ../midori/midori-preferences.c:331 +#: ../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:334 +#: ../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:336 +#: ../midori/midori-preferences.c:335 msgid "Fixed-width Font Family" msgstr "Czcionka stałej szerokości:" -#: ../midori/midori-preferences.c:340 +#: ../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" -#: ../midori/midori-preferences.c:343 +#: ../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 tekstu o stałej szerokości " "znaków" -#: ../midori/midori-preferences.c:345 +#: ../midori/midori-preferences.c:344 msgid "Minimum Font Size" msgstr "Minimalny rozmiar czcionki:" -#: ../midori/midori-preferences.c:349 +#: ../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:360 +#: ../midori/midori-preferences.c:359 msgid "Behavior" msgstr "Zachowanie" -#: ../midori/midori-preferences.c:386 +#: ../midori/midori-preferences.c:385 msgid "Allow scripts to open popups" msgstr "Otwieranie nowych okien przez skrypty" -#: ../midori/midori-preferences.c:387 +#: ../midori/midori-preferences.c:386 msgid "Whether scripts are allowed to open popup windows automatically" msgstr "Umożliwia skryptom automatyczne otwieranie nowych okien" #. Page "Interface" -#: ../midori/midori-preferences.c:418 +#: ../midori/midori-preferences.c:409 msgid "Browsing" msgstr "Przeglądanie" #. Page "Network" -#: ../midori/midori-preferences.c:458 +#: ../midori/midori-preferences.c:447 msgid "Network" msgstr "Sieć" -#: ../midori/midori-preferences.c:465 +#: ../midori/midori-preferences.c:454 msgid "Hostname" msgstr "Nazwa serwera:" -#: ../midori/midori-preferences.c:489 +#: ../midori/midori-preferences.c:478 msgid "MB" msgstr "MB" -#: ../midori/midori-searchaction.c:958 +#: ../midori/midori-searchaction.c:907 msgid "Add search engine" msgstr "Nowa wyszukiwarka" -#: ../midori/midori-searchaction.c:958 +#: ../midori/midori-searchaction.c:907 msgid "Edit search engine" msgstr "Edycja wyszukiwarki" -#: ../midori/midori-searchaction.c:986 +#: ../midori/midori-searchaction.c:936 msgid "_Name:" msgstr "_Nazwa:" -#: ../midori/midori-searchaction.c:1001 +#: ../midori/midori-searchaction.c:952 msgid "_Description:" msgstr "_Opis:" -#: ../midori/midori-searchaction.c:1014 ../extensions/feed-panel/main.c:377 -msgid "_Address:" -msgstr "_Adres:" +#: ../midori/midori-searchaction.c:985 +msgid "_Icon:" +msgstr "_Ikona:" -#: ../midori/midori-searchaction.c:1033 +#: ../midori/midori-searchaction.c:999 msgid "_Token:" msgstr "Słowo _kluczowe:" -#: ../midori/midori-searchaction.c:1331 +#: ../midori/midori-searchaction.c:1299 msgid "Manage Search Engines" msgstr "Wyszukiwarki" -#: ../midori/midori-searchaction.c:1436 +#: ../midori/midori-searchaction.c:1399 msgid "Use as _default" msgstr "Ustaw _domyślną" -#: ../midori/sokoke.c:346 +#: ../midori/sokoke.c:406 +#, fuzzy msgid "Open with" -msgstr "Otwórz za pomocą" +msgstr "Wybór pliku" -#: ../midori/sokoke.c:354 +#: ../midori/sokoke.c:414 #, c-format msgid "Choose an application or command to open \"%s\":" msgstr "Proszę wprowadzić polecenie służące do otworzenia „%s”:" -#: ../midori/sokoke.c:468 ../midori/sokoke.c:482 +#: ../midori/sokoke.c:455 ../midori/sokoke.c:465 ../midori/sokoke.c:493 +#: ../midori/sokoke.c:522 ../midori/sokoke.c:536 msgid "Could not run external program." msgstr "Nie można uruchomić zewnętrznego programu." -#: ../midori/sokoke.c:1529 +#: ../midori/sokoke.c:1673 #, c-format msgid "%d hour" msgid_plural "%d hours" @@ -2160,7 +1994,7 @@ msgstr[0] "%d godzina" msgstr[1] "%d godziny" msgstr[2] "%d godzin" -#: ../midori/sokoke.c:1530 +#: ../midori/sokoke.c:1674 #, c-format msgid "%d minute" msgid_plural "%d minutes" @@ -2168,7 +2002,7 @@ msgstr[0] "%d minuta" msgstr[1] "%d minuty" msgstr[2] "%d minut" -#: ../midori/sokoke.c:1531 +#: ../midori/sokoke.c:1675 #, c-format msgid "%d second" msgid_plural "%d seconds" @@ -2177,67 +2011,67 @@ msgstr[1] "%d sekundy" msgstr[2] "%d sekund" #. i18n: Download tooltip (size): 4KB of 43MB -#: ../midori/sokoke.c:1539 ../panels/midori-transfers.c:269 +#: ../midori/sokoke.c:1683 ../panels/midori-transfers.c:267 #, c-format msgid "%s of %s" msgstr "Pobrano %s z %s" #. i18n: Unknown number of bytes, used for transfer rate like ?B/s -#: ../midori/sokoke.c:1548 +#: ../midori/sokoke.c:1692 msgid "?B" msgstr "?B" #. i18n: Download tooltip (transfer rate): (130KB/s) -#: ../midori/sokoke.c:1551 +#: ../midori/sokoke.c:1695 #, c-format msgid " (%s/s)" msgstr " (%s/s)" #. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning -#: ../midori/sokoke.c:1568 +#: ../midori/sokoke.c:1712 #, c-format msgid " - %s remaining" msgstr " - pozostało %s" #. i18n: A panel at the bottom, to search text in pages -#: ../toolbars/midori-findbar.c:280 +#: ../toolbars/midori-findbar.c:264 msgid "_Inline Find:" msgstr "_Wyszukiwanie:" -#: ../toolbars/midori-findbar.c:306 +#: ../toolbars/midori-findbar.c:291 msgid "Previous" msgstr "Poprzednie" -#: ../toolbars/midori-findbar.c:312 +#: ../toolbars/midori-findbar.c:297 msgid "Next" msgstr "Następne" -#: ../toolbars/midori-findbar.c:316 +#: ../toolbars/midori-findbar.c:301 msgid "Match Case" msgstr "Uwzględnianie wielkości liter" -#: ../toolbars/midori-findbar.c:325 +#: ../toolbars/midori-findbar.c:310 msgid "Highlight Matches" msgstr "Wyróżnianie" -#: ../toolbars/midori-findbar.c:336 +#: ../toolbars/midori-findbar.c:321 msgid "Close Findbar" msgstr "Zamyka pasek wyszukiwania" -#: ../toolbars/midori-transferbar.c:124 +#: ../toolbars/midori-transferbar.c:122 #, c-format msgid "The file '%s' has been downloaded." msgstr "Pobrano plik „%s”." -#: ../toolbars/midori-transferbar.c:127 +#: ../toolbars/midori-transferbar.c:125 msgid "Transfer completed" msgstr "Zakończono pobieranie" -#: ../toolbars/midori-transferbar.c:195 +#: ../toolbars/midori-transferbar.c:193 msgid "The downloaded file is erroneous." msgstr "Pobrany plik jest uszkodzony." -#: ../toolbars/midori-transferbar.c:196 +#: ../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." @@ -2246,61 +2080,56 @@ msgstr "" "obliczona. Oznacza to, że prawdopodobnie plik jest niekompletny lub został " "zmodyfikowany." -#: ../toolbars/midori-transferbar.c:339 ../panels/midori-transfers.c:142 +#: ../toolbars/midori-transferbar.c:331 ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "Wyczyść wszystko" -#: ../toolbars/midori-transferbar.c:376 ../toolbars/midori-transferbar.c:378 +#: ../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:382 +#: ../toolbars/midori-transferbar.c:374 msgid "_Quit Midori" msgstr "Za_kończ program" -#: ../toolbars/midori-transferbar.c:384 +#: ../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-bookmarks.c:308 +#: ../panels/midori-bookmarks.c:113 +msgid "Bookmarks" +msgstr "Zakładki" + +#: ../panels/midori-bookmarks.c:260 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "Nie udało się dodać zakładki: %s\n" -#: ../panels/midori-bookmarks.c:475 -#, c-format -msgid "Failed to update bookmark : %s\n" -msgstr "Nie udało się uaktualnić zakładki: %s\n" - -#: ../panels/midori-bookmarks.c:535 +#: ../panels/midori-bookmarks.c:440 msgid "Edit the selected bookmark" msgstr "Edytuj wybraną zakładkę" -#: ../panels/midori-bookmarks.c:543 +#: ../panels/midori-bookmarks.c:448 msgid "Delete the selected bookmark" msgstr "Usuń wybraną zakładkę" -#: ../panels/midori-bookmarks.c:558 +#: ../panels/midori-bookmarks.c:463 msgid "Add a new folder" msgstr "Tworzy nowy katalog zakładek" -#: ../panels/midori-bookmarks.c:694 ../panels/midori-history.c:635 +#: ../panels/midori-bookmarks.c:597 ../panels/midori-history.c:579 msgid "Separator" msgstr "Separator" -#: ../panels/midori-history.c:111 +#: ../panels/midori-history.c:110 msgid "History" msgstr "Historia" -#: ../panels/midori-history.c:158 ../panels/midori-history.c:189 -msgid "Today" -msgstr "Dzisiaj" - -#: ../panels/midori-history.c:160 ../panels/midori-history.c:191 -msgid "Yesterday" -msgstr "Wczoraj" +#: ../panels/midori-history.c:142 +msgid "A week ago" +msgstr "Tydzień temu" -#: ../panels/midori-history.c:162 ../panels/midori-history.c:186 +#: ../panels/midori-history.c:144 #, c-format msgid "%d day ago" msgid_plural "%d days ago" @@ -2308,40 +2137,39 @@ 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:147 +msgid "Today" +msgstr "Dzisiaj" -#: ../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" +#: ../panels/midori-history.c:149 +msgid "Yesterday" +msgstr "Wczoraj" -#: ../panels/midori-history.c:360 +#: ../panels/midori-history.c:317 msgid "Are you sure you want to remove all history items?" msgstr "Czy na pewno usunąć wszystkie elementy historii?" -#: ../panels/midori-history.c:407 +#: ../panels/midori-history.c:363 msgid "Bookmark the selected history item" msgstr "Dodaje zakładkę do zaznaczonego elementu historii" -#: ../panels/midori-history.c:416 +#: ../panels/midori-history.c:372 msgid "Delete the selected history item" msgstr "Usuwa zaznaczony element historii" -#: ../panels/midori-history.c:424 +#: ../panels/midori-history.c:380 msgid "Clear the entire history" msgstr "Czyści całą historię" -#: ../panels/midori-transfers.c:87 +#: ../panels/midori-transfers.c:86 msgid "Transfers" msgstr "Pobieranie plików" -#: ../panels/midori-transfers.c:470 +#: ../panels/midori-transfers.c:467 msgid "Open Destination _Folder" msgstr "Otwórz _katalog pobierania" -#: ../panels/midori-transfers.c:473 +#: ../panels/midori-transfers.c:470 msgid "Copy Link Loc_ation" msgstr "Skopiuj położ_enie pliku" @@ -2367,68 +2195,68 @@ msgstr "Hasło:" msgid "_Remember password" msgstr "_Pamiętanie hasła" -#: ../katze/katze-throbber.c:949 +#: ../katze/katze-throbber.c:942 #, c-format msgid "Named icon '%s' couldn't be loaded" msgstr "Nie udało się wczytać nazwanej ikony „%s”" -#: ../katze/katze-throbber.c:962 +#: ../katze/katze-throbber.c:955 #, c-format msgid "Stock icon '%s' couldn't be loaded" msgstr "Nie udało się wczytać standardowej ikony „%s”" -#: ../katze/katze-throbber.c:1042 +#: ../katze/katze-throbber.c:1035 msgid "Animation frames are broken" msgstr "Klatki animacji są uszkodzone" -#: ../katze/katze-utils.c:443 ../katze/katze-utils.c:867 +#: ../katze/katze-utils.c:439 ../katze/katze-utils.c:873 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Właściwość „%s” jest niepoprawna dla %s" -#: ../katze/katze-utils.c:489 ../katze/katze-utils.c:518 +#: ../katze/katze-utils.c:485 ../katze/katze-utils.c:514 #: ../extensions/addons.c:308 msgid "Choose file" msgstr "Wybierz plik" -#: ../katze/katze-utils.c:504 +#: ../katze/katze-utils.c:500 msgid "Choose folder" msgstr "Wybór katalogu" -#: ../katze/katze-utils.c:602 +#: ../katze/katze-utils.c:604 msgid "None" msgstr "Brak" -#: ../katze/katze-utils.c:717 +#: ../katze/katze-utils.c:719 msgid "1 hour" msgstr "Godzina" -#: ../katze/katze-utils.c:718 +#: ../katze/katze-utils.c:720 msgid "1 day" msgstr "Dzień" -#: ../katze/katze-utils.c:719 +#: ../katze/katze-utils.c:721 msgid "1 week" msgstr "Tydzień" -#: ../katze/katze-utils.c:720 +#: ../katze/katze-utils.c:722 msgid "1 month" msgstr "Miesiąc" -#: ../katze/katze-utils.c:721 +#: ../katze/katze-utils.c:723 msgid "1 year" msgstr "Rok" -#: ../katze/katze-preferences.c:98 ../extensions/history-list.vala:235 +#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235 #, c-format msgid "Preferences for %s" msgstr "Preferencje %s" -#: ../extensions/adblock.c:470 +#: ../extensions/adblock.c:434 msgid "Configure Advertisement filters" msgstr "Filtr reklam" -#: ../extensions/adblock.c:506 +#: ../extensions/adblock.c:465 #, c-format msgid "" "Type the address of a preconfigured filter list in the text entry and click " @@ -2438,27 +2266,27 @@ msgstr "" "„Dodaj”, aby umieścić ją na poniższej liście. Więcej list można znaleźć pod " "adresem %s." -#: ../extensions/adblock.c:920 +#: ../extensions/adblock.c:831 msgid "Edit rule" msgstr "Edycja reguły" -#: ../extensions/adblock.c:934 +#: ../extensions/adblock.c:845 msgid "_Rule:" msgstr "_Reguła:" -#: ../extensions/adblock.c:988 +#: ../extensions/adblock.c:899 msgid "Bl_ock image" msgstr "Za_blokuj obraz" -#: ../extensions/adblock.c:993 +#: ../extensions/adblock.c:904 msgid "Bl_ock link" msgstr "Za_blokuj odnośnik" -#: ../extensions/adblock.c:1692 +#: ../extensions/adblock.c:1495 msgid "Advertisement blocker" msgstr "Filtr reklam" -#: ../extensions/adblock.c:1693 +#: ../extensions/adblock.c:1496 msgid "Block advertisements according to a filter list" msgstr "Blokuje wyświetlanie treści według określonych filtrów" @@ -2484,116 +2312,117 @@ msgstr "_Zainstaluj styl" msgid "Don't install" msgstr "Nie instaluj" -#: ../extensions/addons.c:319 ../extensions/addons.c:677 +#: ../extensions/addons.c:319 ../extensions/addons.c:681 msgid "Userscripts" msgstr "Skrypty użytkownika" -#: ../extensions/addons.c:324 ../extensions/addons.c:679 +#: ../extensions/addons.c:324 ../extensions/addons.c:683 msgid "Userstyles" msgstr "Style użytkownika" -#: ../extensions/addons.c:370 ../extensions/addons.c:449 +#: ../extensions/addons.c:380 ../extensions/addons.c:459 #: ../extensions/feed-panel/main.c:129 msgid "Error" msgstr "Błąd" -#: ../extensions/addons.c:411 +#: ../extensions/addons.c:421 #, c-format msgid "Do you want to delete '%s'?" msgstr "Usunąć „%s”?" -#: ../extensions/addons.c:417 +#: ../extensions/addons.c:427 msgid "Delete user script" msgstr "Usuwa skrypt użytkownika" -#: ../extensions/addons.c:418 +#: ../extensions/addons.c:428 msgid "Delete user style" msgstr "Usuwa styl użytkownika" -#: ../extensions/addons.c:421 +#: ../extensions/addons.c:431 #, c-format msgid "The file %s will be permanently deleted." msgstr "Plik „%s” zostanie usunięty." -#: ../extensions/addons.c:566 ../extensions/addons.c:643 +#: ../extensions/addons.c:570 ../extensions/addons.c:647 msgid "Open in Text Editor" msgstr "Otwiera w edytorze tekstu" -#: ../extensions/addons.c:568 ../extensions/addons.c:652 +#: ../extensions/addons.c:572 ../extensions/addons.c:656 msgid "Open Target Folder" msgstr "Otwiera katalog docelowy" -#: ../extensions/addons.c:634 +#: ../extensions/addons.c:638 msgid "Add new addon" msgstr "Dodaje nowy dodatek" -#: ../extensions/addons.c:660 +#: ../extensions/addons.c:664 msgid "Remove selected addon" msgstr "Usuwa zaznaczony dodatek" -#: ../extensions/addons.c:1689 ../extensions/addons.c:1907 +#: ../extensions/addons.c:1691 ../extensions/addons.c:1909 msgid "User addons" msgstr "Dodatki użytkownika" -#: ../extensions/addons.c:1819 +#: ../extensions/addons.c:1821 #, c-format msgid "Can't monitor folder '%s': %s" msgstr "Nie można obserwować katalogu „%s”: %s" -#: ../extensions/addons.c:1908 +#: ../extensions/addons.c:1910 msgid "Support for userscripts and userstyles" msgstr "Obsługuje własne skrypty i style" -#: ../extensions/colorful-tabs.c:201 +#: ../extensions/colorful-tabs.c:202 msgid "Colorful Tabs" msgstr "Kolorowe karty" -#: ../extensions/colorful-tabs.c:202 +#: ../extensions/colorful-tabs.c:203 msgid "Tint each tab distinctly" msgstr "Wyświetla kolorowe nagłówki kart" -#: ../extensions/cookie-manager/cookie-manager-page.c:73 +#: ../extensions/cookie-manager/cookie-manager-page.c:80 #: ../extensions/cookie-manager/main.c:35 msgid "Cookie Manager" msgstr "Menedżer ciasteczek" -#: ../extensions/cookie-manager/cookie-manager-page.c:103 +#: ../extensions/cookie-manager/cookie-manager-page.c:110 msgid "Delete All" msgstr "Usuń wszystko" -#: ../extensions/cookie-manager/cookie-manager-page.c:105 +#: ../extensions/cookie-manager/cookie-manager-page.c:112 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:120 +#: ../extensions/cookie-manager/cookie-manager-page.c:127 msgid "Expand All" msgstr "Rozwija wszystkie gałęzie" -#: ../extensions/cookie-manager/cookie-manager-page.c:127 +#: ../extensions/cookie-manager/cookie-manager-page.c:134 msgid "Collapse All" msgstr "Zwija wszystkie gałęzie" -#: ../extensions/cookie-manager/cookie-manager-page.c:572 +#: ../extensions/cookie-manager/cookie-manager-page.c:576 msgid "Do you really want to delete all cookies?" msgstr "Usunąć wszystkie ciasteczka?" -#: ../extensions/cookie-manager/cookie-manager-page.c:574 +#: ../extensions/cookie-manager/cookie-manager-page.c:578 msgid "Question" msgstr "Pytanie" -#: ../extensions/cookie-manager/cookie-manager-page.c:583 +#: ../extensions/cookie-manager/cookie-manager-page.c:587 msgid "Only cookies which match the filter will be deleted." msgstr "" "Usunięte zostaną tylko ciasteczka o nazwie domeny pasującej do wyrażenia " "filtra." -#: ../extensions/cookie-manager/cookie-manager-page.c:671 +#: ../extensions/cookie-manager/cookie-manager-page.c:675 +#, fuzzy msgid "At the end of the session" msgstr "Pod koniec sesji" -#: ../extensions/cookie-manager/cookie-manager-page.c:674 +#: ../extensions/cookie-manager/cookie-manager-page.c:678 #, c-format msgid "" "Host: %s\n" @@ -2610,15 +2439,15 @@ msgstr "" "Bezpieczne: %s\n" "Data wygaśnięcia: %s" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:684 msgid "Yes" msgstr "Tak" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:684 msgid "No" msgstr "Nie" -#: ../extensions/cookie-manager/cookie-manager-page.c:694 +#: ../extensions/cookie-manager/cookie-manager-page.c:698 #, c-format msgid "" "Domain: %s\n" @@ -2627,23 +2456,23 @@ msgstr "" "Domena: %s\n" "Ilość ciasteczek: %d" -#: ../extensions/cookie-manager/cookie-manager-page.c:1021 +#: ../extensions/cookie-manager/cookie-manager-page.c:1028 msgid "Name" msgstr "Nazwa:" -#: ../extensions/cookie-manager/cookie-manager-page.c:1072 +#: ../extensions/cookie-manager/cookie-manager-page.c:1081 msgid "_Expand All" msgstr "_Rozwiń wszystko" -#: ../extensions/cookie-manager/cookie-manager-page.c:1080 +#: ../extensions/cookie-manager/cookie-manager-page.c:1089 msgid "_Collapse All" msgstr "_Zwiń wszystko" -#: ../extensions/cookie-manager/cookie-manager-page.c:1134 +#: ../extensions/cookie-manager/cookie-manager-page.c:1142 msgid "Filter:" msgstr "Filtr:" -#: ../extensions/cookie-manager/cookie-manager-page.c:1139 +#: ../extensions/cookie-manager/cookie-manager-page.c:1147 msgid "" "Enter a filter string to show only cookies whose name or domain field match " "the entered filter" @@ -2748,73 +2577,46 @@ msgstr "Kanały wiadomości" msgid "Read Atom/ RSS feeds" msgstr "Odczytuje wiadomości z kanałów Atom/RSS" -#: ../extensions/formhistory/formhistory.c:39 +#: ../extensions/formhistory.c:143 #, 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/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 +#: ../extensions/formhistory.c:295 #, fuzzy msgid "Toggle form history state" msgstr "Czas przechowywania historii:" -#: ../extensions/formhistory/formhistory.c:438 +#: ../extensions/formhistory.c:296 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 +#: ../extensions/formhistory.c:432 ../extensions/formhistory.c:436 #, 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 -msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab" +#: ../extensions/formhistory.c:511 +msgid "only activate form history via hotkey (Ctrl+Shift+F) per tab" msgstr "" -"Wyświetlanie historii pól formularzy na bieżącej karcie,\n" -"tylko po wciśnięciu skrótu klawiszowego (Ctrl+Shift+F) " +"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 +#: ../extensions/formhistory.c:570 msgid "Stores history of entered form data" msgstr "Przechowuje historię uzupełnionych pól formularzy" -#: ../extensions/formhistory/formhistory-gdom-frontend.c:225 -#: ../extensions/formhistory/formhistory-js-frontend.c:106 +#: ../extensions/formhistory.c:574 #, c-format -msgid "Failed to select suggestions\n" -msgstr "Nie udało się wybrać sugestii\n" +msgid "Not available: %s" +msgstr "Nie dostępne: %s" + +#: ../extensions/formhistory.c:575 +msgid "Resource files not installed" +msgstr "Nie zainstalowano pliku zasobów" + +#: ../extensions/formhistory.c:581 +msgid "Form history filler" +msgstr "Historia pól formularzy" #: ../extensions/history-list.vala:197 msgid "There are no unvisited tabs" @@ -2863,11 +2665,11 @@ msgstr "" #: ../extensions/history-list.vala:443 msgid "Display tab in background (History List)" -msgstr "Wyświetl kartę w tle (Lista historii)" +msgstr "" #: ../extensions/history-list.vala:444 msgid "Display the current selected tab in background" -msgstr "Wyświetl aktualnie wybraną kartę w tle" +msgstr "" #: ../extensions/history-list.vala:569 msgid "History List" @@ -2888,21 +2690,21 @@ msgstr "Umożliwia kontrolowanie przeglądarki za pomocą gestów myszy" #: ../extensions/shortcuts.c:109 msgid "Reload page or stop loading" -msgstr "Wczytaj ponownie lub zatrzymaj wczytywanie" +msgstr "Odśwież lub zatrzymaj wczytywanie" #: ../extensions/shortcuts.c:176 msgid "Customize Keyboard shortcuts" msgstr "Skróty klawiszowe" -#: ../extensions/shortcuts.c:283 +#: ../extensions/shortcuts.c:285 msgid "Customize Sh_ortcuts..." msgstr "Dostosuj skróty _klawiszowe..." -#: ../extensions/shortcuts.c:320 +#: ../extensions/shortcuts.c:322 msgid "Shortcuts" msgstr "Edytor skrótów klawiszowych" -#: ../extensions/shortcuts.c:321 +#: ../extensions/shortcuts.c:323 msgid "View and edit keyboard shortcuts" msgstr "Umożliwia wyświetlanie i modyfikowanie skrótów klawiszowych" @@ -2914,36 +2716,36 @@ msgstr "Zegar paska stanu" msgid "Display date and time in the statusbar" msgstr "Wyświetla datę i czas na pasku stanu" -#: ../extensions/statusbar-features.c:152 +#: ../extensions/statusbar-features.c:128 msgid "Images" msgstr "Obrazy" -#: ../extensions/statusbar-features.c:162 +#: ../extensions/statusbar-features.c:137 msgid "Scripts" msgstr "Skrypty użytkownika" -#: ../extensions/statusbar-features.c:174 +#: ../extensions/statusbar-features.c:146 msgid "Netscape plugins" msgstr "Wtyczki Netscape" -#: ../extensions/statusbar-features.c:259 +#: ../extensions/statusbar-features.c:192 msgid "Statusbar Features" msgstr "Dodatki paska stanu" -#: ../extensions/statusbar-features.c:260 +#: ../extensions/statusbar-features.c:193 msgid "Easily toggle features on web pages on and off" msgstr "" "Umożliwia przełączanie wczytywania i wykonywania określonych elementów stron" -#: ../extensions/tab-panel.c:589 ../extensions/tab-panel.c:676 +#: ../extensions/tab-panel.c:596 ../extensions/tab-panel.c:683 msgid "Tab Panel" msgstr "Panel kart" -#: ../extensions/tab-panel.c:659 +#: ../extensions/tab-panel.c:666 msgid "T_ab Panel" msgstr "Panel _kart" -#: ../extensions/tab-panel.c:677 +#: ../extensions/tab-panel.c:684 msgid "Show tabs in a vertical panel" msgstr "Wyświetla karty w panelu bocznym" @@ -2955,36 +2757,40 @@ msgstr "Ikony kart" msgid "New tabs have no label by default" msgstr "Ukrywa etykiety nowo otwieranych kart" -#: ../extensions/toolbar-editor.c:390 +#: ../extensions/toolbar-editor.c:393 msgid "Customize Toolbar" msgstr "Modyfikowanie paska narzędziowego" -#: ../extensions/toolbar-editor.c:406 +#: ../extensions/toolbar-editor.c:413 msgid "" -"Select items to be displayed on the toolbar. Items can be reordered by drag " +"Select items to be displayed on the toolbar. Items can be reodered 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." -#: ../extensions/toolbar-editor.c:422 +#: ../extensions/toolbar-editor.c:429 msgid "Available Items" msgstr "Dostępne elementy" -#: ../extensions/toolbar-editor.c:443 +#: ../extensions/toolbar-editor.c:450 msgid "Displayed Items" msgstr "Wyświetlane elementy" -#: ../extensions/toolbar-editor.c:583 -msgid "_Customize Toolbar…" +#: ../extensions/toolbar-editor.c:585 +msgid "Customize _Toolbar..." msgstr "Dostosuj pasek _narzędziowy..." -#: ../extensions/toolbar-editor.c:612 +#: ../extensions/toolbar-editor.c:601 +msgid "_Customize..." +msgstr "_Dostosuj..." + +#: ../extensions/toolbar-editor.c:631 msgid "Toolbar Editor" msgstr "Edytor paska narzędziowego" -#: ../extensions/toolbar-editor.c:613 +#: ../extensions/toolbar-editor.c:632 msgid "Easily edit the toolbar layout" msgstr "Umożliwia modyfikację układu paska narzędziowego" @@ -2992,57 +2798,6 @@ msgstr "Umożliwia modyfikację układu paska narzędziowego" msgid "Cache HTTP communication on disk" msgstr "Przechowuje dane komunikacji HTTP na dysku" -#~ msgid "_Bookmark" -#~ msgstr "_Zakładka" - -#~ msgid "_Console" -#~ msgstr "_Konsola" - -#~ msgid "Close ot_her Tabs" -#~ msgstr "Zamknij pozo_stałe karty" - -#~ msgid "_Icon:" -#~ msgstr "_Ikona:" - -#~ msgid "Toplevel folder" -#~ msgstr "Katalog główny" - -#~ msgid "_Title:" -#~ msgstr "_Tytuł:" - -#~ msgid "_Folder:" -#~ msgstr "_Katalog:" - -#~ msgid "_Customize…" -#~ msgstr "_Dostosuj…" - -#~ msgid "The bookmarks couldn't be saved. %s" -#~ msgstr "Nie można zapisać zakładek. %s" - -#~ msgid "The specified configuration folder is invalid." -#~ msgstr "Podany katalog konfiguracyjny jest niepoprawny" - -#~ 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" @@ -3122,13 +2877,13 @@ msgstr "Przechowuje dane komunikacji HTTP na dysku" #~ msgid "Add a new bookmark folder" #~ msgstr "Tworzy nowy katalog zakładek" -#~ msgid "Add, edit and remove search engines…" +#~ msgid "Add, edit and remove search engines..." #~ msgstr "Zarządza wyszukiwarkami internetowymi" -#~ msgid "Clear private data…" -#~ msgstr "Usuwa prywatne dane zapisane przez program…" +#~ msgid "Clear private data..." +#~ msgstr "Usuwa prywatne dane zapisane przez program..." -#~ msgid "Inspect page details and access developer tools…" +#~ msgid "Inspect page details and access developer tools..." #~ msgstr "" #~ "Umożliwia analizowanie szczegółów strony i udostępnia narzędzia " #~ "programistyczne" @@ -3214,8 +2969,8 @@ msgstr "Przechowuje dane komunikacji HTTP na dysku" #~ msgid "Reset the last _session" #~ msgstr "Nie przywracaj ostatniej _sesji" -#~ msgid "Configure _Advertisement filters…" -#~ msgstr "Skonfiguruj filtr _reklam…" +#~ msgid "Configure _Advertisement filters..." +#~ msgstr "Skonfiguruj filtr _reklam..." #~ msgid "Not found - %s" #~ msgstr "Nie znaleziono - %s" @@ -3229,6 +2984,9 @@ msgstr "Przechowuje dane komunikacji HTTP na dysku" #~ msgid "Enforce a video dot density of 96 DPI" #~ msgstr "Ustawia rozdzielczość renderowania strony na 96 DPI" +#~ msgid "_Form History" +#~ msgstr "_Historia formularzy" + #~ msgid "Switch tabs with Ctrl+Tab sorted by last usage" #~ msgstr "" #~ "Przełącza za pomocą klawiszy Ctrl+Tab pomiędzy kartami\n" @@ -3525,12 +3283,18 @@ msgstr "Przechowuje dane komunikacji HTTP na dysku" #~ msgid "Encoding" #~ msgstr "Kodowanie znaków" +#~ msgid "User_styles" +#~ msgstr "_Style użytkownika" + +#, fuzzy #~ msgid "Enable" #~ msgstr "Skrypty użytkownika" +#, fuzzy #~ msgid "_Disable" #~ msgstr "_Wyłącz" +#, fuzzy #~ msgid "Disable" #~ msgstr "_Plik" @@ -3538,7 +3302,7 @@ msgstr "Przechowuje dane komunikacji HTTP na dysku" #~ msgstr "Adresy URI" #~ msgid "[URIs]" -#~ msgstr "[ADRES URI…]" +#~ msgstr "[ADRES URI...]" #~ msgid "_URL:" #~ msgstr "_URL:" @@ -3555,6 +3319,7 @@ msgstr "Przechowuje dane komunikacji HTTP na dysku" #~ msgid "Open URL in New _Tab" #~ msgstr "Otwórz URL w nowej karcie" +#, fuzzy #~ msgid "Source" #~ msgstr "Ź_ródło strony" diff --git a/po/pt.po b/po/pt.po index 71e4fa4e..a51937f6 100644 --- a/po/pt.po +++ b/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: midori\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-19 11:45+0000\n" +"POT-Creation-Date: 2011-11-25 10:42+0000\n" "PO-Revision-Date: \n" "Last-Translator: Sérgio Marques \n" "Language-Team: Portuguese\n" @@ -20,35 +20,19 @@ msgstr "" "X-Poedit-Country: PORTUGAL\n" #: ../data/midori.desktop.in.h:1 -msgid "Browse the Web" -msgstr "Navegar na web" - -#: ../data/midori.desktop.in.h:2 msgid "Internet;WWW;Explorer" msgstr "Internet;WWW;Explorador" -#: ../data/midori.desktop.in.h:3 ../midori/main.c:1921 ../midori/main.c:1936 -#: ../midori/main.c:1949 ../midori/midori-websettings.c:200 +#: ../data/midori.desktop.in.h:2 +msgid "Lightweight web browser" +msgstr "Navegador Web rápido" + +#: ../data/midori.desktop.in.h:3 ../midori/main.c:2009 ../midori/main.c:2029 +#: ../midori/main.c:2045 ../midori/midori-websettings.c:303 msgid "Midori" msgstr "Midori" #: ../data/midori.desktop.in.h:4 -msgid "Midori Web Browser" -msgstr "Navegador web Midori" - -#: ../data/midori.desktop.in.h:5 -msgid "New Private Browsing Window" -msgstr "Nova janela de navegação privada" - -#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1326 -msgid "New Tab" -msgstr "Novo separador" - -#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1323 -msgid "New Window" -msgstr "Nova janela" - -#: ../data/midori.desktop.in.h:8 msgid "Web Browser" msgstr "Navegador Web" @@ -60,132 +44,100 @@ msgstr "Midori (Navegação privada)" 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:4307 +#: ../data/midori-private.desktop.in.h:3 msgid "Private Browsing" msgstr "Navegação privada" -#: ../midori/main.c:84 ../midori/main.c:90 +#: ../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:138 +#: ../midori/main.c:150 #, c-format msgid "Value '%s' is invalid for %s" msgstr "O valor \"%s\" é inválido para %s" -#: ../midori/main.c:143 ../midori/main.c:247 +#: ../midori/main.c:155 ../midori/main.c:261 #, c-format msgid "Invalid configuration value '%s'" -msgstr "O valor de configuração \"%s\" é inválido " +msgstr "Valor de configuração \"%s\" é inválido " -#: ../midori/main.c:357 +#: ../midori/main.c:366 #, 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:411 +#: ../midori/main.c:420 #, c-format msgid "Failed to clear history: %s\n" msgstr "Falha ao apagar o histórico: %s\n" -#: ../midori/main.c:433 ../extensions/formhistory/formhistory.c:531 +#: ../midori/main.c:440 ../midori/main.c:561 ../extensions/formhistory.c:417 #, 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:505 +#: ../midori/main.c:504 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Falha ao remover histórico mais antigo: %s\n" -#: ../midori/main.c:527 +#: ../midori/main.c:544 ../panels/midori-history.c:189 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "Falha ao remover histórico: %s\n" + +#: ../midori/main.c:591 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "Os marcadores não foram gtavados. %s" + +#: ../midori/main.c:624 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "A configuração não foi gravada. %s" -#: ../midori/main.c:553 +#: ../midori/main.c:659 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Os motores de pesquisa não foram gravados. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:590 +#: ../midori/main.c:685 ../midori/main.c:705 #, c-format msgid "The trash couldn't be saved. %s" msgstr "O lixo não foi gravado. %s" -#: ../midori/main.c:663 ../panels/midori-extensions.c:90 +#: ../midori/main.c:739 ../panels/midori-extensions.c:91 msgid "Extensions" msgstr "Extensões" -#: ../midori/main.c:677 +#: ../midori/main.c:753 msgid "Privacy" msgstr "Privacidade" -#: ../midori/main.c:679 -msgid "Delete old Cookies after:" -msgstr "Apagar cookies após:" - -#: ../midori/main.c:681 ../midori/main.c:684 -msgid "The maximum number of days to save cookies for" -msgstr "O número máximo de dias para guardar os cookies" - -#: ../midori/main.c:688 -msgid "Only accept Cookies from sites you visit" -msgstr "Aceitar cookies dos sítios que eu visitar" - -#: ../midori/main.c:689 -msgid "Block cookies sent by third-party websites" -msgstr "Bloquear cookies de sítios de terceiros" - -#: ../midori/main.c:694 +#: ../midori/main.c:765 msgid "" "Cookies store login data, saved games, or user profiles for advertisement " "purposes." msgstr "" -"Os \"cookies\" guardam dados ou perfis de utilizador para publicitar " +"Os \"cookies\" guardam dados, jogos ou perfis de utilizador para publicitar " "produtos." -#: ../midori/main.c:701 -msgid "Enable offline web application cache" -msgstr "Ativar \"cache\" de aplicações web \"offline\"" - -#: ../midori/main.c:704 -msgid "Enable HTML5 local storage support" -msgstr "Ativar suporte a armazenagem local HTML5" - -#. i18n: Reworded: Shorten details propagated when going to another page -#: ../midori/main.c:708 -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/main.c:710 -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/main.c:713 -msgid "Delete pages from history after:" -msgstr "Apagar páginas no histórico após:" - -#: ../midori/main.c:715 ../midori/main.c:718 -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/main.c:759 +#: ../midori/main.c:821 #, c-format msgid "The session couldn't be saved. %s" msgstr "A sessão não foi gravada. %s" -#: ../midori/main.c:981 +#: ../midori/main.c:1031 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:1076 +#: ../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." @@ -193,237 +145,243 @@ 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:1095 +#: ../midori/main.c:1118 msgid "Modify _preferences" msgstr "Modificar _preferências" -#: ../midori/main.c:1099 +#: ../midori/main.c:1122 msgid "Disable all _extensions" msgstr "Desativar todas as _extensões" -#: ../midori/main.c:1108 -msgid "Show a dialog after Midori crashed" -msgstr "Mostrar a janela após o encerramento do Midori" - -#: ../midori/main.c:1113 +#: ../midori/main.c:1135 msgid "Discard old tabs" msgstr "Rejeitar separadores antigos" -#: ../midori/main.c:1114 ../midori/midori-websettings.c:108 +#: ../midori/main.c:1136 ../midori/midori-websettings.c:212 msgid "Show last tabs without loading" msgstr "Mostrar últimos separadores sem os carregar" -#: ../midori/main.c:1115 ../midori/midori-websettings.c:107 +#: ../midori/main.c:1137 ../midori/midori-websettings.c:211 msgid "Show last open tabs" msgstr "Mostrar últimos separadores abertos" -#: ../midori/main.c:1362 ../midori/main.c:2377 +#: ../midori/main.c:1347 ../midori/main.c:2417 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "A sessão não foi carregada: %s\n" -#: ../midori/main.c:1500 +#: ../midori/main.c:1488 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Captura gravada em: %s\n" -#: ../midori/main.c:1836 +#: ../midori/main.c:1912 msgid "Run ADDRESS as a web application" msgstr "Executar ENDEREÇO como aplicação web" -#: ../midori/main.c:1836 +#: ../midori/main.c:1912 msgid "ADDRESS" msgstr "ENDEREÇO" -#: ../midori/main.c:1839 +#: ../midori/main.c:1915 msgid "Use FOLDER as configuration folder" msgstr "Usar PASTA como pasta de configuração" -#: ../midori/main.c:1839 +#: ../midori/main.c:1915 msgid "FOLDER" msgstr "PASTA" -#: ../midori/main.c:1842 +#: ../midori/main.c:1918 msgid "Private browsing, no changes are saved" msgstr "Navegação privada, as alterações não são gravadas" -#: ../midori/main.c:1845 -msgid "Portable mode, all runtime files are stored in one place" -msgstr "Modo portátil em que todas as rotinas são guardadas num só local" - -#: ../midori/main.c:1848 -msgid "Plain GTK+ window with WebKit, akin to GtkLauncher" -msgstr "Janela GTK+ com WebKit, similar ao GtkLauncher" - -#: ../midori/main.c:1850 +#: ../midori/main.c:1920 msgid "Show a diagnostic dialog" msgstr "Mostrar janela de diagnóstico" -#: ../midori/main.c:1852 +#: ../midori/main.c:1922 msgid "Run the specified filename as javascript" msgstr "Executar o ficheiro como \"javascript\"" -#: ../midori/main.c:1854 +#: ../midori/main.c:1924 msgid "Take a snapshot of the specified URI" msgstr "Obter uma captura da URI especificada" -#: ../midori/main.c:1856 +#: ../midori/main.c:1926 msgid "Execute the specified command" msgstr "Executar o comando especificado" -#: ../midori/main.c:1858 +#: ../midori/main.c:1928 msgid "List available commands to execute with -e/ --execute" msgstr "Lista dos comandos disponíveis para executar com -e/ --execute" -#: ../midori/main.c:1860 +#: ../midori/main.c:1930 msgid "Display program version" msgstr "Exibir versão do programa" -#: ../midori/main.c:1862 +#: ../midori/main.c:1932 msgid "Addresses" msgstr "Endereços " -#: ../midori/main.c:1864 +#: ../midori/main.c:1934 msgid "Block URIs according to regular expression PATTERN" -msgstr "Bloquear URIs conforme a expressão PADRÃO" +msgstr "Bloquear URIs conforme a expressão PATTERN" -#: ../midori/main.c:1864 +#: ../midori/main.c:1934 msgid "PATTERN" msgstr "PADRÃO" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1868 +#: ../midori/main.c:1938 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "Repor Midori após SEGUNDOS segundos de inatividade" -#: ../midori/main.c:1868 +#: ../midori/main.c:1938 msgid "SECONDS" msgstr "SEGUNDOS" -#: ../midori/main.c:1871 +#: ../midori/main.c:1941 msgid "Redirects console warnings to the specified FILENAME" msgstr "Avisos de reencaminhamento para o NOMEDEFICHEIRO especificado" -#: ../midori/main.c:1871 +#: ../midori/main.c:1941 msgid "FILENAME" -msgstr "NOMEDEFICHEIRO" +msgstr "NOMEDOFICHEIRO" -#: ../midori/main.c:1950 +#: ../midori/main.c:2006 +msgid "[Addresses]" +msgstr "[Endereços]" + +#: ../midori/main.c:2016 +msgid "The specified configuration folder is invalid." +msgstr "A pasta de configuração especificada é inválida." + +#: ../midori/main.c:2046 msgid "Please report comments, suggestions and bugs to:" -msgstr "Por favor reporte comentários, sugestões e erros em:" +msgstr "Por favor reporte comentários, sugestões e erros para:" -#: ../midori/main.c:1952 +#: ../midori/main.c:2048 msgid "Check for new versions at:" msgstr "Verificar por novas versões a:" +#: ../midori/main.c:2131 +msgid "Website icons" +msgstr "Ícones de sítios web" + #. i18n: Logins and passwords in websites and web forms -#: ../midori/main.c:2091 +#: ../midori/main.c:2134 msgid "Saved logins and _passwords" -msgstr "Autenticações e sen_has gravadas" +msgstr "Autenticações e _palavras-passe gravadas" + +#: ../midori/main.c:2136 +msgid "Cookies" +msgstr "\"Cookies\"" -#: ../midori/main.c:2093 -msgid "Cookies and Website data" -msgstr "Cookies e dados da página web" +#: ../midori/main.c:2139 +msgid "'Flash' Cookies" +msgstr "\"Cookies Flash\"" -#. TODO: Preserve page icons of search engines and merge privacy items -#: ../midori/main.c:2097 ../midori/midori-preferences.c:508 -#: ../extensions/web-cache.c:461 ../extensions/web-cache.c:470 +#: ../midori/main.c:2142 +msgid "HTML5 _Databases" +msgstr "Bases de _dados HTML5" + +#: ../midori/main.c:2145 ../midori/midori-websettings.c:936 +#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471 msgid "Web Cache" msgstr "\"Web cache\"" -#: ../midori/main.c:2100 -msgid "Website icons" -msgstr "Ícones de sítios web" +#: ../midori/main.c:2147 +msgid "Offline Application Cache" +msgstr "\"Cache\" de aplicações \"offline\"" -#: ../midori/main.c:2210 +#: ../midori/main.c:2250 msgid "An unknown error occured" msgstr "Ocorreu um erro desconhecido" -#: ../midori/main.c:2325 +#: ../midori/main.c:2348 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:2359 +#: ../midori/main.c:2384 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Os marcadores não foram carregados: %s\n" -#: ../midori/main.c:2392 +#: ../midori/main.c:2432 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "O lixo não foi carregado: %s\n" -#: ../midori/main.c:2405 +#: ../midori/main.c:2445 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "O histórico não foi carregado: %s\n" -#: ../midori/main.c:2420 +#: ../midori/main.c:2461 msgid "The following errors occured:" msgstr "Ocorreram os seguintes erros:" -#: ../midori/main.c:2436 +#: ../midori/main.c:2477 msgid "_Ignore" msgstr "_Ignorar " -#: ../midori/midori-app.c:1156 ../midori/midori-browser.c:534 -#, c-format -msgid "Unexpected action '%s'." -msgstr "Ação inesperada \"%s\"." +#: ../midori/midori-app.c:1329 +msgid "_Bookmark" +msgstr "_Marcador" -#: ../midori/midori-app.c:1372 ../midori/midori-browser.c:6251 +#: ../midori/midori-app.c:1330 ../midori/midori-browser.c:5980 msgid "_Bookmarks" msgstr "_Marcadores" -#: ../midori/midori-app.c:1373 +#: ../midori/midori-app.c:1331 msgid "Add Boo_kmark" msgstr "Adicionar mar_cador" -#: ../midori/midori-app.c:1374 +#: ../midori/midori-app.c:1332 +msgid "_Console" +msgstr "_Consola" + +#: ../midori/midori-app.c:1333 msgid "_Extensions" msgstr "_Extensões" #. i18n: Browsing history, visited web pages, closed tabs -#: ../midori/midori-app.c:1375 ../midori/midori-browser.c:4700 +#: ../midori/midori-app.c:1334 ../midori/midori-browser.c:4575 msgid "_History" msgstr "_Histórico" -#: ../midori/midori-app.c:1376 +#: ../midori/midori-app.c:1335 +msgid "_Homepage" +msgstr "_Página inicial" + +#: ../midori/midori-app.c:1336 msgid "_Userscripts" msgstr "\"Scripts\" de _utilizador" -#: ../midori/midori-app.c:1377 -msgid "User_styles" -msgstr "Estilo_s de utilizador" - -#: ../midori/midori-app.c:1378 +#: ../midori/midori-app.c:1337 msgid "New _Tab" msgstr "No_vo separador" -#: ../midori/midori-app.c:1379 +#: ../midori/midori-app.c:1338 msgid "_Transfers" msgstr "_Transferências" -#: ../midori/midori-app.c:1380 +#: ../midori/midori-app.c:1339 msgid "Netscape p_lugins" msgstr "\"P_lug-ins\" Netscape" -#: ../midori/midori-app.c:1381 +#: ../midori/midori-app.c:1340 msgid "_Closed Tabs" msgstr "Separadores _fechados" -#: ../midori/midori-app.c:1382 ../midori/midori-browser.c:5387 +#: ../midori/midori-app.c:1341 ../midori/midori-browser.c:5163 msgid "New _Window" msgstr "_Nova janela" -#: ../midori/midori-app.c:1383 +#: ../midori/midori-app.c:1342 msgid "New _Folder" msgstr "Nova _pasta" -#: ../midori/midori-app.c:1437 -msgid "[Addresses]" -msgstr "[Endereços]" - #: ../midori/midori-array.c:522 msgid "File not found." msgstr "Ficheiro não encontrado." @@ -441,113 +399,124 @@ msgstr "Formato de marcadores não reconhecido." msgid "Writing failed." msgstr "Falha ao escrever." -#: ../midori/midori-browser.c:347 ../midori/midori-browser.c:5526 -msgid "Go forward to the next page" -msgstr "Ir para a página seguinte" - -#. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:354 ../midori/midori-browser.c:5534 -#: ../midori/midori-browser.c:5537 -msgid "Go to the next sub-page" -msgstr "Ir para a sub-página seguinte" - -#: ../midori/midori-browser.c:441 ../midori/midori-browser.c:5475 -#: ../midori/midori-browser.c:5484 +#: ../midori/midori-browser.c:329 ../midori/midori-browser.c:5245 +#: ../midori/midori-browser.c:5254 msgid "Reload the current page" msgstr "Recarregar página atual" -#: ../midori/midori-browser.c:449 ../midori/midori-browser.c:5481 +#: ../midori/midori-browser.c:337 ../midori/midori-browser.c:5251 msgid "Stop loading the current page" msgstr "Parar de carregar da página atual" -#: ../midori/midori-browser.c:519 +#: ../midori/midori-browser.c:462 #, c-format msgid "Failed to update title: %s\n" msgstr "Falha ao atualizar título: %s\n" -#: ../midori/midori-browser.c:614 +#: ../midori/midori-browser.c:475 +#, c-format +msgid "Unexpected action '%s'." +msgstr "Ação inesperada \"%s\"." + +#: ../midori/midori-browser.c:576 #, c-format msgid "%s (Private Browsing)" msgstr "%s (Navegação privada)" -#: ../midori/midori-browser.c:724 ../midori/midori-browser.c:766 -#: ../panels/midori-bookmarks.c:114 -msgid "Bookmarks" -msgstr "Marcadores" +#: ../midori/midori-browser.c:687 ../midori/midori-browser.c:720 +msgid "Toplevel folder" +msgstr "Pasta superior" -#: ../midori/midori-browser.c:826 +#: ../midori/midori-browser.c:777 msgid "New folder" msgstr "Nova pasta" -#: ../midori/midori-browser.c:826 +#: ../midori/midori-browser.c:777 msgid "Edit folder" msgstr "Editar pasta" -#: ../midori/midori-browser.c:828 +#: ../midori/midori-browser.c:779 msgid "New bookmark" msgstr "Novo marcador" -#: ../midori/midori-browser.c:828 +#: ../midori/midori-browser.c:779 msgid "Edit bookmark" msgstr "Editar marcador" -#: ../midori/midori-browser.c:862 -msgid "Type a name for this bookmark and choose where to keep it." -msgstr "Escolha o nome e o local para este marcador." +#: ../midori/midori-browser.c:810 +msgid "_Title:" +msgstr "_Título:" + +#: ../midori/midori-browser.c:830 ../midori/midori-searchaction.c:966 +#: ../extensions/feed-panel/main.c:377 +msgid "_Address:" +msgstr "_Endereço:" -#: ../midori/midori-browser.c:923 +#: ../midori/midori-browser.c:853 ../midori/midori-browser.c:4310 +msgid "_Folder:" +msgstr "_Pasta:" + +#: ../midori/midori-browser.c:869 msgid "Add to _Speed Dial" msgstr "Adicionar à _ligação rápida" -#: ../midori/midori-browser.c:929 +#: ../midori/midori-browser.c:882 msgid "Show in the tool_bar" msgstr "Mostrar na _barra de ferramentas" -#: ../midori/midori-browser.c:937 +#: ../midori/midori-browser.c:897 msgid "Run as _web application" msgstr "Executar como aplicação _web" -#: ../midori/midori-browser.c:1055 ../midori/midori-browser.c:4504 +#: ../midori/midori-browser.c:968 +#, 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:970 +#, 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:977 +#, 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:980 +#, c-format +msgid "The file needs %s but only %s are left." +msgstr "Precisa de %s e apenas tem livre %s." + +#: ../midori/midori-browser.c:1024 ../midori/midori-browser.c:4380 msgid "Save file as" msgstr "Gravar como" -#: ../midori/midori-browser.c:1065 -msgid "Save associated _resources" -msgstr "Gravar _recursos associados" +#: ../midori/midori-browser.c:1333 +msgid "New Window" +msgstr "Nova janela" -#: ../midori/midori-browser.c:1323 +#: ../midori/midori-browser.c:1333 msgid "A new window has been opened" msgstr "Foi aberta uma nova janela" -#: ../midori/midori-browser.c:1326 +#: ../midori/midori-browser.c:1336 +msgid "New Tab" +msgstr "Novo separador" + +#: ../midori/midori-browser.c:1336 msgid "A new tab has been opened" msgstr "Foi aberto um novo separador" -#: ../midori/midori-browser.c:1343 -msgid "Error opening the image!" -msgstr "Ocorreu um erro ao abrir a imagem!" - -#: ../midori/midori-browser.c:1344 -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:1350 -msgid "Error downloading the image!" -msgstr "Ocorreu um erro ao transferir a imagem!" - -#: ../midori/midori-browser.c:1351 -msgid "Can not download selected image." -msgstr "não é possível transferir a imagem." - -#: ../midori/midori-browser.c:1408 +#: ../midori/midori-browser.c:1373 msgid "Save file" msgstr "Gravar ficheiro" -#: ../midori/midori-browser.c:2335 +#: ../midori/midori-browser.c:2263 msgid "Open file" msgstr "Abrir ficheiro" -#: ../midori/midori-browser.c:2467 +#: ../midori/midori-browser.c:2394 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" @@ -561,1501 +530,1617 @@ msgstr "" "notícias. Da próxima vez que clicar no ícone de fontes, esta será " "automaticamente adicionada." -#: ../midori/midori-browser.c:2473 ../extensions/feed-panel/main.c:365 +#: ../midori/midori-browser.c:2400 ../extensions/feed-panel/main.c:365 msgid "New feed" msgstr "Nova fonte" -#: ../midori/midori-browser.c:2516 ../midori/midori-browser.c:5550 -#: ../panels/midori-bookmarks.c:527 +#: ../midori/midori-browser.c:2443 ../midori/midori-browser.c:5314 +#: ../panels/midori-bookmarks.c:432 msgid "Add a new bookmark" msgstr "Adicionar novo marcador" -#: ../midori/midori-browser.c:3060 ../midori/midori-searchaction.c:487 +#: ../midori/midori-browser.c:2969 ../midori/midori-searchaction.c:487 msgid "Empty" msgstr "Vazio" -#: ../midori/midori-browser.c:3506 ../midori/midori-browser.c:3507 +#: ../midori/midori-browser.c:3459 msgid "Toggle text cursor navigation" msgstr "Alternar navegação de cursor de texto" -#: ../midori/midori-browser.c:3509 -msgid "" -"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in " -"all websites." -msgstr "" -"Se premir F7 alterna a navegação com cursor. Se ativa, surgirá um cursor de " -"texto em todas as páginas web." - -#: ../midori/midori-browser.c:3512 -msgid "_Enable Caret Browsing" -msgstr "Ativar nav_egação por cursor" - -#: ../midori/midori-browser.c:3904 ../midori/midori-browser.c:5944 +#: ../midori/midori-browser.c:3771 ../midori/midori-browser.c:5721 #, 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:4230 ../panels/midori-bookmarks.c:850 -#: ../panels/midori-history.c:806 +#: ../midori/midori-browser.c:4107 ../panels/midori-bookmarks.c:748 +#: ../panels/midori-history.c:747 msgid "Open all in _Tabs" msgstr "Abrir todos em _separadores" -#: ../midori/midori-browser.c:4237 ../panels/midori-bookmarks.c:856 -#: ../panels/midori-history.c:812 ../extensions/feed-panel/feed-panel.c:528 +#: ../midori/midori-browser.c:4114 ../panels/midori-bookmarks.c:754 +#: ../panels/midori-history.c:753 ../extensions/feed-panel/feed-panel.c:528 msgid "Open in New _Tab" msgstr "Abrir em novo _separador" -#: ../midori/midori-browser.c:4240 ../midori/midori-view.c:2904 -#: ../midori/midori-view.c:4880 ../panels/midori-bookmarks.c:858 -#: ../panels/midori-history.c:814 ../extensions/feed-panel/feed-panel.c:530 +#: ../midori/midori-browser.c:4117 ../midori/midori-view.c:2530 +#: ../midori/midori-view.c:4357 ../panels/midori-bookmarks.c:756 +#: ../panels/midori-history.c:755 ../extensions/feed-panel/feed-panel.c:530 msgid "Open in New _Window" msgstr "Abrir em nova _janela" -#: ../midori/midori-browser.c:4329 +#: ../midori/midori-browser.c:4197 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4330 +#: ../midori/midori-browser.c:4198 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4331 +#: ../midori/midori-browser.c:4199 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4332 +#: ../midori/midori-browser.c:4200 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4333 +#: ../midori/midori-browser.c:4201 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4334 +#: ../midori/midori-browser.c:4202 #, c-format msgid "Firefox (%s)" msgstr "Firefox (%s)" -#: ../midori/midori-browser.c:4335 -msgid "Midori 0.2.6" -msgstr "Midori 0.2.6" +#: ../midori/midori-browser.c:4223 +msgid "Import bookmarks..." +msgstr "Importar marcadores..." -#: ../midori/midori-browser.c:4356 -msgid "Import bookmarks…" -msgstr "Importar marcadores…" - -#: ../midori/midori-browser.c:4359 ../midori/midori-browser.c:5555 +#: ../midori/midori-browser.c:4226 ../midori/midori-browser.c:5319 msgid "_Import bookmarks" msgstr "_Importar marcadores" -#: ../midori/midori-browser.c:4370 +#: ../midori/midori-browser.c:4237 msgid "_Application:" msgstr "_Aplicação:" -#: ../midori/midori-browser.c:4435 +#: ../midori/midori-browser.c:4302 msgid "Import from XBEL or HTML file" msgstr "Importar de XBEL ou HTML" -#: ../midori/midori-browser.c:4463 +#: ../midori/midori-browser.c:4337 msgid "Import from a file" msgstr "Importar de um ficheiro" -#: ../midori/midori-browser.c:4475 +#: ../midori/midori-browser.c:4349 msgid "Failed to import bookmarks" msgstr "Falha ao importar marcadores" -#: ../midori/midori-browser.c:4509 +#: ../midori/midori-browser.c:4385 msgid "XBEL Bookmarks" msgstr "Marcadores XBEL" -#: ../midori/midori-browser.c:4514 +#: ../midori/midori-browser.c:4390 msgid "Netscape Bookmarks" msgstr "Marcadores Netscape" -#: ../midori/midori-browser.c:4528 +#: ../midori/midori-browser.c:4404 msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)" -msgstr "O Midori só consegue exportar para XBEL (*.xbel) e Netscape (*.html)" +msgstr "" +"O Midori apenas consegue exportar para XBEL (*.xbel) e Netscape (*.html)" -#: ../midori/midori-browser.c:4543 +#: ../midori/midori-browser.c:4420 msgid "Failed to export bookmarks" msgstr "Falha ao exportar marcadores" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4665 +#: ../midori/midori-browser.c:4542 msgid "Clear Private Data" msgstr "Limpar dados privados" -#: ../midori/midori-browser.c:4669 +#: ../midori/midori-browser.c:4546 msgid "_Clear private data" msgstr "_Limpar dados privados" -#: ../midori/midori-browser.c:4684 +#: ../midori/midori-browser.c:4559 msgid "Clear the following data:" msgstr "Limpar os seguintes dados:" -#: ../midori/midori-browser.c:4694 +#: ../midori/midori-browser.c:4569 msgid "Last open _tabs" msgstr "Úl_timos separadores abertos" -#: ../midori/midori-browser.c:4720 +#: ../midori/midori-browser.c:4595 msgid "Clear private data when _quitting Midori" msgstr "Limpar dados privados ao _sair do Midori" -#: ../midori/midori-browser.c:4935 +#: ../midori/midori-browser.c:4771 msgid "A lightweight web browser." msgstr "Um navegador web rápido." -#: ../midori/midori-browser.c:4936 +#: ../midori/midori-browser.c:4772 msgid "See about:version for version info." msgstr "Veja about:version para informações da versão." -#: ../midori/midori-browser.c:4938 +#: ../midori/midori-browser.c:4774 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 " +"Esta 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:4968 +#: ../midori/midori-browser.c:4795 msgid "translator-credits" msgstr "Sérgio Marques " -#: ../midori/midori-browser.c:5385 +#: ../midori/midori-browser.c:5161 msgid "_File" msgstr "_Ficheiro" -#: ../midori/midori-browser.c:5388 +#: ../midori/midori-browser.c:5164 msgid "Open a new window" msgstr "Abrir nova janela" -#: ../midori/midori-browser.c:5391 +#: ../midori/midori-browser.c:5167 msgid "Open a new tab" msgstr "Abrir novo separador" -#: ../midori/midori-browser.c:5393 +#: ../midori/midori-browser.c:5169 msgid "New P_rivate Browsing Window" -msgstr "Nova janela de navegação p_rivada" +msgstr "Nova janela de navegação privada" -#: ../midori/midori-browser.c:5397 +#: ../midori/midori-browser.c:5173 msgid "Open a file" msgstr "Abrir ficheiro" -#: ../midori/midori-browser.c:5399 -msgid "_Save Page As…" +#: ../midori/midori-browser.c:5175 +msgid "_Save Page As..." msgstr "_Gravar página como" -#: ../midori/midori-browser.c:5400 +#: ../midori/midori-browser.c:5176 msgid "Save to a file" msgstr "Gravar para ficheiro" -#: ../midori/midori-browser.c:5402 +#: ../midori/midori-browser.c:5178 msgid "Add to Speed _dial" -msgstr "Adicionar à ligação rápi_da" +msgstr "Adicionar a ligação rápi_da" -#: ../midori/midori-browser.c:5406 +#: ../midori/midori-browser.c:5182 msgid "Add Shortcut to the _desktop" msgstr "A_dicionar atalho ao ambiente de trabalho" -#: ../midori/midori-browser.c:5408 +#: ../midori/midori-browser.c:5184 msgid "Create _Launcher" msgstr "Criar lança_dor" -#: ../midori/midori-browser.c:5412 +#: ../midori/midori-browser.c:5188 msgid "Subscribe to News _feed" msgstr "Subscrever _fonte de notícias" -#: ../midori/midori-browser.c:5418 +#: ../midori/midori-browser.c:5194 msgid "_Close Tab" msgstr "_Fechar separador" -#: ../midori/midori-browser.c:5419 +#: ../midori/midori-browser.c:5195 msgid "Close the current tab" msgstr "Fechar o separador atual" -#: ../midori/midori-browser.c:5421 +#: ../midori/midori-browser.c:5197 msgid "C_lose Window" msgstr "Fec_har janela" -#: ../midori/midori-browser.c:5425 -msgid "_Share" -msgstr "_Partilhar" - -#: ../midori/midori-browser.c:5430 +#: ../midori/midori-browser.c:5201 msgid "Print the current page" msgstr "Imprimir a página atual" -#: ../midori/midori-browser.c:5433 +#: ../midori/midori-browser.c:5203 msgid "Close a_ll Windows" msgstr "Fechar todas as jane_las" -#: ../midori/midori-browser.c:5436 +#: ../midori/midori-browser.c:5206 msgid "_Edit" msgstr "_Editar" -#: ../midori/midori-browser.c:5459 -msgid "_Find…" -msgstr "_Localizar…" +#: ../midori/midori-browser.c:5229 +msgid "_Find..." +msgstr "_Localizar..." -#: ../midori/midori-browser.c:5460 +#: ../midori/midori-browser.c:5230 msgid "Find a word or phrase in the page" msgstr "Localizar palavra ou frase na página" -#: ../midori/midori-browser.c:5462 +#: ../midori/midori-browser.c:5232 msgid "Find _Next" msgstr "Localizar seg_uinte" -#: ../midori/midori-browser.c:5465 +#: ../midori/midori-browser.c:5235 msgid "Find _Previous" msgstr "Localizar _anterior" -#: ../midori/midori-browser.c:5469 +#: ../midori/midori-browser.c:5239 msgid "Configure the application preferences" msgstr "Configurar preferências da aplicação" -#: ../midori/midori-browser.c:5471 +#: ../midori/midori-browser.c:5241 msgid "_View" msgstr "_Ver" -#: ../midori/midori-browser.c:5472 +#: ../midori/midori-browser.c:5242 msgid "_Toolbars" msgstr "_Barra de ferramentas" -#: ../midori/midori-browser.c:5477 +#: ../midori/midori-browser.c:5247 msgid "Reload page without caching" msgstr "Recarregar página sem colocar em cache" -#: ../midori/midori-browser.c:5487 +#: ../midori/midori-browser.c:5257 msgid "Increase the zoom level" msgstr "Aumentar a ampliação" -#: ../midori/midori-browser.c:5490 +#: ../midori/midori-browser.c:5260 msgid "Decrease the zoom level" msgstr "Diminuir a ampliação" -#: ../midori/midori-browser.c:5494 +#: ../midori/midori-browser.c:5264 msgid "_Encoding" msgstr "_Codificação" -#: ../midori/midori-browser.c:5496 +#: ../midori/midori-browser.c:5266 msgid "View So_urce" -msgstr "Ver código f_onte" +msgstr "Ver f_onte" -#: ../midori/midori-browser.c:5499 +#: ../midori/midori-browser.c:5269 msgid "Ca_ret Browsing" msgstr "Navegação ca_ret" -#: ../midori/midori-browser.c:5503 +#: ../midori/midori-browser.c:5273 msgid "Toggle fullscreen view" msgstr "Alternar para ecrã completo" -#: ../midori/midori-browser.c:5505 +#: ../midori/midori-browser.c:5275 msgid "Scroll _Left" msgstr "Deslocar à _esquerda" -#: ../midori/midori-browser.c:5508 +#: ../midori/midori-browser.c:5278 msgid "Scroll _Down" msgstr "Deslocar para _baixo" -#: ../midori/midori-browser.c:5511 +#: ../midori/midori-browser.c:5281 msgid "Scroll _Up" msgstr "Deslocar para _cima" -#: ../midori/midori-browser.c:5514 +#: ../midori/midori-browser.c:5284 msgid "Scroll _Right" msgstr "Deslocar à _direita" -#: ../midori/midori-browser.c:5517 -msgid "_Readable" -msgstr "Pode se_r lido" - -#: ../midori/midori-browser.c:5520 +#: ../midori/midori-browser.c:5287 msgid "_Go" msgstr "_Ir" -#: ../midori/midori-browser.c:5523 +#: ../midori/midori-browser.c:5290 msgid "Go back to the previous page" msgstr "Ir para a página anterior" +#: ../midori/midori-browser.c:5293 +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:5530 +#: ../midori/midori-browser.c:5297 msgid "Go to the previous sub-page" msgstr "Ir para a sub-página anterior" -#: ../midori/midori-browser.c:5539 -msgid "_Homepage" -msgstr "_Página inicial" +#. i18n: Visit the following logical page, ie. in a forum or blog +#: ../midori/midori-browser.c:5301 +msgid "Go to the next sub-page" +msgstr "Ir para a sub-página seguinte" -#: ../midori/midori-browser.c:5540 +#: ../midori/midori-browser.c:5304 msgid "Go to your homepage" msgstr "Ir para a página inicial" -#: ../midori/midori-browser.c:5542 +#: ../midori/midori-browser.c:5306 msgid "Empty Trash" msgstr "Esvaziar lixo" -#: ../midori/midori-browser.c:5545 +#: ../midori/midori-browser.c:5309 msgid "Undo _Close Tab" -msgstr "Anular _fecho de separadores" +msgstr "Desfazer _fecho de separadores" -#: ../midori/midori-browser.c:5552 +#: ../midori/midori-browser.c:5316 msgid "Add a new _folder" msgstr "Adicionar _nova pasta" -#: ../midori/midori-browser.c:5558 +#: ../midori/midori-browser.c:5322 msgid "_Export bookmarks" msgstr "_Exportar marcadores" -#: ../midori/midori-browser.c:5561 ../midori/midori-searchaction.c:496 +#: ../midori/midori-browser.c:5325 ../midori/midori-searchaction.c:496 msgid "_Manage Search Engines" msgstr "_Gerir motores de pesquisa" -#: ../midori/midori-browser.c:5564 +#: ../midori/midori-browser.c:5328 msgid "_Clear Private Data" msgstr "_Limpar dados privados" -#: ../midori/midori-browser.c:5567 +#: ../midori/midori-browser.c:5331 msgid "_Inspect Page" msgstr "_Inspecionar página" -#: ../midori/midori-browser.c:5571 +#: ../midori/midori-browser.c:5335 msgid "_Previous Tab" msgstr "Separador _anterior" -#: ../midori/midori-browser.c:5574 +#: ../midori/midori-browser.c:5338 msgid "_Next Tab" msgstr "Separador _seguinte" -#: ../midori/midori-browser.c:5576 +#: ../midori/midori-browser.c:5340 msgid "Move Tab _Backward" msgstr "M_over separador para trás" -#: ../midori/midori-browser.c:5578 +#: ../midori/midori-browser.c:5342 msgid "_Move Tab Forward" msgstr "_Mover separador para a frente" -#: ../midori/midori-browser.c:5581 +#: ../midori/midori-browser.c:5345 msgid "Focus _Current Tab" msgstr "_Focar o separador atual" -#: ../midori/midori-browser.c:5584 +#: ../midori/midori-browser.c:5348 msgid "Focus _Next view" msgstr "Focar visualização segui_nte" -#: ../midori/midori-browser.c:5587 +#: ../midori/midori-browser.c:5351 msgid "Only show the Icon of the _Current Tab" msgstr "Apenas mostrar o ícone do separador _atual" -#: ../midori/midori-browser.c:5590 +#: ../midori/midori-browser.c:5354 msgid "_Duplicate Current Tab" msgstr "_Duplicar o separador atual" -#: ../midori/midori-browser.c:5593 +#: ../midori/midori-browser.c:5357 msgid "Close Ot_her Tabs" msgstr "Fec_har os outros separadores" -#: ../midori/midori-browser.c:5596 +#: ../midori/midori-browser.c:5360 msgid "Open last _session" msgstr "Abrir últi_ma sessão" -#: ../midori/midori-browser.c:5599 +#: ../midori/midori-browser.c:5363 msgid "_Help" msgstr "_Ajuda" -#: ../midori/midori-browser.c:5601 +#: ../midori/midori-browser.c:5365 msgid "_Frequent Questions" msgstr "_Questões frequentes" -#: ../midori/midori-browser.c:5604 -msgid "_Report a Problem…" -msgstr "_Reportar um problema…" - -#: ../midori/midori-browser.c:5609 ../midori/midori-browser.c:6270 -msgid "_Tools" -msgstr "Ferramen_tas" +#: ../midori/midori-browser.c:5368 +msgid "_Report a Problem..." +msgstr "_Reportar um problema..." -#: ../midori/midori-browser.c:5616 +#: ../midori/midori-browser.c:5380 msgid "_Menubar" msgstr "Barra de _menu" -#: ../midori/midori-browser.c:5620 +#: ../midori/midori-browser.c:5384 msgid "_Navigationbar" msgstr "Barra de _navegação" -#: ../midori/midori-browser.c:5624 +#: ../midori/midori-browser.c:5388 msgid "Side_panel" msgstr "Painel _lateral" -#: ../midori/midori-browser.c:5625 +#: ../midori/midori-browser.c:5389 msgid "Sidepanel" msgstr "Painel lateral" -#: ../midori/midori-browser.c:5628 +#: ../midori/midori-browser.c:5392 msgid "_Bookmarkbar" msgstr "_Barra de marcadores" -#: ../midori/midori-browser.c:5632 +#: ../midori/midori-browser.c:5396 msgid "_Statusbar" msgstr "Barra de _estado" -#: ../midori/midori-browser.c:5641 ../midori/midori-websettings.c:199 +#: ../midori/midori-browser.c:5405 ../midori/midori-websettings.c:302 msgid "_Automatic" msgstr "_Automático" -#: ../midori/midori-browser.c:5644 ../midori/midori-websettings.c:123 -msgid "Chinese Traditional (BIG5)" -msgstr "Mandarim tradicional (BIG5)" - -#: ../midori/midori-browser.c:5647 ../midori/midori-websettings.c:124 -msgid "Chinese Simplified (GB18030)" -msgstr "mandarim simplificado (GB18030)" +#: ../midori/midori-browser.c:5408 ../midori/midori-websettings.c:227 +msgid "Chinese (BIG5)" +msgstr "Chinês (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5651 +#: ../midori/midori-browser.c:5412 msgid "Japanese (SHIFT__JIS)" msgstr "Japonês (SHIFT__JIS)" -#: ../midori/midori-browser.c:5654 ../midori/midori-websettings.c:126 +#: ../midori/midori-browser.c:5415 ../midori/midori-websettings.c:229 msgid "Korean (EUC-KR)" msgstr "Coreano (EUC-KR)" -#: ../midori/midori-browser.c:5657 ../midori/midori-websettings.c:127 +#: ../midori/midori-browser.c:5418 ../midori/midori-websettings.c:230 msgid "Russian (KOI8-R)" msgstr "Russo (KOI8-R)" -#: ../midori/midori-browser.c:5660 ../midori/midori-websettings.c:128 +#: ../midori/midori-browser.c:5421 ../midori/midori-websettings.c:231 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5663 ../midori/midori-websettings.c:129 +#: ../midori/midori-browser.c:5424 ../midori/midori-websettings.c:232 msgid "Western (ISO-8859-1)" msgstr "Ocidental (ISO-8859-1)" -#: ../midori/midori-browser.c:5666 -msgid "Custom…" -msgstr "Personalizado…" +#: ../midori/midori-browser.c:5427 ../midori/midori-websettings.c:233 +#: ../midori/midori-websettings.c:308 ../katze/katze-utils.c:635 +msgid "Custom..." +msgstr "Personalizado..." -#: ../midori/midori-browser.c:6176 +#: ../midori/midori-browser.c:5907 msgid "_Separator" msgstr "_Separador" -#: ../midori/midori-browser.c:6183 -msgid "_Location…" -msgstr "_Localização…" +#: ../midori/midori-browser.c:5914 +msgid "_Location..." +msgstr "_Localização..." -#: ../midori/midori-browser.c:6185 +#: ../midori/midori-browser.c:5916 msgid "Open a particular location" msgstr "Abrir localização específica" -#: ../midori/midori-browser.c:6207 -msgid "_Web Search…" -msgstr "Pesquisa _web…" +#: ../midori/midori-browser.c:5938 +msgid "_Web Search..." +msgstr "Pesquisa _web..." -#: ../midori/midori-browser.c:6209 +#: ../midori/midori-browser.c:5940 msgid "Run a web search" msgstr "Executar uma pesquisa web" -#: ../midori/midori-browser.c:6236 +#: ../midori/midori-browser.c:5967 msgid "Reopen a previously closed tab or window" msgstr "Reabrir janela ou separador anteriormente fechado" -#: ../midori/midori-browser.c:6253 +#: ../midori/midori-browser.c:5982 msgid "Show the saved bookmarks" msgstr "Mostrar marcadores gravados" -#: ../midori/midori-browser.c:6286 +#: ../midori/midori-browser.c:5996 +msgid "_Tools" +msgstr "Ferramen_tas" + +#: ../midori/midori-browser.c:6011 msgid "_Window" msgstr "_Janela" -#: ../midori/midori-browser.c:6288 +#: ../midori/midori-browser.c:6013 msgid "Show a list of all open tabs" msgstr "Mostrar lista de separadores abertos" -#: ../midori/midori-browser.c:6302 +#: ../midori/midori-browser.c:6027 msgid "_Menu" msgstr "_Menu" -#: ../midori/midori-browser.c:6304 +#: ../midori/midori-browser.c:6029 msgid "Menu" msgstr "Menu" -#: ../midori/midori-browser.c:7134 +#: ../midori/midori-browser.c:6671 #, c-format msgid "Unexpected setting '%s'" msgstr "Definição inesperada \"%s\"" -#: ../midori/midori-extension.c:330 +#: ../midori/midori-extension.c:310 #, c-format 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-extension.c:752 ../midori/midori-extension.c:849 -#: ../midori/midori-extension.c:946 ../midori/midori-extension.c:1058 -#: ../extensions/addons.c:1686 +#: ../midori/midori-extension.c:721 ../midori/midori-extension.c:818 +#: ../midori/midori-extension.c:915 ../midori/midori-extension.c:1027 +#: ../extensions/addons.c:1690 #, 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" -#: ../midori/midori-locationaction.c:398 -#, c-format -msgid "Search with %s" -msgstr "Pesquisar com %s" - -#: ../midori/midori-locationaction.c:418 -msgid "Search with…" -msgstr "Pesquisar _com…" - -#: ../midori/midori-locationaction.c:545 +#: ../midori/midori-locationaction.c:425 #, c-format msgid "Failed to select from history\n" msgstr "Falha ao selecionar do histórico\n" -#: ../midori/midori-locationaction.c:632 +#: ../midori/midori-locationaction.c:509 #, c-format msgid "Search for %s" msgstr "Pesquisar por %s" -#: ../midori/midori-locationaction.c:1227 -msgid "Export certificate" -msgstr "Exportar certificado" - -#: ../midori/midori-locationaction.c:1259 -msgid "The signing certificate authority is not known." -msgstr "A autoridade de certificação não é conhecida." - -#: ../midori/midori-locationaction.c:1261 -msgid "" -"The certificate does not match the expected identity of the site that it was " -"retrieved from." -msgstr "" -"O certificado não coincide com a identidade do sítio para o qual foi obtido." - -#: ../midori/midori-locationaction.c:1263 -msgid "The certificate's activation time is still in the future." -msgstr "A data e hora de ativação do certificado é no futuro." - -#: ../midori/midori-locationaction.c:1265 -msgid "The certificate has expired" -msgstr "O certificado expirou." - -#: ../midori/midori-locationaction.c:1267 -msgid "" -"The certificate has been revoked according to the GTlsConnection's " -"certificate revocation list." -msgstr "" -"O certificado foi revogado de acordo com a lista de revogações " -"GTlsConnection's." - -#: ../midori/midori-locationaction.c:1269 -msgid "The certificate's algorithm is considered insecure." -msgstr "O algoritmo do certificado não é seguro." - -#: ../midori/midori-locationaction.c:1271 -msgid "Some other error occurred validating the certificate." -msgstr "Ocorreram alguns erros ao validar o certificado." - -#: ../midori/midori-locationaction.c:1318 -msgid "_Export certificate" -msgstr "_Exportar certificado" - -#: ../midori/midori-locationaction.c:1333 -msgid "Self-signed" -msgstr "Autoassinado" - -#: ../midori/midori-locationaction.c:1367 -msgid "Security details" -msgstr "Detalhes de segurança" +#: ../midori/midori-locationaction.c:535 +#, c-format +msgid "Search with %s" +msgstr "Pesquisar com %s" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1650 +#: ../midori/midori-locationaction.c:1287 msgid "Paste and p_roceed" msgstr "Cola_r e prosseguir" -#: ../midori/midori-locationaction.c:1974 +#: ../midori/midori-locationaction.c:1656 msgid "Not verified" msgstr "Não verificada" -#: ../midori/midori-locationaction.c:1982 +#: ../midori/midori-locationaction.c:1671 msgid "Verified and encrypted connection" msgstr "Ligação verificada e encriptada" -#: ../midori/midori-locationaction.c:1989 -msgid "Open, unencrypted connection" -msgstr "Ligação aberta e não codificada" - -#: ../midori/midori-panel.c:317 ../midori/midori-panel.c:319 -#: ../midori/midori-panel.c:483 ../midori/midori-panel.c:486 +#: ../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:329 ../midori/midori-panel.c:330 +#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410 msgid "Close panel" msgstr "Fechar painel" -#: ../midori/midori-panel.c:484 ../midori/midori-panel.c:487 +#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566 msgid "Align sidepanel to the left" msgstr "Alinhar painel lateral à esquerda" -#: ../midori/midori-websettings.c:105 +#: ../midori/midori-websettings.c:209 msgid "Show Speed Dial" msgstr "Mostrar ligação rápida" -#: ../midori/midori-websettings.c:106 +#: ../midori/midori-websettings.c:210 msgid "Show Homepage" msgstr "Mostrar página inicial" -#: ../midori/midori-websettings.c:125 +#: ../midori/midori-websettings.c:228 msgid "Japanese (SHIFT_JIS)" msgstr "Japonês (SHIFT_JIS)" -#: ../midori/midori-websettings.c:130 ../midori/midori-websettings.c:206 -#: ../katze/katze-utils.c:633 -msgid "Custom..." -msgstr "Personalizar…" - -#: ../midori/midori-websettings.c:145 +#: ../midori/midori-websettings.c:248 msgid "New tab" msgstr "Novo separador" -#: ../midori/midori-websettings.c:146 +#: ../midori/midori-websettings.c:249 msgid "New window" msgstr "Nova janela" -#: ../midori/midori-websettings.c:147 +#: ../midori/midori-websettings.c:250 msgid "Current tab" msgstr "Separador atual" -#: ../midori/midori-websettings.c:162 +#: ../midori/midori-websettings.c:265 msgid "Default" msgstr "Omissão" -#: ../midori/midori-websettings.c:163 +#: ../midori/midori-websettings.c:266 msgid "Icons" msgstr "Ícones" -#: ../midori/midori-websettings.c:164 +#: ../midori/midori-websettings.c:267 msgid "Small icons" msgstr "Ícones pequenos" -#: ../midori/midori-websettings.c:165 +#: ../midori/midori-websettings.c:268 msgid "Text" msgstr "Texto" -#: ../midori/midori-websettings.c:166 +#: ../midori/midori-websettings.c:269 msgid "Icons and text" msgstr "Ícones e texto" -#: ../midori/midori-websettings.c:167 +#: ../midori/midori-websettings.c:270 msgid "Text beside icons" msgstr "Texto ao lado dos ícones" -#: ../midori/midori-websettings.c:182 +#: ../midori/midori-websettings.c:285 msgid "Automatic (GNOME or environment)" msgstr "Automático (GNOME ou ambiente)" -#: ../midori/midori-websettings.c:183 +#: ../midori/midori-websettings.c:286 msgid "HTTP proxy server" msgstr "Servidor proxy HTTP" -#: ../midori/midori-websettings.c:184 +#: ../midori/midori-websettings.c:287 msgid "No proxy server" msgstr "Sem servidor proxy" -#: ../midori/midori-websettings.c:201 -msgid "Chrome" -msgstr "Chrome" - -#: ../midori/midori-websettings.c:202 +#: ../midori/midori-websettings.c:304 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:203 +#: ../midori/midori-websettings.c:305 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:306 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:307 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:278 -msgid "Toolbar Style:" -msgstr "Estilo da barra de ferramentas:" +#: ../midori/midori-websettings.c:360 +msgid "Remember last window size" +msgstr "Lembrar último tamanho da janela" -#: ../midori/midori-websettings.c:279 -msgid "The style of the toolbar" -msgstr "O estilo da barra de ferramentas" +#: ../midori/midori-websettings.c:361 +msgid "Whether to save the last window size" +msgstr "Marque se quiser gravar o último tamanho da janela" -#: ../midori/midori-websettings.c:288 -msgid "When Midori starts:" -msgstr "Ao iniciar o Midori:" +#: ../midori/midori-websettings.c:369 +msgid "Last window width" +msgstr "Largura da última janela" -#: ../midori/midori-websettings.c:325 -msgid "Open new pages in:" -msgstr "Abrir novas páginas em:" +#: ../midori/midori-websettings.c:370 +msgid "The last saved window width" +msgstr "Última largura de janela gravada" -#. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:388 -msgid "Identify as" -msgstr "Identificar como" +#: ../midori/midori-websettings.c:378 +msgid "Last window height" +msgstr "Altura da última janela" -#: ../midori/midori-websettings.c:389 -msgid "What to identify as to web pages" -msgstr "Identificar nas páginas web como" +#: ../midori/midori-websettings.c:379 +msgid "The last saved window height" +msgstr "Última altura de janela gravada" -#: ../midori/midori-websettings.c:472 -msgid "Always use my font choices" -msgstr "Utilizar sempre as minhas escolhas de tipo de letras" +#: ../midori/midori-websettings.c:404 +msgid "Last panel position" +msgstr "Última posição do painel" -#: ../midori/midori-websettings.c:473 -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-websettings.c:405 +msgid "The last saved panel position" +msgstr "Última posição de painel gravada" -#: ../midori/midori-view.c:1012 ../midori/midori-view.c:1151 -msgid "Trust this website" -msgstr "Confiar neste sítio web" +#. i18n: The internal index of the last opened panel +#: ../midori/midori-websettings.c:414 +msgid "Last panel page" +msgstr "Última página do painel" -#: ../midori/midori-view.c:1149 -msgid "Security unknown" -msgstr "Segurança desconhecida" +#: ../midori/midori-websettings.c:415 +msgid "The last saved panel page" +msgstr "Última página de painel gravada" -#: ../midori/midori-view.c:1447 -#, c-format -msgid "%s wants to save an HTML5 database." -msgstr "%s pretende gravar uma base de dados HTML5." +#: ../midori/midori-websettings.c:423 +msgid "Last Web search" +msgstr "Última pesquisa web" -#: ../midori/midori-view.c:1451 ../midori/midori-view.c:1485 -msgid "_Deny" -msgstr "_Rejeitar" +#: ../midori/midori-websettings.c:424 +msgid "The last saved Web search" +msgstr "Última pesquisa web gravada" -#: ../midori/midori-view.c:1451 ../midori/midori-view.c:1485 -msgid "_Allow" -msgstr "_Permitir" +#: ../midori/midori-websettings.c:433 +msgid "Show Menubar" +msgstr "Mostrar barra de menu" -#: ../midori/midori-view.c:1480 -#, c-format -msgid "%s wants to know your location." -msgstr "%s pretende saber a sua localização." +#: ../midori/midori-websettings.c:434 +msgid "Whether to show the menubar" +msgstr "Marque se quiser mostrar a barra de menu" -#: ../midori/midori-view.c:1576 -#, c-format -msgid "Error - %s" -msgstr "Erro - %s" +#: ../midori/midori-websettings.c:442 +msgid "Show Navigationbar" +msgstr "Mostrar barra de navegação" -#: ../midori/midori-view.c:1577 -#, c-format -msgid "The page '%s' couldn't be loaded." -msgstr "A página \"%s\" não foi carregada." +#: ../midori/midori-websettings.c:443 +msgid "Whether to show the navigationbar" +msgstr "Marque se quiser mostrar a barra de navegação" -#: ../midori/midori-view.c:1579 -msgid "Try again" -msgstr "Tente novamente" +#: ../midori/midori-websettings.c:451 +msgid "Show Bookmarkbar" +msgstr "Mostrar barra de marcadores" -#: ../midori/midori-view.c:1775 ../midori/midori-view.c:2839 -#, c-format -msgid "Send a message to %s" -msgstr "Enviar mensagem a %s" +#: ../midori/midori-websettings.c:452 +msgid "Whether to show the bookmarkbar" +msgstr "Marque se quiser mostrar a barra de marcadores" -#: ../midori/midori-view.c:2622 -msgid "Add _search engine..." -msgstr "Adicionar motor de pe_squisa" +#: ../midori/midori-websettings.c:460 +msgid "Show Panel" +msgstr "Mostrar painel" -#: ../midori/midori-view.c:2666 ../midori/midori-view.c:2995 -msgid "Inspect _Element" -msgstr "Inspecionar _elementos" +#: ../midori/midori-websettings.c:461 +msgid "Whether to show the panel" +msgstr "Marque se quiser mostrar o painel" -#: ../midori/midori-view.c:2718 -msgid "Open Link in New _Tab" -msgstr "_Abrir ligação em novo separador" +#: ../midori/midori-websettings.c:469 +msgid "Show Statusbar" +msgstr "Mostrar barra de estado" -#: ../midori/midori-view.c:2722 -msgid "Open Link in _Foreground Tab" -msgstr "Abrir ligação no _separador principal" +#: ../midori/midori-websettings.c:470 +msgid "Whether to show the statusbar" +msgstr "Marque se quiser mostrar a barra de estado" -#: ../midori/midori-view.c:2723 -msgid "Open Link in _Background Tab" -msgstr "Abrir _ligação no separador secundário" +#: ../midori/midori-websettings.c:479 +msgid "Toolbar Style:" +msgstr "Estilo da barra de ferramentas:" -#: ../midori/midori-view.c:2726 -msgid "Open Link in New _Window" -msgstr "Abrir ligação em _nova janela" +#: ../midori/midori-websettings.c:480 +msgid "The style of the toolbar" +msgstr "O estilo da barra de ferramentas" -#: ../midori/midori-view.c:2729 -msgid "Open Link as Web A_pplication" -msgstr "Abrir ligação como a_plicação web" +#: ../midori/midori-websettings.c:489 +msgid "Toolbar Items" +msgstr "Itens da barra de ferramentas" -#: ../midori/midori-view.c:2734 -msgid "Copy Link de_stination" -msgstr "_Copiar destino da ligação" +#: ../midori/midori-websettings.c:490 +msgid "The items to show on the toolbar" +msgstr "Itens a mostrar na barra de ferramentas" -#: ../midori/midori-view.c:2750 -msgid "Open _Image in New Tab" -msgstr "Abrir _imagem em novo separador" +#: ../midori/midori-websettings.c:498 +msgid "Compact Sidepanel" +msgstr "Compactar painel lateral" -#: ../midori/midori-view.c:2753 -msgid "Copy Im_age" -msgstr "Copiar im_agem" +#: ../midori/midori-websettings.c:499 +msgid "Whether to make the sidepanel compact" +msgstr "Marque se quiser compactar o painel lateral" -#: ../midori/midori-view.c:2756 -msgid "Save I_mage" -msgstr "Gravar image_m" +#: ../midori/midori-websettings.c:514 +msgid "Align sidepanel on the right" +msgstr "Alinhar painel lateral à direita" -#: ../midori/midori-view.c:2759 -msgid "Open in Image _Viewer" -msgstr "Abrir no _visualizador de imagens" +#: ../midori/midori-websettings.c:515 +msgid "Whether to align the sidepanel on the right" +msgstr "Marque se quiser alinhar o painel lateral à direita" -#: ../midori/midori-view.c:2766 -msgid "Copy Video _Address" -msgstr "Copiar _endereço do vídeo" +#: ../midori/midori-websettings.c:530 +msgid "Open panels in separate windows" +msgstr "Abrir painéis em janelas distintas" -#: ../midori/midori-view.c:2769 -msgid "Save _Video" -msgstr "Gravar _vídeo" +#: ../midori/midori-websettings.c:531 +msgid "Whether to always open panels in separate windows" +msgstr "Marque se quiser abrir os painéis em janelas distintas" -#: ../midori/midori-view.c:2769 -msgid "Download _Video" -msgstr "Transferir _vídeo" +#: ../midori/midori-websettings.c:540 +msgid "When Midori starts:" +msgstr "Ao iniciar o Midori:" -#: ../midori/midori-view.c:2795 -msgid "Search _with" -msgstr "Pesquisar _com" +#: ../midori/midori-websettings.c:541 +msgid "What to do when Midori starts" +msgstr "O que fazer ao iniciar o Midori" -#: ../midori/midori-view.c:2827 -msgid "_Search the Web" -msgstr "_Pesquisar na web" +#: ../midori/midori-websettings.c:550 +msgid "Homepage:" +msgstr "Página inicial:" -#: ../midori/midori-view.c:2847 -msgid "Open Address in New _Tab" -msgstr "Abrir endereço em novo _separador" +#: ../midori/midori-websettings.c:551 +msgid "The homepage" +msgstr "A página inicial" -#: ../midori/midori-view.c:2900 -msgid "Open _Frame in New Tab" -msgstr "Abrir mol_dura em novo separador" +#: ../midori/midori-websettings.c:566 +msgid "Show crash dialog" +msgstr "Mostrar janela de encerramento" -#: ../midori/midori-view.c:3155 -#, c-format -msgid "Open or download file from %s" -msgstr "Abrir ou transferir ficheiro de %s" +#: ../midori/midori-websettings.c:567 +msgid "Show a dialog after Midori crashed" +msgstr "Mostrar a janela após o encerramento do Midori" -#: ../midori/midori-view.c:3168 -#, c-format -msgid "File Name: %s" -msgstr "Nome do ficheiro: %s" +#: ../midori/midori-websettings.c:575 +msgid "Save downloaded files to:" +msgstr "Gravar ficheiros transferidos em:" -#: ../midori/midori-view.c:3173 -#, c-format -msgid "File Type: '%s'" -msgstr "Tipo de ficheiro: \"%s\"" +#: ../midori/midori-websettings.c:576 +msgid "The folder downloaded files are saved to" +msgstr "A pasta para gravar as transferências" -#: ../midori/midori-view.c:3175 -#, c-format -msgid "File Type: %s ('%s')" -msgstr "Tipo de ficheiro: %s (\"%s\")" +#: ../midori/midori-websettings.c:584 +msgid "Text Editor" +msgstr "Editor de texto" -#: ../midori/midori-view.c:3212 -#, c-format -msgid "Size: %s" -msgstr "Tamanho: %s" +#: ../midori/midori-websettings.c:585 +msgid "An external text editor" +msgstr "Um editor de texto externo" -#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:3223 -#, c-format -msgid "Open %s" -msgstr "Abrir %s" +#: ../midori/midori-websettings.c:600 +msgid "News Aggregator" +msgstr "Agregador de notícias" -#: ../midori/midori-view.c:3834 -#, c-format -msgid "Inspect page - %s" -msgstr "Inspecionar página - %s" +#: ../midori/midori-websettings.c:601 +msgid "An external news aggregator" +msgstr "Um agregador de notícias externo" -#: ../midori/midori-view.c:4231 -#, c-format -msgid "No documentation installed" -msgstr "Nenhuma documentação instalada" +#: ../midori/midori-websettings.c:609 +msgid "Location entry Search" +msgstr "Pesquisa no endereço" + +#: ../midori/midori-websettings.c:610 +msgid "The search to perform inside the location entry" +msgstr "A pesquisa a executar na barra do endereço" + +#: ../midori/midori-websettings.c:618 +msgid "Preferred Encoding" +msgstr "Codificação preferida" -#: ../midori/midori-view.c:4308 -msgid "Midori doesn't store any personal data:" -msgstr "O Midori não guarda quaisquer dados privados." +#: ../midori/midori-websettings.c:619 +msgid "The preferred character encoding" +msgstr "A codificação de caracteres preferida" -#: ../midori/midori-view.c:4309 -msgid "No history or web cookies are being saved." -msgstr "O histórico e os cookies não são guardados." +#: ../midori/midori-websettings.c:629 +msgid "Always Show Tabbar" +msgstr "Mostrar sempre barra de separadores" + +#: ../midori/midori-websettings.c:630 +msgid "Always show the tabbar" +msgstr "Mostrar sempre barra de separadores" + +#: ../midori/midori-websettings.c:638 +msgid "Close Buttons on Tabs" +msgstr "Ícone fechar nos separadores" -#: ../midori/midori-view.c:4310 -msgid "Extensions are disabled." -msgstr "As extensões estão inativas." +#: ../midori/midori-websettings.c:639 +msgid "Whether tabs have close buttons" +msgstr "Marque se quiser que os separadores tenham ícones para fechar" + +#: ../midori/midori-websettings.c:664 +msgid "Open new pages in:" +msgstr "Abrir novas páginas em:" + +#: ../midori/midori-websettings.c:665 +msgid "Where to open new pages" +msgstr "Onde abrir novas páginas" + +#: ../midori/midori-websettings.c:674 +msgid "Middle click opens Selection" +msgstr "Clique na roda do rato abre seleção" + +#: ../midori/midori-websettings.c:675 +msgid "Load an address from the selection via middle click" +msgstr "Carregar endereço através do clique na roda do rato" -#: ../midori/midori-view.c:4311 -msgid "HTML5 storage, local database and application caches are disabled." +#: ../midori/midori-websettings.c:683 +msgid "Open tabs in the background" +msgstr "Abrir separadores em segundo plano" + +#: ../midori/midori-websettings.c:684 +msgid "Whether to open new tabs in the background" +msgstr "Marque se quiser abrir os novos separadores em segundo plano" + +#: ../midori/midori-websettings.c:692 +msgid "Open Tabs next to Current" +msgstr "Abrir separadores perto do atual" + +#: ../midori/midori-websettings.c:693 +msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "" -"O armazenamento local de HTML5, base de dados e \"cache\" da aplicação estão " -"inativas." +"Marque se quiser abrir os novos separadores perto do atual ou após o último " -#: ../midori/midori-view.c:4312 -msgid "Midori prevents websites from tracking the user:" -msgstr "O Midori impede que os sítios web obtenham dados do utilizador." +#: ../midori/midori-websettings.c:701 +msgid "Open popups in tabs" +msgstr "Abrir \"pop-ups\" em separadores" -#: ../midori/midori-view.c:4313 -msgid "Referrer URLs are stripped down to the hostname." -msgstr "Os URL são removidos do nome do servidor." +#: ../midori/midori-websettings.c:702 +msgid "Whether to open popup windows in tabs" +msgstr "Marque se quiser abrir janelas \"pop-up\" em separadores" -#: ../midori/midori-view.c:4314 -msgid "DNS prefetching is disabled." -msgstr "A obtenção prévia de DNS está inativa." +#: ../midori/midori-websettings.c:712 ../extensions/statusbar-features.c:131 +msgid "Load images automatically" +msgstr "Carregar imagens automaticamente" -#: ../midori/midori-view.c:4315 -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-websettings.c:713 +msgid "Load and display images automatically" +msgstr "Carregar e exibir automaticamente as imagens " -#: ../midori/midori-view.c:4316 -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-websettings.c:720 ../extensions/statusbar-features.c:140 +msgid "Enable scripts" +msgstr "Ativar \"scripts\"" -#: ../midori/midori-view.c:4402 -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-websettings.c:721 +msgid "Enable embedded scripting languages" +msgstr "Ativar linguagem de \"scripts\" incorporados" -#: ../midori/midori-view.c:4451 -msgid "Page loading delayed" -msgstr "Atualização de página atrasada" +#: ../midori/midori-websettings.c:728 ../extensions/statusbar-features.c:149 +msgid "Enable Netscape plugins" +msgstr "Ativar \"plug-ins\" Netscape" -#: ../midori/midori-view.c:4452 -msgid "Loading delayed either due to a recent crash or startup preferences." +#: ../midori/midori-websettings.c:729 +msgid "Enable embedded Netscape plugin objects" +msgstr "Ativar \"plug-ins\" Netscape incorporados" + +#: ../midori/midori-websettings.c:749 +msgid "Enable Spell Checking" +msgstr "Ativar verificação ortográfica" + +#: ../midori/midori-websettings.c:750 +msgid "Enable spell checking while typing" +msgstr "Ativar verificação ortográfica ao escrever" + +#: ../midori/midori-websettings.c:756 +msgid "Enable HTML5 database support" +msgstr "Ativar suporte a dados HTML5" + +#: ../midori/midori-websettings.c:757 +msgid "Whether to enable HTML5 database support" +msgstr "Marque se quiser ativar o suporte a dados HTML5" + +#: ../midori/midori-websettings.c:763 +msgid "Enable HTML5 local storage support" +msgstr "Ativar suporte a armazenagem local HTML5" + +#: ../midori/midori-websettings.c:764 +msgid "Whether to enable HTML5 local storage support" +msgstr "Marque se quiser ativar o suporte à armazenagem local HTML5" + +#: ../midori/midori-websettings.c:770 +msgid "Enable offline web application cache" +msgstr "Ativar \"cache\" de aplicações web \"offline\"" + +#: ../midori/midori-websettings.c:771 +msgid "Whether to enable offline web application cache" +msgstr "Marque se quiser ativar \"cache\" de aplicações web \"offline\"" + +#: ../midori/midori-websettings.c:787 +msgid "Flash window on background tabs" +msgstr "Janela intermitente nos separadores secundários" + +#: ../midori/midori-websettings.c:788 +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:803 +msgid "Zoom Text and Images" +msgstr "Ampliar texto e imagens" + +#: ../midori/midori-websettings.c:804 +msgid "Whether to zoom text and images" +msgstr "Marque se quiser ajustar o texto e as imagens" + +#: ../midori/midori-websettings.c:819 +msgid "Find inline while typing" +msgstr "Encontrar ao escrever" + +#: ../midori/midori-websettings.c:820 +msgid "Whether to automatically find inline while typing" +msgstr "Marque se quiser encontrar automaticamente ao escrever" + +#: ../midori/midori-websettings.c:835 +msgid "Kinetic scrolling" +msgstr "Deslocamento cinético" + +#: ../midori/midori-websettings.c:836 +msgid "Whether scrolling should kinetically move according to speed" msgstr "" -"O atraso na atualização foi devido a um encerramento brusco ou às " -"preferências de arranque." +"Marque se quiser que o deslocamento se mova cineticamente conforme a " +"velocidade" -#: ../midori/midori-view.c:4453 -msgid "Load Page" -msgstr "Carregar página" +#: ../midori/midori-websettings.c:844 +msgid "Delete old Cookies after:" +msgstr "Apagar \"cookies\" após:" -#: ../midori/midori-view.c:4620 -msgid "Blank page" -msgstr "Página em branco" +#: ../midori/midori-websettings.c:845 +msgid "The maximum number of days to save cookies for" +msgstr "O número máximo de dias para guardar os \"cookies\"" -#: ../midori/midori-view.c:4884 -msgid "_Duplicate Tab" -msgstr "_Duplicar separador" +#: ../midori/midori-websettings.c:861 +msgid "Only accept Cookies from sites you visit" +msgstr "Aceitar cookies dos sítios que eu visitar" -#: ../midori/midori-view.c:4889 -msgid "Show Tab _Label" -msgstr "Mostrar _texto do separador" +#: ../midori/midori-websettings.c:862 +msgid "Block cookies sent by third-party websites" +msgstr "Bloquear cookies de sítios de terceiros" -#: ../midori/midori-view.c:4889 -msgid "Show Tab _Icon Only" -msgstr "Mostrar apenas o í_cone" +#: ../midori/midori-websettings.c:876 +msgid "Delete pages from history after:" +msgstr "Apagar páginas no histórico após:" -#: ../midori/midori-view.c:4896 -msgid "Close Ot_her Tab" -msgid_plural "Close Ot_her Tabs" -msgstr[0] "Fec_har o outro separador" -msgstr[1] "Fec_har os outros separadores" +#: ../midori/midori-websettings.c:877 +msgid "The maximum number of days to save the history for" +msgstr "O número máximo de dias para guardar o histórico" -#. i18n: word stem of "previous page" type links, case is not important -#: ../midori/midori-view.c:5653 -msgid "previous" -msgstr "anterior" +#: ../midori/midori-websettings.c:892 +msgid "Proxy server" +msgstr "Servidor proxy" -#. i18n: word stem of "next page" type links, case is not important -#: ../midori/midori-view.c:5672 -msgid "next" -msgstr "seguinte" +#: ../midori/midori-websettings.c:893 +msgid "The type of proxy server to use" +msgstr "O tipo de servidor proxy a utilizar" -#: ../midori/midori-view.c:5685 -msgid "Print background images" -msgstr "Imprimir imagens de fundo" +#: ../midori/midori-websettings.c:902 +msgid "HTTP Proxy Server" +msgstr "Servidor proxy HTTP" -#: ../midori/midori-view.c:5686 -msgid "Whether background images should be printed" -msgstr "Marque se quiser imprimir as imagens de fundo" +#: ../midori/midori-websettings.c:903 +msgid "The proxy server used for HTTP connections" +msgstr "Servidor proxy para ligações HTTP" -#: ../midori/midori-view.c:5718 -msgid "Features" -msgstr "Funcionalidades" +#: ../midori/midori-websettings.c:918 +msgid "Port" +msgstr "Porta" -#. i18n: Download tooltip (size): 4KB of 43MB -#: ../midori/midori-download.vala:48 -#, c-format -msgid "%s of %s" -msgstr "%s de %s" +#: ../midori/midori-websettings.c:919 +msgid "The proxy server port used for HTTP connections" +msgstr "A porta do servidor proxy para ligações HTTP" + +#: ../midori/midori-websettings.c:937 +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:954 +msgid "Identify as" +msgstr "Identificar como" -#: ../midori/midori-download.vala:64 +#: ../midori/midori-websettings.c:955 +msgid "What to identify as to web pages" +msgstr "Identificar nas páginas web como" + +#: ../midori/midori-websettings.c:971 +msgid "Identification string" +msgstr "Texto da identificação" + +#: ../midori/midori-websettings.c:972 +msgid "The application identification string" +msgstr "O texto de identificação da aplicação" + +#: ../midori/midori-websettings.c:988 +msgid "Preferred languages" +msgstr "Idiomas preferidos" + +#: ../midori/midori-websettings.c:989 +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:1004 +msgid "Clear private data" +msgstr "Limpar dados privados" + +#: ../midori/midori-websettings.c:1005 +msgid "The private data selected for deletion" +msgstr "Os dados privados selecionados para apagar" + +#: ../midori/midori-websettings.c:1020 +msgid "Clear data" +msgstr "Limpar dados" + +#: ../midori/midori-websettings.c:1021 +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:1054 +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:1056 +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:1070 +msgid "Always use my font choices" +msgstr "Utilizar sempre as minhas escolhas de tipo de letras" + +#: ../midori/midori-websettings.c:1071 +msgid "Override fonts picked by websites with user preferences" +msgstr "" +"Substituir tipo de letras dos sítios web pelas que forem definidas pelo " +"utilizador" + +#: ../midori/midori-view.c:1343 #, c-format -msgid "%d hour" -msgid_plural "%d hours" -msgstr[0] "%d hora" -msgstr[1] "%d horas" +msgid "%s wants to save an HTML5 database." +msgstr "%s pretende gravar uma base de dados HTML5." -#: ../midori/midori-download.vala:65 +#: ../midori/midori-view.c:1347 ../midori/midori-view.c:1377 +msgid "_Deny" +msgstr "_Rejeitar" + +#: ../midori/midori-view.c:1347 ../midori/midori-view.c:1377 +msgid "_Allow" +msgstr "_Permitir" + +#: ../midori/midori-view.c:1373 #, c-format -msgid "%d minute" -msgid_plural "%d minutes" -msgstr[0] "%d minuto" -msgstr[1] "%d minutos" +msgid "%s wants to know your location." +msgstr "%s pretende saber a sua localização." -#: ../midori/midori-download.vala:66 +#: ../midori/midori-view.c:1461 #, c-format -msgid "%d second" -msgid_plural "%d seconds" -msgstr[0] "%d segundo" -msgstr[1] "%d segundos" +msgid "Error - %s" +msgstr "Erro - %s" -#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning -#: ../midori/midori-download.vala:82 +#: ../midori/midori-view.c:1462 #, c-format -msgid " - %s remaining" -msgstr " - %s restante(s)" +msgid "The page '%s' couldn't be loaded." +msgstr "A página \"%s\" não foi carregada." -#. i18n: Unknown number of bytes, used for transfer rate like ?B/s -#: ../midori/midori-download.vala:92 -msgid "?B" -msgstr "?B" +#: ../midori/midori-view.c:1464 +msgid "Try again" +msgstr "Tente novamente" -#. i18n: Download tooltip (transfer rate): (130KB/s) -#: ../midori/midori-download.vala:94 +#: ../midori/midori-view.c:1626 ../midori/midori-view.c:2471 #, c-format -msgid " (%s/s)" -msgstr " (%s/s)" +msgid "Send a message to %s" +msgstr "Enviar mensagem a %s" -#: ../midori/midori-download.vala:188 -msgid "The downloaded file is erroneous." -msgstr "O ficheiro transferido contém erros." +#: ../midori/midori-view.c:2313 ../midori/midori-view.c:2624 +msgid "Inspect _Element" +msgstr "Inspecionar _elementos" -#: ../midori/midori-download.vala:189 -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." +#: ../midori/midori-view.c:2363 +msgid "Open Link in New _Tab" +msgstr "_Abrir ligação em novo separador" + +#: ../midori/midori-view.c:2367 +msgid "Open Link in _Foreground Tab" +msgstr "Abrir ligação no _separador principal" + +#: ../midori/midori-view.c:2368 +msgid "Open Link in _Background Tab" +msgstr "Abrir _ligação no separador secundário" + +#: ../midori/midori-view.c:2371 +msgid "Open Link in New _Window" +msgstr "Abrir ligação em _nova janela" + +#: ../midori/midori-view.c:2374 +msgid "Open Link as Web A_pplication" +msgstr "Abrir ligação como a_plicação web" + +#: ../midori/midori-view.c:2377 +msgid "Copy Link de_stination" +msgstr "_Copiar destino da ligação" + +#: ../midori/midori-view.c:2389 +msgid "Open _Image in New Tab" +msgstr "Abrir _imagem em novo separador" + +#: ../midori/midori-view.c:2392 +msgid "Copy Image _Address" +msgstr "Copiar _endereço da imagem" + +#: ../midori/midori-view.c:2395 +msgid "Save I_mage" +msgstr "Gravar image_m" + +#: ../midori/midori-view.c:2402 +msgid "Copy Video _Address" +msgstr "Copiar _endereço do vídeo" + +#: ../midori/midori-view.c:2405 +msgid "Save _Video" +msgstr "Gravar _vídeo" -#: ../midori/midori-download.vala:302 +#: ../midori/midori-view.c:2405 +msgid "Download _Video" +msgstr "Transferir _vídeo" + +#: ../midori/midori-view.c:2431 +msgid "Search _with" +msgstr "Pesquisar _com" + +#: ../midori/midori-view.c:2463 +msgid "_Search the Web" +msgstr "_Pesquisar na web" + +#: ../midori/midori-view.c:2479 +msgid "Open Address in New _Tab" +msgstr "Abrir endereço em novo _separador" + +#: ../midori/midori-view.c:2775 +msgid "Open or download file" +msgstr "Abrir ou transferir ficheiro" + +#: ../midori/midori-view.c:2794 #, c-format -msgid "The file \"%s\" can't be saved in this folder." -msgstr "O ficheiro \"%s\" não pode ser gravado nesta pasta." +msgid "File Type: '%s'" +msgstr "Tipo de ficheiro: '%s' " -#: ../midori/midori-download.vala:304 -msgid "You don't have permission to write in this location." -msgstr "Não tem permissão para escrever nesta localização." +#: ../midori/midori-view.c:2796 +#, c-format +msgid "File Type: %s ('%s')" +msgstr "Tipo de ficheiro: %s ('%s')" -#: ../midori/midori-download.vala:307 +#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" +#: ../midori/midori-view.c:2813 #, c-format -msgid "There is not enough free space to download \"%s\"." -msgstr "Não possui espaço suficiente para transferir \"%s\"." +msgid "Open %s" +msgstr "Abrir %s" -#: ../midori/midori-download.vala:309 +#: ../midori/midori-view.c:3405 #, c-format -msgid "The file needs %s but only %s are left." -msgstr "Precisa de %s e apenas tem livre %s." +msgid "Inspect page - %s" +msgstr "Inspecionar página - %s" -#: ../midori/midori-speeddial.vala:180 +#: ../midori/midori-view.c:3692 msgid "Speed Dial" msgstr "Ligação rápida" -#: ../midori/midori-speeddial.vala:181 ../midori/midori-speeddial.vala:261 -msgid "Click to add a shortcut" -msgstr "Clique para adicionar atalho" +#: ../midori/midori-view.c:3693 ../midori/midori-view.c:3789 +msgid "Click to add a shortcut" +msgstr "Clique para adicionar atalho" + +#: ../midori/midori-view.c:3694 +msgid "Enter shortcut address" +msgstr "Introduza endereço do atalho" + +#: ../midori/midori-view.c:3695 +msgid "Enter shortcut title" +msgstr "Introduza título do atalho" + +#: ../midori/midori-view.c:3696 +msgid "Are you sure you want to delete this shortcut?" +msgstr "Tem a certeza que quer apagar este atalho?" + +#: ../midori/midori-view.c:3860 +#, c-format +msgid "No documentation installed" +msgstr "Nenhuma documentação instalada" + +#: ../midori/midori-view.c:3910 +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:3955 +msgid "Page loading delayed" +msgstr "Atualização de página atrasada" + +#: ../midori/midori-view.c:3956 +msgid "Loading delayed either due to a recent crash or startup preferences." +msgstr "" +"O atraso na atualização foi devido a um encerramento brusco ou às " +"preferências de arranque." + +#: ../midori/midori-view.c:3957 +msgid "Load Page" +msgstr "Carregar página" + +#: ../midori/midori-view.c:4097 +msgid "Blank page" +msgstr "Página em branco" + +#: ../midori/midori-view.c:4361 +msgid "_Duplicate Tab" +msgstr "_Duplicar separador" + +#: ../midori/midori-view.c:4366 +msgid "Show Tab _Label" +msgstr "Mostrar _texto do separador" + +#: ../midori/midori-view.c:4366 +msgid "Show Tab _Icon Only" +msgstr "Mostrar apenas o í_cone" + +#: ../midori/midori-view.c:4372 +msgid "Close ot_her Tabs" +msgstr "Fec_har outros separadores" + +#. i18n: word stem of "previous page" type links, case is not important +#: ../midori/midori-view.c:4989 +msgid "previous" +msgstr "anterior" + +#. i18n: word stem of "next page" type links, case is not important +#: ../midori/midori-view.c:5008 +msgid "next" +msgstr "seguinte" -#: ../midori/midori-speeddial.vala:182 -msgid "Enter shortcut address" -msgstr "Introduza o endereço do atalho" +#: ../midori/midori-view.c:5021 +msgid "Print background images" +msgstr "Imprimir imagens de fundo" -#: ../midori/midori-speeddial.vala:183 -msgid "Enter shortcut title" -msgstr "Introduza o título do atalho" +#: ../midori/midori-view.c:5022 +msgid "Whether background images should be printed" +msgstr "Marque se quiser imprimir as imagens de fundo" -#: ../midori/midori-speeddial.vala:184 -msgid "Are you sure you want to delete this shortcut?" -msgstr "Tem a certeza que quer apagar este atalho?" +#: ../midori/midori-view.c:5054 +msgid "Features" +msgstr "Funcionalidades" -#: ../midori/midori-preferences.c:299 +#: ../midori/midori-preferences.c:297 msgid "Startup" -msgstr "Arranque" - -#: ../midori/midori-preferences.c:305 -msgid "Homepage:" -msgstr "Página inicial:" +msgstr "Início" -#: ../midori/midori-preferences.c:313 +#: ../midori/midori-preferences.c:310 msgid "Use _current page" msgstr "Utili_zar página atual" -#: ../midori/midori-preferences.c:317 +#: ../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:326 +#: ../midori/midori-preferences.c:323 msgid "Fonts" msgstr "Tipo de letra" -#: ../midori/midori-preferences.c:329 +#: ../midori/midori-preferences.c:326 msgid "Proportional Font Family" msgstr "Família de letras proporcionais" -#: ../midori/midori-preferences.c:333 +#: ../midori/midori-preferences.c:330 msgid "The default font family used to display text" msgstr "A família das letras a utilizar para exibir o texto" -#: ../midori/midori-preferences.c:336 +#: ../midori/midori-preferences.c:333 msgid "The default font size used to display text" msgstr "O tamanho das letras utilizadas para exibir o texto" -#: ../midori/midori-preferences.c:338 +#: ../midori/midori-preferences.c:335 msgid "Fixed-width Font Family" msgstr "Letras com largura fixa" -#: ../midori/midori-preferences.c:342 +#: ../midori/midori-preferences.c:339 msgid "The font family used to display fixed-width text" msgstr "A família de letras utilizada para exibir o texto com largura fixa" -#: ../midori/midori-preferences.c:345 +#: ../midori/midori-preferences.c:342 msgid "The font size used to display fixed-width text" msgstr "O tamanho das letras utilizadas para exibir o texto com largura fixa" -#: ../midori/midori-preferences.c:347 +#: ../midori/midori-preferences.c:344 msgid "Minimum Font Size" msgstr "Tamanho mínimo da letra" -#: ../midori/midori-preferences.c:351 +#: ../midori/midori-preferences.c:348 msgid "The minimum font size used to display text" msgstr "Tamanho mínimo da letra para exibir o texto" -#: ../midori/midori-preferences.c:356 -msgid "Preferred Encoding" -msgstr "Codificação preferida" - #. Page "Behavior" -#: ../midori/midori-preferences.c:363 +#: ../midori/midori-preferences.c:359 msgid "Behavior" msgstr "Comportamento" -#: ../midori/midori-preferences.c:367 ../extensions/statusbar-features.c:155 -msgid "Load images automatically" -msgstr "Carregar imagens automaticamente" - -#: ../midori/midori-preferences.c:370 -msgid "Enable Spell Checking" -msgstr "Ativar verificação ortográfica" - -#: ../midori/midori-preferences.c:384 ../extensions/statusbar-features.c:165 -msgid "Enable scripts" -msgstr "Ativar \"scripts\"" - -#: ../midori/midori-preferences.c:387 ../extensions/statusbar-features.c:177 -msgid "Enable Netscape plugins" -msgstr "Ativar \"plug-ins\" Netscape" - -#: ../midori/midori-preferences.c:392 -msgid "Zoom Text and Images" -msgstr "Ampliar texto e imagens" - -#: ../midori/midori-preferences.c:395 +#: ../midori/midori-preferences.c:385 msgid "Allow scripts to open popups" msgstr "Permitir que os \"scripts\" abram \"pop-ups\"" -#: ../midori/midori-preferences.c:396 +#: ../midori/midori-preferences.c:386 msgid "Whether scripts are allowed to open popup windows automatically" msgstr "" -"Marque para permitir que os \"scripts\" abram janelas \"pop-up\" " -"automaticamente" - -#: ../midori/midori-preferences.c:402 -msgid "Kinetic scrolling" -msgstr "Deslocamento cinético" - -#: ../midori/midori-preferences.c:403 -msgid "Whether scrolling should kinetically move according to speed" -msgstr "" -"Marque se quiser que o deslocamento se mova cineticamente conforme a " -"velocidade" - -#: ../midori/midori-preferences.c:408 -msgid "Middle click opens Selection" -msgstr "Clique na roda do rato abre seleção" - -#: ../midori/midori-preferences.c:409 -msgid "Load an address from the selection via middle click" -msgstr "Carregar endereço através do clique na roda do rato" - -#: ../midori/midori-preferences.c:415 -msgid "Enable WebGL support" -msgstr "Ativar suporte a WebGL" - -#: ../midori/midori-preferences.c:420 -msgid "Flash window on background tabs" -msgstr "Janela intermitente nos separadores secundários" - -#: ../midori/midori-preferences.c:425 -msgid "Preferred languages" -msgstr "Idiomas preferidos" - -#: ../midori/midori-preferences.c:429 -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-preferences.c:431 -msgid "Save downloaded files to:" -msgstr "Gravar ficheiros transferidos em:" +"Marque se quiser que os \"scripts\" abram janelas \"pop-up\" automaticamente" #. Page "Interface" -#: ../midori/midori-preferences.c:438 +#: ../midori/midori-preferences.c:409 msgid "Browsing" msgstr "Navegar" -#: ../midori/midori-preferences.c:454 -msgid "Close Buttons on Tabs" -msgstr "Botão Fechar nos separadores" - -#: ../midori/midori-preferences.c:458 -msgid "Always Show Tabbar" -msgstr "Mostrar sempre barra de separadores" - -#: ../midori/midori-preferences.c:462 -msgid "Open Tabs next to Current" -msgstr "Abrir separadores perto do atual" - -#: ../midori/midori-preferences.c:463 -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 atual ou após o último " - -#: ../midori/midori-preferences.c:466 -msgid "Open tabs in the background" -msgstr "Abrir separadores em segundo plano" - -#: ../midori/midori-preferences.c:470 -msgid "Text Editor" -msgstr "Editor de texto" - -#: ../midori/midori-preferences.c:475 -msgid "News Aggregator" -msgstr "Agregador de notícias" - #. Page "Network" -#: ../midori/midori-preferences.c:482 +#: ../midori/midori-preferences.c:447 msgid "Network" msgstr "Rede" -#: ../midori/midori-preferences.c:484 -msgid "Proxy server" -msgstr "Servidor proxy" - -#: ../midori/midori-preferences.c:489 +#: ../midori/midori-preferences.c:454 msgid "Hostname" msgstr "Nome de anfitrião" -#: ../midori/midori-preferences.c:497 -msgid "Port" -msgstr "Porta" - -#: ../midori/midori-preferences.c:509 ../midori/midori-preferences.c:512 -msgid "The maximum size of cached pages on disk" -msgstr "O tamanho máximo, no disco, das páginas em cache" - -#: ../midori/midori-preferences.c:514 +#: ../midori/midori-preferences.c:478 msgid "MB" msgstr "MB" -#: ../midori/midori-searchaction.c:1074 +#: ../midori/midori-searchaction.c:907 msgid "Add search engine" msgstr "Adicionar motor de pesquisa" -#: ../midori/midori-searchaction.c:1074 +#: ../midori/midori-searchaction.c:907 msgid "Edit search engine" msgstr "Editar motor de pesquisa" -#: ../midori/midori-searchaction.c:1102 +#: ../midori/midori-searchaction.c:936 msgid "_Name:" msgstr "_Nome:" -#: ../midori/midori-searchaction.c:1117 +#: ../midori/midori-searchaction.c:952 msgid "_Description:" msgstr "_Descrição:" -#: ../midori/midori-searchaction.c:1130 ../extensions/feed-panel/main.c:377 -msgid "_Address:" -msgstr "_Endereço:" +#: ../midori/midori-searchaction.c:985 +msgid "_Icon:" +msgstr "Í_cone:" -#: ../midori/midori-searchaction.c:1149 +#: ../midori/midori-searchaction.c:999 msgid "_Token:" msgstr "\"_Token\":" -#: ../midori/midori-searchaction.c:1447 +#: ../midori/midori-searchaction.c:1299 msgid "Manage Search Engines" msgstr "Gerir motores de pesquisa" -#: ../midori/midori-searchaction.c:1549 +#: ../midori/midori-searchaction.c:1399 msgid "Use as _default" msgstr "Usar por _omissão" -#: ../midori/sokoke.c:355 +#: ../midori/sokoke.c:406 msgid "Open with" msgstr "Abrir com" -#: ../midori/sokoke.c:363 +#: ../midori/sokoke.c:414 #, c-format msgid "Choose an application or command to open \"%s\":" msgstr "Escolha a aplicação ou comando para abrir \"%s\":" -#: ../midori/sokoke.c:478 ../midori/sokoke.c:492 +#: ../midori/sokoke.c:455 ../midori/sokoke.c:465 ../midori/sokoke.c:493 +#: ../midori/sokoke.c:522 ../midori/sokoke.c:536 msgid "Could not run external program." msgstr "Não é possível executar o programa externo." +#: ../midori/sokoke.c:1673 +#, c-format +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "%d hora" +msgstr[1] "%d horas" + +#: ../midori/sokoke.c:1674 +#, c-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "%d minuto" +msgstr[1] "%d minutos" + +#: ../midori/sokoke.c:1675 +#, c-format +msgid "%d second" +msgid_plural "%d seconds" +msgstr[0] "%d segundo" +msgstr[1] "%d segundos" + +#. i18n: Download tooltip (size): 4KB of 43MB +#: ../midori/sokoke.c:1683 ../panels/midori-transfers.c:267 +#, c-format +msgid "%s of %s" +msgstr "%s de %s" + +#. i18n: Unknown number of bytes, used for transfer rate like ?B/s +#: ../midori/sokoke.c:1692 +msgid "?B" +msgstr "?B" + +#. i18n: Download tooltip (transfer rate): (130KB/s) +#: ../midori/sokoke.c:1695 +#, c-format +msgid " (%s/s)" +msgstr " (%s/s)" + +#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning +#: ../midori/sokoke.c:1712 +#, c-format +msgid " - %s remaining" +msgstr " - %s restante(s)" + #. i18n: A panel at the bottom, to search text in pages -#: ../toolbars/midori-findbar.c:265 +#: ../toolbars/midori-findbar.c:264 msgid "_Inline Find:" msgstr "Local_izar:" -#: ../toolbars/midori-findbar.c:287 +#: ../toolbars/midori-findbar.c:291 msgid "Previous" msgstr "Anterior" -#: ../toolbars/midori-findbar.c:293 +#: ../toolbars/midori-findbar.c:297 msgid "Next" msgstr "Seguinte" -#: ../toolbars/midori-findbar.c:297 +#: ../toolbars/midori-findbar.c:301 msgid "Match Case" msgstr "Sensível a maiúsculas" -#: ../toolbars/midori-findbar.c:306 +#: ../toolbars/midori-findbar.c:310 msgid "Highlight Matches" msgstr "Realçar ocorrências" -#: ../toolbars/midori-findbar.c:317 +#: ../toolbars/midori-findbar.c:321 msgid "Close Findbar" msgstr "Fechar" -#: ../toolbars/midori-transferbar.c:109 +#: ../toolbars/midori-transferbar.c:122 #, c-format msgid "The file '%s' has been downloaded." msgstr "O ficheiro \"%s\" foi transferido." -#: ../toolbars/midori-transferbar.c:114 +#: ../toolbars/midori-transferbar.c:125 msgid "Transfer completed" msgstr "Transferência concluída" -#: ../toolbars/midori-transferbar.c:239 ../panels/midori-transfers.c:139 +#: ../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 disponibilizado 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:331 ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "Limpar tudo" -#: ../toolbars/midori-transferbar.c:272 ../toolbars/midori-transferbar.c:274 +#: ../toolbars/midori-transferbar.c:368 ../toolbars/midori-transferbar.c:370 msgid "Some files are being downloaded" msgstr "Existem ficheiros a ser transferidos" -#: ../toolbars/midori-transferbar.c:278 +#: ../toolbars/midori-transferbar.c:374 msgid "_Quit Midori" msgstr "_Sair do Midori" -#: ../toolbars/midori-transferbar.c:280 +#: ../toolbars/midori-transferbar.c:376 msgid "The transfers will be cancelled if Midori quits." msgstr "As transferências serão canceladas se sair do Midori." -#: ../panels/midori-bookmarks.c:308 +#: ../panels/midori-bookmarks.c:113 +msgid "Bookmarks" +msgstr "Marcadores" + +#: ../panels/midori-bookmarks.c:260 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "Falha ao adicionar marcador: %s\n" -#: ../panels/midori-bookmarks.c:475 -#, c-format -msgid "Failed to update bookmark : %s\n" -msgstr "Falha ao atualizar marcador: %s\n" - -#: ../panels/midori-bookmarks.c:535 +#: ../panels/midori-bookmarks.c:440 msgid "Edit the selected bookmark" msgstr "Editar o marcador selecionado" -#: ../panels/midori-bookmarks.c:543 +#: ../panels/midori-bookmarks.c:448 msgid "Delete the selected bookmark" msgstr "Apagar o marcador selecionado" -#: ../panels/midori-bookmarks.c:558 +#: ../panels/midori-bookmarks.c:463 msgid "Add a new folder" msgstr "Adicionar nova pasta" -#: ../panels/midori-bookmarks.c:697 ../panels/midori-history.c:638 +#: ../panels/midori-bookmarks.c:597 ../panels/midori-history.c:579 msgid "Separator" msgstr "Separador" -#. Create the filter entry -#: ../panels/midori-bookmarks.c:1027 -msgid "Search Bookmarks" -msgstr "Procurar nos marcadores" - -#: ../panels/midori-history.c:111 +#: ../panels/midori-history.c:110 msgid "History" msgstr "Histórico" -#: ../panels/midori-history.c:158 ../panels/midori-history.c:189 -msgid "Today" -msgstr "Hoje" - -#: ../panels/midori-history.c:160 ../panels/midori-history.c:191 -msgid "Yesterday" -msgstr "Ontem" +#: ../panels/midori-history.c:142 +msgid "A week ago" +msgstr "Uma semana atrás" -#: ../panels/midori-history.c:162 ../panels/midori-history.c:186 +#: ../panels/midori-history.c:144 #, 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:165 ../panels/midori-history.c:184 -msgid "A week ago" -msgstr "Uma semana atrás" +#: ../panels/midori-history.c:147 +msgid "Today" +msgstr "Hoje" -#: ../panels/midori-history.c:232 -#, c-format -msgid "Failed to remove history item: %s\n" -msgstr "Falha ao remover histórico: %s\n" +#: ../panels/midori-history.c:149 +msgid "Yesterday" +msgstr "Ontem" -#: ../panels/midori-history.c:360 +#: ../panels/midori-history.c:317 msgid "Are you sure you want to remove all history items?" msgstr "Tem a certeza de que quer remover todo o histórico?" -#: ../panels/midori-history.c:407 +#: ../panels/midori-history.c:363 msgid "Bookmark the selected history item" msgstr "Marcar o item de histórico selecionado" -#: ../panels/midori-history.c:416 +#: ../panels/midori-history.c:372 msgid "Delete the selected history item" msgstr "Apagar o item de histórico selecionado" -#: ../panels/midori-history.c:424 +#: ../panels/midori-history.c:380 msgid "Clear the entire history" msgstr "Limpar todo o histórico" -#. Create the filter entry -#: ../panels/midori-history.c:997 -msgid "Search History" -msgstr "Procurar no histórico" - -#: ../panels/midori-transfers.c:87 +#: ../panels/midori-transfers.c:86 msgid "Transfers" msgstr "Transferências" -#: ../panels/midori-transfers.c:435 +#: ../panels/midori-transfers.c:467 msgid "Open Destination _Folder" msgstr "Abrir pas_ta de destino" -#: ../panels/midori-transfers.c:438 +#: ../panels/midori-transfers.c:470 msgid "Copy Link Loc_ation" msgstr "Copiar localização da lig_ação" @@ -2083,76 +2168,68 @@ msgstr "Senha" msgid "_Remember password" msgstr "_Lembrar senha" -#: ../katze/katze-throbber.c:949 +#: ../katze/katze-throbber.c:942 #, c-format msgid "Named icon '%s' couldn't be loaded" msgstr "O ícone \"%s\" não foi carregado" -#: ../katze/katze-throbber.c:962 +#: ../katze/katze-throbber.c:955 #, c-format msgid "Stock icon '%s' couldn't be loaded" msgstr "O ícone \"%s\" não foi carregado" -#: ../katze/katze-throbber.c:1042 +#: ../katze/katze-throbber.c:1035 msgid "Animation frames are broken" -msgstr "As \"frames\" de animação estão danificadas" +msgstr "As frames de animação estão corrompidas" -#: ../katze/katze-utils.c:443 ../katze/katze-utils.c:866 +#: ../katze/katze-utils.c:439 ../katze/katze-utils.c:873 #, c-format msgid "Property '%s' is invalid for %s" msgstr "A propriedade \"%s\" é inválida para %s" -#: ../katze/katze-utils.c:489 ../katze/katze-utils.c:518 -#: ../extensions/addons.c:309 +#: ../katze/katze-utils.c:485 ../katze/katze-utils.c:514 +#: ../extensions/addons.c:308 msgid "Choose file" msgstr "Escolha o ficheiro" -#: ../katze/katze-utils.c:504 +#: ../katze/katze-utils.c:500 msgid "Choose folder" msgstr "Escolha a pasta" -#: ../katze/katze-utils.c:602 +#: ../katze/katze-utils.c:604 msgid "None" msgstr "Nenhum" -#: ../katze/katze-utils.c:717 +#: ../katze/katze-utils.c:719 msgid "1 hour" msgstr "1 hora" -#: ../katze/katze-utils.c:718 +#: ../katze/katze-utils.c:720 msgid "1 day" msgstr "1 dia" -#: ../katze/katze-utils.c:719 +#: ../katze/katze-utils.c:721 msgid "1 week" msgstr "1 semana" -#: ../katze/katze-utils.c:720 +#: ../katze/katze-utils.c:722 msgid "1 month" msgstr "1 mês" -#: ../katze/katze-utils.c:721 +#: ../katze/katze-utils.c:723 msgid "1 year" msgstr "1 ano" -#: ../katze/katze-preferences.c:98 ../extensions/history-list.vala:235 +#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235 #, c-format msgid "Preferences for %s" msgstr "Preferências para %s" -#: ../katze/midori-uri.vala:168 -msgid "MD5-Checksum:" -msgstr "Verificação MD5:" - -#: ../katze/midori-uri.vala:175 -msgid "SHA1-Checksum:" -msgstr "Verificação SHA1:" - -#: ../extensions/adblock.c:495 +#: ../extensions/adblock.c:434 msgid "Configure Advertisement filters" msgstr "Configurar filtros de publicidade" -#: ../extensions/adblock.c:528 +#: ../extensions/adblock.c:465 #, c-format msgid "" "Type the address of a preconfigured filter list in the text entry and click " @@ -2162,131 +2239,131 @@ msgstr "" "\"Adicionar\" para a adicionar à lista.\n" "Pode encontrar mais listas em %s." -#: ../extensions/adblock.c:944 +#: ../extensions/adblock.c:831 msgid "Edit rule" msgstr "Editar regra" -#: ../extensions/adblock.c:958 +#: ../extensions/adblock.c:845 msgid "_Rule:" msgstr "_Regra:" -#: ../extensions/adblock.c:1012 +#: ../extensions/adblock.c:899 msgid "Bl_ock image" msgstr "Bl_oquear imagem" -#: ../extensions/adblock.c:1017 +#: ../extensions/adblock.c:904 msgid "Bl_ock link" msgstr "Bl_oquear ligação" -#: ../extensions/adblock.c:1915 +#: ../extensions/adblock.c:1495 msgid "Advertisement blocker" msgstr "Bloqueador de publicidade" -#: ../extensions/adblock.c:1916 +#: ../extensions/adblock.c:1496 msgid "Block advertisements according to a filter list" msgstr "Bloquear publicidade de acordo com o filtro" #. i18n: An infobar shows up when viewing a script on userscripts.org -#: ../extensions/addons.c:222 +#: ../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:223 +#: ../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:228 +#: ../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:229 +#: ../extensions/addons.c:228 msgid "_Install user style" msgstr "_Instalar estilo de utilizador" -#: ../extensions/addons.c:237 +#: ../extensions/addons.c:236 msgid "Don't install" msgstr "Não instalar" -#: ../extensions/addons.c:320 ../extensions/addons.c:675 +#: ../extensions/addons.c:319 ../extensions/addons.c:681 msgid "Userscripts" msgstr "\"Scripts\" de utilizador" -#: ../extensions/addons.c:325 ../extensions/addons.c:677 +#: ../extensions/addons.c:324 ../extensions/addons.c:683 msgid "Userstyles" msgstr "Estilos de utilizador" -#: ../extensions/addons.c:371 ../extensions/addons.c:450 +#: ../extensions/addons.c:380 ../extensions/addons.c:459 #: ../extensions/feed-panel/main.c:129 msgid "Error" msgstr "Erro" -#: ../extensions/addons.c:412 +#: ../extensions/addons.c:421 #, c-format msgid "Do you want to delete '%s'?" -msgstr "Pretende apagar \"%s\"?" +msgstr "Deseja realmente apagar \"%s\"?" -#: ../extensions/addons.c:418 +#: ../extensions/addons.c:427 msgid "Delete user script" msgstr "Apagar \"script\" de utilizador" -#: ../extensions/addons.c:419 +#: ../extensions/addons.c:428 msgid "Delete user style" msgstr "Apagar estilo de utilizador" -#: ../extensions/addons.c:422 +#: ../extensions/addons.c:431 #, c-format msgid "The file %s will be permanently deleted." msgstr "O ficheiro \"%s\" será apagado permanentemente." -#: ../extensions/addons.c:564 ../extensions/addons.c:641 +#: ../extensions/addons.c:570 ../extensions/addons.c:647 msgid "Open in Text Editor" msgstr "Abrir no editor de texto" -#: ../extensions/addons.c:566 ../extensions/addons.c:650 +#: ../extensions/addons.c:572 ../extensions/addons.c:656 msgid "Open Target Folder" msgstr "Abrir pasta de destino" -#: ../extensions/addons.c:632 +#: ../extensions/addons.c:638 msgid "Add new addon" msgstr "Adicionar novo extra" -#: ../extensions/addons.c:658 +#: ../extensions/addons.c:664 msgid "Remove selected addon" msgstr "Remover o extra selecionado" -#: ../extensions/addons.c:1687 ../extensions/addons.c:1905 +#: ../extensions/addons.c:1691 ../extensions/addons.c:1909 msgid "User addons" msgstr "Extras de utilizador" -#: ../extensions/addons.c:1817 +#: ../extensions/addons.c:1821 #, c-format msgid "Can't monitor folder '%s': %s" msgstr "Não é possível vigiar a pasta \"%s\": %s " -#: ../extensions/addons.c:1906 +#: ../extensions/addons.c:1910 msgid "Support for userscripts and userstyles" msgstr "Suporte a \"scripts\" e estilos de utilizador" -#: ../extensions/colorful-tabs.c:201 +#: ../extensions/colorful-tabs.c:202 msgid "Colorful Tabs" msgstr "Separadores coloridos" -#: ../extensions/colorful-tabs.c:202 +#: ../extensions/colorful-tabs.c:203 msgid "Tint each tab distinctly" msgstr "Cor distinta para cada separador" -#: ../extensions/cookie-manager/cookie-manager-page.c:73 +#: ../extensions/cookie-manager/cookie-manager-page.c:80 #: ../extensions/cookie-manager/main.c:35 msgid "Cookie Manager" -msgstr "Gestor de cookies" +msgstr "Gestor de \"cookies\"" -#: ../extensions/cookie-manager/cookie-manager-page.c:103 +#: ../extensions/cookie-manager/cookie-manager-page.c:110 msgid "Delete All" msgstr "Apagar todos" -#: ../extensions/cookie-manager/cookie-manager-page.c:105 +#: ../extensions/cookie-manager/cookie-manager-page.c:112 msgid "" "Deletes all shown cookies. If a filter is set, only those cookies are " "deleted which match the filter." @@ -2294,31 +2371,31 @@ 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:120 +#: ../extensions/cookie-manager/cookie-manager-page.c:127 msgid "Expand All" -msgstr "Expandir tudo" +msgstr "Expandir todos" -#: ../extensions/cookie-manager/cookie-manager-page.c:127 +#: ../extensions/cookie-manager/cookie-manager-page.c:134 msgid "Collapse All" -msgstr "Recolher tudo" +msgstr "Contrair todos" -#: ../extensions/cookie-manager/cookie-manager-page.c:572 +#: ../extensions/cookie-manager/cookie-manager-page.c:576 msgid "Do you really want to delete all cookies?" -msgstr "Deseja realmente apagar todos os cookies?" +msgstr "Deseja realmente apagar todos os \"cookies\"?" -#: ../extensions/cookie-manager/cookie-manager-page.c:574 +#: ../extensions/cookie-manager/cookie-manager-page.c:578 msgid "Question" msgstr "Pergunta" -#: ../extensions/cookie-manager/cookie-manager-page.c:583 +#: ../extensions/cookie-manager/cookie-manager-page.c:587 msgid "Only cookies which match the filter will be deleted." -msgstr "Só serão apagados os cookies que coincidam com o filtro." +msgstr "Apenas serão apagados os \"cookies\" que coincidam com o filtro." -#: ../extensions/cookie-manager/cookie-manager-page.c:671 +#: ../extensions/cookie-manager/cookie-manager-page.c:675 msgid "At the end of the session" msgstr "No fim da sessão" -#: ../extensions/cookie-manager/cookie-manager-page.c:674 +#: ../extensions/cookie-manager/cookie-manager-page.c:678 #, c-format msgid "" "Host: %s\n" @@ -2335,15 +2412,15 @@ msgstr "" "Seguro: %s\n" "Expira: %s" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:684 msgid "Yes" msgstr "Sim" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:684 msgid "No" msgstr "Não" -#: ../extensions/cookie-manager/cookie-manager-page.c:694 +#: ../extensions/cookie-manager/cookie-manager-page.c:698 #, c-format msgid "" "Domain: %s\n" @@ -2352,25 +2429,33 @@ msgstr "" "Domínio: %s\n" "\"Cookies\": %d" -#: ../extensions/cookie-manager/cookie-manager-page.c:1017 +#: ../extensions/cookie-manager/cookie-manager-page.c:1028 msgid "Name" msgstr "Nome" -#: ../extensions/cookie-manager/cookie-manager-page.c:1069 +#: ../extensions/cookie-manager/cookie-manager-page.c:1081 msgid "_Expand All" -msgstr "_Expandir tudo" +msgstr "_Expandir todos" -#: ../extensions/cookie-manager/cookie-manager-page.c:1077 +#: ../extensions/cookie-manager/cookie-manager-page.c:1089 msgid "_Collapse All" -msgstr "Re_colher tudo" +msgstr "_Contrair todos" + +#: ../extensions/cookie-manager/cookie-manager-page.c:1142 +msgid "Filter:" +msgstr "Filtro:" -#: ../extensions/cookie-manager/cookie-manager-page.c:1129 -msgid "Search Cookies by Name or Domain" -msgstr "Procurar \"cookies\" por nome ou domínio" +#: ../extensions/cookie-manager/cookie-manager-page.c:1147 +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:36 msgid "List, view and delete cookies" -msgstr "Listar, ver e apagar cookies" +msgstr "Listar, ver e apagar \"cookies\"" #: ../extensions/copy-tabs.c:38 msgid "Copy Tab _Addresses" @@ -2465,70 +2550,45 @@ msgstr "Painel de fontes" msgid "Read Atom/ RSS feeds" msgstr "Ler fontes Atom/RSS" -#: ../extensions/formhistory/formhistory.c:39 +#: ../extensions/formhistory.c:143 #, c-format msgid "Failed to add form value: %s\n" msgstr "Falha ao adicionar o valor de formulário: %s\n" -#: ../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 +#: ../extensions/formhistory.c:295 msgid "Toggle form history state" msgstr "Alternar estado do histórico de formulários" -#: ../extensions/formhistory/formhistory.c:438 +#: ../extensions/formhistory.c:296 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 +#: ../extensions/formhistory.c:432 ../extensions/formhistory.c:436 #, 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/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.c:511 +msgid "only activate form history via hotkey (Ctrl+Shift+F) per tab" +msgstr "" +"Ativar apenas através das teclas de atalho e por separador (Ctrl+Shift+F)" -#: ../extensions/formhistory/formhistory.c:669 +#: ../extensions/formhistory.c:570 msgid "Stores history of entered form data" msgstr "Armazena o histórico do formulário" -#: ../extensions/formhistory/formhistory-gdom-frontend.c:225 -#: ../extensions/formhistory/formhistory-js-frontend.c:106 +#: ../extensions/formhistory.c:574 #, c-format -msgid "Failed to select suggestions\n" -msgstr "Falha ao selecionar as sugestões\n" +msgid "Not available: %s" +msgstr "Não disponível: %s" + +#: ../extensions/formhistory.c:575 +msgid "Resource files not installed" +msgstr "O ficheiro não está instalado" + +#: ../extensions/formhistory.c:581 +msgid "Form history filler" +msgstr "Preenchimento do formulário" #: ../extensions/history-list.vala:197 msgid "There are no unvisited tabs" @@ -2577,13 +2637,13 @@ 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" +msgstr "Exibir, em segundo plano, o separador selecionado " -#: ../extensions/history-list.vala:566 +#: ../extensions/history-list.vala:569 msgid "History List" msgstr "Lista de histórico" -#: ../extensions/history-list.vala:567 +#: ../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" @@ -2604,15 +2664,15 @@ msgstr "Atualizar página ou parar de carregar" msgid "Customize Keyboard shortcuts" msgstr "Personalizar atalhos de teclado" -#: ../extensions/shortcuts.c:283 +#: ../extensions/shortcuts.c:285 msgid "Customize Sh_ortcuts..." -msgstr "Personalizar atalh_os…" +msgstr "Personalizar atalh_os..." -#: ../extensions/shortcuts.c:320 +#: ../extensions/shortcuts.c:322 msgid "Shortcuts" msgstr "Atalhos" -#: ../extensions/shortcuts.c:321 +#: ../extensions/shortcuts.c:323 msgid "View and edit keyboard shortcuts" msgstr "Ver e editar os atalhos de teclado" @@ -2624,35 +2684,35 @@ msgstr "Relógio de barra de estado" msgid "Display date and time in the statusbar" msgstr "Mostrar data e hora na barra de estado" -#: ../extensions/statusbar-features.c:152 +#: ../extensions/statusbar-features.c:128 msgid "Images" msgstr "Imagens" -#: ../extensions/statusbar-features.c:162 +#: ../extensions/statusbar-features.c:137 msgid "Scripts" msgstr "\"Scripts\"" -#: ../extensions/statusbar-features.c:174 +#: ../extensions/statusbar-features.c:146 msgid "Netscape plugins" msgstr "\"Plug-ins\" Netscape" -#: ../extensions/statusbar-features.c:259 +#: ../extensions/statusbar-features.c:192 msgid "Statusbar Features" msgstr "Funções na barra de estado" -#: ../extensions/statusbar-features.c:260 +#: ../extensions/statusbar-features.c:193 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:589 ../extensions/tab-panel.c:676 +#: ../extensions/tab-panel.c:596 ../extensions/tab-panel.c:683 msgid "Tab Panel" msgstr "Painel de separadores" -#: ../extensions/tab-panel.c:659 +#: ../extensions/tab-panel.c:666 msgid "T_ab Panel" msgstr "P_ainel de separadores" -#: ../extensions/tab-panel.c:677 +#: ../extensions/tab-panel.c:684 msgid "Show tabs in a vertical panel" msgstr "Mostrar separadores num painel vertical" @@ -2664,301 +2724,397 @@ msgstr "Por omissão, mostrar apenas os ícones" msgid "New tabs have no label by default" msgstr "Os novos separadores não mostram texto" -#: ../extensions/toolbar-editor.c:395 +#: ../extensions/toolbar-editor.c:393 msgid "Customize Toolbar" msgstr "Personalizar barra de ferramentas" -#: ../extensions/toolbar-editor.c:411 +#: ../extensions/toolbar-editor.c:413 msgid "" -"Select items to be displayed on the toolbar. Items can be reordered by drag " +"Select items to be displayed on the toolbar. Items can be reodered 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:427 +#: ../extensions/toolbar-editor.c:429 msgid "Available Items" msgstr "Itens disponíveis" -#: ../extensions/toolbar-editor.c:448 +#: ../extensions/toolbar-editor.c:450 msgid "Displayed Items" -msgstr "Itens exibidos" +msgstr "Itens a exibir" -#: ../extensions/toolbar-editor.c:588 -msgid "_Customize Toolbar…" -msgstr "Personalizar barra de ferramen_tas…" +#: ../extensions/toolbar-editor.c:585 +msgid "Customize _Toolbar..." +msgstr "Personalizar barra de ferramen_tas..." -#: ../extensions/toolbar-editor.c:617 +#: ../extensions/toolbar-editor.c:601 +msgid "_Customize..." +msgstr "Personali_zar..." + +#: ../extensions/toolbar-editor.c:631 msgid "Toolbar Editor" msgstr "Editor da barra de ferramentas" -#: ../extensions/toolbar-editor.c:618 +#: ../extensions/toolbar-editor.c:632 msgid "Easily edit the toolbar layout" msgstr "Editar facilmente a barra de ferramentas" -#: ../extensions/web-cache.c:462 +#: ../extensions/web-cache.c:463 msgid "Cache HTTP communication on disk" msgstr "Pôr comunicações HTTP em cache" -#~ msgid "Remember last window size" -#~ msgstr "Lembrar último tamanho da janela" +#~ msgid "Don't save any private data while browsing" +#~ msgstr "Não gravar quaisquer dados privados ao navegar" -#~ msgid "Whether to save the last window size" -#~ msgstr "Marque se quiser gravar o último tamanho da janela" +#~ msgid "Add shortcut to speed dial" +#~ msgstr "Adicionar atalho à ligação rápida" -#~ msgid "Last window width" -#~ msgstr "Largura da última janela" +#~ msgid "Add shortcut to the desktop" +#~ msgstr "Adicionar atalho ao ambiente de trabalho" -#~ msgid "The last saved window width" -#~ msgstr "Última largura de janela gravada" +#~ msgid "Create a launcher" +#~ msgstr "Criar um lançador" -#~ msgid "Last window height" -#~ msgstr "Altura da última janela" +#~ msgid "Subscribe to this news feed" +#~ msgstr "Subscrever a esta fonte de notícias" -#~ msgid "The last saved window height" -#~ msgstr "Última altura de janela gravada" +#~ msgid "Close this window" +#~ msgstr "Fechar esta janela" -#~ msgid "Last panel position" -#~ msgstr "Última posição do painel" +#~ msgid "Close all open windows" +#~ msgstr "Fechar todas as janelas abertas" -#~ msgid "The last saved panel position" -#~ msgstr "Última posição de painel gravada" +#~ msgid "Undo the last modification" +#~ msgstr "Desfazer a última modificação" -#~ msgid "Last panel page" -#~ msgstr "Última página do painel" +#~ msgid "Redo the last modification" +#~ msgstr "Refazer a última modificação" -#~ msgid "The last saved panel page" -#~ msgstr "Última página de painel gravada" +#~ msgid "Cut the selected text" +#~ msgstr "Cortar o texto selecionado" -#~ msgid "Last Web search" -#~ msgstr "Última pesquisa web" +#~ msgid "Copy the selected text" +#~ msgstr "Copiar o texto selecionado" -#~ msgid "The last saved Web search" -#~ msgstr "Última pesquisa web gravada" +#~ msgid "Paste text from the clipboard" +#~ msgstr "Colar texto da área de transferência" -#~ msgid "Show Menubar" -#~ msgstr "Mostrar barra de menu" +#~ msgid "Delete the selected text" +#~ msgstr "Apagar o texto selecionado" -#~ msgid "Whether to show the menubar" -#~ msgstr "Marque se quiser mostrar a barra de menu" +#~ msgid "Select all text" +#~ msgstr "Selecionar tudo" -#~ msgid "Show Navigationbar" -#~ msgstr "Mostrar barra de navegação" +#~ msgid "Find the next occurrence of a word or phrase" +#~ msgstr "Localizar a ocorrência seguinte da palavra ou frase" -#~ msgid "Whether to show the navigationbar" -#~ msgstr "Marque se quiser mostrar a barra de navegação" +#~ msgid "Find the previous occurrence of a word or phrase" +#~ msgstr "Localizar a ocorrência anterior da palavra ou frase" -#~ msgid "Show Bookmarkbar" -#~ msgstr "Mostrar barra de marcadores" +#~ msgid "Reset the zoom level" +#~ msgstr "Repor ampliação" -#~ msgid "Whether to show the bookmarkbar" -#~ msgstr "Marque se quiser mostrar a barra de marcadores" +#~ msgid "View the source code of the page" +#~ msgstr "Ver o código fonte da página" -#~ msgid "Show Panel" -#~ msgstr "Mostrar painel" +#~ msgid "Scroll to the left" +#~ msgstr "Deslocar para a esquerda" -#~ msgid "Whether to show the panel" -#~ msgstr "Marque se quiser mostrar o painel" +#~ msgid "Scroll down" +#~ msgstr "Deslocar para baixo" -#~ msgid "Show Statusbar" -#~ msgstr "Mostrar barra de estado" +#~ msgid "Scroll up" +#~ msgstr "Deslocar para cima" -#~ msgid "Whether to show the statusbar" -#~ msgstr "Marque se quiser mostrar a barra de estado" +#~ msgid "Scroll to the right" +#~ msgstr "Deslocar para a direita" -#~ msgid "Toolbar Items" -#~ msgstr "Itens da barra de ferramentas" +#~ msgid "Delete the contents of the trash" +#~ msgstr "Apagar o conteúdo do lixo" -#~ msgid "The items to show on the toolbar" -#~ msgstr "Itens a mostrar na barra de ferramentas" +#~ msgid "Open the last closed tab" +#~ msgstr "Abrir último separador fechado" -#~ msgid "Compact Sidepanel" -#~ msgstr "Compactar painel lateral" +#~ msgid "Add a new bookmark folder" +#~ msgstr "Adicionar nova pasta de marcadores" -#~ msgid "Whether to make the sidepanel compact" -#~ msgstr "Marque se quiser compactar o painel lateral" +#~ msgid "Add, edit and remove search engines..." +#~ msgstr "Adicionar, editar e remover motores de pesquisa..." -#~ msgid "Align sidepanel on the right" -#~ msgstr "Alinhar painel lateral à direita" +#~ msgid "Clear private data..." +#~ msgstr "Limpar dados privados..." -#~ msgid "Whether to align the sidepanel on the right" -#~ msgstr "Marque se quiser alinhar o painel lateral à direita" +#~ msgid "Inspect page details and access developer tools..." +#~ msgstr "Inspecionar página e aceder às ferramentas de desenvolvimento..." -#~ msgid "Open panels in separate windows" -#~ msgstr "Abrir painéis em janelas distintas" +#~ msgid "Switch to the previous tab" +#~ msgstr "Mudar para o separador anterior" -#~ msgid "Whether to always open panels in separate windows" -#~ msgstr "Marque se quiser abrir os painéis em janelas distintas" +#~ msgid "Switch to the next tab" +#~ msgstr "Mudar para o separador seguinte" -#~ msgid "What to do when Midori starts" -#~ msgstr "O que fazer ao iniciar o Midori" +#~ msgid "Move tab behind the previous tab" +#~ msgstr "Mover separador para trás do anterior" -#~ msgid "The homepage" -#~ msgstr "A página inicial" +#~ msgid "Move tab in front of the next tab" +#~ msgstr "Mover separador para a frente do seguinte" -#~ msgid "Show crash dialog" -#~ msgstr "Mostrar janela de encerramento" +#~ msgid "Focus the current tab" +#~ msgstr "Focar o separador atual" -#~ msgid "The folder downloaded files are saved to" -#~ msgstr "A pasta para gravar as transferências" +#~ msgid "Cycle focus between views" +#~ msgstr "Alternar foco entre visualizações" -#~ msgid "An external text editor" -#~ msgstr "Um editor de texto externo" +#~ msgid "Only show the icon of the current tab" +#~ msgstr "Apenas mostrar o ícone do separador atual" -#~ msgid "An external news aggregator" -#~ msgstr "Um agregador de notícias externo" +#~ msgid "Duplicate the current tab" +#~ msgstr "Duplicar o separador atual" -#~ msgid "Location entry Search" -#~ msgstr "Pesquisa no endereço" +#~ msgid "Close all tabs except the current tab" +#~ msgstr "Fechar todos os separadores excepto o atual" -#~ msgid "The search to perform inside the location entry" -#~ msgstr "A pesquisa a executar na barra do endereço" +#~ msgid "Open the tabs saved in the last session" +#~ msgstr "Abrir separadores gravados na última sessão" -#~ msgid "The preferred character encoding" -#~ msgstr "A codificação de caracteres preferida" +#~ msgid "Show the Frequently Asked Questions" +#~ msgstr "Mostrar questões frequentes" -#~ msgid "Always show the tabbar" -#~ msgstr "Mostrar sempre barra de separadores" +#~ msgid "Open Midori's bug tracker" +#~ msgstr "Abrir registo de erros do Midori" -#~ msgid "Whether tabs have close buttons" -#~ msgstr "Marque se quiser que os separadores tenham os ícones para fechar" +#~ msgid "Show information about the program" +#~ msgstr "Mostrar informação sobre o programa" -#~ msgid "Where to open new pages" -#~ msgstr "Onde abrir novas páginas" +#~ msgid "Show menubar" +#~ msgstr "Mostrar a barra de menu" -#~ msgid "Whether to open new tabs in the background" -#~ msgstr "Marque se quiser abrir os novos separadores em segundo plano" +#~ msgid "Show navigationbar" +#~ msgstr "Mostrar a barra de navegação" -#~ msgid "Open popups in tabs" -#~ msgstr "Abrir \"pop-ups\" em separadores" +#~ msgid "Show sidepanel" +#~ msgstr "Mostrar o painel lateral" -#~ msgid "Whether to open popup windows in tabs" -#~ msgstr "Marque se quiser abrir janelas \"pop-up\" em separadores" +#~ msgid "Show bookmarkbar" +#~ msgstr "Mostrar a barra de marcadores" -#~ msgid "Load and display images automatically" -#~ msgstr "Carregar e exibir automaticamente as imagens " +#~ msgid "Show statusbar" +#~ msgstr "Mostrar a barra de estado" -#~ msgid "Enable embedded scripting languages" -#~ msgstr "Ativar linguagem de \"scripts\" incorporados" +#~ msgid "MD5-Checksum:" +#~ msgstr "Código MD5:" -#~ msgid "Enable embedded Netscape plugin objects" -#~ msgstr "Ativar \"plug-ins\" Netscape incorporados" +#~ msgid "SHA1-Checksum:" +#~ msgstr "Código SHA1:" -#~ msgid "Enable spell checking while typing" -#~ msgstr "Ativar verificação ortográfica ao escrever" +#~ msgid "No filename specified" +#~ msgstr "Nenhum nome especificado" -#~ msgid "Enable HTML5 database support" -#~ msgstr "Ativar suporte a dados HTML5" +#~ msgid "Set number of columns and rows" +#~ msgstr "Defina o número de colunas e linhas" -#~ msgid "Whether to enable HTML5 database support" -#~ msgstr "Marque se quiser ativar o suporte a dados HTML5" +#~ msgid "Enter number of columns and rows:" +#~ msgstr "Indique o número de colunas e linhas:" -#~ msgid "Whether to enable HTML5 local storage support" -#~ msgstr "Marque se quiser ativar o suporte à armazenagem local HTML5" +#~ msgid "Invalid input for the size of the speed dial" +#~ msgstr "Entrada inválida para o tamanho da ligação rápida" -#~ msgid "Whether to enable offline web application cache" -#~ msgstr "Marque se quiser ativar \"cache\" de aplicações web \"offline\"" +#~ msgid "Thumb size:" +#~ msgstr "Tamanho das miniaturas:" -#~ 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" +#~ msgid "Small" +#~ msgstr "Pequenas" -#~ msgid "Allow websites to use OpenGL rendering" -#~ msgstr "Permite que os sítios web utilizem o OpenGL" +#~ msgid "Medium" +#~ msgstr "Médias" -#~ msgid "Whether to zoom text and images" -#~ msgstr "Marque se quiser ajustar o texto e as imagens" +#~ msgid "Big" +#~ msgstr "Grandes" -#~ msgid "Find inline while typing" -#~ msgstr "Encontrar ao escrever" +#~ msgid "Reset the last _session" +#~ msgstr "Restaurar últi_ma sessão" -#~ msgid "Whether to automatically find inline while typing" -#~ msgstr "Marque se quiser encontrar automaticamente ao escrever" +#~ msgid "Configure _Advertisement filters..." +#~ msgstr "_Configurar filtros de publicidade..." -#~ msgid "The type of proxy server to use" -#~ msgstr "O tipo de servidor proxy a utilizar" +#~ msgid "Not found - %s" +#~ msgstr "Não encontrada(o) - %s" -#~ msgid "HTTP Proxy Server" -#~ msgstr "Servidor proxy HTTP" +#~ msgid "Document cannot be displayed" +#~ msgstr "O documento não pôde ser exibido" -#~ msgid "The proxy server used for HTTP connections" -#~ msgstr "Servidor proxy para ligações HTTP" +#~ msgid "Enforce 96 dots per inch" +#~ msgstr "Forçar 96 pontos por polegada" -#~ msgid "The proxy server port used for HTTP connections" -#~ msgstr "A porta do servidor proxy para ligações HTTP" +#~ msgid "Enforce a video dot density of 96 DPI" +#~ msgstr "Forçar densidade de vídeo de 96 PPP" -#~ msgid "Identification string" -#~ msgstr "Texto da identificação" +#~ msgid "Switch tabs with Ctrl+Tab sorted by last usage" +#~ msgstr "Troque de separadores com Ctrl+Tab " -#~ msgid "The application identification string" -#~ msgstr "O texto de identificação da aplicação" +#~ msgid "_Form History" +#~ msgstr "Histórico de formulários" -#~ msgid "Clear private data" -#~ msgstr "Limpar dados privados" +#~ msgid "Web Cookies" +#~ msgstr "\"Web cookies\"" -#~ msgid "The private data selected for deletion" -#~ msgstr "Os dados privados selecionados para apagar" +#~ msgid "Delete old cookies after 1 hour" +#~ msgstr "Apagar \"cookies\" após 1 hora" -#~ msgid "Clear data" -#~ msgstr "Limpar dados" +#~ msgid "Delete old cookies after 1 week" +#~ msgstr "Apagar \"cookies\" após 1 semana" -#~ msgid "The data selected for deletion" -#~ msgstr "Os dados selecionados para apagar" +#~ msgid "Delete old cookies after 1 month" +#~ msgstr "Apagar \"cookies\" após 1 mês" -#~ msgid "Filter:" -#~ msgstr "Filtro:" +#~ msgid "Delete old cookies after 1 year" +#~ msgstr "Apagar \"cookies\" após 1 ano" -#~ msgid "" -#~ "Enter a filter string to show only cookies whose name or domain field " -#~ "match the entered filter" +#~ msgid "All cookies" +#~ msgstr "Todos os \"cookies\"" + +#~ msgid "Session cookies" +#~ msgstr "\"Cookies\" da sessão" + +#~ msgid "Show Transferbar" +#~ msgstr "Mostrar barra de transferências" + +#~ msgid "Whether to show the transferbar" +#~ msgstr "Marque se quiser mostrar a barra de transferências" + +#~ msgid "Search engines in location completion" +#~ msgstr "Motores de pesquisa na conclusão do endereço" + +#~ msgid "Whether to show search engines in the location completion" #~ msgstr "" -#~ "Introduza um filtro para só mostrar os \"cookies\" cujo nome ou domínio " -#~ "coincidam com o filtro" +#~ "Marque se quiser mostrar motores de pesquisa na conclusão do endereço" + +#~ msgid "Show operating controls of the panel" +#~ msgstr "Mostrar os controlos operacionais do painel" + +#~ msgid "Whether to show the operating controls of the panel" +#~ msgstr "Marque se quiser mostrar os controlos operacionais do painel" + +#~ msgid "Show speed dial in new tabs" +#~ msgstr "Mostrar ligação rápida em novos separadores" + +#~ msgid "Show speed dial in newly opened tabs" +#~ msgstr "Mostrar ligação rápida nos separadores abertos recentemente" + +#~ msgid "Download Manager" +#~ msgstr "Gestor de transferências" + +#~ msgid "An external download manager" +#~ msgstr "Um gestor de transferências 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 de \"cookies\"" + +#~ msgid "Maximum history age" +#~ msgstr "Antiguidade máxima do histórico" + +#~ msgid "Remember last downloaded files" +#~ msgstr "Lembrar últimas transferências " + +#~ msgid "Whether the last downloaded files are saved" +#~ msgstr "Marque se quiser guardar as últimas transferências" + +#~ msgid "General" +#~ msgstr "Geral" + +#~ msgid "Appearance" +#~ msgstr "Aparência" + +#~ msgid "Font settings" +#~ msgstr "Definições de letra" + +#~ msgid "Navigationbar" +#~ msgstr "Barra de navegação" + +#~ msgid "Interface" +#~ msgstr "Interface" + +#~ msgid "Applications" +#~ msgstr "Aplicações" + +#~ msgid "External applications" +#~ msgstr "Aplicações externas" + +#~ msgid "Delete cookies when quitting Midori" +#~ msgstr "Apagar \"cookies\" ao sair do Midori" + +#~ msgid "Failed to execute database statement\n" +#~ msgstr "Falha ao executar o relatório da base de dados:\n" + +#~ msgid "Next Tab (History List)" +#~ msgstr "Separador seguinte (lista de histórico)" + +#~ msgid "Previous Tab (History List)" +#~ msgstr "Separador anterior (lista de histórico)" + +#~ msgid "Previous tab from history" +#~ msgstr "Separador anterior do histórico" + +#~ msgid "Download with Download _Manager" +#~ msgstr "Transferir com g_estor de transferências" -#~ msgid "Close ot_her Tabs" -#~ msgstr "Fec_har outros separadores" +#~ msgid "%s of %s, %s/s" +#~ msgstr "%s de %s, %s/s" -#~ msgid "_Icon:" -#~ msgstr "Í_cone:" +#~ msgid "Open target folder for selected addon" +#~ msgstr "Abrir pasta de destino para o extra selecionado" -#~ msgid "Load page" -#~ msgstr "Carregar página" +#~ msgid "Pageholder" +#~ msgstr "Fixador de página" -#~ msgid "_Bookmark" -#~ msgstr "_Marcador" +#~ msgid "_Pageholder" +#~ msgstr "Fixador de _página" -#~ msgid "_Console" -#~ msgstr "_Consola" +#~ msgid "Keep one or multiple pages open in parallel to your tabs" +#~ msgstr "Manter uma/várias páginas abertas em paralelo aos separadores" -#~ msgid "Toplevel folder" -#~ msgstr "Pasta superior" +#~ msgid "Quit the application" +#~ msgstr "Sair da aplicação" -#~ msgid "_Title:" -#~ msgstr "_Título:" +#~ msgid "Show Blank page" +#~ msgstr "Mostrar página em branco" -#~ msgid "_Folder:" -#~ msgstr "_Pasta:" +#~ msgid "_Contents" +#~ msgstr "_Conteúdo" -#~ msgid "_Customize…" -#~ msgstr "Personali_zar…" +#~ msgid "Show the documentation" +#~ msgstr "Mostrar documentação" -#~ msgid "The bookmarks couldn't be saved. %s" -#~ msgstr "Os marcadores não foram gravados. %s" +#~ msgid "_Save Link destination" +#~ msgstr "_Gravar destino da ligação" -#~ msgid "The specified configuration folder is invalid." -#~ msgstr "A pasta de configuração especificada é inválida." +#~ msgid "_Download Link destination" +#~ msgstr "_Transferir destino da ligação" -#~ msgid "Cookies" -#~ msgstr "\"Cookies\"" +#~ msgid "%d%% loaded" +#~ msgstr "%d%% carregado" -#~ msgid "'Flash' Cookies" -#~ msgstr "\"Cookies Flash\"" +#~ msgid "_Transferbar" +#~ msgstr "Barra de _transferências" -#~ msgid "HTML5 _Databases" -#~ msgstr "Bases de _dados HTML5" +#~ msgid "Show transferbar" +#~ msgstr "Mostrar a barra de transferências" -#~ msgid "Offline Application Cache" -#~ msgstr "\"Cache\" de aplicações \"offline\"" +#~ msgid "Show progress in location entry" +#~ msgstr "Mostrar evolução no endereço" -#~ msgid "Lightweight web browser" -#~ msgstr "Navegador Web rápido" +#~ msgid "Whether to show loading progress in the location entry" +#~ msgstr "Marque se quiser mostrar a evolução de carregamento do endereço" diff --git a/po/pt_BR.po b/po/pt_BR.po index 61929af0..4e5ca5cf 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -3,16 +3,15 @@ # This file is distributed under the same license as the midori package. # Rogério Brito 2009 # Sergio Cipolla 2010, 2011 -# Rafael Ferreira 2012 # msgid "" msgstr "" "Project-Id-Version: Midori 0.2.9\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-03 21:15+0000\n" -"PO-Revision-Date: 2012-08-14 22:47-0300\n" -"Last-Translator: Rafael Ferreira \n" -"Language-Team: Brazilian Portuguese \n" +"POT-Creation-Date: 2011-10-26 10:10+0000\n" +"PO-Revision-Date: 2011-06-09 18:00-0300\n" +"Last-Translator: Sérgio Cipolla \n" +"Language-Team: Brazilian Portuguese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -20,127 +19,89 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../data/midori.desktop.in.h:1 -msgid "Browse the Web" -msgstr "Navegue na Web" +msgid "Lightweight web browser" +msgstr "Navegador web leve" -#: ../data/midori.desktop.in.h:2 -msgid "Internet;WWW;Explorer" -msgstr "Internet;WWW;Explorer" - -#: ../data/midori.desktop.in.h:3 ../midori/main.c:1937 ../midori/main.c:1961 -#: ../midori/main.c:1975 ../midori/midori-websettings.c:199 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:2033 ../midori/main.c:2057 +#: ../midori/main.c:2073 ../midori/midori-websettings.c:297 msgid "Midori" msgstr "Midori" -#: ../data/midori.desktop.in.h:4 -msgid "Midori Web Browser" -msgstr "Navegador Web Midori" - -#: ../data/midori.desktop.in.h:5 -msgid "New Private Browsing Window" -msgstr "Nova janela de navegação privada" - -#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1420 -msgid "New Tab" -msgstr "Nova aba" - -#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1417 -msgid "New Window" -msgstr "Nova janela" - -#: ../data/midori.desktop.in.h:8 +#: ../data/midori.desktop.in.h:3 msgid "Web Browser" msgstr "Navegador web" -#: ../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:4375 -msgid "Private Browsing" -msgstr "Navegação Privada" - -#: ../midori/main.c:91 ../midori/main.c:97 +#: ../midori/main.c:107 ../midori/main.c:113 #, 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:145 +#: ../midori/main.c:161 #, c-format msgid "Value '%s' is invalid for %s" msgstr "O valor '%s' é inválido para %s" -#: ../midori/main.c:150 ../midori/main.c:254 +#: ../midori/main.c:166 ../midori/main.c:259 #, c-format msgid "Invalid configuration value '%s'" msgstr "Valor de configuração '%s' inválido " -#: ../midori/main.c:365 +#: ../midori/main.c:364 #, 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:419 +#: ../midori/main.c:418 #, c-format msgid "Failed to clear history: %s\n" msgstr "Falha ao limpar o histórico: %s\n" -#: ../midori/main.c:441 ../extensions/formhistory/formhistory.c:531 +#: ../midori/main.c:438 ../midori/main.c:559 ../extensions/formhistory.c:423 #, 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:513 +#: ../midori/main.c:502 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Falha ao excluir itens antigos do histórico: %s\n" -#: ../midori/main.c:535 +#: ../midori/main.c:542 ../panels/midori-history.c:194 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "Falha ao excluir item do histórico: %s\n" + +#: ../midori/main.c:589 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "Os favoritos não puderam ser salvos. %s" + +#: ../midori/main.c:623 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "A configuração não pôde ser salva. %s" -#: ../midori/main.c:561 +#: ../midori/main.c:658 #, 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:598 +#: ../midori/main.c:684 ../midori/main.c:704 #, c-format msgid "The trash couldn't be saved. %s" msgstr "O lixo não pôde ser salvo. %s" -#: ../midori/main.c:671 ../panels/midori-extensions.c:90 +#: ../midori/main.c:738 ../panels/midori-extensions.c:92 msgid "Extensions" msgstr "Extensões" -#: ../midori/main.c:685 +#: ../midori/main.c:752 msgid "Privacy" msgstr "Privacidade" -#: ../midori/main.c:687 -msgid "Delete old Cookies after:" -msgstr "Excluir cookies antigos após:" - -#: ../midori/main.c:689 ../midori/main.c:692 -msgid "The maximum number of days to save cookies for" -msgstr "O número máximo de dias para manter cookies salvos" - -#: ../midori/main.c:696 -msgid "Only accept Cookies from sites you visit" -msgstr "Aceitar coockies apenas de sites visitados" - -#: ../midori/main.c:697 -msgid "Block cookies sent by third-party websites" -msgstr "Bloquear coockies enviados por outros sites" - -#: ../midori/main.c:702 +#: ../midori/main.c:764 msgid "" "Cookies store login data, saved games, or user profiles for advertisement " "purposes." @@ -148,45 +109,19 @@ msgstr "" "Os cookies armazenam dados de autenticação, jogos salvos ou perfis do " "usuário para fins de propaganda." -#: ../midori/main.c:709 -msgid "Enable offline web application cache" -msgstr "Habilitar cache de aplicativos web offline" - -#: ../midori/main.c:712 -msgid "Enable HTML5 local storage support" -msgstr "Habilitar suporte a armazenagem local HTML5" - -#. i18n: Reworded: Shorten details propagated when going to another page -#: ../midori/main.c:716 -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/main.c:718 -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/main.c:721 -msgid "Delete pages from history after:" -msgstr "Excluir páginas do histórico após:" - -#: ../midori/main.c:723 ../midori/main.c:726 -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/main.c:767 +#: ../midori/main.c:826 #, c-format msgid "The session couldn't be saved. %s" msgstr "A sessão não pôde ser salva. %s" -#: ../midori/main.c:993 +#: ../midori/main.c:1036 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:1088 +#: ../midori/main.c:1104 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." @@ -195,234 +130,187 @@ msgstr "" "ocorrer repetidamente, tente uma das seguintes opções para resolver o " "problema." -#: ../midori/main.c:1107 +#: ../midori/main.c:1123 msgid "Modify _preferences" msgstr "Modificar _preferências" -#: ../midori/main.c:1111 +#: ../midori/main.c:1127 msgid "Disable all _extensions" msgstr "Desabilitar todas as _extensões" -#: ../midori/main.c:1120 -msgid "Show a dialog after Midori crashed" -msgstr "Exibir um diálogo após o encerramento abrupto do Midori" - -#: ../midori/main.c:1125 +#: ../midori/main.c:1140 msgid "Discard old tabs" msgstr "Descartar abas antigas" -#: ../midori/main.c:1126 ../midori/midori-websettings.c:107 +#: ../midori/main.c:1141 ../midori/midori-websettings.c:206 msgid "Show last tabs without loading" msgstr "Exibir as últimas abas sem carregá-las" -#: ../midori/main.c:1127 ../midori/midori-websettings.c:106 +#: ../midori/main.c:1142 ../midori/midori-websettings.c:205 msgid "Show last open tabs" msgstr "Exibir as últimas abas abertas" -#: ../midori/main.c:1374 ../midori/main.c:2353 +#: ../midori/main.c:1352 ../midori/main.c:2456 #, 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:1512 +#: ../midori/main.c:1493 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Captura salva em: %s\n" -#: ../midori/main.c:1840 +#: ../midori/main.c:1917 msgid "Run ADDRESS as a web application" msgstr "Executar ENDEREÇO como aplicativo web" -#: ../midori/main.c:1840 +#: ../midori/main.c:1917 msgid "ADDRESS" msgstr "ENDEREÇO" -#: ../midori/main.c:1843 +#: ../midori/main.c:1920 msgid "Use FOLDER as configuration folder" msgstr "Usar PASTA como pasta de configuração" -#: ../midori/main.c:1843 +#: ../midori/main.c:1920 msgid "FOLDER" msgstr "PASTA" -#: ../midori/main.c:1846 +#: ../midori/main.c:1923 msgid "Private browsing, no changes are saved" msgstr "Navegação privada, nenhuma modificação é salva" -#: ../midori/main.c:1849 -msgid "Portable mode, all runtime files are stored in one place" -msgstr "Modo portátil, todos arquivos de runtime armazenados em um só lugar" - -#: ../midori/main.c:1852 +#: ../midori/main.c:1925 msgid "Show a diagnostic dialog" msgstr "Exibir diálogo de diagnóstico" -#: ../midori/main.c:1854 +#: ../midori/main.c:1927 msgid "Run the specified filename as javascript" msgstr "Executar o arquivo especificado como javascript" -#: ../midori/main.c:1856 +#: ../midori/main.c:1929 msgid "Take a snapshot of the specified URI" msgstr "Capturar o URI especificado num arquivo PDF" -#: ../midori/main.c:1858 +#: ../midori/main.c:1931 msgid "Execute the specified command" msgstr "Executar o comando especificado" -#: ../midori/main.c:1860 +#: ../midori/main.c:1933 msgid "List available commands to execute with -e/ --execute" msgstr "Listar comandos disponíveis para execução com -e/ --execute" -#: ../midori/main.c:1862 +#: ../midori/main.c:1935 msgid "Display program version" msgstr "Exibir a versão do programa" -#: ../midori/main.c:1864 +#: ../midori/main.c:1937 msgid "Addresses" msgstr "Endereços" -#: ../midori/main.c:1866 +#: ../midori/main.c:1939 msgid "Block URIs according to regular expression PATTERN" msgstr "Bloquear URIs conforme a expressão regular PADRÃO" -#: ../midori/main.c:1866 +#: ../midori/main.c:1939 msgid "PATTERN" msgstr "PADRÃO" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1870 +#: ../midori/main.c:1943 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "Limpar a sessão do Midori após SEGUNDOS segundos de inatividade" -#: ../midori/main.c:1870 +#: ../midori/main.c:1943 msgid "SECONDS" msgstr "SEGUNDOS" -#: ../midori/main.c:1873 +#: ../midori/main.c:1946 msgid "Redirects console warnings to the specified FILENAME" msgstr "Redirecionar alertas do console para o ARQUIVO especificado" -#: ../midori/main.c:1873 +#: ../midori/main.c:1946 msgid "FILENAME" msgstr "ARQUIVO" -#: ../midori/main.c:1976 +#: ../midori/main.c:2030 +msgid "[Addresses]" +msgstr "[Endereços]" + +#: ../midori/main.c:2044 +msgid "The specified configuration folder is invalid." +msgstr "A pasta de configuração especificada é inválida." + +#: ../midori/main.c:2074 msgid "Please report comments, suggestions and bugs to:" msgstr "Por favor, envie comentários, sugestões e relatos de erros para:" -#: ../midori/main.c:1978 +#: ../midori/main.c:2076 msgid "Check for new versions at:" msgstr "Verificar por novas versões em:" +#: ../midori/main.c:2159 +msgid "Website icons" +msgstr "Ícones de sites" + #. i18n: Logins and passwords in websites and web forms -#: ../midori/main.c:2073 +#: ../midori/main.c:2162 msgid "Saved logins and _passwords" msgstr "Nomes de _usuário e senhas salvos" -#: ../midori/main.c:2075 -msgid "Cookies and Website data" -msgstr "Cookies e dados de sites" +#: ../midori/main.c:2164 +msgid "Cookies" +msgstr "Cookies" + +#: ../midori/main.c:2167 +msgid "'Flash' Cookies" +msgstr "Cookies 'Flash'" -#. TODO: Preserve page icons of search engines and merge privacy items -#: ../midori/main.c:2079 ../midori/midori-preferences.c:505 -#: ../extensions/web-cache.c:461 ../extensions/web-cache.c:470 +#: ../midori/main.c:2170 +msgid "HTML5 _Databases" +msgstr "Bases de _dados HTML5" + +#: ../midori/main.c:2173 ../midori/midori-websettings.c:930 +#: ../extensions/web-cache.c:464 ../extensions/web-cache.c:473 msgid "Web Cache" msgstr "Cache da web" -#: ../midori/main.c:2082 -msgid "Website icons" -msgstr "Ícones de sites" +#: ../midori/main.c:2175 +msgid "Offline Application Cache" +msgstr "Cache de aplicativos offline" -#: ../midori/main.c:2186 +#: ../midori/main.c:2278 msgid "An unknown error occured" msgstr "Ocorreu um erro desconhecido." -#: ../midori/main.c:2301 +#: ../midori/main.c:2387 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:2335 +#: ../midori/main.c:2423 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Os favoritos não puderam ser carregados: %s\n" -#: ../midori/main.c:2368 +#: ../midori/main.c:2471 #, 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:2381 +#: ../midori/main.c:2484 #, 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:2396 +#: ../midori/main.c:2500 msgid "The following errors occured:" msgstr "Ocorreram os seguintes erros:" -#: ../midori/main.c:2412 +#: ../midori/main.c:2516 msgid "_Ignore" msgstr "_Ignorar " -#: ../midori/midori-app.c:1156 ../midori/midori-browser.c:542 -#, c-format -msgid "Unexpected action '%s'." -msgstr "Ação inesperada '%s'." - -#: ../midori/midori-app.c:1372 ../midori/midori-browser.c:6379 -msgid "_Bookmarks" -msgstr "_Favoritos" - -#: ../midori/midori-app.c:1373 -msgid "Add Boo_kmark" -msgstr "Adicionar _favorito" - -#: ../midori/midori-app.c:1374 -msgid "_Extensions" -msgstr "_Extensões" - -#. i18n: Browsing history, visited web pages, closed tabs -#: ../midori/midori-app.c:1375 ../midori/midori-browser.c:4832 -msgid "_History" -msgstr "_Histórico" - -#: ../midori/midori-app.c:1376 -msgid "_Userscripts" -msgstr "Scripts de _usuário" - -#: ../midori/midori-app.c:1377 -msgid "User_styles" -msgstr "E_stilos de usuário" - -#: ../midori/midori-app.c:1378 -msgid "New _Tab" -msgstr "_Nova aba" - -#: ../midori/midori-app.c:1379 -msgid "_Transfers" -msgstr "_Transferências" - -#: ../midori/midori-app.c:1380 -msgid "Netscape p_lugins" -msgstr "P_lugins Netscape" - -#: ../midori/midori-app.c:1381 -msgid "_Closed Tabs" -msgstr "Abas _fechadas" - -#: ../midori/midori-app.c:1382 ../midori/midori-browser.c:5515 -msgid "New _Window" -msgstr "Nova _janela" - -#: ../midori/midori-app.c:1383 -msgid "New _Folder" -msgstr "Nova _pasta" - -#: ../midori/midori-app.c:1437 -msgid "[Addresses]" -msgstr "[Endereços]" - #: ../midori/midori-array.c:522 msgid "File not found." msgstr "Arquivo não encontrado." @@ -436,137 +324,128 @@ msgstr "Documento mal conformado." msgid "Unrecognized bookmark format." msgstr "Formato de favoritos não reconhecido." -#: ../midori/midori-array.c:915 +#: ../midori/midori-array.c:916 msgid "Writing failed." msgstr "Falha na escrita." -#: ../midori/midori-browser.c:355 ../midori/midori-browser.c:5654 -msgid "Go forward to the next page" -msgstr "Ir para a página seguinte" - -#. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:362 ../midori/midori-browser.c:5662 -#: ../midori/midori-browser.c:5665 -msgid "Go to the next sub-page" -msgstr "Ir para a subpágina seguinte" - -#: ../midori/midori-browser.c:449 ../midori/midori-browser.c:5603 -#: ../midori/midori-browser.c:5612 +#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:5300 +#: ../midori/midori-browser.c:5309 msgid "Reload the current page" msgstr "Recarregar a página atual" -#: ../midori/midori-browser.c:457 ../midori/midori-browser.c:5609 +#: ../midori/midori-browser.c:347 ../midori/midori-browser.c:5306 msgid "Stop loading the current page" msgstr "Parar o carregamento da página atual" -#: ../midori/midori-browser.c:527 +#: ../midori/midori-browser.c:474 #, c-format msgid "Failed to update title: %s\n" msgstr "Falha ao atualizar título: %s\n" -#: ../midori/midori-browser.c:622 +#: ../midori/midori-browser.c:487 +#, c-format +msgid "Unexpected action '%s'." +msgstr "Ação inesperada '%s'." + +#: ../midori/midori-browser.c:588 #, c-format msgid "%s (Private Browsing)" msgstr "%s (navegação privada)" -#: ../midori/midori-browser.c:732 ../midori/midori-browser.c:774 -#: ../panels/midori-bookmarks.c:114 -msgid "Bookmarks" -msgstr "Favoritos" +#: ../midori/midori-browser.c:699 ../midori/midori-browser.c:732 +msgid "Toplevel folder" +msgstr "Pasta principal" -#: ../midori/midori-browser.c:834 +#: ../midori/midori-browser.c:789 msgid "New folder" msgstr "Nova pasta" -#: ../midori/midori-browser.c:834 +#: ../midori/midori-browser.c:789 msgid "Edit folder" msgstr "Editar pasta" -#: ../midori/midori-browser.c:836 +#: ../midori/midori-browser.c:791 msgid "New bookmark" msgstr "Novo favorito" -#: ../midori/midori-browser.c:836 +#: ../midori/midori-browser.c:791 msgid "Edit bookmark" msgstr "Editar favorito" -#: ../midori/midori-browser.c:870 -msgid "Type a name for this bookmark and choose where to keep it." -msgstr "Digite um nome para este favorito e escolha onde deseja mantê-lo." +#: ../midori/midori-browser.c:826 +msgid "_Title:" +msgstr "_Título:" + +#: ../midori/midori-browser.c:846 ../midori/midori-searchaction.c:974 +#: ../extensions/feed-panel/main.c:385 +msgid "_Address:" +msgstr "_Endereço:" -#: ../midori/midori-browser.c:931 +#: ../midori/midori-browser.c:869 ../midori/midori-browser.c:4349 +msgid "_Folder:" +msgstr "_Pasta:" + +#: ../midori/midori-browser.c:885 msgid "Add to _Speed Dial" msgstr "Adicionar à _ligação rápida" -#: ../midori/midori-browser.c:937 +#: ../midori/midori-browser.c:898 msgid "Show in the tool_bar" msgstr "Exibir na _barra de ferramentas" -#: ../midori/midori-browser.c:945 +#: ../midori/midori-browser.c:913 msgid "Run as _web application" msgstr "Executar como aplicativo _web" -#: ../midori/midori-browser.c:1016 +#: ../midori/midori-browser.c:984 #, 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:1018 +#: ../midori/midori-browser.c:986 #, 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:1025 +#: ../midori/midori-browser.c:993 #, 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:1028 +#: ../midori/midori-browser.c:996 #, 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:1164 ../midori/midori-browser.c:4636 +#: ../midori/midori-browser.c:1040 ../midori/midori-browser.c:4419 msgid "Save file as" msgstr "Salvar como" -#: ../midori/midori-browser.c:1170 -msgid "Save associated _resources" -msgstr "Salvar _recursos associados" +#: ../midori/midori-browser.c:1356 +msgid "New Window" +msgstr "Nova janela" -#: ../midori/midori-browser.c:1417 +#: ../midori/midori-browser.c:1356 msgid "A new window has been opened" msgstr "Uma nova janela foi aberta" -#: ../midori/midori-browser.c:1420 +#: ../midori/midori-browser.c:1359 +msgid "New Tab" +msgstr "Nova aba" + +#: ../midori/midori-browser.c:1359 msgid "A new tab has been opened" msgstr "Uma nova aba foi aberta" -#: ../midori/midori-browser.c:1437 -msgid "Error opening the image!" -msgstr "Erro ao abrir a imagem!" - -#: ../midori/midori-browser.c:1438 -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:1444 -msgid "Error downloading the image!" -msgstr "Erro ao baixar a imagem!" - -#: ../midori/midori-browser.c:1445 -msgid "Can not download selected image." -msgstr "Não é possível baixar a imagem selecionada." - -#: ../midori/midori-browser.c:1564 +#: ../midori/midori-browser.c:1396 msgid "Save file" msgstr "Salvar arquivo" -#: ../midori/midori-browser.c:2467 +#: ../midori/midori-browser.c:2279 msgid "Open file" msgstr "Abrir arquivo" -#: ../midori/midori-browser.c:2599 +#: ../midori/midori-browser.c:2409 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" @@ -580,155 +459,144 @@ msgstr "" "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:2605 ../extensions/feed-panel/main.c:365 +#: ../midori/midori-browser.c:2415 ../extensions/feed-panel/main.c:365 msgid "New feed" msgstr "Novo feed" -#: ../midori/midori-browser.c:2648 ../midori/midori-browser.c:5678 -#: ../panels/midori-bookmarks.c:527 +#: ../midori/midori-browser.c:2458 ../midori/midori-browser.c:5369 +#: ../panels/midori-bookmarks.c:467 msgid "Add a new bookmark" msgstr "Adicionar novo favorito" -#: ../midori/midori-browser.c:3192 ../midori/midori-searchaction.c:487 +#: ../midori/midori-browser.c:3021 ../midori/midori-searchaction.c:491 msgid "Empty" msgstr "Vazio" -#: ../midori/midori-browser.c:3638 ../midori/midori-browser.c:3639 -msgid "Toggle text cursor navigation" -msgstr "Habilitar/desabilitar navegação por cursor de texto" - -#: ../midori/midori-browser.c:3641 -msgid "" -"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in " -"all websites." -msgstr "" -"Pressione F7 para ativar ou desativar Caret Browsing. Quando ativo, um " -"cursor de texto aparece em todos os websites." - -#: ../midori/midori-browser.c:3644 -msgid "_Enable Caret Browsing" -msgstr "Habilitar Nav_egação por cursor" - -#: ../midori/midori-browser.c:4036 ../midori/midori-browser.c:6072 +#: ../midori/midori-browser.c:3812 ../midori/midori-browser.c:5779 #, 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:4362 ../panels/midori-bookmarks.c:850 -#: ../panels/midori-history.c:806 +#: ../midori/midori-browser.c:4142 ../panels/midori-bookmarks.c:783 +#: ../panels/midori-history.c:752 msgid "Open all in _Tabs" msgstr "Abrir tudo em a_bas" -#: ../midori/midori-browser.c:4369 ../panels/midori-bookmarks.c:856 -#: ../panels/midori-history.c:812 ../extensions/feed-panel/feed-panel.c:528 +#: ../midori/midori-browser.c:4149 ../panels/midori-bookmarks.c:789 +#: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:533 msgid "Open in New _Tab" msgstr "Abrir em nova a_ba" -#: ../midori/midori-browser.c:4372 ../midori/midori-view.c:2938 -#: ../midori/midori-view.c:4948 ../panels/midori-bookmarks.c:858 -#: ../panels/midori-history.c:814 ../extensions/feed-panel/feed-panel.c:530 +#: ../midori/midori-browser.c:4152 ../midori/midori-view.c:2556 +#: ../midori/midori-view.c:4388 ../panels/midori-bookmarks.c:791 +#: ../panels/midori-history.c:760 ../extensions/feed-panel/feed-panel.c:535 msgid "Open in New _Window" msgstr "Abrir em nova _janela" -#: ../midori/midori-browser.c:4461 +#: ../midori/midori-browser.c:4232 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4462 +#: ../midori/midori-browser.c:4233 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4463 +#: ../midori/midori-browser.c:4234 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4464 +#: ../midori/midori-browser.c:4235 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4465 +#: ../midori/midori-browser.c:4236 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4466 +#: ../midori/midori-browser.c:4237 #, c-format msgid "Firefox (%s)" msgstr "Firefox (%s)" -#: ../midori/midori-browser.c:4467 -msgid "Midori 0.2.6" -msgstr "Midori 0.2.6" - -#: ../midori/midori-browser.c:4488 -msgid "Import bookmarks…" -msgstr "Importar favoritos…" +#: ../midori/midori-browser.c:4258 +msgid "Import bookmarks..." +msgstr "Importar favoritos..." -#: ../midori/midori-browser.c:4491 ../midori/midori-browser.c:5683 +#: ../midori/midori-browser.c:4265 ../midori/midori-browser.c:5374 msgid "_Import bookmarks" msgstr "_Importar favoritos" -#: ../midori/midori-browser.c:4502 +#: ../midori/midori-browser.c:4276 msgid "_Application:" msgstr "_Aplicativo:" -#: ../midori/midori-browser.c:4567 +#: ../midori/midori-browser.c:4341 msgid "Import from XBEL or HTML file" msgstr "Importar de um arquivo XBEL ou HTML" -#: ../midori/midori-browser.c:4595 +#: ../midori/midori-browser.c:4376 msgid "Import from a file" msgstr "Importar de um arquivo" -#: ../midori/midori-browser.c:4607 +#: ../midori/midori-browser.c:4388 msgid "Failed to import bookmarks" msgstr "Falha ao importar favoritos" -#: ../midori/midori-browser.c:4641 +#: ../midori/midori-browser.c:4424 msgid "XBEL Bookmarks" msgstr "Favoritos XBEL" -#: ../midori/midori-browser.c:4646 +#: ../midori/midori-browser.c:4429 msgid "Netscape Bookmarks" msgstr "Favoritos Netscape" -#: ../midori/midori-browser.c:4660 +#: ../midori/midori-browser.c:4443 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:4675 +#: ../midori/midori-browser.c:4459 msgid "Failed to export bookmarks" msgstr "Falha ao exportar favoritos" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4797 +#: ../midori/midori-browser.c:4585 msgid "Clear Private Data" msgstr "Limpar dados privados" -#: ../midori/midori-browser.c:4801 +#: ../midori/midori-browser.c:4593 msgid "_Clear private data" msgstr "_Limpar dados privados" -#: ../midori/midori-browser.c:4816 +#: ../midori/midori-browser.c:4606 msgid "Clear the following data:" msgstr "Limpar os seguintes dados:" -#: ../midori/midori-browser.c:4826 +#: ../midori/midori-browser.c:4616 msgid "Last open _tabs" msgstr "Últimas abas abertas" -#: ../midori/midori-browser.c:4852 +#. i18n: Browsing history, visited web pages +#: ../midori/midori-browser.c:4622 ../midori/sokoke.c:1223 +msgid "_History" +msgstr "_Histórico" + +#: ../midori/midori-browser.c:4627 ../midori/sokoke.c:1229 +msgid "_Closed Tabs" +msgstr "Abas _fechadas" + +#: ../midori/midori-browser.c:4647 msgid "Clear private data when _quitting Midori" msgstr "Limpar dados privados ao _sair do Midori" -#: ../midori/midori-browser.c:5067 +#: ../midori/midori-browser.c:4823 msgid "A lightweight web browser." msgstr "Um navegador web leve." -#: ../midori/midori-browser.c:5068 +#: ../midori/midori-browser.c:4824 msgid "See about:version for version info." msgstr "Veja about:version para informações da versão." -#: ../midori/midori-browser.c:5070 +#: ../midori/midori-browser.c:4826 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 " @@ -740,608 +608,1104 @@ msgstr "" "Software Foundation; tanto na versão 2.1 ou (por sua opção) qualquer versão " "mais recente." -#: ../midori/midori-browser.c:5100 +#: ../midori/midori-browser.c:4847 msgid "translator-credits" msgstr "" "Sérgio Cipolla \n" -"Rogério Brito \n" -"Rafael Ferreira " +"Rogério Brito " -#: ../midori/midori-browser.c:5513 +#: ../midori/midori-browser.c:5213 msgid "_File" msgstr "_Arquivo" -#: ../midori/midori-browser.c:5516 +#: ../midori/midori-browser.c:5215 ../midori/sokoke.c:1230 +msgid "New _Window" +msgstr "Nova _janela" + +#: ../midori/midori-browser.c:5216 msgid "Open a new window" msgstr "Abrir nova janela" -#: ../midori/midori-browser.c:5519 +#: ../midori/midori-browser.c:5219 msgid "Open a new tab" msgstr "Abrir nova aba" -#: ../midori/midori-browser.c:5521 +#: ../midori/midori-browser.c:5221 msgid "New P_rivate Browsing Window" msgstr "Nova janela de navegação pri_vada" -#: ../midori/midori-browser.c:5525 +#: ../midori/midori-browser.c:5222 +msgid "Don't save any private data while browsing" +msgstr "Não salvar quaisquer dados privados ao navegar" + +#: ../midori/midori-browser.c:5226 msgid "Open a file" -msgstr "Abrir um arquivo" +msgstr "Abrir arquivo" -#: ../midori/midori-browser.c:5527 -msgid "_Save Page As…" -msgstr "_Salvar página como…" +#: ../midori/midori-browser.c:5228 +msgid "_Save Page As..." +msgstr "_Salvar página como..." -#: ../midori/midori-browser.c:5528 +#: ../midori/midori-browser.c:5229 msgid "Save to a file" msgstr "Salvar para arquivo" -#: ../midori/midori-browser.c:5530 +#: ../midori/midori-browser.c:5231 msgid "Add to Speed _dial" msgstr "Adicionar à li_gação rápida" -#: ../midori/midori-browser.c:5534 +#: ../midori/midori-browser.c:5232 +msgid "Add shortcut to speed dial" +msgstr "Adicionar atalho à ligação rápida" + +#: ../midori/midori-browser.c:5235 msgid "Add Shortcut to the _desktop" msgstr "A_dicionar atalho à área de trabalho" -#: ../midori/midori-browser.c:5536 +#: ../midori/midori-browser.c:5236 +msgid "Add shortcut to the desktop" +msgstr "Adicionar atalho à área de trabalho" + +#: ../midori/midori-browser.c:5238 msgid "Create _Launcher" msgstr "Criar lança_dor" -#: ../midori/midori-browser.c:5540 +#: ../midori/midori-browser.c:5239 +msgid "Create a launcher" +msgstr "Criar um lançador" + +#: ../midori/midori-browser.c:5242 msgid "Subscribe to News _feed" msgstr "Inscrever _feed de notícias" -#: ../midori/midori-browser.c:5546 +#: ../midori/midori-browser.c:5243 +msgid "Subscribe to this news feed" +msgstr "Inscrever este feed de notícias" + +#: ../midori/midori-browser.c:5248 msgid "_Close Tab" msgstr "_Fechar aba" -#: ../midori/midori-browser.c:5547 +#: ../midori/midori-browser.c:5249 msgid "Close the current tab" msgstr "Fechar a aba atual" -#: ../midori/midori-browser.c:5549 +#: ../midori/midori-browser.c:5251 msgid "C_lose Window" msgstr "Fechar jane_la" -#: ../midori/midori-browser.c:5553 -msgid "_Share" -msgstr "_Compartilhar" +#: ../midori/midori-browser.c:5252 +msgid "Close this window" +msgstr "Fechar esta janela" -#: ../midori/midori-browser.c:5558 +#: ../midori/midori-browser.c:5255 msgid "Print the current page" msgstr "Imprimir a página atual" -#: ../midori/midori-browser.c:5561 +#: ../midori/midori-browser.c:5257 msgid "Close a_ll Windows" msgstr "Fechar _todas as janelas" -#: ../midori/midori-browser.c:5564 +#: ../midori/midori-browser.c:5258 +msgid "Close all open windows" +msgstr "Fechar todas as janelas abertas" + +#: ../midori/midori-browser.c:5260 msgid "_Edit" msgstr "_Editar" -#: ../midori/midori-browser.c:5587 -msgid "_Find…" -msgstr "Locali_zar…" +#: ../midori/midori-browser.c:5263 +msgid "Undo the last modification" +msgstr "Desfazer a última modificação" + +#: ../midori/midori-browser.c:5266 +msgid "Redo the last modification" +msgstr "Refazer a última modificação" + +#: ../midori/midori-browser.c:5269 +msgid "Cut the selected text" +msgstr "Recortar o texto selecionado" -#: ../midori/midori-browser.c:5588 +#: ../midori/midori-browser.c:5272 +msgid "Copy the selected text" +msgstr "Copiar o texto selecionado" + +#: ../midori/midori-browser.c:5275 +msgid "Paste text from the clipboard" +msgstr "Colar texto da área de transferência" + +#: ../midori/midori-browser.c:5278 +msgid "Delete the selected text" +msgstr "Excluir o texto selecionado" + +#: ../midori/midori-browser.c:5281 +msgid "Select all text" +msgstr "Selecionar todo o texto" + +#: ../midori/midori-browser.c:5283 +msgid "_Find..." +msgstr "Locali_zar..." + +#: ../midori/midori-browser.c:5284 msgid "Find a word or phrase in the page" msgstr "Localizar palavra ou frase na página" -#: ../midori/midori-browser.c:5590 +#: ../midori/midori-browser.c:5286 msgid "Find _Next" msgstr "Localizar _seguinte" -#: ../midori/midori-browser.c:5593 +#: ../midori/midori-browser.c:5287 +msgid "Find the next occurrence of a word or phrase" +msgstr "Localizar a ocorrência seguinte da palavra ou frase" + +#: ../midori/midori-browser.c:5289 msgid "Find _Previous" msgstr "Localizar _anterior" -#: ../midori/midori-browser.c:5597 +#: ../midori/midori-browser.c:5290 +msgid "Find the previous occurrence of a word or phrase" +msgstr "Localizar a ocorrência anterior da palavra ou frase" + +#: ../midori/midori-browser.c:5294 msgid "Configure the application preferences" msgstr "Configurar preferências do aplicativo" -#: ../midori/midori-browser.c:5599 +#: ../midori/midori-browser.c:5296 msgid "_View" msgstr "_Ver" -#: ../midori/midori-browser.c:5600 +#: ../midori/midori-browser.c:5297 msgid "_Toolbars" msgstr "_Barras de ferramentas" -#: ../midori/midori-browser.c:5605 +#: ../midori/midori-browser.c:5302 ../midori/midori-browser.c:5303 msgid "Reload page without caching" msgstr "Recarregar a página sem caching" -#: ../midori/midori-browser.c:5615 +#: ../midori/midori-browser.c:5312 msgid "Increase the zoom level" msgstr "Ampliar" -#: ../midori/midori-browser.c:5618 +#: ../midori/midori-browser.c:5315 msgid "Decrease the zoom level" msgstr "Reduzir" -#: ../midori/midori-browser.c:5622 +#: ../midori/midori-browser.c:5318 +msgid "Reset the zoom level" +msgstr "Tamanho normal" + +#: ../midori/midori-browser.c:5319 msgid "_Encoding" msgstr "_Codificação" -#: ../midori/midori-browser.c:5624 +#: ../midori/midori-browser.c:5321 msgid "View So_urce" msgstr "Ver _fonte" -#: ../midori/midori-browser.c:5627 +#: ../midori/midori-browser.c:5322 +msgid "View the source code of the page" +msgstr "Ver código fonte da página" + +#: ../midori/midori-browser.c:5324 msgid "Ca_ret Browsing" msgstr "Navegação _por cursor" -#: ../midori/midori-browser.c:5631 +#: ../midori/midori-browser.c:5325 +msgid "Toggle text cursor navigation" +msgstr "Habilitar/desabilitar navegação por cursor de texto" + +#: ../midori/midori-browser.c:5328 msgid "Toggle fullscreen view" msgstr "Alternar tela cheia" -#: ../midori/midori-browser.c:5633 +#: ../midori/midori-browser.c:5330 msgid "Scroll _Left" msgstr "Rolar à _esquerda" -#: ../midori/midori-browser.c:5636 +#: ../midori/midori-browser.c:5331 +msgid "Scroll to the left" +msgstr "Rolar à esquerda" + +#: ../midori/midori-browser.c:5333 msgid "Scroll _Down" msgstr "Rolar para _baixo" -#: ../midori/midori-browser.c:5639 +#: ../midori/midori-browser.c:5334 +msgid "Scroll down" +msgstr "Rolar para baixo" + +#: ../midori/midori-browser.c:5336 msgid "Scroll _Up" msgstr "Rolar para _cima" -#: ../midori/midori-browser.c:5642 +#: ../midori/midori-browser.c:5337 +msgid "Scroll up" +msgstr "Rolar para cima" + +#: ../midori/midori-browser.c:5339 msgid "Scroll _Right" msgstr "Rolar à _direita" -#: ../midori/midori-browser.c:5645 -msgid "_Readable" -msgstr "_Legível" +#: ../midori/midori-browser.c:5340 +msgid "Scroll to the right" +msgstr "Rolar à direita" -#: ../midori/midori-browser.c:5648 +#: ../midori/midori-browser.c:5342 msgid "_Go" msgstr "_Ir" -#: ../midori/midori-browser.c:5651 +#: ../midori/midori-browser.c:5345 msgid "Go back to the previous page" msgstr "Ir para a página anterior" +#: ../midori/midori-browser.c:5348 +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:5658 +#: ../midori/midori-browser.c:5352 msgid "Go to the previous sub-page" msgstr "Ir para a subpágina anterior" -#: ../midori/midori-browser.c:5667 -msgid "_Homepage" -msgstr "_Página inicial" +#. i18n: Visit the following logical page, ie. in a forum or blog +#: ../midori/midori-browser.c:5356 +msgid "Go to the next sub-page" +msgstr "Ir para a subpágina seguinte" -#: ../midori/midori-browser.c:5668 +#: ../midori/midori-browser.c:5359 msgid "Go to your homepage" msgstr "Ir para a página inicial" -#: ../midori/midori-browser.c:5670 +#: ../midori/midori-browser.c:5361 msgid "Empty Trash" msgstr "Esvaziar lixo" -#: ../midori/midori-browser.c:5673 +#: ../midori/midori-browser.c:5362 +msgid "Delete the contents of the trash" +msgstr "Excluir o conteúdo do lixo" + +#: ../midori/midori-browser.c:5364 msgid "Undo _Close Tab" msgstr "De_sfazer fechar aba" -#: ../midori/midori-browser.c:5680 +#: ../midori/midori-browser.c:5365 +msgid "Open the last closed tab" +msgstr "Abrir a última aba fechada" + +#: ../midori/midori-browser.c:5371 msgid "Add a new _folder" msgstr "Adicionar _nova pasta" -#: ../midori/midori-browser.c:5686 +#: ../midori/midori-browser.c:5372 +msgid "Add a new bookmark folder" +msgstr "Adicionar nova pasta de favoritos" + +#: ../midori/midori-browser.c:5377 msgid "_Export bookmarks" msgstr "_Exportar favoritos" -#: ../midori/midori-browser.c:5689 ../midori/midori-searchaction.c:496 +#: ../midori/midori-browser.c:5380 ../midori/midori-searchaction.c:500 msgid "_Manage Search Engines" msgstr "Gerenciar motores de _pesquisa" -#: ../midori/midori-browser.c:5692 +#: ../midori/midori-browser.c:5381 +msgid "Add, edit and remove search engines..." +msgstr "Adicionar, editar e excluir motores de pesquisa..." + +#: ../midori/midori-browser.c:5384 msgid "_Clear Private Data" msgstr "Limpar _dados privados" -#: ../midori/midori-browser.c:5695 +#: ../midori/midori-browser.c:5385 +msgid "Clear private data..." +msgstr "Limpar dados privados..." + +#: ../midori/midori-browser.c:5388 msgid "_Inspect Page" msgstr "_Inspecionar página" -#: ../midori/midori-browser.c:5699 +#: ../midori/midori-browser.c:5389 +msgid "Inspect page details and access developer tools..." +msgstr "" +"Inspecionar detalhes da página e acessar ferramentas de desenvolvimento..." + +#: ../midori/midori-browser.c:5393 msgid "_Previous Tab" msgstr "Aba _anterior" -#: ../midori/midori-browser.c:5702 +#: ../midori/midori-browser.c:5394 +msgid "Switch to the previous tab" +msgstr "Mudar para a aba anterior" + +#: ../midori/midori-browser.c:5396 msgid "_Next Tab" msgstr "Aba _seguinte" -#: ../midori/midori-browser.c:5704 +#: ../midori/midori-browser.c:5397 +msgid "Switch to the next tab" +msgstr "Mudar para a aba seguinte" + +#: ../midori/midori-browser.c:5398 msgid "Move Tab _Backward" msgstr "Mover a aba para _trás" -#: ../midori/midori-browser.c:5706 +#: ../midori/midori-browser.c:5399 +msgid "Move tab behind the previous tab" +msgstr "Mover a aba para trás da aba anterior" + +#: ../midori/midori-browser.c:5400 msgid "_Move Tab Forward" msgstr "Mover a aba para a _frente" -#: ../midori/midori-browser.c:5709 +#: ../midori/midori-browser.c:5401 +msgid "Move tab in front of the next tab" +msgstr "Mover a aba para frente da aba seguinte" + +#: ../midori/midori-browser.c:5403 msgid "Focus _Current Tab" msgstr "_Focar a aba atual" -#: ../midori/midori-browser.c:5712 +#: ../midori/midori-browser.c:5404 +msgid "Focus the current tab" +msgstr "Focar a aba atual" + +#: ../midori/midori-browser.c:5406 msgid "Focus _Next view" msgstr "Focar o _campo de visão seguinte" -#: ../midori/midori-browser.c:5715 +#: ../midori/midori-browser.c:5407 +msgid "Cycle focus between views" +msgstr "Circular o foco entre os campos de visão" + +#: ../midori/midori-browser.c:5409 msgid "Only show the Icon of the _Current Tab" msgstr "Exibir apenas o _ícone da aba atual" -#: ../midori/midori-browser.c:5718 +#: ../midori/midori-browser.c:5410 +msgid "Only show the icon of the current tab" +msgstr "Exibir apenas o ícone da aba atual" + +#: ../midori/midori-browser.c:5412 msgid "_Duplicate Current Tab" msgstr "Duplicar a_ba atual" -#: ../midori/midori-browser.c:5721 +#: ../midori/midori-browser.c:5413 +msgid "Duplicate the current tab" +msgstr "Duplicar a aba atual" + +#: ../midori/midori-browser.c:5415 msgid "Close Ot_her Tabs" msgstr "Fec_har outras abas" -#: ../midori/midori-browser.c:5724 +#: ../midori/midori-browser.c:5416 +msgid "Close all tabs except the current tab" +msgstr "Fechar todas as abas exceto a atual" + +#: ../midori/midori-browser.c:5418 msgid "Open last _session" msgstr "Abrir a _última sessão" -#: ../midori/midori-browser.c:5727 +#: ../midori/midori-browser.c:5419 +msgid "Open the tabs saved in the last session" +msgstr "Abrir as abas salvas na última sessão" + +#: ../midori/midori-browser.c:5421 msgid "_Help" msgstr "Aj_uda" -#: ../midori/midori-browser.c:5729 +#: ../midori/midori-browser.c:5423 msgid "_Frequent Questions" msgstr "Perguntas fre_quentes" -#: ../midori/midori-browser.c:5732 -msgid "_Report a Problem…" -msgstr "_Relatar um problema…" +#: ../midori/midori-browser.c:5424 +msgid "Show the Frequently Asked Questions" +msgstr "Exibir as perguntas frequentes" -#: ../midori/midori-browser.c:5737 ../midori/midori-browser.c:6398 -msgid "_Tools" -msgstr "Ferramen_tas" +#: ../midori/midori-browser.c:5426 +msgid "_Report a Problem..." +msgstr "_Relatar um problema..." + +#: ../midori/midori-browser.c:5427 +msgid "Open Midori's bug tracker" +msgstr "Abrir o serviço de acompanhamento de erros do Midori" + +#: ../midori/midori-browser.c:5430 +msgid "Show information about the program" +msgstr "Exibir informação sobre o programa" -#: ../midori/midori-browser.c:5744 +#: ../midori/midori-browser.c:5438 msgid "_Menubar" msgstr "Barra de _menu" -#: ../midori/midori-browser.c:5748 +#: ../midori/midori-browser.c:5439 +msgid "Show menubar" +msgstr "Exibir barra de menu" + +#: ../midori/midori-browser.c:5442 msgid "_Navigationbar" msgstr "Barra de _navegação" -#: ../midori/midori-browser.c:5752 +#: ../midori/midori-browser.c:5443 +msgid "Show navigationbar" +msgstr "Exibir barra de navegação" + +#: ../midori/midori-browser.c:5446 msgid "Side_panel" msgstr "Painel _lateral" -#: ../midori/midori-browser.c:5753 -msgid "Sidepanel" -msgstr "Painel lateral" +#: ../midori/midori-browser.c:5447 +msgid "Show sidepanel" +msgstr "Exibir painel lateral" -#: ../midori/midori-browser.c:5756 +#: ../midori/midori-browser.c:5450 msgid "_Bookmarkbar" msgstr "Barra de _favoritos" -#: ../midori/midori-browser.c:5760 +#: ../midori/midori-browser.c:5451 +msgid "Show bookmarkbar" +msgstr "Exibir barra de favoritos" + +#: ../midori/midori-browser.c:5454 msgid "_Statusbar" msgstr "Barra de _status" -#: ../midori/midori-browser.c:5769 ../midori/midori-websettings.c:198 +#: ../midori/midori-browser.c:5455 +msgid "Show statusbar" +msgstr "Exibir barra de status" + +#: ../midori/midori-browser.c:5463 ../midori/midori-websettings.c:296 msgid "_Automatic" msgstr "_Automático" -#: ../midori/midori-browser.c:5772 ../midori/midori-websettings.c:122 -msgid "Chinese Traditional (BIG5)" -msgstr "Chinês Tradicional (BIG5)" - -#: ../midori/midori-browser.c:5775 ../midori/midori-websettings.c:123 -msgid "Chinese Simplified (GB18030)" -msgstr "Chinês Simplificado (GB18030)" +#: ../midori/midori-browser.c:5466 ../midori/midori-websettings.c:221 +msgid "Chinese (BIG5)" +msgstr "Chinês (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5779 +#: ../midori/midori-browser.c:5470 msgid "Japanese (SHIFT__JIS)" msgstr "Japonês (SHIFT__JIS)" -#: ../midori/midori-browser.c:5782 ../midori/midori-websettings.c:125 +#: ../midori/midori-browser.c:5473 ../midori/midori-websettings.c:223 msgid "Korean (EUC-KR)" msgstr "Coreano (EUC-KR)" -#: ../midori/midori-browser.c:5785 ../midori/midori-websettings.c:126 +#: ../midori/midori-browser.c:5476 ../midori/midori-websettings.c:224 msgid "Russian (KOI8-R)" msgstr "Russo (KOI8-R)" -#: ../midori/midori-browser.c:5788 ../midori/midori-websettings.c:127 +#: ../midori/midori-browser.c:5479 ../midori/midori-websettings.c:225 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5791 ../midori/midori-websettings.c:128 +#: ../midori/midori-browser.c:5482 ../midori/midori-websettings.c:226 msgid "Western (ISO-8859-1)" msgstr "Ocidental (ISO-8859-1)" -#: ../midori/midori-browser.c:5794 -msgid "Custom…" -msgstr "Personalizado…" +#: ../midori/midori-browser.c:5485 ../midori/midori-websettings.c:227 +#: ../midori/midori-websettings.c:302 ../katze/katze-utils.c:635 +msgid "Custom..." +msgstr "Personalizado..." -#: ../midori/midori-browser.c:6304 +#: ../midori/midori-browser.c:6015 msgid "_Separator" msgstr "_Aba" -#: ../midori/midori-browser.c:6311 -msgid "_Location…" -msgstr "_Localização…" +#: ../midori/midori-browser.c:6022 +msgid "_Location..." +msgstr "_Localização..." -#: ../midori/midori-browser.c:6313 +#: ../midori/midori-browser.c:6024 msgid "Open a particular location" msgstr "Abrir localização específica" -#: ../midori/midori-browser.c:6335 -msgid "_Web Search…" -msgstr "Pesquisa _web…" +#: ../midori/midori-browser.c:6046 +msgid "_Web Search..." +msgstr "Pesquisa _web..." -#: ../midori/midori-browser.c:6337 +#: ../midori/midori-browser.c:6048 msgid "Run a web search" msgstr "Pesquisar na web" -#: ../midori/midori-browser.c:6364 +#: ../midori/midori-browser.c:6069 msgid "Reopen a previously closed tab or window" msgstr "Reabrir janela ou aba anteriormente fechada" -#: ../midori/midori-browser.c:6381 +#: ../midori/midori-browser.c:6082 ../midori/sokoke.c:1219 +msgid "_Bookmarks" +msgstr "_Favoritos" + +#: ../midori/midori-browser.c:6084 msgid "Show the saved bookmarks" msgstr "Exibir favoritos salvos" -#: ../midori/midori-browser.c:6414 +#: ../midori/midori-browser.c:6098 +msgid "_Tools" +msgstr "Ferramen_tas" + +#: ../midori/midori-browser.c:6113 msgid "_Window" msgstr "_Janela" -#: ../midori/midori-browser.c:6416 +#: ../midori/midori-browser.c:6115 msgid "Show a list of all open tabs" msgstr "Exibir lista das abas abertas" -#: ../midori/midori-browser.c:6430 +#: ../midori/midori-browser.c:6129 msgid "_Menu" msgstr "_Menu" -#: ../midori/midori-browser.c:6432 +#: ../midori/midori-browser.c:6131 msgid "Menu" msgstr "Menu" -#: ../midori/midori-browser.c:7257 +#: ../midori/midori-browser.c:6698 #, c-format msgid "Unexpected setting '%s'" msgstr "Configuração inesperada '%s'" -#: ../midori/midori-extension.c:330 +#: ../midori/midori-extension.c:314 #, c-format 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-extension.c:749 ../midori/midori-extension.c:846 -#: ../midori/midori-extension.c:943 ../midori/midori-extension.c:1055 -#: ../extensions/addons.c:1685 +#: ../midori/midori-extension.c:712 ../midori/midori-extension.c:809 +#: ../midori/midori-extension.c:906 ../midori/midori-extension.c:1018 +#: ../extensions/addons.c:1649 #, 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" -#: ../midori/midori-locationaction.c:398 -#, c-format -msgid "Search with %s" -msgstr "Pesquisar com %s" - -#: ../midori/midori-locationaction.c:418 -msgid "Search with…" -msgstr "Pesquisar com…" - -#: ../midori/midori-locationaction.c:545 +#: ../midori/midori-locationaction.c:402 #, c-format msgid "Failed to select from history\n" msgstr "Falha ao selecionar do histórico\n" -#: ../midori/midori-locationaction.c:632 +#: ../midori/midori-locationaction.c:486 #, c-format msgid "Search for %s" msgstr "Pesquisar por %s" -#: ../midori/midori-locationaction.c:1227 -msgid "Export certificate" -msgstr "Exportar certificado" - -#: ../midori/midori-locationaction.c:1259 -msgid "The signing certificate authority is not known." -msgstr "A autoridade certificado signatária é desconhecida." - -#: ../midori/midori-locationaction.c:1261 -msgid "" -"The certificate does not match the expected identity of the site that it was " -"retrieved from." -msgstr "" -"O certificado não corresponde à identidade experada para o site do qual o " -"certificado foi adquirido." - -#: ../midori/midori-locationaction.c:1263 -msgid "The certificate's activation time is still in the future." -msgstr "O tempo de ativação do certificado está no futuro." - -#: ../midori/midori-locationaction.c:1265 -msgid "The certificate has expired" -msgstr "O certificado expirou" - -#: ../midori/midori-locationaction.c:1267 -msgid "" -"The certificate has been revoked according to the GTlsConnection's " -"certificate revocation list." -msgstr "" -"O certificado foi revogado, de acordo com a lista de revogação de " -"certificado da GTlsConnection" - -#: ../midori/midori-locationaction.c:1269 -msgid "The certificate's algorithm is considered insecure." -msgstr "O algoritmo do certificado é considerado inseguro." - -#: ../midori/midori-locationaction.c:1271 -msgid "Some other error occurred validating the certificate." -msgstr "Alguns erros ocorreram na validação do certificado." - -#: ../midori/midori-locationaction.c:1318 -msgid "_Export certificate" -msgstr "_Exportar certificado" - -#: ../midori/midori-locationaction.c:1333 -msgid "Self-signed" -msgstr "Auto-assinado" - -#: ../midori/midori-locationaction.c:1367 -msgid "Security details" -msgstr "Detalhes da segurança" +#: ../midori/midori-locationaction.c:512 +#, c-format +msgid "Search with %s" +msgstr "Pesquisar com %s" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1650 +#: ../midori/midori-locationaction.c:1262 msgid "Paste and p_roceed" msgstr "Cola_r e prosseguir" -#: ../midori/midori-locationaction.c:1974 +#: ../midori/midori-locationaction.c:1657 msgid "Not verified" msgstr "Não verificado" -#: ../midori/midori-locationaction.c:1982 +#: ../midori/midori-locationaction.c:1672 msgid "Verified and encrypted connection" msgstr "Verificado e conexão criptografada" -#: ../midori/midori-locationaction.c:1989 -msgid "Open, unencrypted connection" -msgstr "Aberto, conexão não criptografada" - -#: ../midori/midori-panel.c:317 ../midori/midori-panel.c:319 -#: ../midori/midori-panel.c:483 ../midori/midori-panel.c:486 +#: ../midori/midori-panel.c:399 ../midori/midori-panel.c:401 +#: ../midori/midori-panel.c:564 ../midori/midori-panel.c:567 msgid "Align sidepanel to the right" msgstr "Alinhar painel lateral à direita" -#: ../midori/midori-panel.c:329 ../midori/midori-panel.c:330 +#: ../midori/midori-panel.c:411 ../midori/midori-panel.c:412 msgid "Close panel" msgstr "Fechar painel" -#: ../midori/midori-panel.c:484 ../midori/midori-panel.c:487 +#: ../midori/midori-panel.c:565 ../midori/midori-panel.c:568 msgid "Align sidepanel to the left" msgstr "Alinhar painel lateral à esquerda" -#: ../midori/midori-websettings.c:104 +#: ../midori/midori-websettings.c:203 msgid "Show Speed Dial" msgstr "Exibir ligação rápida" -#: ../midori/midori-websettings.c:105 +#: ../midori/midori-websettings.c:204 msgid "Show Homepage" msgstr "Exibir a página inicial" -#: ../midori/midori-websettings.c:124 +#: ../midori/midori-websettings.c:222 msgid "Japanese (SHIFT_JIS)" msgstr "Japonês (SHIFT_JIS)" -#: ../midori/midori-websettings.c:129 ../midori/midori-websettings.c:205 -#: ../katze/katze-utils.c:633 -msgid "Custom..." -msgstr "Personalizado..." - -#: ../midori/midori-websettings.c:144 +#: ../midori/midori-websettings.c:242 msgid "New tab" msgstr "Nova aba" -#: ../midori/midori-websettings.c:145 +#: ../midori/midori-websettings.c:243 msgid "New window" msgstr "Nova janela" -#: ../midori/midori-websettings.c:146 +#: ../midori/midori-websettings.c:244 msgid "Current tab" msgstr "Aba atual" -#: ../midori/midori-websettings.c:161 +#: ../midori/midori-websettings.c:259 msgid "Default" msgstr "Padrão" -#: ../midori/midori-websettings.c:162 +#: ../midori/midori-websettings.c:260 msgid "Icons" msgstr "Ícones" -#: ../midori/midori-websettings.c:163 +#: ../midori/midori-websettings.c:261 msgid "Small icons" msgstr "Ícones pequenos" -#: ../midori/midori-websettings.c:164 +#: ../midori/midori-websettings.c:262 msgid "Text" msgstr "Texto" -#: ../midori/midori-websettings.c:165 +#: ../midori/midori-websettings.c:263 msgid "Icons and text" msgstr "Ícones e texto" -#: ../midori/midori-websettings.c:166 +#: ../midori/midori-websettings.c:264 msgid "Text beside icons" msgstr "Texto ao lado dos ícones" -#: ../midori/midori-websettings.c:181 +#: ../midori/midori-websettings.c:279 msgid "Automatic (GNOME or environment)" msgstr "Automático (GNOME ou ambiente)" -#: ../midori/midori-websettings.c:182 +#: ../midori/midori-websettings.c:280 msgid "HTTP proxy server" msgstr "Servidor proxy HTTP" -#: ../midori/midori-websettings.c:183 +#: ../midori/midori-websettings.c:281 msgid "No proxy server" msgstr "Sem servidor proxy" -#: ../midori/midori-websettings.c:200 -msgid "Chrome" -msgstr "Chrome" - -#: ../midori/midori-websettings.c:201 +#: ../midori/midori-websettings.c:298 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:202 +#: ../midori/midori-websettings.c:299 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:203 +#: ../midori/midori-websettings.c:300 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:301 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:277 -msgid "Toolbar Style:" -msgstr "Estilo da barra de ferramentas:" +#: ../midori/midori-websettings.c:354 +msgid "Remember last window size" +msgstr "Lembrar último tamanho da janela" -#: ../midori/midori-websettings.c:278 -msgid "The style of the toolbar" -msgstr "O estilo da barra de ferramentas" +#: ../midori/midori-websettings.c:355 +msgid "Whether to save the last window size" +msgstr "Se o último tamanho da janela deve ser salvo" -#: ../midori/midori-websettings.c:287 -msgid "When Midori starts:" -msgstr "Ao iniciar o Midori:" +#: ../midori/midori-websettings.c:363 +msgid "Last window width" +msgstr "Última largura da janela" -#: ../midori/midori-websettings.c:297 -msgid "Preferred Encoding" -msgstr "Codificação preferida" +#: ../midori/midori-websettings.c:364 +msgid "The last saved window width" +msgstr "Última largura da janela salva" -#: ../midori/midori-websettings.c:324 +#: ../midori/midori-websettings.c:372 +msgid "Last window height" +msgstr "Última altura da janela" + +#: ../midori/midori-websettings.c:373 +msgid "The last saved window height" +msgstr "Última altura da janela salva" + +#: ../midori/midori-websettings.c:398 +msgid "Last panel position" +msgstr "Última posição do painel" + +#: ../midori/midori-websettings.c:399 +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:408 +msgid "Last panel page" +msgstr "Última página do painel" + +#: ../midori/midori-websettings.c:409 +msgid "The last saved panel page" +msgstr "Última página do painel salva" + +#: ../midori/midori-websettings.c:417 +msgid "Last Web search" +msgstr "Última pesquisa na web" + +#: ../midori/midori-websettings.c:418 +msgid "The last saved Web search" +msgstr "Última pesquisa na web salva" + +#: ../midori/midori-websettings.c:427 +msgid "Show Menubar" +msgstr "Exibir barra de menu" + +#: ../midori/midori-websettings.c:428 +msgid "Whether to show the menubar" +msgstr "Se a barra de menu deve ser exibida" + +#: ../midori/midori-websettings.c:436 +msgid "Show Navigationbar" +msgstr "Exibir barra de navegação" + +#: ../midori/midori-websettings.c:437 +msgid "Whether to show the navigationbar" +msgstr "Se a barra de navegação deve ser exibida" + +#: ../midori/midori-websettings.c:445 +msgid "Show Bookmarkbar" +msgstr "Exibir barra de favoritos" + +#: ../midori/midori-websettings.c:446 +msgid "Whether to show the bookmarkbar" +msgstr "Se a barra de favoritos deve ser exibida" + +#: ../midori/midori-websettings.c:454 +msgid "Show Panel" +msgstr "Exibir painel" + +#: ../midori/midori-websettings.c:455 +msgid "Whether to show the panel" +msgstr "Se o painel deve ser exibido" + +#: ../midori/midori-websettings.c:463 +msgid "Show Statusbar" +msgstr "Exibir barra de status" + +#: ../midori/midori-websettings.c:464 +msgid "Whether to show the statusbar" +msgstr "Se a barra de status deve ser exibida" + +#: ../midori/midori-websettings.c:473 +msgid "Toolbar Style:" +msgstr "Estilo da barra de ferramentas:" + +#: ../midori/midori-websettings.c:474 +msgid "The style of the toolbar" +msgstr "O estilo da barra de ferramentas" + +#: ../midori/midori-websettings.c:483 +msgid "Toolbar Items" +msgstr "Itens da barra de ferramentas" + +#: ../midori/midori-websettings.c:484 +msgid "The items to show on the toolbar" +msgstr "Itens a serem exibidos na barra de ferramentas" + +#: ../midori/midori-websettings.c:492 +msgid "Compact Sidepanel" +msgstr "Painel lateral compacto" + +#: ../midori/midori-websettings.c:493 +msgid "Whether to make the sidepanel compact" +msgstr "Se o painel lateral deve ser compacto" + +#: ../midori/midori-websettings.c:508 +msgid "Align sidepanel on the right" +msgstr "Alinhar painel lateral à direita" + +#: ../midori/midori-websettings.c:509 +msgid "Whether to align the sidepanel on the right" +msgstr "Se o painel lateral deve ser alinhado à direita" + +#: ../midori/midori-websettings.c:524 +msgid "Open panels in separate windows" +msgstr "Abrir painéis em janelas separadas" + +#: ../midori/midori-websettings.c:525 +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:534 +msgid "When Midori starts:" +msgstr "Ao iniciar o Midori:" + +#: ../midori/midori-websettings.c:535 +msgid "What to do when Midori starts" +msgstr "O que fazer ao iniciar o Midori" + +#: ../midori/midori-websettings.c:544 +msgid "Homepage:" +msgstr "Página inicial:" + +#: ../midori/midori-websettings.c:545 +msgid "The homepage" +msgstr "A página inicial" + +#: ../midori/midori-websettings.c:560 +msgid "Show crash dialog" +msgstr "Exibir diálogo de encerramento abrupto" + +#: ../midori/midori-websettings.c:561 +msgid "Show a dialog after Midori crashed" +msgstr "Exibir um diálogo após o encerramento abrupto do Midori" + +#: ../midori/midori-websettings.c:569 +msgid "Save downloaded files to:" +msgstr "Salvar arquivos baixados em:" + +#: ../midori/midori-websettings.c:570 +msgid "The folder downloaded files are saved to" +msgstr "A pasta na qual salvar os arquivos baixados" + +#: ../midori/midori-websettings.c:578 +msgid "Text Editor" +msgstr "Editor de texto" + +#: ../midori/midori-websettings.c:579 +msgid "An external text editor" +msgstr "Um editor de texto externo" + +#: ../midori/midori-websettings.c:594 +msgid "News Aggregator" +msgstr "Agregador de notícias" + +#: ../midori/midori-websettings.c:595 +msgid "An external news aggregator" +msgstr "Um agregador de notícias externo" + +#: ../midori/midori-websettings.c:603 +msgid "Location entry Search" +msgstr "Pesquisa no campo de endereço" + +#: ../midori/midori-websettings.c:604 +msgid "The search to perform inside the location entry" +msgstr "A pesquisa a ser executada pelo campo de endereço" + +#: ../midori/midori-websettings.c:612 +msgid "Preferred Encoding" +msgstr "Codificação preferida" + +#: ../midori/midori-websettings.c:613 +msgid "The preferred character encoding" +msgstr "A codificação de caracteres preferida" + +#: ../midori/midori-websettings.c:623 +msgid "Always Show Tabbar" +msgstr "Sempre exibir barra de abas" + +#: ../midori/midori-websettings.c:624 +msgid "Always show the tabbar" +msgstr "Se a barra de abas deve ser exibida mesmo com apenas uma aba aberta" + +#: ../midori/midori-websettings.c:632 +msgid "Close Buttons on Tabs" +msgstr "Botão fechar nas abas" + +#: ../midori/midori-websettings.c:633 +msgid "Whether tabs have close buttons" +msgstr "Se as abas devem ter um botão para fechar" + +#: ../midori/midori-websettings.c:658 msgid "Open new pages in:" msgstr "Abrir novas páginas em:" +#: ../midori/midori-websettings.c:659 +msgid "Where to open new pages" +msgstr "Onde abrir novas páginas" + +#: ../midori/midori-websettings.c:668 +msgid "Middle click opens Selection" +msgstr "Clicar o botão do meio do mouse abre seleção" + +#: ../midori/midori-websettings.c:669 +msgid "Load an address from the selection via middle click" +msgstr "Carregar o endereço selecionado clicando o botão do meio do mouse" + +#: ../midori/midori-websettings.c:677 +msgid "Open tabs in the background" +msgstr "Abrir abas em segundo plano" + +#: ../midori/midori-websettings.c:678 +msgid "Whether to open new tabs in the background" +msgstr "Se as novas abas devem ser abertas em segundo plano" + +#: ../midori/midori-websettings.c:686 +msgid "Open Tabs next to Current" +msgstr "Abrir abas ao lado da atual" + +#: ../midori/midori-websettings.c:687 +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" + +#: ../midori/midori-websettings.c:695 +msgid "Open popups in tabs" +msgstr "Abrir popups em abas" + +#: ../midori/midori-websettings.c:696 +msgid "Whether to open popup windows in tabs" +msgstr "Se janelas popup devem ser abertas em abas" + +#: ../midori/midori-websettings.c:706 ../extensions/statusbar-features.c:132 +msgid "Load images automatically" +msgstr "Carregar imagens automaticamente" + +#: ../midori/midori-websettings.c:707 +msgid "Load and display images automatically" +msgstr "Carregar e exibir as imagens automaticamente" + +#: ../midori/midori-websettings.c:714 ../extensions/statusbar-features.c:141 +msgid "Enable scripts" +msgstr "Habilitar scripts" + +#: ../midori/midori-websettings.c:715 +msgid "Enable embedded scripting languages" +msgstr "Habilitar linguagem de scripts incorporadas" + +#: ../midori/midori-websettings.c:722 ../extensions/statusbar-features.c:150 +msgid "Enable Netscape plugins" +msgstr "Habilitar plugins Netscape" + +#: ../midori/midori-websettings.c:723 +msgid "Enable embedded Netscape plugin objects" +msgstr "Habilitar plugins Netscape incorporados" + +#: ../midori/midori-websettings.c:743 +msgid "Enable Spell Checking" +msgstr "Habilitar verificação ortográfica" + +#: ../midori/midori-websettings.c:744 +msgid "Enable spell checking while typing" +msgstr "Habilitar verificação ortográfica ao digitar" + +#: ../midori/midori-websettings.c:750 +msgid "Enable HTML5 database support" +msgstr "Habilitar suporte a bases de dados HTML5" + +#: ../midori/midori-websettings.c:751 +msgid "Whether to enable HTML5 database support" +msgstr "Se o suporte a bases de dados HTML5 deve ser habilitado" + +#: ../midori/midori-websettings.c:757 +msgid "Enable HTML5 local storage support" +msgstr "Habilitar suporte a armazenagem local HTML5" + +#: ../midori/midori-websettings.c:758 +msgid "Whether to enable HTML5 local storage support" +msgstr "Se o suporte a armazenagem local HTML5 deve ser habilitado" + +#: ../midori/midori-websettings.c:764 +msgid "Enable offline web application cache" +msgstr "Habilitar cache de aplicativos web offline" + +#: ../midori/midori-websettings.c:765 +msgid "Whether to enable offline web application cache" +msgstr "Se o cache de aplicativos web offline deve ser habilitado" + +#: ../midori/midori-websettings.c:781 +msgid "Flash window on background tabs" +msgstr "Piscar janela em abas de segundo plano" + +#: ../midori/midori-websettings.c:782 +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:797 +msgid "Zoom Text and Images" +msgstr "Zoom de texto e imagens" + +#: ../midori/midori-websettings.c:798 +msgid "Whether to zoom text and images" +msgstr "Se o zoom de texto e imagens pode ser ajustado" + +#: ../midori/midori-websettings.c:813 +msgid "Find inline while typing" +msgstr "Localizar na página ao digitar" + +#: ../midori/midori-websettings.c:814 +msgid "Whether to automatically find inline while typing" +msgstr "Se a localização na página deve se dar automaticamente ao digitar" + +#: ../midori/midori-websettings.c:829 +msgid "Kinetic scrolling" +msgstr "Rolagem cinética" + +#: ../midori/midori-websettings.c:830 +msgid "Whether scrolling should kinetically move according to speed" +msgstr "Se a rolagem deve se mover cineticamente conforme a velocidade" + +#: ../midori/midori-websettings.c:838 +msgid "Delete old Cookies after:" +msgstr "Excluir cookies antigos após:" + +#: ../midori/midori-websettings.c:839 +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:855 +msgid "Only accept Cookies from sites you visit" +msgstr "Aceitar coockies apenas de sites visitados" + +#: ../midori/midori-websettings.c:856 +msgid "Block cookies sent by third-party websites" +msgstr "Bloquear coockies enviados por outros sites" + +#: ../midori/midori-websettings.c:870 +msgid "Delete pages from history after:" +msgstr "Excluir páginas do histórico após:" + +#: ../midori/midori-websettings.c:871 +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:886 +msgid "Proxy server" +msgstr "Servidor proxy" + +#: ../midori/midori-websettings.c:887 +msgid "The type of proxy server to use" +msgstr "O tipo de servidor a utilizar" + +#: ../midori/midori-websettings.c:896 +msgid "HTTP Proxy Server" +msgstr "Servidor proxy HTTP" + +#: ../midori/midori-websettings.c:897 +msgid "The proxy server used for HTTP connections" +msgstr "Servidor proxy para conexões HTTP" + +#: ../midori/midori-websettings.c:912 +msgid "Port" +msgstr "Porta" + +#: ../midori/midori-websettings.c:913 +msgid "The proxy server port used for HTTP connections" +msgstr "Porta do servidor proxy usado para conexões HTTPS" + +#: ../midori/midori-websettings.c:931 +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:387 +#: ../midori/midori-websettings.c:948 msgid "Identify as" msgstr "Identificar-se como" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:949 msgid "What to identify as to web pages" msgstr "Identificar-se para as páginas web como" -#: ../midori/midori-websettings.c:421 +#: ../midori/midori-websettings.c:965 +msgid "Identification string" +msgstr "Cadeia de identificação" + +#: ../midori/midori-websettings.c:966 +msgid "The application identification string" +msgstr "A cadeia de identificação do aplicativo" + +#: ../midori/midori-websettings.c:982 msgid "Preferred languages" msgstr "Idiomas preferidos" -#: ../midori/midori-websettings.c:422 +#: ../midori/midori-websettings.c:983 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\"" @@ -1350,530 +1714,433 @@ msgstr "" "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:471 -msgid "Always use my font choices" -msgstr "Sempre usar minhas escolhas de fonte" +#: ../midori/midori-websettings.c:998 +msgid "Clear private data" +msgstr "Limpar dados privados" + +#: ../midori/midori-websettings.c:999 +msgid "The private data selected for deletion" +msgstr "Os dados privados selecionados para exclusão" + +#: ../midori/midori-websettings.c:1014 +msgid "Clear data" +msgstr "Limpar dados" -#: ../midori/midori-websettings.c:472 -msgid "Override fonts picked by websites with user preferences" -msgstr "Substituir fontes escolhidas por sites com as preferencias do usuário" +#: ../midori/midori-websettings.c:1015 +msgid "The data selected for deletion" +msgstr "Os dados selecionados para exclusão" -#: ../midori/midori-view.c:997 ../midori/midori-view.c:1136 -msgid "Trust this website" -msgstr "Confiar neste site" +#. i18n: Reworded: Shorten details propagated when going to another page +#: ../midori/midori-websettings.c:1048 +msgid "Strip referrer details sent to websites" +msgstr "Eliminar detalhes do referrer enviados a sites externos" -#: ../midori/midori-view.c:1134 -msgid "Security unknown" -msgstr "Segurança desconhecida" +#. i18n: Referer here is not a typo but a technical term +#: ../midori/midori-websettings.c:1050 +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-view.c:1432 +#: ../midori/midori-view.c:1367 #, c-format msgid "%s wants to save an HTML5 database." msgstr "%s quer salvar uma base de dados HTML5." -#: ../midori/midori-view.c:1436 ../midori/midori-view.c:1470 +#: ../midori/midori-view.c:1371 ../midori/midori-view.c:1400 msgid "_Deny" msgstr "_Negar" -#: ../midori/midori-view.c:1436 ../midori/midori-view.c:1470 +#: ../midori/midori-view.c:1371 ../midori/midori-view.c:1400 msgid "_Allow" msgstr "_Permitir" -#: ../midori/midori-view.c:1465 +#: ../midori/midori-view.c:1396 #, c-format msgid "%s wants to know your location." msgstr "%s quer saber a sua localização." -#: ../midori/midori-view.c:1561 +#: ../midori/midori-view.c:1485 #, c-format msgid "Error - %s" msgstr "Erro - %s" -#: ../midori/midori-view.c:1562 +#: ../midori/midori-view.c:1486 #, 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:1564 +#: ../midori/midori-view.c:1488 msgid "Try again" msgstr "Tentar novamente" -#: ../midori/midori-view.c:1760 ../midori/midori-view.c:2873 +#: ../midori/midori-view.c:1650 ../midori/midori-view.c:2497 #, c-format msgid "Send a message to %s" msgstr "Enviar uma mensagem para %s" -#: ../midori/midori-view.c:2659 -msgid "Add _search engine..." -msgstr "Adicionar mecanismo de _pesquisa..." - -#: ../midori/midori-view.c:2703 ../midori/midori-view.c:3029 +#: ../midori/midori-view.c:2337 ../midori/midori-view.c:2650 msgid "Inspect _Element" msgstr "Inspecionar _elemento" -#: ../midori/midori-view.c:2755 +#: ../midori/midori-view.c:2387 msgid "Open Link in New _Tab" msgstr "Abrir link em nova a_ba" -#: ../midori/midori-view.c:2759 +#: ../midori/midori-view.c:2391 msgid "Open Link in _Foreground Tab" msgstr "Abrir link na aba em _primeiro plano" -#: ../midori/midori-view.c:2760 +#: ../midori/midori-view.c:2392 msgid "Open Link in _Background Tab" msgstr "Abrir link na aba em _segundo plano" -#: ../midori/midori-view.c:2763 +#: ../midori/midori-view.c:2395 msgid "Open Link in New _Window" msgstr "Abrir link em nova _janela" -#: ../midori/midori-view.c:2766 +#: ../midori/midori-view.c:2398 msgid "Open Link as Web A_pplication" msgstr "Abrir link como aplicativo _web" -#: ../midori/midori-view.c:2771 +#: ../midori/midori-view.c:2401 msgid "Copy Link de_stination" msgstr "Copiar _destino do link" -#: ../midori/midori-view.c:2787 +#: ../midori/midori-view.c:2413 msgid "Open _Image in New Tab" msgstr "Abrir _imagem em nova aba" -#: ../midori/midori-view.c:2790 +#: ../midori/midori-view.c:2416 msgid "Copy Image _Address" msgstr "Copiar _endereço da imagem" -#: ../midori/midori-view.c:2793 +#: ../midori/midori-view.c:2419 msgid "Save I_mage" msgstr "Salvar i_magem" -#: ../midori/midori-view.c:2796 -msgid "Open in Image _Viewer" -msgstr "Abrir no Visualizador de Imagens" - -#: ../midori/midori-view.c:2803 +#: ../midori/midori-view.c:2426 msgid "Copy Video _Address" msgstr "Copiar _endereço do vídeo" -#: ../midori/midori-view.c:2806 +#: ../midori/midori-view.c:2429 msgid "Save _Video" msgstr "Salvar _vídeo" -#: ../midori/midori-view.c:2806 +#: ../midori/midori-view.c:2429 msgid "Download _Video" msgstr "Baixar _vídeo" -#: ../midori/midori-view.c:2832 +#: ../midori/midori-view.c:2455 msgid "Search _with" msgstr "Pesquisar _com" -#: ../midori/midori-view.c:2864 +#: ../midori/midori-view.c:2489 msgid "_Search the Web" msgstr "_Pesquisar na web" -#: ../midori/midori-view.c:2881 +#: ../midori/midori-view.c:2505 msgid "Open Address in New _Tab" msgstr "Abrir endereço em nova a_ba" -#: ../midori/midori-view.c:2934 -msgid "Open _Frame in New Tab" -msgstr "Abrir _Frame em nova aba" - -#: ../midori/midori-view.c:3191 -#, c-format -msgid "Open or download file from %s" -msgstr "Abrir ou baixar arquivo de %s" - -#: ../midori/midori-view.c:3215 -#, c-format -msgid "File Name: %s" -msgstr "Nome do arquivo: %s" +#: ../midori/midori-view.c:2789 +msgid "Open or download file" +msgstr "Abrir ou baixar arquivo" -#: ../midori/midori-view.c:3220 +#: ../midori/midori-view.c:2808 #, c-format msgid "File Type: '%s'" msgstr "Tipo de arquivo: '%s'" -#: ../midori/midori-view.c:3222 +#: ../midori/midori-view.c:2810 #, c-format msgid "File Type: %s ('%s')" msgstr "Tipo de arquivo: %s ('%s')" -#: ../midori/midori-view.c:3257 -#, c-format -msgid "Size: %s" -msgstr "Tamanho: %s" +#: ../midori/midori-view.c:2821 +msgid "MD5-Checksum:" +msgstr "Soma de verificação MD5:" + +#: ../midori/midori-view.c:2828 +msgid "SHA1-Checksum:" +msgstr "Soma de verificação SHA1:" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:3268 +#: ../midori/midori-view.c:2838 #, c-format msgid "Open %s" msgstr "Abrir %s" -#: ../midori/midori-view.c:3900 +#: ../midori/midori-view.c:3423 #, c-format msgid "Inspect page - %s" msgstr "Inspecionar página - %s" -#: ../midori/midori-view.c:4299 -#, c-format -msgid "No documentation installed" -msgstr "Nenhuma documentação instalada" - -#: ../midori/midori-view.c:4376 -msgid "Midori doesn't store any personal data:" -msgstr "Midori não armazena quaisquer dados pessoais:" - -#: ../midori/midori-view.c:4377 -msgid "No history or web cookies are being saved." -msgstr "O histórico e cookies não estando sendo guardados." - -#: ../midori/midori-view.c:4378 -msgid "Extensions are disabled." -msgstr "As extensões estão desativadas." - -#: ../midori/midori-view.c:4379 -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:3716 +msgid "Speed Dial" +msgstr "Ligação rápida" -#: ../midori/midori-view.c:4380 -msgid "Midori prevents websites from tracking the user:" -msgstr "O Midori impede que sites obtenham dados do usuário:" +#: ../midori/midori-view.c:3717 ../midori/midori-view.c:3801 +msgid "Click to add a shortcut" +msgstr "Clique para adicionar um atalho" -#: ../midori/midori-view.c:4381 -msgid "Referrer URLs are stripped down to the hostname." -msgstr "Os URL são removidos do nome da máquina." +#: ../midori/midori-view.c:3718 +msgid "Enter shortcut address" +msgstr "Informe o endereço do atalho" -#: ../midori/midori-view.c:4382 -msgid "DNS prefetching is disabled." -msgstr "A obtenção prévia de DNS está desativada." +#: ../midori/midori-view.c:3719 +msgid "Enter shortcut title" +msgstr "Informe o título do atalho" -#: ../midori/midori-view.c:4383 -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:3720 +msgid "Are you sure you want to delete this shortcut?" +msgstr "Tem certeza de que quer excluir esse atalho?" -#: ../midori/midori-view.c:4384 -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:3878 +#, c-format +msgid "No documentation installed" +msgstr "Nenhuma documentação instalada" -#: ../midori/midori-view.c:4470 +#: ../midori/midori-view.c:3939 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:4519 +#: ../midori/midori-view.c:3987 msgid "Page loading delayed" msgstr "Carregamento da página postergado" -#: ../midori/midori-view.c:4520 +#: ../midori/midori-view.c:3988 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." -#: ../midori/midori-view.c:4521 +#: ../midori/midori-view.c:3989 msgid "Load Page" msgstr "Carregar página" -#: ../midori/midori-view.c:4688 +#: ../midori/midori-view.c:4129 msgid "Blank page" msgstr "Página em branco" -#: ../midori/midori-view.c:4952 +#: ../midori/midori-view.c:4392 msgid "_Duplicate Tab" msgstr "_Duplicar aba" -#: ../midori/midori-view.c:4957 +#: ../midori/midori-view.c:4397 msgid "Show Tab _Label" msgstr "Exibir _título da aba" -#: ../midori/midori-view.c:4957 +#: ../midori/midori-view.c:4397 msgid "Show Tab _Icon Only" msgstr "Exibir apenas o _ícone da aba" -#: ../midori/midori-view.c:4964 -msgid "Close Ot_her Tab" -msgid_plural "Close Ot_her Tabs" -msgstr[0] "_Fechar outra aba" -msgstr[1] "_Fechar outras abas" +#: ../midori/midori-view.c:4403 +msgid "Close ot_her Tabs" +msgstr "Fec_har outras abas" #. i18n: word stem of "previous page" type links, case is not important -#: ../midori/midori-view.c:5784 +#: ../midori/midori-view.c:5020 msgid "previous" msgstr "anterior" #. i18n: word stem of "next page" type links, case is not important -#: ../midori/midori-view.c:5803 +#: ../midori/midori-view.c:5039 msgid "next" msgstr "próxima" -#: ../midori/midori-view.c:5816 +#: ../midori/midori-view.c:5052 msgid "Print background images" msgstr "Imprimir imagens de fundo" -#: ../midori/midori-view.c:5817 +#: ../midori/midori-view.c:5053 msgid "Whether background images should be printed" msgstr "Se as imagens de fundo devem ser impressas" -#: ../midori/midori-view.c:5849 +#: ../midori/midori-view.c:5085 msgid "Features" msgstr "Funcionalidades" -#: ../midori/midori-speeddial.vala:142 -msgid "Speed Dial" -msgstr "Ligação rápida" - -#: ../midori/midori-speeddial.vala:143 ../midori/midori-speeddial.vala:229 -msgid "Click to add a shortcut" -msgstr "Clique para adicionar um atalho" - -#: ../midori/midori-speeddial.vala:144 -msgid "Enter shortcut address" -msgstr "Informe o endereço do atalho" - -#: ../midori/midori-speeddial.vala:145 -msgid "Enter shortcut title" -msgstr "Informe o título do atalho" - -#: ../midori/midori-speeddial.vala:146 -msgid "Are you sure you want to delete this shortcut?" -msgstr "Tem certeza de que quer excluir esse atalho?" - -#: ../midori/midori-preferences.c:299 +#: ../midori/midori-preferences.c:301 msgid "Startup" msgstr "Início" -#: ../midori/midori-preferences.c:305 -msgid "Homepage:" -msgstr "Página inicial:" - -#: ../midori/midori-preferences.c:313 +#: ../midori/midori-preferences.c:314 msgid "Use _current page" msgstr "Usar a _página atual" -#: ../midori/midori-preferences.c:317 +#: ../midori/midori-preferences.c:318 msgid "Use current page as homepage" msgstr "Usar a página atual como página inicial" #. Page "Appearance" -#: ../midori/midori-preferences.c:326 +#: ../midori/midori-preferences.c:327 msgid "Fonts" msgstr "Fontes" -#: ../midori/midori-preferences.c:329 +#: ../midori/midori-preferences.c:330 msgid "Proportional Font Family" msgstr "Família de fontes proporcionais" -#: ../midori/midori-preferences.c:333 +#: ../midori/midori-preferences.c:334 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:336 +#: ../midori/midori-preferences.c:337 msgid "The default font size used to display text" msgstr "O tamanho de fonte padrão usado para exibir texto" -#: ../midori/midori-preferences.c:338 +#: ../midori/midori-preferences.c:339 msgid "Fixed-width Font Family" msgstr "Família de fontes de largura fixa" -#: ../midori/midori-preferences.c:342 +#: ../midori/midori-preferences.c:343 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:345 +#: ../midori/midori-preferences.c:346 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:347 +#: ../midori/midori-preferences.c:348 msgid "Minimum Font Size" msgstr "Tamanho mínimo de fonte" -#: ../midori/midori-preferences.c:351 +#: ../midori/midori-preferences.c:352 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:362 +#: ../midori/midori-preferences.c:361 msgid "Behavior" msgstr "Comportamento" -#: ../midori/midori-preferences.c:366 ../extensions/statusbar-features.c:155 -msgid "Load images automatically" -msgstr "Carregar imagens automaticamente" - -#: ../midori/midori-preferences.c:369 -msgid "Enable Spell Checking" -msgstr "Habilitar verificação ortográfica" - -#: ../midori/midori-preferences.c:383 ../extensions/statusbar-features.c:165 -msgid "Enable scripts" -msgstr "Habilitar scripts" - -#: ../midori/midori-preferences.c:386 ../extensions/statusbar-features.c:177 -msgid "Enable Netscape plugins" -msgstr "Habilitar plugins Netscape" - -#: ../midori/midori-preferences.c:391 -msgid "Zoom Text and Images" -msgstr "Zoom de texto e imagens" - -#: ../midori/midori-preferences.c:394 +#: ../midori/midori-preferences.c:387 msgid "Allow scripts to open popups" -msgstr "Permitir que os scripts abram popups" - -#: ../midori/midori-preferences.c:395 -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:401 -msgid "Kinetic scrolling" -msgstr "Rolagem cinética" - -#: ../midori/midori-preferences.c:402 -msgid "Whether scrolling should kinetically move according to speed" -msgstr "Se a rolagem deve se mover cineticamente conforme a velocidade" - -#: ../midori/midori-preferences.c:407 -msgid "Middle click opens Selection" -msgstr "Clicar o botão do meio do mouse abre seleção" - -#: ../midori/midori-preferences.c:408 -msgid "Load an address from the selection via middle click" -msgstr "Carregar o endereço selecionado clicando o botão do meio do mouse" - -#: ../midori/midori-preferences.c:414 -msgid "Enable WebGL support" -msgstr "Habilitar suporte a WebGL" - -#: ../midori/midori-preferences.c:419 -msgid "Flash window on background tabs" -msgstr "Piscar janela em abas de segundo plano" - -#: ../midori/midori-preferences.c:428 -msgid "Save downloaded files to:" -msgstr "Salvar arquivos baixados em:" - -#. Page "Interface" -#: ../midori/midori-preferences.c:435 -msgid "Browsing" -msgstr "Navegação" - -#: ../midori/midori-preferences.c:451 -msgid "Close Buttons on Tabs" -msgstr "Botão fechar nas abas" - -#: ../midori/midori-preferences.c:455 -msgid "Always Show Tabbar" -msgstr "Sempre exibir barra de abas" - -#: ../midori/midori-preferences.c:459 -msgid "Open Tabs next to Current" -msgstr "Abrir abas ao lado da atual" - -#: ../midori/midori-preferences.c:460 -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" - -#: ../midori/midori-preferences.c:463 -msgid "Open tabs in the background" -msgstr "Abrir abas em segundo plano" +msgstr "Permitir que os scripts abram popups" -#: ../midori/midori-preferences.c:467 -msgid "Text Editor" -msgstr "Editor de texto" +#: ../midori/midori-preferences.c:388 +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:472 -msgid "News Aggregator" -msgstr "Agregador de notícias" +#. Page "Interface" +#: ../midori/midori-preferences.c:411 +msgid "Browsing" +msgstr "Navegação" #. Page "Network" -#: ../midori/midori-preferences.c:479 +#: ../midori/midori-preferences.c:449 msgid "Network" msgstr "Rede" -#: ../midori/midori-preferences.c:481 -msgid "Proxy server" -msgstr "Servidor proxy" - -#: ../midori/midori-preferences.c:486 +#: ../midori/midori-preferences.c:456 msgid "Hostname" msgstr "Nome da máquina" -#: ../midori/midori-preferences.c:494 -msgid "Port" -msgstr "Porta" - -#: ../midori/midori-preferences.c:506 ../midori/midori-preferences.c:509 -msgid "The maximum size of cached pages on disk" -msgstr "O tamanho máximo no disco das páginas em cache" - -#: ../midori/midori-preferences.c:511 +#: ../midori/midori-preferences.c:480 msgid "MB" msgstr "MB" -#: ../midori/midori-searchaction.c:957 +#: ../midori/midori-searchaction.c:911 msgid "Add search engine" msgstr "Adicionar motor de pesquisa" -#: ../midori/midori-searchaction.c:957 +#: ../midori/midori-searchaction.c:911 msgid "Edit search engine" msgstr "Editar motor de pesquisa" -#: ../midori/midori-searchaction.c:985 +#: ../midori/midori-searchaction.c:944 msgid "_Name:" msgstr "_Nome:" -#: ../midori/midori-searchaction.c:1000 +#: ../midori/midori-searchaction.c:960 msgid "_Description:" msgstr "_Descrição:" -#: ../midori/midori-searchaction.c:1013 ../extensions/feed-panel/main.c:377 -msgid "_Address:" -msgstr "_Endereço:" +#: ../midori/midori-searchaction.c:993 +msgid "_Icon:" +msgstr "_Ícone:" -#: ../midori/midori-searchaction.c:1032 +#: ../midori/midori-searchaction.c:1007 msgid "_Token:" msgstr "_Palavra-chave:" -#: ../midori/midori-searchaction.c:1330 +#: ../midori/midori-searchaction.c:1307 msgid "Manage Search Engines" msgstr "Gerenciar motores de pesquisa" -#: ../midori/midori-searchaction.c:1432 +#: ../midori/midori-searchaction.c:1411 msgid "Use as _default" msgstr "Usar como _padrão" -#: ../midori/sokoke.c:353 +#: ../midori/sokoke.c:409 msgid "Open with" msgstr "Abrir com" -#: ../midori/sokoke.c:361 +#: ../midori/sokoke.c:417 #, c-format msgid "Choose an application or command to open \"%s\":" msgstr "Escolha um aplicativo ou um comando para abrir \"%s\":" -#: ../midori/sokoke.c:475 ../midori/sokoke.c:489 +#: ../midori/sokoke.c:458 ../midori/sokoke.c:468 ../midori/sokoke.c:496 +#: ../midori/sokoke.c:525 ../midori/sokoke.c:539 msgid "Could not run external program." msgstr "Não foi possível executar o programa externo." -#: ../midori/sokoke.c:1327 +#: ../midori/sokoke.c:1218 +msgid "_Bookmark" +msgstr "_Favorito" + +#: ../midori/sokoke.c:1220 +msgid "Add Boo_kmark" +msgstr "Adicionar _favorito" + +#: ../midori/sokoke.c:1221 +msgid "_Console" +msgstr "_Console" + +#: ../midori/sokoke.c:1222 +msgid "_Extensions" +msgstr "_Extensões" + +#: ../midori/sokoke.c:1224 +msgid "_Homepage" +msgstr "_Página inicial" + +#: ../midori/sokoke.c:1225 +msgid "_Userscripts" +msgstr "Scripts de _usuário" + +#: ../midori/sokoke.c:1226 +msgid "New _Tab" +msgstr "_Nova aba" + +#: ../midori/sokoke.c:1227 +msgid "_Transfers" +msgstr "_Transferências" + +#: ../midori/sokoke.c:1228 +msgid "Netscape p_lugins" +msgstr "P_lugins Netscape" + +#: ../midori/sokoke.c:1231 +msgid "New _Folder" +msgstr "Nova _pasta" + +#: ../midori/sokoke.c:1927 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d hora" msgstr[1] "%d horas" -#: ../midori/sokoke.c:1328 +#: ../midori/sokoke.c:1928 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minuto" msgstr[1] "%d minutos" -#: ../midori/sokoke.c:1329 +#: ../midori/sokoke.c:1929 #, c-format msgid "%d second" msgid_plural "%d seconds" @@ -1881,67 +2148,67 @@ msgstr[0] "%d segundo" msgstr[1] "%d segundos" #. i18n: Download tooltip (size): 4KB of 43MB -#: ../midori/sokoke.c:1337 ../panels/midori-transfers.c:268 +#: ../midori/sokoke.c:1937 ../panels/midori-transfers.c:268 #, c-format msgid "%s of %s" msgstr "%s de %s" #. i18n: Unknown number of bytes, used for transfer rate like ?B/s -#: ../midori/sokoke.c:1346 +#: ../midori/sokoke.c:1946 msgid "?B" msgstr "?B" #. i18n: Download tooltip (transfer rate): (130KB/s) -#: ../midori/sokoke.c:1349 +#: ../midori/sokoke.c:1949 #, c-format msgid " (%s/s)" msgstr " (%s/s)" #. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning -#: ../midori/sokoke.c:1366 +#: ../midori/sokoke.c:1966 #, c-format msgid " - %s remaining" msgstr " - %s para terminar" #. i18n: A panel at the bottom, to search text in pages -#: ../toolbars/midori-findbar.c:265 +#: ../toolbars/midori-findbar.c:264 msgid "_Inline Find:" msgstr "Local_izar na página:" -#: ../toolbars/midori-findbar.c:287 +#: ../toolbars/midori-findbar.c:291 msgid "Previous" msgstr "Anterior" -#: ../toolbars/midori-findbar.c:293 +#: ../toolbars/midori-findbar.c:297 msgid "Next" msgstr "Seguinte" -#: ../toolbars/midori-findbar.c:297 +#: ../toolbars/midori-findbar.c:301 msgid "Match Case" msgstr "Sensível ao caso" -#: ../toolbars/midori-findbar.c:306 +#: ../toolbars/midori-findbar.c:310 msgid "Highlight Matches" msgstr "Realçar correspondências" -#: ../toolbars/midori-findbar.c:317 +#: ../toolbars/midori-findbar.c:321 msgid "Close Findbar" msgstr "Fechar barra de localização" -#: ../toolbars/midori-transferbar.c:124 +#: ../toolbars/midori-transferbar.c:120 #, c-format msgid "The file '%s' has been downloaded." msgstr "O arquivo %s foi baixado." -#: ../toolbars/midori-transferbar.c:129 +#: ../toolbars/midori-transferbar.c:123 msgid "Transfer completed" msgstr "Transferência concluída" -#: ../toolbars/midori-transferbar.c:198 +#: ../toolbars/midori-transferbar.c:212 msgid "The downloaded file is erroneous." msgstr "O arquivo baixado é errôneo." -#: ../toolbars/midori-transferbar.c:199 +#: ../toolbars/midori-transferbar.c:213 msgid "" "The checksum provided with the link did not match. This means the file is " "probably incomplete or was modified afterwards." @@ -1949,119 +2216,103 @@ 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:342 ../panels/midori-transfers.c:142 +#: ../toolbars/midori-transferbar.c:350 ../panels/midori-transfers.c:142 msgid "Clear All" msgstr "Limpar tudo" -#: ../toolbars/midori-transferbar.c:379 ../toolbars/midori-transferbar.c:381 +#: ../toolbars/midori-transferbar.c:387 ../toolbars/midori-transferbar.c:389 msgid "Some files are being downloaded" msgstr "Alguns arquivos estão sendo baixados" -#: ../toolbars/midori-transferbar.c:385 +#: ../toolbars/midori-transferbar.c:393 msgid "_Quit Midori" msgstr "_Sair do Midori" -#: ../toolbars/midori-transferbar.c:387 +#: ../toolbars/midori-transferbar.c:395 msgid "The transfers will be cancelled if Midori quits." msgstr "As transferências serão canceladas se sair do Midori." -#: ../panels/midori-bookmarks.c:308 +#: ../panels/midori-bookmarks.c:117 +msgid "Bookmarks" +msgstr "Favoritos" + +#: ../panels/midori-bookmarks.c:295 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "Falha ao adicionar item aos favoritos: %s\n" #: ../panels/midori-bookmarks.c:475 -#, c-format -msgid "Failed to update bookmark : %s\n" -msgstr "Falha ao atualizar favoritos: %s\n" - -#: ../panels/midori-bookmarks.c:535 msgid "Edit the selected bookmark" msgstr "Editar o favorito selecionado" -#: ../panels/midori-bookmarks.c:543 +#: ../panels/midori-bookmarks.c:483 msgid "Delete the selected bookmark" msgstr "Excluir o favorito selecionado" -#: ../panels/midori-bookmarks.c:558 +#: ../panels/midori-bookmarks.c:498 msgid "Add a new folder" msgstr "Adicionar nova pasta" -#: ../panels/midori-bookmarks.c:697 ../panels/midori-history.c:638 +#: ../panels/midori-bookmarks.c:632 ../panels/midori-history.c:584 msgid "Separator" msgstr "Aba" -#. Create the filter entry -#: ../panels/midori-bookmarks.c:1027 -msgid "Search Bookmarks" -msgstr "Pesquisar no Favoritos" - -#: ../panels/midori-history.c:111 +#: ../panels/midori-history.c:115 msgid "History" msgstr "Histórico" -#: ../panels/midori-history.c:158 ../panels/midori-history.c:189 -msgid "Today" -msgstr "Hoje" - -#: ../panels/midori-history.c:160 ../panels/midori-history.c:191 -msgid "Yesterday" -msgstr "Ontem" +#: ../panels/midori-history.c:147 +msgid "A week ago" +msgstr "Uma semana atrás" -#: ../panels/midori-history.c:162 ../panels/midori-history.c:186 +#: ../panels/midori-history.c:149 #, 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:165 ../panels/midori-history.c:184 -msgid "A week ago" -msgstr "Uma semana atrás" +#: ../panels/midori-history.c:152 +msgid "Today" +msgstr "Hoje" -#: ../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" +#: ../panels/midori-history.c:154 +msgid "Yesterday" +msgstr "Ontem" -#: ../panels/midori-history.c:360 +#: ../panels/midori-history.c:322 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:407 +#: ../panels/midori-history.c:368 msgid "Bookmark the selected history item" msgstr "Adicionar como favorito o item do histórico selecionado" -#: ../panels/midori-history.c:416 +#: ../panels/midori-history.c:377 msgid "Delete the selected history item" msgstr "Excluir o item do histórico selecionado" -#: ../panels/midori-history.c:424 +#: ../panels/midori-history.c:385 msgid "Clear the entire history" msgstr "Limpar todo o histórico" -#. Create the filter entry -#: ../panels/midori-history.c:997 -msgid "Search History" -msgstr "Pesquisar no Histórico" - #: ../panels/midori-transfers.c:87 msgid "Transfers" msgstr "Transferências" -#: ../panels/midori-transfers.c:470 +#: ../panels/midori-transfers.c:468 msgid "Open Destination _Folder" msgstr "Abrir pas_ta de destino" -#: ../panels/midori-transfers.c:473 +#: ../panels/midori-transfers.c:471 msgid "Copy Link Loc_ation" msgstr "Copiar loc_alização do link" -#: ../katze/katze-http-auth.c:210 +#: ../katze/katze-http-auth.c:213 msgid "Authentication Required" msgstr "Autenticação requerida" -#: ../katze/katze-http-auth.c:226 +#: ../katze/katze-http-auth.c:233 msgid "" "A username and a password are required\n" "to open this location:" @@ -2069,88 +2320,80 @@ msgstr "" "É necessário um nome de usuário e uma senha\n" "para abrir esta localização:" -#: ../katze/katze-http-auth.c:240 +#: ../katze/katze-http-auth.c:247 msgid "Username" msgstr "Nome de usuário" -#: ../katze/katze-http-auth.c:253 +#: ../katze/katze-http-auth.c:260 msgid "Password" msgstr "Senha" -#: ../katze/katze-http-auth.c:267 +#: ../katze/katze-http-auth.c:274 msgid "_Remember password" msgstr "_Lembrar senha" -#: ../katze/katze-throbber.c:949 +#: ../katze/katze-throbber.c:942 #, 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:962 +#: ../katze/katze-throbber.c:955 #, 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:1042 +#: ../katze/katze-throbber.c:1035 msgid "Animation frames are broken" msgstr "Os quadros de animação estão corrompidos" -#: ../katze/katze-utils.c:443 ../katze/katze-utils.c:866 +#: ../katze/katze-utils.c:439 ../katze/katze-utils.c:873 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Propriedade '%s' é inválida para %s" -#: ../katze/katze-utils.c:489 ../katze/katze-utils.c:518 +#: ../katze/katze-utils.c:485 ../katze/katze-utils.c:514 #: ../extensions/addons.c:309 msgid "Choose file" msgstr "Escolher arquivo" -#: ../katze/katze-utils.c:504 +#: ../katze/katze-utils.c:500 msgid "Choose folder" msgstr "Escolher pasta" -#: ../katze/katze-utils.c:602 +#: ../katze/katze-utils.c:604 msgid "None" msgstr "Nenhum" -#: ../katze/katze-utils.c:717 +#: ../katze/katze-utils.c:719 msgid "1 hour" msgstr "1 hora" -#: ../katze/katze-utils.c:718 +#: ../katze/katze-utils.c:720 msgid "1 day" msgstr "1 dia" -#: ../katze/katze-utils.c:719 +#: ../katze/katze-utils.c:721 msgid "1 week" msgstr "1 semana" -#: ../katze/katze-utils.c:720 +#: ../katze/katze-utils.c:722 msgid "1 month" msgstr "1 mês" -#: ../katze/katze-utils.c:721 +#: ../katze/katze-utils.c:723 msgid "1 year" msgstr "1 ano" -#: ../katze/katze-preferences.c:98 ../extensions/history-list.vala:235 +#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235 #, c-format msgid "Preferences for %s" msgstr "%s - Preferências" -#: ../katze/midori-uri.vala:158 -msgid "MD5-Checksum:" -msgstr "Soma de verificação MD5:" - -#: ../katze/midori-uri.vala:165 -msgid "SHA1-Checksum:" -msgstr "Soma de verificação SHA1:" - -#: ../extensions/adblock.c:475 +#: ../extensions/adblock.c:418 msgid "Configure Advertisement filters" msgstr "Configurar filtros de publicidade" -#: ../extensions/adblock.c:508 +#: ../extensions/adblock.c:462 #, c-format msgid "" "Type the address of a preconfigured filter list in the text entry and click " @@ -2160,113 +2403,113 @@ msgstr "" "\"Adicionar\" para a adicioná-la à lista. Você pode encontrar mais listas em " "%s." -#: ../extensions/adblock.c:922 +#: ../extensions/adblock.c:843 msgid "Edit rule" msgstr "Editar regra" -#: ../extensions/adblock.c:936 +#: ../extensions/adblock.c:864 msgid "_Rule:" msgstr "_Regra:" -#: ../extensions/adblock.c:990 +#: ../extensions/adblock.c:926 msgid "Bl_ock image" msgstr "Bl_oquear imagem" -#: ../extensions/adblock.c:995 +#: ../extensions/adblock.c:931 msgid "Bl_ock link" msgstr "Bl_oquear link" -#: ../extensions/adblock.c:1799 +#: ../extensions/adblock.c:1518 msgid "Advertisement blocker" msgstr "Bloqueador de publicidade" -#: ../extensions/adblock.c:1800 +#: ../extensions/adblock.c:1519 msgid "Block advertisements according to a filter list" msgstr "Bloquear publicidade de acordo com uma lista de filtros" #. i18n: An infobar shows up when viewing a script on userscripts.org -#: ../extensions/addons.c:222 +#: ../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:223 +#: ../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:228 +#: ../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:229 +#: ../extensions/addons.c:228 msgid "_Install user style" msgstr "_Instalar estilo de usuário" -#: ../extensions/addons.c:237 +#: ../extensions/addons.c:236 msgid "Don't install" msgstr "Não instalar" -#: ../extensions/addons.c:320 ../extensions/addons.c:675 +#: ../extensions/addons.c:320 ../extensions/addons.c:682 msgid "Userscripts" msgstr "Scripts de usuário" -#: ../extensions/addons.c:325 ../extensions/addons.c:677 +#: ../extensions/addons.c:325 ../extensions/addons.c:684 msgid "Userstyles" msgstr "Estilos de usuário" -#: ../extensions/addons.c:371 ../extensions/addons.c:450 +#: ../extensions/addons.c:381 ../extensions/addons.c:460 #: ../extensions/feed-panel/main.c:129 msgid "Error" msgstr "Erro" -#: ../extensions/addons.c:412 +#: ../extensions/addons.c:422 #, c-format msgid "Do you want to delete '%s'?" msgstr "Você quer excluir '%s'?" -#: ../extensions/addons.c:418 +#: ../extensions/addons.c:428 msgid "Delete user script" msgstr "Excluir script de usuário" -#: ../extensions/addons.c:419 +#: ../extensions/addons.c:429 msgid "Delete user style" msgstr "Excluir estilo de usuário" -#: ../extensions/addons.c:422 +#: ../extensions/addons.c:432 #, c-format msgid "The file %s will be permanently deleted." msgstr "O arquivo %s será permanentemente excluído." -#: ../extensions/addons.c:564 ../extensions/addons.c:641 +#: ../extensions/addons.c:571 ../extensions/addons.c:648 msgid "Open in Text Editor" msgstr "Abrir no editor de texto" -#: ../extensions/addons.c:566 ../extensions/addons.c:650 +#: ../extensions/addons.c:573 ../extensions/addons.c:657 msgid "Open Target Folder" msgstr "Abrir pasta de destino" -#: ../extensions/addons.c:632 +#: ../extensions/addons.c:639 msgid "Add new addon" msgstr "Adicionar novo complemento" -#: ../extensions/addons.c:658 +#: ../extensions/addons.c:665 msgid "Remove selected addon" msgstr "Excluir o complemento selecionado" -#: ../extensions/addons.c:1686 ../extensions/addons.c:1904 +#: ../extensions/addons.c:1650 ../extensions/addons.c:1812 msgid "User addons" msgstr "Extras de usuário" -#: ../extensions/addons.c:1816 +#: ../extensions/addons.c:1771 #, c-format msgid "Can't monitor folder '%s': %s" msgstr "Não é possível monitorar a pasta '%s': %s" -#: ../extensions/addons.c:1905 +#: ../extensions/addons.c:1813 msgid "Support for userscripts and userstyles" msgstr "Suporte a scripts e estilos de usuário" @@ -2278,16 +2521,16 @@ msgstr "Abas coloridas" msgid "Tint each tab distinctly" msgstr "Colorir distintamente cada aba" -#: ../extensions/cookie-manager/cookie-manager-page.c:73 +#: ../extensions/cookie-manager/cookie-manager-page.c:83 #: ../extensions/cookie-manager/main.c:35 msgid "Cookie Manager" msgstr "Gerenciador de cookies" -#: ../extensions/cookie-manager/cookie-manager-page.c:103 +#: ../extensions/cookie-manager/cookie-manager-page.c:113 msgid "Delete All" msgstr "Excluir tudo" -#: ../extensions/cookie-manager/cookie-manager-page.c:105 +#: ../extensions/cookie-manager/cookie-manager-page.c:115 msgid "" "Deletes all shown cookies. If a filter is set, only those cookies are " "deleted which match the filter." @@ -2295,31 +2538,31 @@ 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:120 +#: ../extensions/cookie-manager/cookie-manager-page.c:130 msgid "Expand All" msgstr "Expandir tudo" -#: ../extensions/cookie-manager/cookie-manager-page.c:127 +#: ../extensions/cookie-manager/cookie-manager-page.c:137 msgid "Collapse All" msgstr "Ocultar tudo" -#: ../extensions/cookie-manager/cookie-manager-page.c:572 +#: ../extensions/cookie-manager/cookie-manager-page.c:579 msgid "Do you really want to delete all cookies?" msgstr "Você quer realmente excluir todos os cookies?" -#: ../extensions/cookie-manager/cookie-manager-page.c:574 +#: ../extensions/cookie-manager/cookie-manager-page.c:581 msgid "Question" msgstr "Pergunta" -#: ../extensions/cookie-manager/cookie-manager-page.c:583 +#: ../extensions/cookie-manager/cookie-manager-page.c:590 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:671 +#: ../extensions/cookie-manager/cookie-manager-page.c:678 msgid "At the end of the session" msgstr "No fim da sessão" -#: ../extensions/cookie-manager/cookie-manager-page.c:674 +#: ../extensions/cookie-manager/cookie-manager-page.c:681 #, c-format msgid "" "Host: %s\n" @@ -2336,15 +2579,15 @@ msgstr "" "Seguro: %s\n" "Expiração: %s" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:687 msgid "Yes" msgstr "Sim" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:687 msgid "No" msgstr "Não" -#: ../extensions/cookie-manager/cookie-manager-page.c:694 +#: ../extensions/cookie-manager/cookie-manager-page.c:701 #, c-format msgid "" "Domain: %s\n" @@ -2353,35 +2596,43 @@ msgstr "" "Domínio: %s\n" "Cookies: %d" -#: ../extensions/cookie-manager/cookie-manager-page.c:1017 +#: ../extensions/cookie-manager/cookie-manager-page.c:1031 msgid "Name" msgstr "Nome" -#: ../extensions/cookie-manager/cookie-manager-page.c:1069 +#: ../extensions/cookie-manager/cookie-manager-page.c:1084 msgid "_Expand All" msgstr "_Expandir tudo" -#: ../extensions/cookie-manager/cookie-manager-page.c:1077 +#: ../extensions/cookie-manager/cookie-manager-page.c:1092 msgid "_Collapse All" msgstr "_Ocultar tudo" -#: ../extensions/cookie-manager/cookie-manager-page.c:1129 -msgid "Search Cookies by Name or Domain" -msgstr "Pesquisar cookies por nome ou domínio" +#: ../extensions/cookie-manager/cookie-manager-page.c:1145 +msgid "Filter:" +msgstr "Filtro:" + +#: ../extensions/cookie-manager/cookie-manager-page.c:1150 +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:36 msgid "List, view and delete cookies" msgstr "Listar, ver e excluir cookies" -#: ../extensions/copy-tabs.c:38 +#: ../extensions/copy-tabs.c:39 msgid "Copy Tab _Addresses" msgstr "Copiar _endereços das abas" -#: ../extensions/copy-tabs.c:95 +#: ../extensions/copy-tabs.c:96 msgid "Copy Addresses of Tabs" msgstr "Copiar endereços das abas" -#: ../extensions/copy-tabs.c:96 +#: ../extensions/copy-tabs.c:97 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" @@ -2396,25 +2647,25 @@ 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:387 +#: ../extensions/feed-panel/feed-panel.c:392 #, c-format msgctxt "Feed" msgid "Last updated: %s." msgstr "Última atualização: %s." -#: ../extensions/feed-panel/feed-panel.c:653 +#: ../extensions/feed-panel/feed-panel.c:658 msgid "Feeds" msgstr "Feeds" -#: ../extensions/feed-panel/feed-panel.c:706 +#: ../extensions/feed-panel/feed-panel.c:711 msgid "Add new feed" msgstr "Adicionar novo feed" -#: ../extensions/feed-panel/feed-panel.c:713 +#: ../extensions/feed-panel/feed-panel.c:718 msgid "Delete feed" msgstr "Excluir feed" -#: ../extensions/feed-panel/feed-panel.c:795 +#: ../extensions/feed-panel/feed-panel.c:800 msgid "_Feeds" msgstr "_Feeds" @@ -2461,80 +2712,54 @@ msgstr "O feed '%s' já existe" msgid "Error loading feed '%s'" msgstr "Erro ao carregar o feed '%s'" -#: ../extensions/feed-panel/main.c:518 +#: ../extensions/feed-panel/main.c:530 msgid "Feed Panel" msgstr "Painel de feeds" -#: ../extensions/feed-panel/main.c:519 +#: ../extensions/feed-panel/main.c:531 msgid "Read Atom/ RSS feeds" msgstr "Ler feeds Atom/RSS" -#: ../extensions/formhistory/formhistory.c:39 +#: ../extensions/formhistory.c:151 #, c-format msgid "Failed to add form value: %s\n" msgstr "Falha ao adicionar o valor de formulário: %s\n" -#: ../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 +#: ../extensions/formhistory.c:303 msgid "Toggle form history state" msgstr "Alternar estado do formulário de histórico" -#: ../extensions/formhistory/formhistory.c:438 +#: ../extensions/formhistory.c:304 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 +#: ../extensions/formhistory.c:438 ../extensions/formhistory.c:442 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Falha ao executar afirmação da base de dados: %s\n" -#: ../extensions/formhistory/formhistory.c:629 -msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab" +#: ../extensions/formhistory.c:517 +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 +#: ../extensions/formhistory.c:576 msgid "Stores history of entered form data" msgstr "Armazenar o histórico de dados de formulário" -#: ../extensions/formhistory/formhistory-gdom-frontend.c:225 -#: ../extensions/formhistory/formhistory-js-frontend.c:106 +#: ../extensions/formhistory.c:580 #, c-format -msgid "Failed to select suggestions\n" -msgstr "Falha ao selecionar sugestões\n" +msgid "Not available: %s" +msgstr "Não disponível: %s" + +#: ../extensions/formhistory.c:581 +msgid "Resource files not installed" +msgstr "arquivos de configuração não instalados" + +#: ../extensions/formhistory.c:587 +msgid "Form history filler" +msgstr "Preenchimento de formulários" #: ../extensions/history-list.vala:197 msgid "There are no unvisited tabs" @@ -2601,23 +2826,23 @@ msgstr "Gestos do mouse" msgid "Control Midori by moving the mouse" msgstr "Controlar o Midori movendo o mouse" -#: ../extensions/shortcuts.c:109 +#: ../extensions/shortcuts.c:110 msgid "Reload page or stop loading" msgstr "Recarregar a página ou parar o recarregamento" -#: ../extensions/shortcuts.c:176 +#: ../extensions/shortcuts.c:177 msgid "Customize Keyboard shortcuts" msgstr "Personalizar atalhos de teclado" -#: ../extensions/shortcuts.c:283 +#: ../extensions/shortcuts.c:298 msgid "Customize Sh_ortcuts..." msgstr "Personalizar atalh_os..." -#: ../extensions/shortcuts.c:320 +#: ../extensions/shortcuts.c:335 msgid "Shortcuts" msgstr "Atalhos" -#: ../extensions/shortcuts.c:321 +#: ../extensions/shortcuts.c:336 msgid "View and edit keyboard shortcuts" msgstr "Ver e editar os atalhos de teclado" @@ -2629,487 +2854,86 @@ msgstr "Relógio na barra de status" msgid "Display date and time in the statusbar" msgstr "Exibir a data e a hora na barra de status" -#: ../extensions/statusbar-features.c:152 +#: ../extensions/statusbar-features.c:129 msgid "Images" msgstr "Imagens" -#: ../extensions/statusbar-features.c:162 +#: ../extensions/statusbar-features.c:138 msgid "Scripts" msgstr "Scripts" -#: ../extensions/statusbar-features.c:174 +#: ../extensions/statusbar-features.c:147 msgid "Netscape plugins" msgstr "Plugins Netscape" -#: ../extensions/statusbar-features.c:259 +#: ../extensions/statusbar-features.c:193 msgid "Statusbar Features" msgstr "Funcionalidades na barra de status" -#: ../extensions/statusbar-features.c:260 +#: ../extensions/statusbar-features.c:194 msgid "Easily toggle features on web pages on and off" msgstr "Habilitar/desabilitar facilmente funcionalidades das páginas web" -#: ../extensions/tab-panel.c:589 ../extensions/tab-panel.c:676 +#: ../extensions/tab-panel.c:597 ../extensions/tab-panel.c:684 msgid "Tab Panel" msgstr "Painel de abas" -#: ../extensions/tab-panel.c:659 +#: ../extensions/tab-panel.c:667 msgid "T_ab Panel" msgstr "P_ainel de abas" -#: ../extensions/tab-panel.c:677 +#: ../extensions/tab-panel.c:685 msgid "Show tabs in a vertical panel" msgstr "Exibir as abas num painel vertical" -#: ../extensions/tabs-minimized.c:76 +#: ../extensions/tabs-minimized.c:77 msgid "Only Icons on Tabs by default" msgstr "Apenas ícones nas abas por padrão" -#: ../extensions/tabs-minimized.c:77 +#: ../extensions/tabs-minimized.c:78 msgid "New tabs have no label by default" msgstr "Novas abas sem título por padrão" -#: ../extensions/toolbar-editor.c:395 +#: ../extensions/toolbar-editor.c:393 msgid "Customize Toolbar" msgstr "Personalizar barra de ferramentas" -#: ../extensions/toolbar-editor.c:411 +#: ../extensions/toolbar-editor.c:413 msgid "" -"Select items to be displayed on the toolbar. Items can be reordered by drag " +"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:427 +#: ../extensions/toolbar-editor.c:429 msgid "Available Items" msgstr "Itens disponíveis" -#: ../extensions/toolbar-editor.c:448 +#: ../extensions/toolbar-editor.c:450 msgid "Displayed Items" msgstr "Itens exibidos" -#: ../extensions/toolbar-editor.c:588 -msgid "_Customize Toolbar…" +#: ../extensions/toolbar-editor.c:585 +msgid "Customize _Toolbar..." msgstr "Personalizar _barra de ferramentas..." -#: ../extensions/toolbar-editor.c:617 +#: ../extensions/toolbar-editor.c:601 +msgid "_Customize..." +msgstr "_Personalizar..." + +#: ../extensions/toolbar-editor.c:631 msgid "Toolbar Editor" msgstr "Editor da barra de ferramentas" -#: ../extensions/toolbar-editor.c:618 +#: ../extensions/toolbar-editor.c:632 msgid "Easily edit the toolbar layout" msgstr "Editar facilmente a barra de ferramentas" -#: ../extensions/web-cache.c:462 +#: ../extensions/web-cache.c:465 msgid "Cache HTTP communication on disk" msgstr "Pôr comunicações HTTP em cache" -#~ msgid "Remember last window size" -#~ msgstr "Lembrar último tamanho da janela" - -#~ msgid "Whether to save the last window size" -#~ msgstr "Se o último tamanho da janela deve ser salvo" - -#~ msgid "Last window width" -#~ msgstr "Última largura da janela" - -#~ msgid "The last saved window width" -#~ msgstr "Última largura da janela salva" - -#~ msgid "Last window height" -#~ msgstr "Última altura da janela" - -#~ msgid "The last saved window height" -#~ msgstr "Última altura da janela salva" - -#~ msgid "Last panel position" -#~ msgstr "Última posição do painel" - -#~ msgid "The last saved panel position" -#~ msgstr "Última posição do painel salva" - -#~ msgid "Last panel page" -#~ msgstr "Última página do painel" - -#~ msgid "The last saved panel page" -#~ msgstr "Última página do painel salva" - -#~ msgid "Last Web search" -#~ msgstr "Última pesquisa na web" - -#~ msgid "The last saved Web search" -#~ msgstr "Última pesquisa na web salva" - -#~ msgid "Show Menubar" -#~ msgstr "Exibir barra de menu" - -#~ msgid "Whether to show the menubar" -#~ msgstr "Se a barra de menu deve ser exibida" - -#~ msgid "Show Navigationbar" -#~ msgstr "Exibir barra de navegação" - -#~ msgid "Whether to show the navigationbar" -#~ msgstr "Se a barra de navegação deve ser exibida" - -#~ msgid "Show Bookmarkbar" -#~ msgstr "Exibir barra de favoritos" - -#~ msgid "Whether to show the bookmarkbar" -#~ msgstr "Se a barra de favoritos deve ser exibida" - -#~ msgid "Show Panel" -#~ msgstr "Exibir painel" - -#~ msgid "Whether to show the panel" -#~ msgstr "Se o painel deve ser exibido" - -#~ msgid "Show Statusbar" -#~ msgstr "Exibir barra de status" - -#~ msgid "Whether to show the statusbar" -#~ msgstr "Se a barra de status deve ser exibida" - -#~ msgid "Toolbar Items" -#~ msgstr "Itens da barra de ferramentas" - -#~ msgid "The items to show on the toolbar" -#~ msgstr "Itens a serem exibidos na barra de ferramentas" - -#~ msgid "Compact Sidepanel" -#~ msgstr "Painel lateral compacto" - -#~ msgid "Whether to make the sidepanel compact" -#~ msgstr "Se o painel lateral deve ser compacto" - -#~ msgid "Align sidepanel on the right" -#~ msgstr "Alinhar painel lateral à direita" - -#~ msgid "Whether to align the sidepanel on the right" -#~ msgstr "Se o painel lateral deve ser alinhado à direita" - -#~ msgid "Open panels in separate windows" -#~ msgstr "Abrir painéis em janelas separadas" - -#~ msgid "Whether to always open panels in separate windows" -#~ msgstr "Se os painéis devem ser sempre abertos em janelas separadas" - -#~ msgid "What to do when Midori starts" -#~ msgstr "O que fazer ao iniciar o Midori" - -#~ msgid "The homepage" -#~ msgstr "A página inicial" - -#~ msgid "Show crash dialog" -#~ msgstr "Exibir diálogo de encerramento abrupto" - -#~ msgid "The folder downloaded files are saved to" -#~ msgstr "A pasta na qual salvar os arquivos baixados" - -#~ msgid "An external text editor" -#~ msgstr "Um editor de texto externo" - -#~ msgid "An external news aggregator" -#~ msgstr "Um agregador de notícias externo" - -#~ msgid "Location entry Search" -#~ msgstr "Pesquisa no campo de endereço" - -#~ msgid "The search to perform inside the location entry" -#~ msgstr "A pesquisa a ser executada pelo campo de endereço" - -#~ msgid "The preferred character encoding" -#~ msgstr "A codificação de caracteres preferida" - -#~ msgid "Always show the tabbar" -#~ msgstr "Se a barra de abas deve ser exibida mesmo com apenas uma aba aberta" - -#~ msgid "Whether tabs have close buttons" -#~ msgstr "Se as abas devem ter um botão para fechar" - -#~ msgid "Where to open new pages" -#~ msgstr "Onde abrir novas páginas" - -#~ msgid "Whether to open new tabs in the background" -#~ msgstr "Se as novas abas devem ser abertas em segundo plano" - -#~ msgid "Open popups in tabs" -#~ msgstr "Abrir popups em abas" - -#~ msgid "Whether to open popup windows in tabs" -#~ msgstr "Se janelas popup devem ser abertas em abas" - -#~ msgid "Load and display images automatically" -#~ msgstr "Carregar e exibir as imagens automaticamente" - -#~ msgid "Enable embedded scripting languages" -#~ msgstr "Habilitar linguagem de scripts incorporadas" - -#~ msgid "Enable embedded Netscape plugin objects" -#~ msgstr "Habilitar plugins Netscape incorporados" - -#~ msgid "Enable spell checking while typing" -#~ msgstr "Habilitar verificação ortográfica ao digitar" - -#~ msgid "Enable HTML5 database support" -#~ msgstr "Habilitar suporte a bases de dados HTML5" - -#~ msgid "Whether to enable HTML5 database support" -#~ msgstr "Se o suporte a bases de dados HTML5 deve ser habilitado" - -#~ msgid "Whether to enable HTML5 local storage support" -#~ msgstr "Se o suporte a armazenagem local HTML5 deve ser habilitado" - -#~ msgid "Whether to enable offline web application cache" -#~ msgstr "Se o cache de aplicativos web offline deve ser habilitado" - -#~ 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" - -#~ msgid "Allow websites to use OpenGL rendering" -#~ msgstr "Permitir que sites usem renderização OpenGL" - -#~ msgid "Whether to zoom text and images" -#~ msgstr "Se o zoom de texto e imagens pode ser ajustado" - -#~ msgid "Find inline while typing" -#~ msgstr "Localizar na página ao digitar" - -#~ msgid "Whether to automatically find inline while typing" -#~ msgstr "Se a localização na página deve se dar automaticamente ao digitar" - -#~ msgid "The type of proxy server to use" -#~ msgstr "O tipo de servidor a utilizar" - -#~ msgid "HTTP Proxy Server" -#~ msgstr "Servidor proxy HTTP" - -#~ msgid "The proxy server used for HTTP connections" -#~ msgstr "Servidor proxy para conexões HTTP" - -#~ msgid "The proxy server port used for HTTP connections" -#~ msgstr "Porta do servidor proxy usado para conexões HTTPS" - -#~ msgid "Identification string" -#~ msgstr "Cadeia de identificação" - -#~ msgid "The application identification string" -#~ msgstr "A cadeia de identificação do aplicativo" - -#~ msgid "Clear private data" -#~ msgstr "Limpar dados privados" - -#~ msgid "The private data selected for deletion" -#~ msgstr "Os dados privados selecionados para exclusão" - -#~ msgid "Clear data" -#~ msgstr "Limpar dados" - -#~ msgid "The data selected for deletion" -#~ msgstr "Os dados selecionados para exclusão" - -#~ msgid "Close ot_her Tabs" -#~ msgstr "Fec_har outras abas" - -#~ msgid "_Icon:" -#~ msgstr "_Ícone:" - -#~ msgid "Filter:" -#~ msgstr "Filtro:" - -#~ 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" - -#~ msgid "_Bookmark" -#~ msgstr "_Favorito" - -#~ msgid "_Console" -#~ msgstr "_Console" - -#~ msgid "The bookmarks couldn't be saved. %s" -#~ msgstr "Os favoritos não puderam ser salvos. %s" - -#~ msgid "Toplevel folder" -#~ msgstr "Pasta principal" - -#~ msgid "_Title:" -#~ msgstr "_Título:" - -#~ msgid "_Folder:" -#~ msgstr "_Pasta:" - -#~ msgid "_Customize…" -#~ msgstr "_Personalizar…" - -#~ 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 "No filename specified" #~ msgstr "Nenhum nome de arquivo especificado" @@ -3137,8 +2961,8 @@ msgstr "Pôr comunicações HTTP em cache" #~ msgid "Reset the last _session" #~ msgstr "Apagar a última _sessão" -#~ msgid "Configure _Advertisement filters…" -#~ msgstr "Configurar _filtros de publicidade…" +#~ msgid "Configure _Advertisement filters..." +#~ msgstr "Configurar _filtros de publicidade..." #~ msgid "Not found - %s" #~ msgstr "Não encontrado - %s" @@ -3155,6 +2979,9 @@ msgstr "Pôr comunicações HTTP em cache" #~ msgid "Switch tabs with Ctrl+Tab sorted by last usage" #~ msgstr "Alternar com Ctrl+Tab entre abas, ordenadas pelo último uso" +#~ msgid "_Form History" +#~ msgstr "_Histórico de formulários" + #~ msgid "Delete old cookies after 1 hour" #~ msgstr "Excluir cookies antigos após 1 hora" @@ -3170,6 +2997,9 @@ msgstr "Pôr comunicações HTTP em cache" #~ msgid "days" #~ msgstr "dias" +#~ msgid "Midori (Private Browsing)" +#~ msgstr "Midori (navegação privada)" + #~ msgid "All cookies" #~ msgstr "Todos os cookies" diff --git a/po/ro.po b/po/ro.po index eb11da7f..96031337 100644 --- a/po/ro.po +++ b/po/ro.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.3.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-06 08:27+0000\n" +"POT-Creation-Date: 2011-12-11 11:09+0000\n" "PO-Revision-Date: 2011-07-30 16:21+0300\n" "Last-Translator: Mișu Moldovan \n" "Language-Team: Romanian \n" @@ -22,35 +22,19 @@ msgstr "" "X-Generator: Virtaal 0.6.1\n" #: ../data/midori.desktop.in.h:1 -msgid "Browse the Web" -msgstr "Navigați pe Internet" - -#: ../data/midori.desktop.in.h:2 msgid "Internet;WWW;Explorer" msgstr "Internet;WWW;Navigator" -#: ../data/midori.desktop.in.h:3 ../midori/main.c:2025 ../midori/main.c:2049 -#: ../midori/main.c:2063 ../midori/midori-websettings.c:315 +#: ../data/midori.desktop.in.h:2 +msgid "Lightweight web browser" +msgstr "Mic navigator web" + +#: ../data/midori.desktop.in.h:3 ../midori/main.c:1990 ../midori/main.c:2010 +#: ../midori/main.c:2021 ../midori/midori-websettings.c:303 msgid "Midori" msgstr "Midori" #: ../data/midori.desktop.in.h:4 -msgid "Midori Web Browser" -msgstr "Navigatorul web Midori" - -#: ../data/midori.desktop.in.h:5 -msgid "New Private Browsing Window" -msgstr "Fereastră nouă de navigare privată" - -#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1478 -msgid "New Tab" -msgstr "Tab nou" - -#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1475 -msgid "New Window" -msgstr "Fereastră nouă" - -#: ../data/midori.desktop.in.h:8 msgid "Web Browser" msgstr "Navigator web" @@ -62,72 +46,82 @@ msgstr "Navigare privată cu Midori" 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:4494 +#: ../data/midori-private.desktop.in.h:3 msgid "Private Browsing" msgstr "Navigare privată" -#: ../midori/main.c:91 ../midori/main.c:97 +#: ../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:145 +#: ../midori/main.c:150 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Valoarea „%s” nu este validă pentru %s" -#: ../midori/main.c:150 ../midori/main.c:254 +#: ../midori/main.c:155 ../midori/main.c:259 #, c-format msgid "Invalid configuration value '%s'" msgstr "Valoare nevalidă „%s” în preferințe" -#: ../midori/main.c:375 +#: ../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:429 +#: ../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:451 ../extensions/formhistory/formhistory.c:531 +#: ../midori/main.c:438 ../midori/main.c:559 ../extensions/formhistory.c:418 #, c-format msgid "Failed to open database: %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:523 +#: ../midori/main.c:502 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Nu s-au putut șterge elementele vechi din istoric: %s\n" -#: ../midori/main.c:545 +#: ../midori/main.c:542 ../panels/midori-history.c:189 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "Nu s-a putut șterge elementul din istoric: %s\n" + +#: ../midori/main.c:589 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "Nu s-au putut salva favoritele. %s" + +#: ../midori/main.c:611 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Nu s-au putut salva preferințele. %s" -#: ../midori/main.c:571 +#: ../midori/main.c:646 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Nu s-au putut salva motoarele de căutare. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:608 +#: ../midori/main.c:683 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Nu s-a putut salva gunoiul. %s" -#: ../midori/main.c:681 ../panels/midori-extensions.c:90 +#: ../midori/main.c:724 ../panels/midori-extensions.c:91 msgid "Extensions" msgstr "Extensii" -#: ../midori/main.c:695 +#: ../midori/main.c:738 msgid "Privacy" msgstr "Intimitate" # dumol: Scurtat puțin pentru a nu lăbărța fereastra preferințelor -#: ../midori/main.c:707 +#: ../midori/main.c:750 msgid "" "Cookies store login data, saved games, or user profiles for advertisement " "purposes." @@ -135,19 +129,19 @@ msgstr "" "Cookie-urile stochează autentificări, preferințe ori alte date, multe în " "scopuri publicitare." -#: ../midori/main.c:763 +#: ../midori/main.c:806 #, c-format msgid "The session couldn't be saved. %s" msgstr "Nu s-a putut salva sesiunea. %s" -#: ../midori/main.c:1001 +#: ../midori/main.c:1021 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:1093 +#: ../midori/main.c:1089 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." @@ -155,227 +149,245 @@ 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:1112 +#: ../midori/main.c:1108 msgid "Modify _preferences" msgstr "_Editare preferințe" -#: ../midori/main.c:1116 +#: ../midori/main.c:1112 msgid "Disable all _extensions" msgstr "_Fără extensii" -#: ../midori/main.c:1129 +#: ../midori/main.c:1125 msgid "Discard old tabs" msgstr "Uită taburile vechi" # dumol: Truc pentru a micșora lățimea ferestrei cu preferințe -#: ../midori/main.c:1130 ../midori/midori-websettings.c:223 +#: ../midori/main.c:1126 ../midori/midori-websettings.c:212 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:1131 ../midori/midori-websettings.c:222 +#: ../midori/main.c:1127 ../midori/midori-websettings.c:211 msgid "Show last open tabs" msgstr "Ultimele taburi deschise" -#: ../midori/main.c:1379 ../midori/main.c:2433 +#: ../midori/main.c:1335 ../midori/main.c:2398 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Nu s-a putut încărca sesiunea: %s\n" -#: ../midori/main.c:1517 +#: ../midori/main.c:1473 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Captură salvată în: %s\n" -#: ../midori/main.c:1933 +#: ../midori/main.c:1893 msgid "Run ADDRESS as a web application" msgstr "Deschide ADRESA ca o aplicație web" -#: ../midori/main.c:1933 +#: ../midori/main.c:1893 msgid "ADDRESS" msgstr "ADRESĂ" -#: ../midori/main.c:1936 +#: ../midori/main.c:1896 msgid "Use FOLDER as configuration folder" msgstr "Folosește DOSAR ca dosar cu preferințe" -#: ../midori/main.c:1936 +#: ../midori/main.c:1896 msgid "FOLDER" msgstr "DOSAR" -#: ../midori/main.c:1939 +#: ../midori/main.c:1899 msgid "Private browsing, no changes are saved" msgstr "Navigare privată, nu se salvează modificările" -#: ../midori/main.c:1941 +#: ../midori/main.c:1901 msgid "Show a diagnostic dialog" msgstr "Arată o fereastră de depanare" -#: ../midori/main.c:1943 +#: ../midori/main.c:1903 msgid "Run the specified filename as javascript" msgstr "Execută ca JavaScript fișierul precizat" -#: ../midori/main.c:1945 +#: ../midori/main.c:1905 msgid "Take a snapshot of the specified URI" msgstr "Salvează o captură a URI-ului specificat" -#: ../midori/main.c:1947 +#: ../midori/main.c:1907 msgid "Execute the specified command" msgstr "Execută comanda specificată" -#: ../midori/main.c:1949 +#: ../midori/main.c:1909 msgid "List available commands to execute with -e/ --execute" msgstr "Arată comenzile ce pot fi executate cu -e / --execute" -#: ../midori/main.c:1951 +#: ../midori/main.c:1911 msgid "Display program version" msgstr "Arată versiunea programului" -#: ../midori/main.c:1953 +#: ../midori/main.c:1913 msgid "Addresses" msgstr "Adrese" -#: ../midori/main.c:1955 +#: ../midori/main.c:1915 msgid "Block URIs according to regular expression PATTERN" msgstr "Blochează URI-uri după modelul regexp MODEL" -#: ../midori/main.c:1955 +#: ../midori/main.c:1915 msgid "PATTERN" msgstr "MODEL" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1959 +#: ../midori/main.c:1919 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "Repornește Midori după un număr de SECUNDE de inactivitate" -#: ../midori/main.c:1959 +#: ../midori/main.c:1919 msgid "SECONDS" msgstr "SECUNDE" -#: ../midori/main.c:1962 +#: ../midori/main.c:1922 msgid "Redirects console warnings to the specified FILENAME" msgstr "Redirectează avertizările din consolă în FIȘIER" -#: ../midori/main.c:1962 +#: ../midori/main.c:1922 msgid "FILENAME" msgstr "FIȘIER" -#: ../midori/main.c:2064 +#: ../midori/main.c:1987 +msgid "[Addresses]" +msgstr "[Adrese]" + +#: ../midori/main.c:1997 +msgid "The specified configuration folder is invalid." +msgstr "Dosarul cu preferințe precizat nu este valid." + +#: ../midori/main.c:2022 msgid "Please report comments, suggestions and bugs to:" msgstr "Trimiteți comentarii, sugestii și raportați problemele la:" -#: ../midori/main.c:2066 +#: ../midori/main.c:2024 msgid "Check for new versions at:" msgstr "Versiunile noi sunt disponibile la:" +#: ../midori/main.c:2107 +msgid "Website icons" +msgstr "Iconițe ale site-urilor web" + #. i18n: Logins and passwords in websites and web forms -#: ../midori/main.c:2161 +#: ../midori/main.c:2110 msgid "Saved logins and _passwords" msgstr "_Parole și autentificări salvate" -#: ../midori/main.c:2163 -msgid "Cookies and Website data" -msgstr "Cookie-uri și date ale site-urilor" +#: ../midori/main.c:2112 +msgid "Cookies" +msgstr "Cookie-uri" + +#: ../midori/main.c:2115 +msgid "'Flash' Cookies" +msgstr "Cookie-uri Flash" -#. TODO: Preserve page icons of search engines and merge privacy items -#: ../midori/main.c:2167 ../midori/midori-websettings.c:1020 +#: ../midori/main.c:2118 +msgid "HTML5 _Databases" +msgstr "Baze de _date HTML5" + +#: ../midori/main.c:2121 ../midori/midori-websettings.c:936 #: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471 msgid "Web Cache" msgstr "Cache web" -#: ../midori/main.c:2170 -msgid "Website icons" -msgstr "Iconițe ale site-urilor web" +#: ../midori/main.c:2123 +msgid "Offline Application Cache" +msgstr "Cache offline de aplicație" -#: ../midori/main.c:2274 +#: ../midori/main.c:2228 msgid "An unknown error occured" msgstr "A intervenit o eroare necunoscută" -#: ../midori/main.c:2381 +#: ../midori/main.c:2329 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:2415 +#: ../midori/main.c:2365 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Nu s-au putut încărca favoritele: %s\n" -#: ../midori/main.c:2448 +#: ../midori/main.c:2413 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Nu s-a putut încărca gunoiul: %s\n" -#: ../midori/main.c:2461 +#: ../midori/main.c:2426 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Nu s-a putut încărca istoricul: %s\n" -#: ../midori/main.c:2476 +#: ../midori/main.c:2442 msgid "The following errors occured:" msgstr "Au intervenit următoarele erori:" -#: ../midori/main.c:2492 +#: ../midori/main.c:2458 msgid "_Ignore" msgstr "_Ignoră" -#: ../midori/midori-app.c:1155 ../midori/midori-browser.c:545 -#, c-format -msgid "Unexpected action '%s'." -msgstr "Acțiune neașteptată „%s”." +#: ../midori/midori-app.c:1333 +msgid "_Bookmark" +msgstr "_Favorit" -#: ../midori/midori-app.c:1457 ../midori/midori-browser.c:6431 +#: ../midori/midori-app.c:1334 ../midori/midori-browser.c:6014 msgid "_Bookmarks" msgstr "Favori_te" -#: ../midori/midori-app.c:1458 +#: ../midori/midori-app.c:1335 msgid "Add Boo_kmark" -msgstr "Adaugă un fa_vorit" +msgstr "Adau_gă un favorit" -#: ../midori/midori-app.c:1459 +#: ../midori/midori-app.c:1336 +msgid "_Console" +msgstr "_Consolă" + +#: ../midori/midori-app.c:1337 msgid "_Extensions" msgstr "E_xtensii" #. i18n: Browsing history, visited web pages, closed tabs -#: ../midori/midori-app.c:1460 ../midori/midori-browser.c:4887 +#: ../midori/midori-app.c:1338 ../midori/midori-browser.c:4576 msgid "_History" msgstr "_Istoric" -#: ../midori/midori-app.c:1461 +#: ../midori/midori-app.c:1339 +msgid "_Homepage" +msgstr "Pagină de _start" + +#: ../midori/midori-app.c:1340 msgid "_Userscripts" msgstr "Scripturi pr_oprii" -#: ../midori/midori-app.c:1462 -msgid "User_styles" -msgstr "_Stiluri de utilizator" - -#: ../midori/midori-app.c:1463 +#: ../midori/midori-app.c:1341 msgid "New _Tab" msgstr "Ta_b nou" -#: ../midori/midori-app.c:1464 +#: ../midori/midori-app.c:1342 msgid "_Transfers" msgstr "De_scărcări" -#: ../midori/midori-app.c:1465 +#: ../midori/midori-app.c:1343 msgid "Netscape p_lugins" msgstr "Module _Netscape" -#: ../midori/midori-app.c:1466 +#: ../midori/midori-app.c:1344 msgid "_Closed Tabs" msgstr "Taburi în_chise" -#: ../midori/midori-app.c:1467 ../midori/midori-browser.c:5570 +#: ../midori/midori-app.c:1345 ../midori/midori-browser.c:5161 msgid "New _Window" msgstr "_Fereastră nouă" -#: ../midori/midori-app.c:1468 +#: ../midori/midori-app.c:1346 msgid "New _Folder" msgstr "_Dosar nou" -#: ../midori/midori-app.c:1497 -msgid "[Addresses]" -msgstr "[Adrese]" - #: ../midori/midori-array.c:522 msgid "File not found." msgstr "Nu s-a găsit fișierul." @@ -393,124 +405,124 @@ msgstr "Format necunoscut de favorite." msgid "Writing failed." msgstr "Scrierea a eșuat." -#: ../midori/midori-browser.c:364 ../midori/midori-browser.c:5658 -#: ../midori/midori-browser.c:5667 +#: ../midori/midori-browser.c:334 ../midori/midori-browser.c:5243 +#: ../midori/midori-browser.c:5252 msgid "Reload the current page" msgstr "Reîncarcă pagina curentă" -#: ../midori/midori-browser.c:373 ../midori/midori-browser.c:5664 +#: ../midori/midori-browser.c:342 ../midori/midori-browser.c:5249 msgid "Stop loading the current page" msgstr "Oprește încărcarea paginii curente" -#: ../midori/midori-browser.c:530 +#: ../midori/midori-browser.c:467 #, c-format msgid "Failed to update title: %s\n" msgstr "Nu s-a putut actualiza titlul: %s\n" -#: ../midori/midori-browser.c:625 +#: ../midori/midori-browser.c:480 +#, c-format +msgid "Unexpected action '%s'." +msgstr "Acțiune neașteptată „%s”." + +#: ../midori/midori-browser.c:573 #, c-format msgid "%s (Private Browsing)" msgstr "%s (Navigare privată)" -#: ../midori/midori-browser.c:735 ../midori/midori-browser.c:777 -#: ../panels/midori-bookmarks.c:114 -msgid "Bookmarks" -msgstr "Favorite" +#: ../midori/midori-browser.c:683 ../midori/midori-browser.c:716 +msgid "Toplevel folder" +msgstr "Dosarul rădăcină" -#: ../midori/midori-browser.c:837 +#: ../midori/midori-browser.c:773 msgid "New folder" msgstr "Dosar nou" -#: ../midori/midori-browser.c:837 +#: ../midori/midori-browser.c:773 msgid "Edit folder" msgstr "Editare dosar" -#: ../midori/midori-browser.c:839 +#: ../midori/midori-browser.c:775 msgid "New bookmark" msgstr "Favorit nou" -#: ../midori/midori-browser.c:839 +#: ../midori/midori-browser.c:775 msgid "Edit bookmark" msgstr "Editare favorite" -#: ../midori/midori-browser.c:873 -msgid "Type a name for this bookmark and choose where to keep it." -msgstr "Introduceți un nume pentru acest favorit și alegeți unde să-l salvați." +#: ../midori/midori-browser.c:806 +msgid "_Title:" +msgstr "_Titlu:" -#: ../midori/midori-browser.c:934 +#: ../midori/midori-browser.c:826 ../midori/midori-searchaction.c:966 +#: ../extensions/feed-panel/main.c:377 +msgid "_Address:" +msgstr "_Adresă:" + +#: ../midori/midori-browser.c:849 ../midori/midori-browser.c:4311 +msgid "_Folder:" +msgstr "D_osar:" + +#: ../midori/midori-browser.c:865 msgid "Add to _Speed Dial" msgstr "Ada_ugă ca apel rapid" -#: ../midori/midori-browser.c:940 +#: ../midori/midori-browser.c:878 msgid "Show in the tool_bar" msgstr "Arată în _bara cu unelte" -#: ../midori/midori-browser.c:948 +#: ../midori/midori-browser.c:893 msgid "Run as _web application" msgstr "Deschide ca o aplicație _web" -#: ../midori/midori-browser.c:1019 +#: ../midori/midori-browser.c:964 #, 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:1021 +#: ../midori/midori-browser.c:966 #, 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:1028 +#: ../midori/midori-browser.c:973 #, 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:1031 +#: ../midori/midori-browser.c:976 #, 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:1167 ../midori/midori-browser.c:4691 +#: ../midori/midori-browser.c:1020 ../midori/midori-browser.c:4381 msgid "Save file as" msgstr "Salvare fișier ca" -#: ../midori/midori-browser.c:1173 -msgid "Save associated _resources" -msgstr "Salvează _resursele asociate" +#: ../midori/midori-browser.c:1329 +msgid "New Window" +msgstr "Fereastră nouă" -#: ../midori/midori-browser.c:1475 +#: ../midori/midori-browser.c:1329 msgid "A new window has been opened" msgstr "S-a deschis o nouă fereastră" -#: ../midori/midori-browser.c:1478 +#: ../midori/midori-browser.c:1332 +msgid "New Tab" +msgstr "Tab nou" + +#: ../midori/midori-browser.c:1332 msgid "A new tab has been opened" msgstr "S-a deschis un nou tab" -#: ../midori/midori-browser.c:1495 -msgid "Error opening the image!" -msgstr "Eroare la deschiderea imaginii!" - -#: ../midori/midori-browser.c:1496 -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:1502 -msgid "Error downloading the image!" -msgstr "Eroare la descărcarea imaginii!" - -#: ../midori/midori-browser.c:1503 -msgid "Can not download selected image." -msgstr "Nu s-a putut descărca imaginea selectată." - -#: ../midori/midori-browser.c:1624 +#: ../midori/midori-browser.c:1369 msgid "Save file" msgstr "Salvare fișier" -#: ../midori/midori-browser.c:2527 +#: ../midori/midori-browser.c:2261 msgid "Open file" msgstr "Deschidere fișier" -#: ../midori/midori-browser.c:2659 +#: ../midori/midori-browser.c:2392 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" @@ -525,156 +537,140 @@ msgstr "" "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:2665 ../extensions/feed-panel/main.c:365 +#: ../midori/midori-browser.c:2398 ../extensions/feed-panel/main.c:365 msgid "New feed" msgstr "Flux nou" -#: ../midori/midori-browser.c:2708 ../midori/midori-browser.c:5730 -#: ../panels/midori-bookmarks.c:527 +#: ../midori/midori-browser.c:2441 ../midori/midori-browser.c:5312 +#: ../panels/midori-bookmarks.c:426 msgid "Add a new bookmark" msgstr "Adăugare favorit nou" -#: ../midori/midori-browser.c:3252 ../midori/midori-searchaction.c:487 +#: ../midori/midori-browser.c:2976 ../midori/midori-searchaction.c:487 msgid "Empty" msgstr "Gol" -#: ../midori/midori-browser.c:3695 ../midori/midori-browser.c:3696 +#: ../midori/midori-browser.c:3464 msgid "Toggle text cursor navigation" msgstr "Navigare cu sau fără cursor" -#: ../midori/midori-browser.c:3698 -msgid "" -"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in " -"all websites." -msgstr "" -"Apăsând F7 comutați navigarea cu cursorul. Când aceasta va fi activă, va " -"apărea un cursor în pagina web." - -#: ../midori/midori-browser.c:3701 -msgid "_Enable Caret Browsing" -msgstr "Activează _navigarea cu cursorul" - -#: ../midori/midori-browser.c:4091 ../midori/midori-browser.c:6124 +#: ../midori/midori-browser.c:3773 ../midori/midori-browser.c:5711 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Nu s-a putut insera noul element în istoric: %s\n" -#: ../midori/midori-browser.c:4417 ../panels/midori-bookmarks.c:850 -#: ../panels/midori-history.c:806 +#: ../midori/midori-browser.c:4108 ../panels/midori-bookmarks.c:742 +#: ../panels/midori-history.c:747 msgid "Open all in _Tabs" msgstr "Deschide tot în _taburi" -#: ../midori/midori-browser.c:4424 ../panels/midori-bookmarks.c:856 -#: ../panels/midori-history.c:812 ../extensions/feed-panel/feed-panel.c:528 +#: ../midori/midori-browser.c:4115 ../panels/midori-bookmarks.c:748 +#: ../panels/midori-history.c:753 ../extensions/feed-panel/feed-panel.c:528 msgid "Open in New _Tab" msgstr "Deschide într-un _tab nou" -#: ../midori/midori-browser.c:4427 ../midori/midori-view.c:2940 -#: ../midori/midori-view.c:5071 ../panels/midori-bookmarks.c:858 -#: ../panels/midori-history.c:814 ../extensions/feed-panel/feed-panel.c:530 +#: ../midori/midori-browser.c:4118 ../midori/midori-view.c:2518 +#: ../midori/midori-view.c:4368 ../panels/midori-bookmarks.c:750 +#: ../panels/midori-history.c:755 ../extensions/feed-panel/feed-panel.c:530 msgid "Open in New _Window" msgstr "Deschide într-o _fereastră nouă" -#: ../midori/midori-browser.c:4516 +#: ../midori/midori-browser.c:4198 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4517 +#: ../midori/midori-browser.c:4199 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4518 +#: ../midori/midori-browser.c:4200 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4519 +#: ../midori/midori-browser.c:4201 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4520 +#: ../midori/midori-browser.c:4202 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4521 +#: ../midori/midori-browser.c:4203 #, c-format msgid "Firefox (%s)" msgstr "Firefox (%s)" -#: ../midori/midori-browser.c:4522 -msgid "Midori 0.2.6" -msgstr "Midori 0.2.6" - -#: ../midori/midori-browser.c:4543 -msgid "Import bookmarks…" -msgstr "Importare de favorite…" +#: ../midori/midori-browser.c:4224 +msgid "Import bookmarks..." +msgstr "Importare de favorite..." -#: ../midori/midori-browser.c:4546 ../midori/midori-browser.c:5735 +#: ../midori/midori-browser.c:4227 ../midori/midori-browser.c:5317 msgid "_Import bookmarks" msgstr "Importă fa_voritele" -#: ../midori/midori-browser.c:4557 +#: ../midori/midori-browser.c:4238 msgid "_Application:" msgstr "_Program:" -#: ../midori/midori-browser.c:4622 +#: ../midori/midori-browser.c:4303 msgid "Import from XBEL or HTML file" msgstr "Importă dintr-un fișier XBEL sau HTML" -#: ../midori/midori-browser.c:4650 +#: ../midori/midori-browser.c:4338 msgid "Import from a file" msgstr "Importă dintr-un fișier" -#: ../midori/midori-browser.c:4662 +#: ../midori/midori-browser.c:4350 msgid "Failed to import bookmarks" msgstr "Nu s-au putut importa favoritele" -#: ../midori/midori-browser.c:4696 +#: ../midori/midori-browser.c:4386 msgid "XBEL Bookmarks" msgstr "Favorite XBEL" -#: ../midori/midori-browser.c:4701 +#: ../midori/midori-browser.c:4391 msgid "Netscape Bookmarks" msgstr "Favorite Netscape" -#: ../midori/midori-browser.c:4715 +#: ../midori/midori-browser.c:4405 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:4730 +#: ../midori/midori-browser.c:4421 msgid "Failed to export bookmarks" msgstr "Nu s-au putut exporta favoritele" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4852 +#: ../midori/midori-browser.c:4543 msgid "Clear Private Data" msgstr "Ștergere de date private" -#: ../midori/midori-browser.c:4856 +#: ../midori/midori-browser.c:4547 msgid "_Clear private data" msgstr "Șt_erge datele private" -#: ../midori/midori-browser.c:4871 +#: ../midori/midori-browser.c:4560 msgid "Clear the following data:" msgstr "Șterge următoarele date:" # dumol: Truc pentru a micșora lățimea ferestrei cu preferințe -#: ../midori/midori-browser.c:4881 +#: ../midori/midori-browser.c:4570 msgid "Last open _tabs" msgstr "Ultimele _taburi deschise" -#: ../midori/midori-browser.c:4907 +#: ../midori/midori-browser.c:4596 msgid "Clear private data when _quitting Midori" msgstr "Șterge datele pri_vate la ieșirea din Midori" -#: ../midori/midori-browser.c:5122 +#: ../midori/midori-browser.c:4772 msgid "A lightweight web browser." msgstr "Un mic navigator web." -#: ../midori/midori-browser.c:5123 +#: ../midori/midori-browser.c:4773 msgid "See about:version for version info." msgstr "Consultați adresa about:version pentru detalii despre versiune." -#: ../midori/midori-browser.c:5125 +#: ../midori/midori-browser.c:4775 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 " @@ -686,1008 +682,920 @@ msgstr "" "publicată de Free Software Foundation, fie versiunea 2.1 ori o versiune " "ulterioară, la alegere." -#: ../midori/midori-browser.c:5155 +#: ../midori/midori-browser.c:4796 msgid "translator-credits" msgstr "" "Igor Știrbu \n" "Mișu Moldovan \n" "Andrei Popescu " -#: ../midori/midori-browser.c:5568 +#: ../midori/midori-browser.c:5159 msgid "_File" msgstr "_Fișier" -#: ../midori/midori-browser.c:5571 +#: ../midori/midori-browser.c:5162 msgid "Open a new window" msgstr "Deschide o fereastră nouă" -#: ../midori/midori-browser.c:5574 +#: ../midori/midori-browser.c:5165 msgid "Open a new tab" msgstr "Deschide un tab nou" -#: ../midori/midori-browser.c:5576 +#: ../midori/midori-browser.c:5167 msgid "New P_rivate Browsing Window" msgstr "Navigare p_rivată în fereastră nouă" -#: ../midori/midori-browser.c:5580 +#: ../midori/midori-browser.c:5171 msgid "Open a file" msgstr "Deschide un fișier" -#: ../midori/midori-browser.c:5582 -msgid "_Save Page As…" -msgstr "_Salvează pagina ca…" +#: ../midori/midori-browser.c:5173 +msgid "_Save Page As..." +msgstr "_Salvează pagina ca..." -#: ../midori/midori-browser.c:5583 +#: ../midori/midori-browser.c:5174 msgid "Save to a file" msgstr "Salvează într-un fișier" -#: ../midori/midori-browser.c:5585 +#: ../midori/midori-browser.c:5176 msgid "Add to Speed _dial" -msgstr "Adaugă ca apel rapi_d" +msgstr "Adaugă _ca apel rapid" -#: ../midori/midori-browser.c:5589 +#: ../midori/midori-browser.c:5180 msgid "Add Shortcut to the _desktop" msgstr "Salvează lin_kul pe desktop" -#: ../midori/midori-browser.c:5591 +#: ../midori/midori-browser.c:5182 msgid "Create _Launcher" msgstr "Creează _lansator" -#: ../midori/midori-browser.c:5595 +#: ../midori/midori-browser.c:5186 msgid "Subscribe to News _feed" msgstr "Abonare la _fluxul de știri" -#: ../midori/midori-browser.c:5601 +#: ../midori/midori-browser.c:5192 msgid "_Close Tab" msgstr "În_chide tabul" -#: ../midori/midori-browser.c:5602 +#: ../midori/midori-browser.c:5193 msgid "Close the current tab" msgstr "Închide tabul curent" -#: ../midori/midori-browser.c:5604 +#: ../midori/midori-browser.c:5195 msgid "C_lose Window" msgstr "Înc_hide fereastra" -#: ../midori/midori-browser.c:5608 -msgid "_Share" -msgstr "Distrib_uire" - -#: ../midori/midori-browser.c:5613 +#: ../midori/midori-browser.c:5199 msgid "Print the current page" msgstr "Tipărește pagina curentă" -#: ../midori/midori-browser.c:5616 +#: ../midori/midori-browser.c:5201 msgid "Close a_ll Windows" msgstr "Închide to_ate ferestrele" -#: ../midori/midori-browser.c:5619 +#: ../midori/midori-browser.c:5204 msgid "_Edit" msgstr "_Editare" -#: ../midori/midori-browser.c:5642 -msgid "_Find…" -msgstr "Ca_ută…" +#: ../midori/midori-browser.c:5227 +msgid "_Find..." +msgstr "Ca_ută..." -#: ../midori/midori-browser.c:5643 +#: ../midori/midori-browser.c:5228 msgid "Find a word or phrase in the page" msgstr "Caută un cuvânt sau o frază în pagină" -#: ../midori/midori-browser.c:5645 +#: ../midori/midori-browser.c:5230 msgid "Find _Next" msgstr "Caută înai_nte" -#: ../midori/midori-browser.c:5648 +#: ../midori/midori-browser.c:5233 msgid "Find _Previous" msgstr "Caută înap_oi" -#: ../midori/midori-browser.c:5652 +#: ../midori/midori-browser.c:5237 msgid "Configure the application preferences" msgstr "Schimbați preferințele programului" -#: ../midori/midori-browser.c:5654 +#: ../midori/midori-browser.c:5239 msgid "_View" msgstr "_Vizualizare" -#: ../midori/midori-browser.c:5655 +#: ../midori/midori-browser.c:5240 msgid "_Toolbars" msgstr "_Bare cu unelte" -#: ../midori/midori-browser.c:5660 +#: ../midori/midori-browser.c:5245 msgid "Reload page without caching" msgstr "Reîncarcă pagina de la sursă" -#: ../midori/midori-browser.c:5670 +#: ../midori/midori-browser.c:5255 msgid "Increase the zoom level" msgstr "Zoom mărit" -#: ../midori/midori-browser.c:5673 +#: ../midori/midori-browser.c:5258 msgid "Decrease the zoom level" msgstr "Zoom micșorat" -#: ../midori/midori-browser.c:5677 +#: ../midori/midori-browser.c:5262 msgid "_Encoding" msgstr "C_odare" -#: ../midori/midori-browser.c:5679 +#: ../midori/midori-browser.c:5264 msgid "View So_urce" msgstr "Arată s_ursa" -#: ../midori/midori-browser.c:5682 +#: ../midori/midori-browser.c:5267 msgid "Ca_ret Browsing" msgstr "Navigare cu cu_rsor" -#: ../midori/midori-browser.c:5686 +#: ../midori/midori-browser.c:5271 msgid "Toggle fullscreen view" msgstr "Comută pe tot ecranul" -#: ../midori/midori-browser.c:5688 +#: ../midori/midori-browser.c:5273 msgid "Scroll _Left" msgstr "Derulare în _stânga" -#: ../midori/midori-browser.c:5691 +#: ../midori/midori-browser.c:5276 msgid "Scroll _Down" msgstr "Derulare în j_os" -#: ../midori/midori-browser.c:5694 +#: ../midori/midori-browser.c:5279 msgid "Scroll _Up" msgstr "Derulare în _sus" -#: ../midori/midori-browser.c:5697 +#: ../midori/midori-browser.c:5282 msgid "Scroll _Right" msgstr "Derulare în _dreapta" -#: ../midori/midori-browser.c:5700 -msgid "_Readable" -msgstr "Li_zibil" - -#: ../midori/midori-browser.c:5703 +#: ../midori/midori-browser.c:5285 msgid "_Go" msgstr "_Navigare" -#: ../midori/midori-browser.c:5706 +#: ../midori/midori-browser.c:5288 msgid "Go back to the previous page" msgstr "Salt la pagina anterioară" -#: ../midori/midori-browser.c:5709 +#: ../midori/midori-browser.c:5291 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:5713 +#: ../midori/midori-browser.c:5295 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:5717 +#: ../midori/midori-browser.c:5299 msgid "Go to the next sub-page" msgstr "Salt la sub-pagina următoare" -#: ../midori/midori-browser.c:5719 -msgid "_Homepage" -msgstr "Pagină de _start" - -#: ../midori/midori-browser.c:5720 +#: ../midori/midori-browser.c:5302 msgid "Go to your homepage" msgstr "Salt la pagina de start" -#: ../midori/midori-browser.c:5722 +#: ../midori/midori-browser.c:5304 msgid "Empty Trash" msgstr "Golește gunoiul" -#: ../midori/midori-browser.c:5725 +#: ../midori/midori-browser.c:5307 msgid "Undo _Close Tab" -msgstr "Revocă închiderea ta_bului" +msgstr "Re_vocă închiderea tabului" -#: ../midori/midori-browser.c:5732 +#: ../midori/midori-browser.c:5314 msgid "Add a new _folder" msgstr "Adaugă un _dosar nou" -#: ../midori/midori-browser.c:5738 +#: ../midori/midori-browser.c:5320 msgid "_Export bookmarks" msgstr "_Exportă favoritele" -#: ../midori/midori-browser.c:5741 ../midori/midori-searchaction.c:496 +#: ../midori/midori-browser.c:5323 ../midori/midori-searchaction.c:496 msgid "_Manage Search Engines" msgstr "_Gestionați motoarele de căutare" -#: ../midori/midori-browser.c:5744 +#: ../midori/midori-browser.c:5326 msgid "_Clear Private Data" msgstr "Șt_erge datele private" -#: ../midori/midori-browser.c:5747 +#: ../midori/midori-browser.c:5329 msgid "_Inspect Page" msgstr "_Inspectați pagina" -#: ../midori/midori-browser.c:5751 +#: ../midori/midori-browser.c:5333 msgid "_Previous Tab" msgstr "Tabul a_nterior" -#: ../midori/midori-browser.c:5754 +#: ../midori/midori-browser.c:5336 msgid "_Next Tab" msgstr "Tabul u_rmător" -#: ../midori/midori-browser.c:5756 +#: ../midori/midori-browser.c:5338 msgid "Move Tab _Backward" msgstr "M_ută înapoi tabul" -#: ../midori/midori-browser.c:5758 +#: ../midori/midori-browser.c:5340 msgid "_Move Tab Forward" msgstr "_Mută înainte tabul" -#: ../midori/midori-browser.c:5761 +#: ../midori/midori-browser.c:5343 msgid "Focus _Current Tab" msgstr "Activează focusul tabului _curent" -#: ../midori/midori-browser.c:5764 +#: ../midori/midori-browser.c:5346 msgid "Focus _Next view" msgstr "Activează focusul _următorului widget" -#: ../midori/midori-browser.c:5767 +#: ../midori/midori-browser.c:5349 msgid "Only show the Icon of the _Current Tab" msgstr "Arată doar iconița tabului _curent" -#: ../midori/midori-browser.c:5770 +#: ../midori/midori-browser.c:5352 msgid "_Duplicate Current Tab" msgstr "_Duplică tabul curent" -#: ../midori/midori-browser.c:5773 +#: ../midori/midori-browser.c:5355 msgid "Close Ot_her Tabs" msgstr "Înc_hide celelalte taburi" -#: ../midori/midori-browser.c:5776 +#: ../midori/midori-browser.c:5358 msgid "Open last _session" msgstr "Deschide ultima _sesiune" -#: ../midori/midori-browser.c:5779 +#: ../midori/midori-browser.c:5361 msgid "_Help" msgstr "_Ajutor" -#: ../midori/midori-browser.c:5781 +#: ../midori/midori-browser.c:5363 msgid "_Frequent Questions" msgstr "Întrebări _frecvente" -#: ../midori/midori-browser.c:5784 -msgid "_Report a Problem…" -msgstr "_Raportați o problemă…" - -#: ../midori/midori-browser.c:5789 ../midori/midori-browser.c:6450 -msgid "_Tools" -msgstr "_Unelte" +#: ../midori/midori-browser.c:5366 +msgid "_Report a Problem..." +msgstr "_Raportați o problemă..." -#: ../midori/midori-browser.c:5796 +#: ../midori/midori-browser.c:5378 msgid "_Menubar" msgstr "Bară de _meniu" -#: ../midori/midori-browser.c:5800 +#: ../midori/midori-browser.c:5382 msgid "_Navigationbar" msgstr "Bară de _navigare" -#: ../midori/midori-browser.c:5804 +#: ../midori/midori-browser.c:5386 msgid "Side_panel" msgstr "_Panou lateral" -#: ../midori/midori-browser.c:5805 +#: ../midori/midori-browser.c:5387 msgid "Sidepanel" msgstr "Panou lateral" -#: ../midori/midori-browser.c:5808 +#: ../midori/midori-browser.c:5390 msgid "_Bookmarkbar" msgstr "Bară cu _favorite" -#: ../midori/midori-browser.c:5812 +#: ../midori/midori-browser.c:5394 msgid "_Statusbar" msgstr "Bară de _stare" -#: ../midori/midori-browser.c:5821 ../midori/midori-websettings.c:314 +#: ../midori/midori-browser.c:5403 ../midori/midori-websettings.c:302 msgid "_Automatic" msgstr "_Automată" -#: ../midori/midori-browser.c:5824 ../midori/midori-websettings.c:238 -msgid "Chinese Traditional (BIG5)" -msgstr "Chineză tradițională (BIG5)" - -#: ../midori/midori-browser.c:5827 ../midori/midori-websettings.c:239 -msgid "Chinese Simplified (GB18030)" -msgstr "Chineză simplificată (GB18030)" +#: ../midori/midori-browser.c:5406 ../midori/midori-websettings.c:227 +msgid "Chinese (BIG5)" +msgstr "Chineză (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5831 +#: ../midori/midori-browser.c:5410 msgid "Japanese (SHIFT__JIS)" msgstr "Japoneză (SHIFT__JIS)" -#: ../midori/midori-browser.c:5834 ../midori/midori-websettings.c:241 +#: ../midori/midori-browser.c:5413 ../midori/midori-websettings.c:229 msgid "Korean (EUC-KR)" msgstr "Coreeană (EUC-KR)" -#: ../midori/midori-browser.c:5837 ../midori/midori-websettings.c:242 +#: ../midori/midori-browser.c:5416 ../midori/midori-websettings.c:230 msgid "Russian (KOI8-R)" msgstr "Rusă (KOI8-R)" -#: ../midori/midori-browser.c:5840 ../midori/midori-websettings.c:243 +#: ../midori/midori-browser.c:5419 ../midori/midori-websettings.c:231 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5843 ../midori/midori-websettings.c:244 +#: ../midori/midori-browser.c:5422 ../midori/midori-websettings.c:232 msgid "Western (ISO-8859-1)" msgstr "Vestică (ISO-8859-1)" -#: ../midori/midori-browser.c:5846 -msgid "Custom…" +#: ../midori/midori-browser.c:5425 ../midori/midori-websettings.c:233 +#: ../midori/midori-websettings.c:308 ../katze/katze-utils.c:635 +msgid "Custom..." msgstr "Personalizat" -#: ../midori/midori-browser.c:6356 +#: ../midori/midori-browser.c:5941 msgid "_Separator" msgstr "_Separator" -#: ../midori/midori-browser.c:6363 -msgid "_Location…" -msgstr "A_dresă…" +#: ../midori/midori-browser.c:5948 +msgid "_Location..." +msgstr "A_dresă..." -#: ../midori/midori-browser.c:6365 +#: ../midori/midori-browser.c:5950 msgid "Open a particular location" msgstr "Deschideți o anumită adresă" -#: ../midori/midori-browser.c:6387 -msgid "_Web Search…" -msgstr "C_aută pe net…" +#: ../midori/midori-browser.c:5972 +msgid "_Web Search..." +msgstr "C_aută pe net..." -#: ../midori/midori-browser.c:6389 +#: ../midori/midori-browser.c:5974 msgid "Run a web search" msgstr "Porniți o căutare pe net" -#: ../midori/midori-browser.c:6416 +#: ../midori/midori-browser.c:6001 msgid "Reopen a previously closed tab or window" msgstr "Redeschideți taburi ori ferestre închise recent" -#: ../midori/midori-browser.c:6433 +#: ../midori/midori-browser.c:6016 msgid "Show the saved bookmarks" msgstr "Arată favoritele salvate" -#: ../midori/midori-browser.c:6466 +#: ../midori/midori-browser.c:6030 +msgid "_Tools" +msgstr "_Unelte" + +#: ../midori/midori-browser.c:6045 msgid "_Window" msgstr "Fe_reastră" -#: ../midori/midori-browser.c:6468 +#: ../midori/midori-browser.c:6047 msgid "Show a list of all open tabs" msgstr "Arată lista tuturor taburilor deschise" -#: ../midori/midori-browser.c:6482 +#: ../midori/midori-browser.c:6061 msgid "_Menu" msgstr "_Meniu" -#: ../midori/midori-browser.c:6484 +#: ../midori/midori-browser.c:6063 msgid "Menu" msgstr "Meniu" -#: ../midori/midori-browser.c:7309 +#: ../midori/midori-browser.c:6732 #, c-format msgid "Unexpected setting '%s'" msgstr "Opțiune neașteptată „%s”" -#: ../midori/midori-extension.c:329 +#: ../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:747 ../midori/midori-extension.c:844 -#: ../midori/midori-extension.c:941 ../midori/midori-extension.c:1053 -#: ../extensions/addons.c:1688 +#: ../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:394 -#, c-format -msgid "Search with %s" -msgstr "Caută cu %s" - -#: ../midori/midori-locationaction.c:414 -msgid "Search with…" -msgstr "Caută cu…" - -#: ../midori/midori-locationaction.c:541 +#: ../midori/midori-locationaction.c:425 #, c-format msgid "Failed to select from history\n" msgstr "Nu s-a putut selecta din istoric\n" -#: ../midori/midori-locationaction.c:628 +#: ../midori/midori-locationaction.c:509 #, c-format msgid "Search for %s" msgstr "Caută %s" -#: ../midori/midori-locationaction.c:1195 -msgid "Export certificate" -msgstr "Exportare certificat" - -#: ../midori/midori-locationaction.c:1227 -msgid "The signing certificate authority is not known." -msgstr "Autoritatea de semnare a certificatului nu este cunoscută." - -#: ../midori/midori-locationaction.c:1229 -msgid "" -"The certificate does not match the expected identity of the site that it was " -"retrieved from." -msgstr "Certificatul nu este potrivit domeniului din care a fost descărcat." - -#: ../midori/midori-locationaction.c:1231 -msgid "The certificate's activation time is still in the future." -msgstr "Data de activare a certificatului este în viitor." - -#: ../midori/midori-locationaction.c:1233 -msgid "The certificate has expired" -msgstr "Certificatul a expirat." - -#: ../midori/midori-locationaction.c:1235 -msgid "" -"The certificate has been revoked according to the GTlsConnection's " -"certificate revocation list." -msgstr "Conform listei de certificate revocate GTlsConnection, certificatul a fost revocat." - -#: ../midori/midori-locationaction.c:1237 -msgid "The certificate's algorithm is considered insecure." -msgstr "Algoritmul certificatului este considerat nesigur." - -#: ../midori/midori-locationaction.c:1239 -msgid "Some other error occurred validating the certificate." -msgstr "A intervenit o altă eroare la validarea certificatului." - -#: ../midori/midori-locationaction.c:1286 -msgid "_Export certificate" -msgstr "_Exportare certificat" - -#: ../midori/midori-locationaction.c:1301 -msgid "Self-signed" -msgstr "Cu semnătură proprie" - -#: ../midori/midori-locationaction.c:1335 -msgid "Security details" -msgstr "Detalii de securitate" +#: ../midori/midori-locationaction.c:535 +#, c-format +msgid "Search with %s" +msgstr "Caută cu %s" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1618 +#: ../midori/midori-locationaction.c:1287 msgid "Paste and p_roceed" msgstr "Lipește și co_ntinuă" -#: ../midori/midori-locationaction.c:1942 +#: ../midori/midori-locationaction.c:1656 msgid "Not verified" msgstr "Neverificată" -#: ../midori/midori-locationaction.c:1950 +#: ../midori/midori-locationaction.c:1671 msgid "Verified and encrypted connection" msgstr "Conexiune verificată și criptată" -#: ../midori/midori-locationaction.c:1957 -msgid "Open, unencrypted connection" -msgstr "Conexiune deschisă, necriptată" - -#: ../midori/midori-panel.c:317 ../midori/midori-panel.c:319 -#: ../midori/midori-panel.c:483 ../midori/midori-panel.c:486 +#: ../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:329 ../midori/midori-panel.c:330 +#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410 msgid "Close panel" msgstr "Închide panoul" -#: ../midori/midori-panel.c:484 ../midori/midori-panel.c:487 +#: ../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-websettings.c:220 +#: ../midori/midori-websettings.c:209 msgid "Show Speed Dial" msgstr "Arată apelurile rapide" # dumol: Truc pentru a micșora lățimea ferestrei cu preferințe -#: ../midori/midori-websettings.c:221 +#: ../midori/midori-websettings.c:210 msgid "Show Homepage" msgstr "Pagina de start" -#: ../midori/midori-websettings.c:240 +#: ../midori/midori-websettings.c:228 msgid "Japanese (SHIFT_JIS)" msgstr "Japoneză (SHIFT_JIS)" -#: ../midori/midori-websettings.c:245 ../midori/midori-websettings.c:321 -#: ../katze/katze-utils.c:633 -msgid "Custom..." -msgstr "Personalizare..." - -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:248 msgid "New tab" msgstr "Tab nou" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:249 msgid "New window" msgstr "Fereastră nouă" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:250 msgid "Current tab" msgstr "Tab curent" -#: ../midori/midori-websettings.c:277 +#: ../midori/midori-websettings.c:265 msgid "Default" msgstr "Implicit" -#: ../midori/midori-websettings.c:278 +#: ../midori/midori-websettings.c:266 msgid "Icons" msgstr "Iconițe" -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-websettings.c:267 msgid "Small icons" msgstr "Iconițe mici" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:268 msgid "Text" msgstr "Text" -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:269 msgid "Icons and text" msgstr "Iconițe și text" -#: ../midori/midori-websettings.c:282 +#: ../midori/midori-websettings.c:270 msgid "Text beside icons" msgstr "Text lângă iconițe" -#: ../midori/midori-websettings.c:297 +#: ../midori/midori-websettings.c:285 msgid "Automatic (GNOME or environment)" msgstr "Automat (din mediu ori GNOME)" -#: ../midori/midori-websettings.c:298 +#: ../midori/midori-websettings.c:286 msgid "HTTP proxy server" msgstr "Server proxy HTTP" -#: ../midori/midori-websettings.c:299 +#: ../midori/midori-websettings.c:287 msgid "No proxy server" msgstr "Fără server proxy" -#: ../midori/midori-websettings.c:316 -msgid "Chrome" -msgstr "Chrome" - -#: ../midori/midori-websettings.c:317 +#: ../midori/midori-websettings.c:304 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:318 +#: ../midori/midori-websettings.c:305 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:319 +#: ../midori/midori-websettings.c:306 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:320 +#: ../midori/midori-websettings.c:307 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:404 +#: ../midori/midori-websettings.c:360 msgid "Remember last window size" msgstr "Reține dimensiunea ultimei ferestre" -#: ../midori/midori-websettings.c:405 +#: ../midori/midori-websettings.c:361 msgid "Whether to save the last window size" msgstr "Specifică dacă se salvează dimensiunea ultimei ferestre" -#: ../midori/midori-websettings.c:413 +#: ../midori/midori-websettings.c:369 msgid "Last window width" msgstr "Lățimea ultimei ferestre" -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:370 msgid "The last saved window width" msgstr "Ultima lățime salvată a ferestrei" -#: ../midori/midori-websettings.c:422 +#: ../midori/midori-websettings.c:378 msgid "Last window height" msgstr "Înălțimea ultimei ferestre" -#: ../midori/midori-websettings.c:423 +#: ../midori/midori-websettings.c:379 msgid "The last saved window height" msgstr "Ultima înălțime salvată a ferestrei" -#: ../midori/midori-websettings.c:448 +#: ../midori/midori-websettings.c:404 msgid "Last panel position" msgstr "Ultima poziție a panoului" -#: ../midori/midori-websettings.c:449 +#: ../midori/midori-websettings.c:405 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:458 +#: ../midori/midori-websettings.c:414 msgid "Last panel page" msgstr "Ultima pagină a panoului" -#: ../midori/midori-websettings.c:459 +#: ../midori/midori-websettings.c:415 msgid "The last saved panel page" msgstr "Ultima pagină salvată a panoului" -#: ../midori/midori-websettings.c:467 +#: ../midori/midori-websettings.c:423 msgid "Last Web search" msgstr "Ultima căutare pe net" -#: ../midori/midori-websettings.c:468 +#: ../midori/midori-websettings.c:424 msgid "The last saved Web search" msgstr "Ultima căutare pe net salvată" -#: ../midori/midori-websettings.c:492 +#: ../midori/midori-websettings.c:433 msgid "Show Menubar" msgstr "Arată bara de meniu" -#: ../midori/midori-websettings.c:493 +#: ../midori/midori-websettings.c:434 msgid "Whether to show the menubar" msgstr "Specifică dacă să fie vizibilă bara de meniu" -#: ../midori/midori-websettings.c:501 +#: ../midori/midori-websettings.c:442 msgid "Show Navigationbar" msgstr "Arată bara de navigare" -#: ../midori/midori-websettings.c:502 +#: ../midori/midori-websettings.c:443 msgid "Whether to show the navigationbar" msgstr "Specifică dacă să fie vizibilă bara de navigare" -#: ../midori/midori-websettings.c:510 +#: ../midori/midori-websettings.c:451 msgid "Show Bookmarkbar" msgstr "Arată bara cu favorite" -#: ../midori/midori-websettings.c:511 +#: ../midori/midori-websettings.c:452 msgid "Whether to show the bookmarkbar" msgstr "Specifică dacă să fie vizibilă bara cu favorite" -#: ../midori/midori-websettings.c:519 +#: ../midori/midori-websettings.c:460 msgid "Show Panel" msgstr "Arată panoul" -#: ../midori/midori-websettings.c:520 +#: ../midori/midori-websettings.c:461 msgid "Whether to show the panel" msgstr "Specifică dacă să fie vizibil panoul" -#: ../midori/midori-websettings.c:528 +#: ../midori/midori-websettings.c:469 msgid "Show Statusbar" msgstr "Arată bara de stare" -#: ../midori/midori-websettings.c:529 +#: ../midori/midori-websettings.c:470 msgid "Whether to show the statusbar" msgstr "Specifică dacă să fie vizibilă bara de stare" -#: ../midori/midori-websettings.c:538 +#: ../midori/midori-websettings.c:479 msgid "Toolbar Style:" msgstr "Stil pentru bara cu unelte:" -#: ../midori/midori-websettings.c:539 +#: ../midori/midori-websettings.c:480 msgid "The style of the toolbar" msgstr "Stilul barei cu unelte" -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:489 msgid "Toolbar Items" msgstr "Elementele barei cu unelte" -#: ../midori/midori-websettings.c:549 +#: ../midori/midori-websettings.c:490 msgid "The items to show on the toolbar" msgstr "Elementele de arătat în bara cu unelte" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:498 msgid "Compact Sidepanel" msgstr "Panou lateral compact" -#: ../midori/midori-websettings.c:558 +#: ../midori/midori-websettings.c:499 msgid "Whether to make the sidepanel compact" msgstr "Specifică dacă panoul lateral e compact" -#: ../midori/midori-websettings.c:573 +#: ../midori/midori-websettings.c:514 msgid "Align sidepanel on the right" msgstr "Aliniază la dreapta panoul lateral" -#: ../midori/midori-websettings.c:574 +#: ../midori/midori-websettings.c:515 msgid "Whether to align the sidepanel on the right" msgstr "Specifică dacă panoul lateral se aliniază la dreapta" -#: ../midori/midori-websettings.c:589 +#: ../midori/midori-websettings.c:530 msgid "Open panels in separate windows" msgstr "Deschide panourile în ferestre separate" -#: ../midori/midori-websettings.c:590 +#: ../midori/midori-websettings.c:531 msgid "Whether to always open panels in separate windows" msgstr "Specifică dacă panourile noi se deschid în ferestre separate" # dumol: Truc pentru a micșora lățimea ferestrei cu preferințe -#: ../midori/midori-websettings.c:599 +#: ../midori/midori-websettings.c:540 msgid "When Midori starts:" msgstr "La pornirea Midori arată:" -#: ../midori/midori-websettings.c:600 +#: ../midori/midori-websettings.c:541 msgid "What to do when Midori starts" msgstr "Specificați cum să pornească Midori" -#: ../midori/midori-websettings.c:609 +#: ../midori/midori-websettings.c:550 msgid "Homepage:" msgstr "Pagină de start:" -#: ../midori/midori-websettings.c:610 +#: ../midori/midori-websettings.c:551 msgid "The homepage" msgstr "Pagina de start" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:566 msgid "Show crash dialog" msgstr "Depanare după terminări premature" -#: ../midori/midori-websettings.c:626 +#: ../midori/midori-websettings.c:567 msgid "Show a dialog after Midori crashed" msgstr "Arată o fereastră de depanare la pornirea după o terminare prematură" -#: ../midori/midori-websettings.c:634 +#: ../midori/midori-websettings.c:575 msgid "Save downloaded files to:" msgstr "Salvează fișierele descărcate în:" -#: ../midori/midori-websettings.c:635 +#: ../midori/midori-websettings.c:576 msgid "The folder downloaded files are saved to" msgstr "Calea către dosarul pentru salvarea fișierelor descărcate" -#: ../midori/midori-websettings.c:643 +#: ../midori/midori-websettings.c:584 msgid "Text Editor" msgstr "Editor de text" -#: ../midori/midori-websettings.c:644 +#: ../midori/midori-websettings.c:585 msgid "An external text editor" msgstr "Editor extern de text" -#: ../midori/midori-websettings.c:659 +#: ../midori/midori-websettings.c:600 msgid "News Aggregator" msgstr "Agregator de știri" -#: ../midori/midori-websettings.c:660 +#: ../midori/midori-websettings.c:601 msgid "An external news aggregator" msgstr "Agregator extern de știri" -#: ../midori/midori-websettings.c:668 +#: ../midori/midori-websettings.c:609 msgid "Location entry Search" msgstr "Căutarea în bara de adrese" -#: ../midori/midori-websettings.c:669 +#: ../midori/midori-websettings.c:610 msgid "The search to perform inside the location entry" msgstr "Căutarea de efectuat în bara de adrese" -#: ../midori/midori-websettings.c:677 +#: ../midori/midori-websettings.c:618 msgid "Preferred Encoding" msgstr "Codare preferată" -#: ../midori/midori-websettings.c:678 +#: ../midori/midori-websettings.c:619 msgid "The preferred character encoding" msgstr "Codarea de caractere preferată" -#: ../midori/midori-websettings.c:688 +#: ../midori/midori-websettings.c:629 msgid "Always Show Tabbar" msgstr "Arată întotdeauna bara cu taburi" -#: ../midori/midori-websettings.c:689 +#: ../midori/midori-websettings.c:630 msgid "Always show the tabbar" msgstr "Arată întotdeauna bara cu taburi" -#: ../midori/midori-websettings.c:702 +#: ../midori/midori-websettings.c:638 msgid "Close Buttons on Tabs" msgstr "Butoane de închidere a taburilor" -#: ../midori/midori-websettings.c:703 +#: ../midori/midori-websettings.c:639 msgid "Whether tabs have close buttons" msgstr "Specifică dacă se adaugă butoane de închidere pe taburi" -#: ../midori/midori-websettings.c:728 +#: ../midori/midori-websettings.c:664 msgid "Open new pages in:" msgstr "Paginile noi se vor deschide în:" -#: ../midori/midori-websettings.c:729 +#: ../midori/midori-websettings.c:665 msgid "Where to open new pages" msgstr "Alegeți unde să se deschidă paginile noi" -#: ../midori/midori-websettings.c:738 +#: ../midori/midori-websettings.c:674 msgid "Middle click opens Selection" msgstr "Butonul din mijloc deschide selecția" -#: ../midori/midori-websettings.c:739 +#: ../midori/midori-websettings.c:675 msgid "Load an address from the selection via middle click" msgstr "" "Încarcă adresa din clipboard prin clic pe butonul din mijloc al mausului" -#: ../midori/midori-websettings.c:747 +#: ../midori/midori-websettings.c:683 msgid "Open tabs in the background" msgstr "Deschide taburile în fundal" -#: ../midori/midori-websettings.c:748 +#: ../midori/midori-websettings.c:684 msgid "Whether to open new tabs in the background" msgstr "Specifică dacă taburile noi se deschid în fundal" -#: ../midori/midori-websettings.c:756 +#: ../midori/midori-websettings.c:692 msgid "Open Tabs next to Current" msgstr "Deschide taburile lângă cel curent" -#: ../midori/midori-websettings.c:757 +#: ../midori/midori-websettings.c:693 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" -#: ../midori/midori-websettings.c:765 +#: ../midori/midori-websettings.c:701 msgid "Open popups in tabs" msgstr "Deschide popup-urile în taburi" -#: ../midori/midori-websettings.c:766 +#: ../midori/midori-websettings.c:702 msgid "Whether to open popup windows in tabs" msgstr "Specifică dacă ferestrele popup se deschid în taburi" -#: ../midori/midori-websettings.c:776 ../extensions/statusbar-features.c:155 +#: ../midori/midori-websettings.c:712 ../extensions/statusbar-features.c:131 msgid "Load images automatically" msgstr "Încarcă automat imaginile" -#: ../midori/midori-websettings.c:777 +#: ../midori/midori-websettings.c:713 msgid "Load and display images automatically" msgstr "Încarcă și afișează automat imaginile" -#: ../midori/midori-websettings.c:784 ../extensions/statusbar-features.c:165 +#: ../midori/midori-websettings.c:720 ../extensions/statusbar-features.c:140 msgid "Enable scripts" msgstr "Execută scripturile" -#: ../midori/midori-websettings.c:785 +#: ../midori/midori-websettings.c:721 msgid "Enable embedded scripting languages" msgstr "Activează limbajele de scripting incluse" -#: ../midori/midori-websettings.c:792 ../extensions/statusbar-features.c:177 +#: ../midori/midori-websettings.c:728 ../extensions/statusbar-features.c:149 msgid "Enable Netscape plugins" msgstr "Activează modulele Netscape" -#: ../midori/midori-websettings.c:793 +#: ../midori/midori-websettings.c:729 msgid "Enable embedded Netscape plugin objects" msgstr "Activează modulele Netscape incluse" -#: ../midori/midori-websettings.c:808 +#: ../midori/midori-websettings.c:749 msgid "Enable Spell Checking" msgstr "Activează verificarea ortografică" -#: ../midori/midori-websettings.c:809 +#: ../midori/midori-websettings.c:750 msgid "Enable spell checking while typing" msgstr "Verifică ortografia în timpul tastării" -#: ../midori/midori-websettings.c:815 +#: ../midori/midori-websettings.c:756 msgid "Enable HTML5 database support" msgstr "Suport pentru baze de date HTML5" -#: ../midori/midori-websettings.c:816 +#: ../midori/midori-websettings.c:757 msgid "Whether to enable HTML5 database support" msgstr "Specifică dacă să se activeze suportul pentru baze de date HTML5" -#: ../midori/midori-websettings.c:822 +#: ../midori/midori-websettings.c:763 msgid "Enable HTML5 local storage support" msgstr "Suport pentru stocare locală HTML5" -#: ../midori/midori-websettings.c:823 +#: ../midori/midori-websettings.c:764 msgid "Whether to enable HTML5 local storage support" msgstr "Specifică dacă să se activeze suportul pentru stocare locală HTML5" -#: ../midori/midori-websettings.c:829 +#: ../midori/midori-websettings.c:770 msgid "Enable offline web application cache" msgstr "Cache offline pentru aplicații web" -#: ../midori/midori-websettings.c:830 +#: ../midori/midori-websettings.c:771 msgid "Whether to enable offline web application cache" msgstr "" "Specifică dacă să se activeze suportul pentru cache offline de aplicații web" -#: ../midori/midori-websettings.c:851 +#: ../midori/midori-websettings.c:787 msgid "Flash window on background tabs" msgstr "Evidențiere pentru taburile noi în fundal" -#: ../midori/midori-websettings.c:852 +#: ../midori/midori-websettings.c:788 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:860 -msgid "Enable WebGL support" -msgstr "Suport pentru standardul WebGL" - -#: ../midori/midori-websettings.c:861 -msgid "Allow websites to use OpenGL rendering" -msgstr "Permite randarea WebGL în paginile web" - -#: ../midori/midori-websettings.c:887 +#: ../midori/midori-websettings.c:803 msgid "Zoom Text and Images" msgstr "Scalează imaginile odată cu textul" -#: ../midori/midori-websettings.c:888 +#: ../midori/midori-websettings.c:804 msgid "Whether to zoom text and images" msgstr "Specifică dacă se scalează concomitent textul și imaginile" -#: ../midori/midori-websettings.c:903 +#: ../midori/midori-websettings.c:819 msgid "Find inline while typing" msgstr "Caută în pagină pe măsură ce se tastează" -#: ../midori/midori-websettings.c:904 +#: ../midori/midori-websettings.c:820 msgid "Whether to automatically find inline while typing" msgstr "Specifică dacă se caută automat pe măsură ce se tastează" -#: ../midori/midori-websettings.c:919 +#: ../midori/midori-websettings.c:835 msgid "Kinetic scrolling" msgstr "Derulare cinetică" -#: ../midori/midori-websettings.c:920 +#: ../midori/midori-websettings.c:836 msgid "Whether scrolling should kinetically move according to speed" msgstr "" "Specifică dacă derularea ar trebui să se facă cinetic, în acord cu viteza " "derulării" # dumol: Truc pentru a micșora lățimea ferestrei cu preferințe -#: ../midori/midori-websettings.c:928 +#: ../midori/midori-websettings.c:844 msgid "Delete old Cookies after:" msgstr "Șterge cookie-urile vechi după:" -#: ../midori/midori-websettings.c:929 +#: ../midori/midori-websettings.c:845 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:945 +#: ../midori/midori-websettings.c:861 msgid "Only accept Cookies from sites you visit" msgstr "Nu accepta cookie-uri third-party" -#: ../midori/midori-websettings.c:946 +#: ../midori/midori-websettings.c:862 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:960 +#: ../midori/midori-websettings.c:876 msgid "Delete pages from history after:" msgstr "Șterge paginile din istoric după:" -#: ../midori/midori-websettings.c:961 +#: ../midori/midori-websettings.c:877 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:976 +#: ../midori/midori-websettings.c:892 msgid "Proxy server" msgstr "Server proxy" -#: ../midori/midori-websettings.c:977 +#: ../midori/midori-websettings.c:893 msgid "The type of proxy server to use" msgstr "Tipul serverului proxy de utilizat" -#: ../midori/midori-websettings.c:986 +#: ../midori/midori-websettings.c:902 msgid "HTTP Proxy Server" msgstr "Server proxy HTTP" -#: ../midori/midori-websettings.c:987 +#: ../midori/midori-websettings.c:903 msgid "The proxy server used for HTTP connections" msgstr "Serverul proxy pentru conexiuni HTTP" -#: ../midori/midori-websettings.c:1002 +#: ../midori/midori-websettings.c:918 msgid "Port" msgstr "Port" -#: ../midori/midori-websettings.c:1003 +#: ../midori/midori-websettings.c:919 msgid "The proxy server port used for HTTP connections" msgstr "Portul serverului proxy pentru conexiuni HTTP" -#: ../midori/midori-websettings.c:1021 +#: ../midori/midori-websettings.c:937 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:1038 +#: ../midori/midori-websettings.c:954 msgid "Identify as" msgstr "Identificare" -#: ../midori/midori-websettings.c:1039 +#: ../midori/midori-websettings.c:955 msgid "What to identify as to web pages" msgstr "Alegeți identitatea de prezentat serverelor web" -#: ../midori/midori-websettings.c:1055 +#: ../midori/midori-websettings.c:971 msgid "Identification string" msgstr "Șir de identificare" -#: ../midori/midori-websettings.c:1056 +#: ../midori/midori-websettings.c:972 msgid "The application identification string" msgstr "Șirul de identificare al navigatorului" -#: ../midori/midori-websettings.c:1072 +#: ../midori/midori-websettings.c:988 msgid "Preferred languages" msgstr "Limbă preferată" -#: ../midori/midori-websettings.c:1073 +#: ../midori/midori-websettings.c:989 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\"" @@ -1695,449 +1603,379 @@ 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:1088 +#: ../midori/midori-websettings.c:1004 msgid "Clear private data" msgstr "Șterge datele private" -#: ../midori/midori-websettings.c:1089 +#: ../midori/midori-websettings.c:1005 msgid "The private data selected for deletion" msgstr "Datele private selectate pentru ștergere" -#: ../midori/midori-websettings.c:1104 +#: ../midori/midori-websettings.c:1020 msgid "Clear data" msgstr "Șterge datele" -#: ../midori/midori-websettings.c:1105 +#: ../midori/midori-websettings.c:1021 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:1154 +#: ../midori/midori-websettings.c:1054 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:1156 +#: ../midori/midori-websettings.c:1056 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:1170 +#: ../midori/midori-websettings.c:1070 msgid "Always use my font choices" msgstr "Folosește întotdeauna fonturile mele" -#: ../midori/midori-websettings.c:1171 +#: ../midori/midori-websettings.c:1071 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:1002 ../midori/midori-view.c:1140 -msgid "Trust this website" -msgstr "Site de încredere" - -#: ../midori/midori-view.c:1138 -msgid "Security unknown" -msgstr "Nivel necunoscut de securitate" - -#: ../midori/midori-view.c:1436 +#: ../midori/midori-view.c:1331 #, 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:1440 ../midori/midori-view.c:1474 +#: ../midori/midori-view.c:1335 ../midori/midori-view.c:1365 msgid "_Deny" msgstr "_Refuză" -#: ../midori/midori-view.c:1440 ../midori/midori-view.c:1474 +#: ../midori/midori-view.c:1335 ../midori/midori-view.c:1365 msgid "_Allow" msgstr "_Acceptă" -#: ../midori/midori-view.c:1469 +#: ../midori/midori-view.c:1361 #, c-format msgid "%s wants to know your location." msgstr "%s dorește să vă identifice locația." -#: ../midori/midori-view.c:1565 +#: ../midori/midori-view.c:1449 #, c-format msgid "Error - %s" msgstr "Eroare - %s" -#: ../midori/midori-view.c:1566 +#: ../midori/midori-view.c:1450 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "Nu s-a putut încărca pagina „%s”." -#: ../midori/midori-view.c:1568 +#: ../midori/midori-view.c:1452 msgid "Try again" msgstr "Reîncearcă" -#: ../midori/midori-view.c:1766 ../midori/midori-view.c:2875 +#: ../midori/midori-view.c:1614 ../midori/midori-view.c:2459 #, c-format msgid "Send a message to %s" msgstr "Scrieți un mail către %s" -#: ../midori/midori-view.c:2661 -msgid "Add _search engine..." -msgstr "Adaugă ca _motor de căutare..." - -#: ../midori/midori-view.c:2705 ../midori/midori-view.c:3031 +#: ../midori/midori-view.c:2301 ../midori/midori-view.c:2612 msgid "Inspect _Element" msgstr "_Inspectați elementul" -#: ../midori/midori-view.c:2757 +#: ../midori/midori-view.c:2351 msgid "Open Link in New _Tab" msgstr "Deschide linkul într-un _tab nou" -#: ../midori/midori-view.c:2761 +#: ../midori/midori-view.c:2355 msgid "Open Link in _Foreground Tab" msgstr "Deschide lin_kul într-un tab nou în prim plan" -#: ../midori/midori-view.c:2762 +#: ../midori/midori-view.c:2356 msgid "Open Link in _Background Tab" msgstr "Deschide linkul într-un tab nou în _fundal" -#: ../midori/midori-view.c:2765 +#: ../midori/midori-view.c:2359 msgid "Open Link in New _Window" msgstr "Deschide linkul într-o _fereastră nouă" -#: ../midori/midori-view.c:2768 +#: ../midori/midori-view.c:2362 msgid "Open Link as Web A_pplication" msgstr "Deschide linkul ca o aplicație _web" -#: ../midori/midori-view.c:2773 +#: ../midori/midori-view.c:2365 msgid "Copy Link de_stination" msgstr "Copiază de_stinația linkului" -#: ../midori/midori-view.c:2789 +#: ../midori/midori-view.c:2377 msgid "Open _Image in New Tab" msgstr "Deschide _imaginea într-un tab nou" -#: ../midori/midori-view.c:2792 +#: ../midori/midori-view.c:2380 msgid "Copy Image _Address" msgstr "Copiază _adresa imaginii" -#: ../midori/midori-view.c:2795 +#: ../midori/midori-view.c:2383 msgid "Save I_mage" msgstr "Salvează i_maginea" -#: ../midori/midori-view.c:2798 -msgid "Open in Image _Viewer" -msgstr "D_eschide imaginea în programul asociat" - -#: ../midori/midori-view.c:2805 +#: ../midori/midori-view.c:2390 msgid "Copy Video _Address" msgstr "Copiază _adresa materialului video" -#: ../midori/midori-view.c:2808 +#: ../midori/midori-view.c:2393 msgid "Save _Video" msgstr "Salvează materialul _video" -#: ../midori/midori-view.c:2808 +#: ../midori/midori-view.c:2393 msgid "Download _Video" msgstr "Descarcă _materialul video" -#: ../midori/midori-view.c:2834 +#: ../midori/midori-view.c:2419 msgid "Search _with" msgstr "Caută c_u" -#: ../midori/midori-view.c:2866 +#: ../midori/midori-view.c:2451 msgid "_Search the Web" msgstr "C_aută pe net" -#: ../midori/midori-view.c:2883 +#: ../midori/midori-view.c:2467 msgid "Open Address in New _Tab" msgstr "Deschide adresa într-un _tab nou" -#: ../midori/midori-view.c:2936 -msgid "Open _Frame in New Tab" -msgstr "Desc_hide cadrul într-un tab nou" - -#: ../midori/midori-view.c:3190 +#: ../midori/midori-view.c:2762 msgid "Open or download file" msgstr "Deschide sau descarcă fișierul" -#: ../midori/midori-view.c:3214 -#, c-format -msgid "File Name: %s" -msgstr "Nume fișier: %s" - -#: ../midori/midori-view.c:3219 +#: ../midori/midori-view.c:2781 #, c-format msgid "File Type: '%s'" msgstr "Tip de fișier: „%s”" -#: ../midori/midori-view.c:3221 +#: ../midori/midori-view.c:2783 #, c-format msgid "File Type: %s ('%s')" msgstr "Tip de fișier: %s („%s”)" -#: ../midori/midori-view.c:3256 -#, c-format -msgid "Size: %s" -msgstr "Mărime: %s" - #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:3267 +#: ../midori/midori-view.c:2800 #, c-format msgid "Open %s" msgstr "Deschide %s" -#: ../midori/midori-view.c:3886 +#: ../midori/midori-view.c:3420 #, c-format msgid "Inspect page - %s" msgstr "Inspectare pagină - %s" -#: ../midori/midori-view.c:4241 +#: ../midori/midori-view.c:3707 msgid "Speed Dial" msgstr "Apeluri rapide" -# dumol: E ok dacă e mai lung… -#: ../midori/midori-view.c:4242 ../midori/midori-view.c:4348 +# dumol: E ok dacă e mai lung... +#: ../midori/midori-view.c:3708 ../midori/midori-view.c:3804 msgid "Click to add a shortcut" msgstr "Dați clic aici pentru a adăuga un apel rapid" -#: ../midori/midori-view.c:4243 +#: ../midori/midori-view.c:3709 msgid "Enter shortcut address" msgstr "Introduceți adresa apelului rapid" -#: ../midori/midori-view.c:4244 +#: ../midori/midori-view.c:3710 msgid "Enter shortcut title" msgstr "Introduceți titlul apelului rapid" -#: ../midori/midori-view.c:4245 +#: ../midori/midori-view.c:3711 msgid "Are you sure you want to delete this shortcut?" msgstr "Sigur doriți să ștergeți acest apel rapid?" -#: ../midori/midori-view.c:4418 +#: ../midori/midori-view.c:3871 #, c-format msgid "No documentation installed" msgstr "Documentația nu este instalată" -#: ../midori/midori-view.c:4495 -msgid "Midori doesn't store any personal data:" -msgstr "Midori nu stochează niciun fel de date personale:" - -#: ../midori/midori-view.c:4496 -msgid "No history or web cookies are being saved." -msgstr "Nu se salvează istoricul ori cookie-urile." - -#: ../midori/midori-view.c:4497 -msgid "Extensions are disabled." -msgstr "Extensiile sunt dezactivate." - -#: ../midori/midori-view.c:4498 -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:4499 -msgid "Midori prevents websites from tracking the user:" -msgstr "Midori previne urmărirea utilizatorilor pe Internet:" - -#: ../midori/midori-view.c:4500 -msgid "Referrer URLs are stripped down to the hostname." -msgstr "Antetele referrer sunt trunchiate la numele serverului." - -#: ../midori/midori-view.c:4501 -msgid "DNS prefetching is disabled." -msgstr "Cererile DNS nu se fac anticipat." - -#: ../midori/midori-view.c:4502 -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:4503 -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:4592 +#: ../midori/midori-view.c:3922 msgid "Version numbers in brackets show the version used at runtime." msgstr "Cifrele dintre paranteze arată versiunile utilizate curent." -#: ../midori/midori-view.c:4642 +#: ../midori/midori-view.c:3969 msgid "Page loading delayed" msgstr "Încărcarea paginii a fost întârziată." -#: ../midori/midori-view.c:4643 +#: ../midori/midori-view.c:3970 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:4644 +#: ../midori/midori-view.c:3971 msgid "Load Page" msgstr "Încarcă pagina" -#: ../midori/midori-view.c:4811 +#: ../midori/midori-view.c:4110 msgid "Blank page" msgstr "O pagină goală" -#: ../midori/midori-view.c:5075 +#: ../midori/midori-view.c:4372 msgid "_Duplicate Tab" msgstr "D_uplică tabul" -#: ../midori/midori-view.c:5080 +#: ../midori/midori-view.c:4377 msgid "Show Tab _Label" msgstr "_Arată eticheta tabului" -#: ../midori/midori-view.c:5080 +#: ../midori/midori-view.c:4377 msgid "Show Tab _Icon Only" msgstr "_Arată doar iconița tabului" -#: ../midori/midori-view.c:5087 -msgid "Close Ot_her Tab" -msgid_plural "Close Ot_her Tabs" -msgstr[0] "Înc_hide celălalt tab" -msgstr[1] "Înc_hide celelalte taburi" -msgstr[2] "Înc_hide celelalte taburi" +#: ../midori/midori-view.c:4383 +msgid "Close ot_her Tabs" +msgstr "Înc_hide celelalte taburi" #. i18n: word stem of "previous page" type links, case is not important -#: ../midori/midori-view.c:5923 +#: ../midori/midori-view.c:5000 msgid "previous" msgstr "înapoi" #. i18n: word stem of "next page" type links, case is not important -#: ../midori/midori-view.c:5942 +#: ../midori/midori-view.c:5019 msgid "next" msgstr "înainte" -#: ../midori/midori-view.c:5955 +#: ../midori/midori-view.c:5032 msgid "Print background images" msgstr "Tipărește imaginile de fundal" -#: ../midori/midori-view.c:5956 +#: ../midori/midori-view.c:5033 msgid "Whether background images should be printed" msgstr "Specifică dacă se tipăresc și imaginile de fundal" -#: ../midori/midori-view.c:5988 +#: ../midori/midori-view.c:5065 msgid "Features" msgstr "Facilități" -#: ../midori/midori-preferences.c:298 +#: ../midori/midori-preferences.c:297 msgid "Startup" msgstr "Pornire" -#: ../midori/midori-preferences.c:311 +#: ../midori/midori-preferences.c:310 msgid "Use _current page" msgstr "Tipărește pagina _curentă" -#: ../midori/midori-preferences.c:315 +#: ../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:324 +#: ../midori/midori-preferences.c:323 msgid "Fonts" msgstr "Fonturi" -#: ../midori/midori-preferences.c:327 +#: ../midori/midori-preferences.c:326 msgid "Proportional Font Family" msgstr "Familie de fonturi proporționale" -#: ../midori/midori-preferences.c:331 +#: ../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:334 +#: ../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:336 +#: ../midori/midori-preferences.c:335 msgid "Fixed-width Font Family" msgstr "Familie de fonturi cu lățime fixă" -#: ../midori/midori-preferences.c:340 +#: ../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:343 +#: ../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ă" -#: ../midori/midori-preferences.c:345 +#: ../midori/midori-preferences.c:344 msgid "Minimum Font Size" msgstr "Mărime minimă a fontului" -#: ../midori/midori-preferences.c:349 +#: ../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:360 +#: ../midori/midori-preferences.c:359 msgid "Behavior" msgstr "Comportament" -#: ../midori/midori-preferences.c:386 +#: ../midori/midori-preferences.c:385 msgid "Allow scripts to open popups" msgstr "Permite popup-uri deschise de scripturi" -#: ../midori/midori-preferences.c:387 +#: ../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" #. Page "Interface" -#: ../midori/midori-preferences.c:418 +#: ../midori/midori-preferences.c:409 msgid "Browsing" msgstr "Navigare" #. Page "Network" -#: ../midori/midori-preferences.c:458 +#: ../midori/midori-preferences.c:447 msgid "Network" msgstr "Rețea" -#: ../midori/midori-preferences.c:465 +#: ../midori/midori-preferences.c:454 msgid "Hostname" msgstr "Nume ori IP" -#: ../midori/midori-preferences.c:489 +#: ../midori/midori-preferences.c:478 msgid "MB" msgstr "MB" -#: ../midori/midori-searchaction.c:957 +#: ../midori/midori-searchaction.c:907 msgid "Add search engine" msgstr "Adăugați un motor de căutare" -#: ../midori/midori-searchaction.c:957 +#: ../midori/midori-searchaction.c:907 msgid "Edit search engine" msgstr "Editare motor de căutare" -#: ../midori/midori-searchaction.c:985 +#: ../midori/midori-searchaction.c:936 msgid "_Name:" msgstr "_Nume:" -#: ../midori/midori-searchaction.c:1000 +#: ../midori/midori-searchaction.c:952 msgid "_Description:" msgstr "_Descriere:" -#: ../midori/midori-searchaction.c:1013 ../extensions/feed-panel/main.c:377 -msgid "_Address:" -msgstr "_Adresă:" +#: ../midori/midori-searchaction.c:985 +msgid "_Icon:" +msgstr "_Iconiță:" -#: ../midori/midori-searchaction.c:1032 +#: ../midori/midori-searchaction.c:999 msgid "_Token:" msgstr "_Etichetă:" -#: ../midori/midori-searchaction.c:1330 +#: ../midori/midori-searchaction.c:1299 msgid "Manage Search Engines" msgstr "Gestionare a motoarelor de căutare" -#: ../midori/midori-searchaction.c:1432 +#: ../midori/midori-searchaction.c:1399 msgid "Use as _default" msgstr "I_mplicit" -#: ../midori/sokoke.c:346 +#: ../midori/sokoke.c:410 msgid "Open with" msgstr "Deschide cu" -#: ../midori/sokoke.c:354 +#: ../midori/sokoke.c:418 #, c-format msgid "Choose an application or command to open \"%s\":" msgstr "Alegeți o asociere pentru a deschide „%s”:" -#: ../midori/sokoke.c:468 ../midori/sokoke.c:482 +#: ../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 "Nu s-a putut porni programul extern." -#: ../midori/sokoke.c:1529 +#: ../midori/sokoke.c:1677 #, c-format msgid "%d hour" msgid_plural "%d hours" @@ -2145,7 +1983,7 @@ msgstr[0] "o oră" msgstr[1] "%d ore" msgstr[2] "%d de ore" -#: ../midori/sokoke.c:1530 +#: ../midori/sokoke.c:1678 #, c-format msgid "%d minute" msgid_plural "%d minutes" @@ -2153,7 +1991,7 @@ msgstr[0] "un minut" msgstr[1] "%d minute" msgstr[2] "%d de minute" -#: ../midori/sokoke.c:1531 +#: ../midori/sokoke.c:1679 #, c-format msgid "%d second" msgid_plural "%d seconds" @@ -2162,67 +2000,67 @@ msgstr[1] "%d secunde" msgstr[2] "%d de secunde" #. i18n: Download tooltip (size): 4KB of 43MB -#: ../midori/sokoke.c:1539 ../panels/midori-transfers.c:269 +#: ../midori/sokoke.c:1687 ../panels/midori-transfers.c:267 #, c-format msgid "%s of %s" msgstr "%s din %s" #. i18n: Unknown number of bytes, used for transfer rate like ?B/s -#: ../midori/sokoke.c:1548 +#: ../midori/sokoke.c:1696 msgid "?B" msgstr "?B" #. i18n: Download tooltip (transfer rate): (130KB/s) -#: ../midori/sokoke.c:1551 +#: ../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:1568 +#: ../midori/sokoke.c:1716 #, c-format msgid " - %s remaining" msgstr " - încă %s" #. i18n: A panel at the bottom, to search text in pages -#: ../toolbars/midori-findbar.c:265 +#: ../toolbars/midori-findbar.c:264 msgid "_Inline Find:" msgstr "_Căutare în pagină:" -#: ../toolbars/midori-findbar.c:287 +#: ../toolbars/midori-findbar.c:291 msgid "Previous" msgstr "Anterioară" -#: ../toolbars/midori-findbar.c:293 +#: ../toolbars/midori-findbar.c:297 msgid "Next" msgstr "Următoare" -#: ../toolbars/midori-findbar.c:297 +#: ../toolbars/midori-findbar.c:301 msgid "Match Case" msgstr "Majuscule semnificative" -#: ../toolbars/midori-findbar.c:306 +#: ../toolbars/midori-findbar.c:310 msgid "Highlight Matches" msgstr "Evidențiază potrivirile" -#: ../toolbars/midori-findbar.c:317 +#: ../toolbars/midori-findbar.c:321 msgid "Close Findbar" msgstr "Închide bara de căutare" -#: ../toolbars/midori-transferbar.c:124 +#: ../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:129 +#: ../toolbars/midori-transferbar.c:125 msgid "Transfer completed" msgstr "Descărcare finalizată" -#: ../toolbars/midori-transferbar.c:201 +#: ../toolbars/midori-transferbar.c:193 msgid "The downloaded file is erroneous." msgstr "Fișierul descărcat este corupt." -#: ../toolbars/midori-transferbar.c:202 +#: ../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." @@ -2230,66 +2068,56 @@ 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:345 ../panels/midori-transfers.c:142 +#: ../toolbars/midori-transferbar.c:331 ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "Șterge tot" -#: ../toolbars/midori-transferbar.c:382 ../toolbars/midori-transferbar.c:384 +#: ../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:388 +#: ../toolbars/midori-transferbar.c:374 msgid "_Quit Midori" msgstr "În_chidere Midori" -#: ../toolbars/midori-transferbar.c:390 +#: ../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:308 +#: ../panels/midori-bookmarks.c:113 +msgid "Bookmarks" +msgstr "Favorite" + +#: ../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:475 -#, c-format -msgid "Failed to update bookmark : %s\n" -msgstr "Nu s-a putut actualiza favoritul: %s\n" - -#: ../panels/midori-bookmarks.c:535 +#: ../panels/midori-bookmarks.c:434 msgid "Edit the selected bookmark" msgstr "Editați favoritul selectat" -#: ../panels/midori-bookmarks.c:543 +#: ../panels/midori-bookmarks.c:442 msgid "Delete the selected bookmark" msgstr "Ștergeți favoritul selectat" -#: ../panels/midori-bookmarks.c:558 +#: ../panels/midori-bookmarks.c:457 msgid "Add a new folder" msgstr "Adăugați un dosar nou" -#: ../panels/midori-bookmarks.c:697 ../panels/midori-history.c:638 +#: ../panels/midori-bookmarks.c:591 ../panels/midori-history.c:579 msgid "Separator" msgstr "Separator" -#. Create the filter entry -#: ../panels/midori-bookmarks.c:1027 -msgid "Search Bookmarks" -msgstr "Căutare în favorite" - -#: ../panels/midori-history.c:111 +#: ../panels/midori-history.c:110 msgid "History" msgstr "Istoric" -#: ../panels/midori-history.c:158 ../panels/midori-history.c:189 -msgid "Today" -msgstr "Azi" - -#: ../panels/midori-history.c:160 ../panels/midori-history.c:191 -msgid "Yesterday" -msgstr "Ieri" +#: ../panels/midori-history.c:142 +msgid "A week ago" +msgstr "Acum o săptămână" -#: ../panels/midori-history.c:162 ../panels/midori-history.c:186 +#: ../panels/midori-history.c:144 #, c-format msgid "%d day ago" msgid_plural "%d days ago" @@ -2297,45 +2125,39 @@ msgstr[0] "Ieri" msgstr[1] "Acum %d zile" msgstr[2] "Acum %d de zile" -#: ../panels/midori-history.c:165 ../panels/midori-history.c:184 -msgid "A week ago" -msgstr "Acum o săptămână" +#: ../panels/midori-history.c:147 +msgid "Today" +msgstr "Azi" -#: ../panels/midori-history.c:232 -#, c-format -msgid "Failed to remove history item: %s\n" -msgstr "Nu s-a putut șterge elementul din istoric: %s\n" +#: ../panels/midori-history.c:149 +msgid "Yesterday" +msgstr "Ieri" -#: ../panels/midori-history.c:360 +#: ../panels/midori-history.c:317 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:407 +#: ../panels/midori-history.c:363 msgid "Bookmark the selected history item" msgstr "Adaugă ca favorit elementul selectat din istoric" -#: ../panels/midori-history.c:416 +#: ../panels/midori-history.c:372 msgid "Delete the selected history item" msgstr "Șterge elementul selectat din istoric" -#: ../panels/midori-history.c:424 +#: ../panels/midori-history.c:380 msgid "Clear the entire history" msgstr "Șterge întregul istoric" -#. Create the filter entry -#: ../panels/midori-history.c:997 -msgid "Search History" -msgstr "Căutare în istoric" - -#: ../panels/midori-transfers.c:87 +#: ../panels/midori-transfers.c:86 msgid "Transfers" msgstr "Descărcări" -#: ../panels/midori-transfers.c:470 +#: ../panels/midori-transfers.c:467 msgid "Open Destination _Folder" msgstr "Deschide _dosarul de destinație" -#: ../panels/midori-transfers.c:473 +#: ../panels/midori-transfers.c:470 msgid "Copy Link Loc_ation" msgstr "Copiază _adresa linkului" @@ -2363,68 +2185,68 @@ msgstr "Parolă" msgid "_Remember password" msgstr "_Reține parola" -#: ../katze/katze-throbber.c:949 +#: ../katze/katze-throbber.c:942 #, 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:962 +#: ../katze/katze-throbber.c:955 #, c-format msgid "Stock icon '%s' couldn't be loaded" msgstr "Nu s-a putut încărca iconița implicită „%s”" -#: ../katze/katze-throbber.c:1042 +#: ../katze/katze-throbber.c:1035 msgid "Animation frames are broken" msgstr "Cadrele animației sunt nevalide" -#: ../katze/katze-utils.c:443 ../katze/katze-utils.c:867 +#: ../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:489 ../katze/katze-utils.c:518 +#: ../katze/katze-utils.c:485 ../katze/katze-utils.c:514 #: ../extensions/addons.c:308 msgid "Choose file" msgstr "Selectați un fișier" -#: ../katze/katze-utils.c:504 +#: ../katze/katze-utils.c:500 msgid "Choose folder" msgstr "Selectați un dosar" -#: ../katze/katze-utils.c:602 +#: ../katze/katze-utils.c:604 msgid "None" msgstr "Fără" -#: ../katze/katze-utils.c:717 +#: ../katze/katze-utils.c:719 msgid "1 hour" msgstr "o oră" -#: ../katze/katze-utils.c:718 +#: ../katze/katze-utils.c:720 msgid "1 day" msgstr "o zi" -#: ../katze/katze-utils.c:719 +#: ../katze/katze-utils.c:721 msgid "1 week" msgstr "o săptămână" -#: ../katze/katze-utils.c:720 +#: ../katze/katze-utils.c:722 msgid "1 month" msgstr "o lună" -#: ../katze/katze-utils.c:721 +#: ../katze/katze-utils.c:723 msgid "1 year" msgstr "un an" -#: ../katze/katze-preferences.c:98 ../extensions/history-list.vala:235 +#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235 #, c-format msgid "Preferences for %s" msgstr "Preferințe pentru %s" -#: ../extensions/adblock.c:470 +#: ../extensions/adblock.c:441 msgid "Configure Advertisement filters" msgstr "Opțiuni pentru filtrarea reclamelor" -#: ../extensions/adblock.c:503 +#: ../extensions/adblock.c:472 #, c-format msgid "" "Type the address of a preconfigured filter list in the text entry and click " @@ -2434,27 +2256,27 @@ msgstr "" "faceți clic pe „Adaugă” pentru a o adăuga în listă. Puteți găsi mai multe " "liste la %s." -#: ../extensions/adblock.c:917 +#: ../extensions/adblock.c:823 msgid "Edit rule" msgstr "Editare regulă" -#: ../extensions/adblock.c:931 +#: ../extensions/adblock.c:837 msgid "_Rule:" msgstr "_Regulă:" -#: ../extensions/adblock.c:985 +#: ../extensions/adblock.c:891 msgid "Bl_ock image" msgstr "Bl_ochează imaginea" -#: ../extensions/adblock.c:990 +#: ../extensions/adblock.c:896 msgid "Bl_ock link" msgstr "Bl_ochează linkul" -#: ../extensions/adblock.c:1689 +#: ../extensions/adblock.c:1499 msgid "Advertisement blocker" msgstr "Filtrare de reclame" -#: ../extensions/adblock.c:1690 +#: ../extensions/adblock.c:1500 msgid "Block advertisements according to a filter list" msgstr "Blochează reclamele conform unei liste de filtre" @@ -2484,71 +2306,71 @@ msgstr "_Instalează stilul" msgid "Don't install" msgstr "Nu instala" -#: ../extensions/addons.c:319 ../extensions/addons.c:677 +#: ../extensions/addons.c:319 ../extensions/addons.c:681 msgid "Userscripts" -msgstr "Scripturi de utilizator" +msgstr "Scripturi proprii" -#: ../extensions/addons.c:324 ../extensions/addons.c:679 +#: ../extensions/addons.c:324 ../extensions/addons.c:683 msgid "Userstyles" -msgstr "Stiluri de utilizator" +msgstr "Stiluri proprii" -#: ../extensions/addons.c:370 ../extensions/addons.c:449 +#: ../extensions/addons.c:380 ../extensions/addons.c:459 #: ../extensions/feed-panel/main.c:129 msgid "Error" msgstr "Eroare" -#: ../extensions/addons.c:411 +#: ../extensions/addons.c:421 #, c-format msgid "Do you want to delete '%s'?" msgstr "Doriți să ștergeți „%s”?" -#: ../extensions/addons.c:417 +#: ../extensions/addons.c:427 msgid "Delete user script" -msgstr "Ștergere script de utilizator" +msgstr "Ștergere script propriu" -#: ../extensions/addons.c:418 +#: ../extensions/addons.c:428 msgid "Delete user style" -msgstr "Ștergere stil de utilizator" +msgstr "Ștergere stil propriu" -#: ../extensions/addons.c:421 +#: ../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:566 ../extensions/addons.c:643 +#: ../extensions/addons.c:570 ../extensions/addons.c:647 msgid "Open in Text Editor" msgstr "Deschide în editorul de text" -#: ../extensions/addons.c:568 ../extensions/addons.c:652 +#: ../extensions/addons.c:572 ../extensions/addons.c:656 msgid "Open Target Folder" msgstr "Deschide dosarul țintă" -#: ../extensions/addons.c:634 +#: ../extensions/addons.c:638 msgid "Add new addon" msgstr "Adăugare de noi elemente" -#: ../extensions/addons.c:660 +#: ../extensions/addons.c:664 msgid "Remove selected addon" msgstr "Șterge elementul selectat" -#: ../extensions/addons.c:1689 ../extensions/addons.c:1907 +#: ../extensions/addons.c:1696 ../extensions/addons.c:1914 msgid "User addons" msgstr "Module proprii" -#: ../extensions/addons.c:1819 +#: ../extensions/addons.c:1826 #, c-format msgid "Can't monitor folder '%s': %s" msgstr "Nu se poate monitoriza dosarul „%s”: %s" -#: ../extensions/addons.c:1908 +#: ../extensions/addons.c:1915 msgid "Support for userscripts and userstyles" -msgstr "Suport pentru scripturi și stiluri de utilizator" +msgstr "Suport pentru scripturi și stiluri proprii" -#: ../extensions/colorful-tabs.c:201 +#: ../extensions/colorful-tabs.c:202 msgid "Colorful Tabs" msgstr "Taburi colorate" -#: ../extensions/colorful-tabs.c:202 +#: ../extensions/colorful-tabs.c:203 msgid "Tint each tab distinctly" msgstr "Colorează distinct taburile" @@ -2627,21 +2449,29 @@ msgstr "" "Domeniu: %s\n" "Cookie-uri: %d" -#: ../extensions/cookie-manager/cookie-manager-page.c:1017 +#: ../extensions/cookie-manager/cookie-manager-page.c:1024 msgid "Name" msgstr "Nume" -#: ../extensions/cookie-manager/cookie-manager-page.c:1069 +#: ../extensions/cookie-manager/cookie-manager-page.c:1077 msgid "_Expand All" msgstr "_Extinde tot" -#: ../extensions/cookie-manager/cookie-manager-page.c:1077 +#: ../extensions/cookie-manager/cookie-manager-page.c:1085 msgid "_Collapse All" msgstr "Plia_ză tot" -#: ../extensions/cookie-manager/cookie-manager-page.c:1129 -msgid "Search Cookies by Name or Domain" -msgstr "Căutare în numele și domeniile cookie-urilor" +#: ../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:36 msgid "List, view and delete cookies" @@ -2740,72 +2570,46 @@ msgstr "Panou cu fluxuri de știri" msgid "Read Atom/ RSS feeds" msgstr "Urmăriți fluxuri de știri Atom/RSS" -#: ../extensions/formhistory/formhistory.c:39 +#: ../extensions/formhistory.c:138 #, c-format msgid "Failed to add form value: %s\n" msgstr "Nu s-a putut adăuga valoarea formularului: %s\n" -#: ../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:294 -msgid "Remember password on this page?" -msgstr "Să se rețină parola pentru această pagină?" - -#: ../extensions/formhistory/formhistory.c:299 -msgid "Remember" -msgstr "Reține" - -#: ../extensions/formhistory/formhistory.c:300 -msgid "Not now" -msgstr "Nu acum" - -#: ../extensions/formhistory/formhistory.c:301 -msgid "Never for this page" -msgstr "Niciodată pentru pagina asta" - -#: ../extensions/formhistory/formhistory.c:437 +#: ../extensions/formhistory.c:296 msgid "Toggle form history state" msgstr "Comută starea istoricului formularelor" -#: ../extensions/formhistory/formhistory.c:438 +#: ../extensions/formhistory.c:297 msgid "Activate or deactivate form history for the current tab." msgstr "Activează ori dezactivează istoricul formularelor pentru tabul curent" -#: ../extensions/formhistory/formhistory.c:549 -#: ../extensions/formhistory/formhistory.c:553 +#: ../extensions/formhistory.c:433 ../extensions/formhistory.c:437 #, 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:629 -msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab" +#: ../extensions/formhistory.c:512 +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:668 -msgid "Form history filler" -msgstr "Istoric pentru formulare" - -#: ../extensions/formhistory/formhistory.c:669 +#: ../extensions/formhistory.c:571 msgid "Stores history of entered form data" msgstr "Salvează istoricul datelor introduse în formulare" -#: ../extensions/formhistory/formhistory-gdom-frontend.c:225 -#: ../extensions/formhistory/formhistory-js-frontend.c:106 +#: ../extensions/formhistory.c:575 #, c-format -msgid "Failed to select suggestions\n" -msgstr "Nu s-a putut selecta o sugestie\n" +msgid "Not available: %s" +msgstr "Indisponibil: %s" + +#: ../extensions/formhistory.c:576 +msgid "Resource files not installed" +msgstr "Fișierele resursă nu sunt instalate" + +#: ../extensions/formhistory.c:582 +msgid "Form history filler" +msgstr "Istoric pentru formulare" #: ../extensions/history-list.vala:197 msgid "There are no unvisited tabs" @@ -2880,15 +2684,15 @@ msgstr "Reîncarcă pagina ori oprește încărcarea" msgid "Customize Keyboard shortcuts" msgstr "Personalizați combinațiile de taste" -#: ../extensions/shortcuts.c:283 +#: ../extensions/shortcuts.c:285 msgid "Customize Sh_ortcuts..." -msgstr "Personalizați c_ombinațiile de taste…" +msgstr "Personalizați c_ombinațiile de taste..." -#: ../extensions/shortcuts.c:320 +#: ../extensions/shortcuts.c:322 msgid "Shortcuts" msgstr "Combinații de taste" -#: ../extensions/shortcuts.c:321 +#: ../extensions/shortcuts.c:323 msgid "View and edit keyboard shortcuts" msgstr "Vizualizați și editați combinațiile de taste" @@ -2900,35 +2704,35 @@ msgstr "Ceas în bara de stare" msgid "Display date and time in the statusbar" msgstr "Arată data și ora în bara de stare" -#: ../extensions/statusbar-features.c:152 +#: ../extensions/statusbar-features.c:128 msgid "Images" msgstr "Imagini" -#: ../extensions/statusbar-features.c:162 +#: ../extensions/statusbar-features.c:137 msgid "Scripts" msgstr "Scripturi" -#: ../extensions/statusbar-features.c:174 +#: ../extensions/statusbar-features.c:146 msgid "Netscape plugins" msgstr "Module Netscape" -#: ../extensions/statusbar-features.c:259 +#: ../extensions/statusbar-features.c:192 msgid "Statusbar Features" msgstr "Facilități web în bara de stare" -#: ../extensions/statusbar-features.c:260 +#: ../extensions/statusbar-features.c:193 msgid "Easily toggle features on web pages on and off" msgstr "Activați cu ușurință facilități pentru paginile web" -#: ../extensions/tab-panel.c:589 ../extensions/tab-panel.c:676 +#: ../extensions/tab-panel.c:596 ../extensions/tab-panel.c:683 msgid "Tab Panel" msgstr "Panou cu taburi" -#: ../extensions/tab-panel.c:659 +#: ../extensions/tab-panel.c:666 msgid "T_ab Panel" msgstr "Panou cu t_aburi" -#: ../extensions/tab-panel.c:677 +#: ../extensions/tab-panel.c:684 msgid "Show tabs in a vertical panel" msgstr "Arată taburile într-un panou vertical" @@ -2940,35 +2744,39 @@ msgstr "Doar iconițe în taburi" msgid "New tabs have no label by default" msgstr "Taburile noi nu vor avea implicit etichete de text" -#: ../extensions/toolbar-editor.c:395 +#: ../extensions/toolbar-editor.c:393 msgid "Customize Toolbar" msgstr "Personalizați bara cu unelte" -#: ../extensions/toolbar-editor.c:411 +#: ../extensions/toolbar-editor.c:413 msgid "" -"Select items to be displayed on the toolbar. Items can be reordered by drag " +"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:427 +#: ../extensions/toolbar-editor.c:429 msgid "Available Items" msgstr "Elemente disponibile" -#: ../extensions/toolbar-editor.c:448 +#: ../extensions/toolbar-editor.c:450 msgid "Displayed Items" msgstr "Elemente afișate" -#: ../extensions/toolbar-editor.c:588 -msgid "_Customize Toolbar…" -msgstr "Personalizați bara cu unel_te…" +#: ../extensions/toolbar-editor.c:585 +msgid "Customize _Toolbar..." +msgstr "Personalizați bara cu unel_te..." + +#: ../extensions/toolbar-editor.c:601 +msgid "_Customize..." +msgstr "_Personalizare..." -#: ../extensions/toolbar-editor.c:617 +#: ../extensions/toolbar-editor.c:631 msgid "Toolbar Editor" msgstr "Editor pentru bara cu unelte" -#: ../extensions/toolbar-editor.c:618 +#: ../extensions/toolbar-editor.c:632 msgid "Easily edit the toolbar layout" msgstr "Personalizați aspectul barei cu unelte" @@ -2976,67 +2784,6 @@ msgstr "Personalizați aspectul barei cu unelte" msgid "Cache HTTP communication on disk" msgstr "Stochează comunicarea HTTP într-un cache pe disc" -#~ msgid "_Bookmark" -#~ msgstr "_Favorit" - -#~ msgid "_Console" -#~ msgstr "_Consolă" - -#~ msgid "Toplevel folder" -#~ msgstr "Dosarul rădăcină" - -#~ msgid "_Title:" -#~ msgstr "_Titlu:" - -#~ msgid "_Folder:" -#~ msgstr "D_osar:" - -#~ msgid "Close ot_her Tabs" -#~ msgstr "Înc_hide celelalte taburi" - -#~ msgid "_Icon:" -#~ msgstr "_Iconiță:" - -#~ msgid "Filter:" -#~ msgstr "Filtru:" - -#~ 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" - -#~ msgid "_Customize…" -#~ msgstr "_Personalizare…" - -#~ msgid "The bookmarks couldn't be saved. %s" -#~ msgstr "Nu s-au putut salva favoritele. %s" - -#~ msgid "The specified configuration folder is invalid." -#~ msgstr "Dosarul cu preferințe precizat nu este valid." - -#~ 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" @@ -3112,14 +2859,14 @@ msgstr "Stochează comunicarea HTTP într-un cache pe disc" #~ 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 "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 "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 "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" @@ -3345,12 +3092,15 @@ msgstr "Stochează comunicarea HTTP într-un cache pe disc" #~ 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 "Configure _Advertisement filters..." +#~ msgstr "Opțiuni pentru _filtrarea reclamelor..." #~ msgid "Open target folder for selected addon" #~ msgstr "Deschide dosarul țintă pentru elementul selectat" +#~ msgid "_Form History" +#~ msgstr "Istoricul _formularelor" + #~ msgid "Next Tab (History List)" #~ msgstr "Tabul următor (din istoric)" diff --git a/po/ru.po b/po/ru.po index d29e3fe8..2a01f970 100644 --- a/po/ru.po +++ b/po/ru.po @@ -3,389 +3,374 @@ # This file is distributed under the same license as the midori package. # Troitskiy Nikita 2008 # Anton Shestakov 2008-2009 -# +# msgid "" msgstr "" "Project-Id-Version: midori 0.2.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-27 07:21+0000\n" -"PO-Revision-Date: 2012-08-27 22:45+1000\n" -"Last-Translator: Alex 'AdUser' Z \n" +"POT-Creation-Date: 2011-11-06 11:12+0000\n" +"PO-Revision-Date: 2011-10-09 14:28+0800\n" +"Last-Translator: Anton Shestakov \n" "Language-Team: Russian \n" -"Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: ru\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 "Browse the Web" -msgstr "Работа в Интернете" +msgid "Lightweight web browser" +msgstr "Легковесный Интернет-обозреватель" -#: ../data/midori.desktop.in.h:2 -msgid "Internet;WWW;Explorer" -msgstr "Internet;Explorer;Интернет;браузер;обозреватель;www" - -#: ../data/midori.desktop.in.h:3 -#: ../midori/main.c:2009 -#: ../midori/main.c:2033 -#: ../midori/main.c:2047 -#: ../midori/midori-websettings.c:316 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:2004 ../midori/main.c:2024 +#: ../midori/main.c:2040 ../midori/midori-websettings.c:299 msgid "Midori" msgstr "Midori" -#: ../data/midori.desktop.in.h:4 -msgid "Midori Web Browser" -msgstr "Интернет-обозреватель Midori" - -#: ../data/midori.desktop.in.h:5 -msgid "New Private Browsing Window" -msgstr "Новое кон_фиденциальное окно" - -#: ../data/midori.desktop.in.h:6 -#: ../midori/midori-browser.c:1491 -msgid "New Tab" -msgstr "Новая вкладка" - -#: ../data/midori.desktop.in.h:7 -#: ../midori/midori-browser.c:1488 -msgid "New Window" -msgstr "Новое окно" - -#: ../data/midori.desktop.in.h:8 +#: ../data/midori.desktop.in.h:3 msgid "Web Browser" 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 "Открывает новое конфиденциальное окно" - -#: ../data/midori-private.desktop.in.h:3 -#: ../midori/midori-view.c:4505 -msgid "Private Browsing" -msgstr "Конфиденциальный режим" - -#: ../midori/main.c:91 -#: ../midori/main.c:97 +#: ../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:145 +#: ../midori/main.c:150 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Значение «%s» недействительно для %s" -#: ../midori/main.c:150 -#: ../midori/main.c:254 +#: ../midori/main.c:155 ../midori/main.c:248 #, c-format msgid "Invalid configuration value '%s'" msgstr "Недопустимое значение параметра: «%s»" -#: ../midori/main.c:375 +#: ../midori/main.c:353 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Не удалось загрузить средства поиска. %s\n" -#: ../midori/main.c:429 +#: ../midori/main.c:407 #, c-format msgid "Failed to clear history: %s\n" msgstr "Не удалось очистить журнал: %s\n" -#: ../midori/main.c:451 -#: ../extensions/formhistory/formhistory.c:531 +#: ../midori/main.c:427 ../midori/main.c:548 ../extensions/formhistory.c:415 #, 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:523 +#: ../midori/main.c:491 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Не удалось удалить устаревшие записи из журнала: %s\n" -#: ../midori/main.c:545 +#: ../midori/main.c:531 ../panels/midori-history.c:189 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "Не удалось удалить запись из журнала: %s\n" + +#: ../midori/main.c:578 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "Не удалось сохранить закладки. %s" + +#: ../midori/main.c:613 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Не удалось сохранить настройки. %s" -#: ../midori/main.c:571 +#: ../midori/main.c:648 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Не удалось сохранить средства поиска. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:608 +#: ../midori/main.c:674 ../midori/main.c:694 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Не удалось сохранить содержимое корзины. %s" -#: ../midori/main.c:681 -#: ../panels/midori-extensions.c:90 +#: ../midori/main.c:728 ../panels/midori-extensions.c:91 msgid "Extensions" msgstr "Дополнения" -#: ../midori/main.c:695 +#: ../midori/main.c:742 msgid "Privacy" msgstr "Конфиденциальность" -#: ../midori/main.c:707 -msgid "Cookies store login data, saved games, or user profiles for advertisement purposes." -msgstr "Фрагменты данных хранят текущего пользователя сайта, сохранения игр, а также могут хранить информацию о пользователе в рекламных целях." +#: ../midori/main.c:754 +msgid "" +"Cookies store login data, saved games, or user profiles for advertisement " +"purposes." +msgstr "" +"Фрагменты данных хранят текущего пользователя сайта, сохранения игр, а также " +"могут хранить информацию о пользователе в рекламных целях." -#: ../midori/main.c:763 +#: ../midori/main.c:816 #, c-format msgid "The session couldn't be saved. %s" msgstr "Не удалось сохранить сеанс. %s" -#: ../midori/main.c:985 -msgid "No root certificate file is available. SSL certificates cannot be verified." +#: ../midori/main.c:1026 +msgid "" +"No root certificate file is available. SSL certificates cannot be verified." msgstr "Недоступен корневой сертификат. SSL сертификат не может быть проверен." -#: ../midori/main.c:1077 -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:1094 +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 +#: ../midori/main.c:1113 msgid "Modify _preferences" msgstr "Изменить _параметры" -#: ../midori/main.c:1100 +#: ../midori/main.c:1117 msgid "Disable all _extensions" msgstr "Отключить _все дополнения" -#: ../midori/main.c:1113 +#: ../midori/main.c:1130 msgid "Discard old tabs" msgstr "Закрыть все вкладки" -#: ../midori/main.c:1114 -#: ../midori/midori-websettings.c:224 +#: ../midori/main.c:1131 ../midori/midori-websettings.c:208 msgid "Show last tabs without loading" msgstr "Открыть последние страницы без загрузки" -#: ../midori/main.c:1115 -#: ../midori/midori-websettings.c:223 +#: ../midori/main.c:1132 ../midori/midori-websettings.c:207 msgid "Show last open tabs" msgstr "Открыть последние открытые страницы" -#: ../midori/main.c:1363 -#: ../midori/main.c:2417 +#: ../midori/main.c:1342 ../midori/main.c:2423 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Не удалось загрузить сеанс: %s\n" -#: ../midori/main.c:1501 +#: ../midori/main.c:1483 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Снимок сохранён в: %s\n" -#: ../midori/main.c:1917 +#: ../midori/main.c:1907 msgid "Run ADDRESS as a web application" msgstr "Запустить АДРЕС как веб-приложение" -#: ../midori/main.c:1917 +#: ../midori/main.c:1907 msgid "ADDRESS" msgstr "АДРЕС" -#: ../midori/main.c:1920 +#: ../midori/main.c:1910 msgid "Use FOLDER as configuration folder" msgstr "Использовать файлы параметров из ПАПКИ" -#: ../midori/main.c:1920 +#: ../midori/main.c:1910 msgid "FOLDER" msgstr "ПАПКА" -#: ../midori/main.c:1923 +#: ../midori/main.c:1913 msgid "Private browsing, no changes are saved" msgstr "Конфиденциальный режим, изменения не будут сохранены" -#: ../midori/main.c:1925 +#: ../midori/main.c:1915 msgid "Show a diagnostic dialog" msgstr "Показать окно действий" -#: ../midori/main.c:1927 +#: ../midori/main.c:1917 msgid "Run the specified filename as javascript" msgstr "Выполнить указанный файл как javascript" -#: ../midori/main.c:1929 +#: ../midori/main.c:1919 msgid "Take a snapshot of the specified URI" msgstr "Создать снимок указанной страницы" -#: ../midori/main.c:1931 +#: ../midori/main.c:1921 msgid "Execute the specified command" msgstr "Выполнить указанную команду" -#: ../midori/main.c:1933 +#: ../midori/main.c:1923 msgid "List available commands to execute with -e/ --execute" msgstr "Вывести список доступных команд для -e/ --execute" -#: ../midori/main.c:1935 +#: ../midori/main.c:1925 msgid "Display program version" msgstr "Отобразить версию программы" -#: ../midori/main.c:1937 +#: ../midori/main.c:1927 msgid "Addresses" msgstr "Адреса" -#: ../midori/main.c:1939 +#: ../midori/main.c:1929 msgid "Block URIs according to regular expression PATTERN" msgstr "Блокировать URI по ШАБЛОНУ (регулярное выражение)" -#: ../midori/main.c:1939 +#: ../midori/main.c:1929 msgid "PATTERN" msgstr "ШАБЛОН" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1943 +#: ../midori/main.c:1933 msgid "Reset Midori after SECONDS seconds of inactivity" -msgstr "Сбросить состояние Midori по прошествии указанного числа СЕКУНД бездействия" +msgstr "" +"Сбросить состояние Midori по прошествии указанного числа СЕКУНД бездействия" -#: ../midori/main.c:1943 +#: ../midori/main.c:1933 msgid "SECONDS" msgstr "СЕКУНД" -#: ../midori/main.c:1946 +#: ../midori/main.c:1936 msgid "Redirects console warnings to the specified FILENAME" msgstr "Перенаправить предупреждения из консоли в выбранный ФАЙЛ" -#: ../midori/main.c:1946 +#: ../midori/main.c:1936 msgid "FILENAME" msgstr "ФАЙЛ" -#: ../midori/main.c:2048 +#: ../midori/main.c:2001 +msgid "[Addresses]" +msgstr "[Адреса]" + +#: ../midori/main.c:2011 +msgid "The specified configuration folder is invalid." +msgstr "Указана некорректная папка файлов параметров." + +#: ../midori/main.c:2041 msgid "Please report comments, suggestions and bugs to:" msgstr "Предложения, комментарии и сообщения об ошибках направляйте по адресу:" -#: ../midori/main.c:2050 +#: ../midori/main.c:2043 msgid "Check for new versions at:" msgstr "Искать обновления на:" +#: ../midori/main.c:2126 +msgid "Website icons" +msgstr "Значки веб-сайтов" + #. i18n: Logins and passwords in websites and web forms -#: ../midori/main.c:2145 +#: ../midori/main.c:2129 msgid "Saved logins and _passwords" msgstr "Сохранённые логины и _пароли" -#: ../midori/main.c:2147 -msgid "Cookies and Website data" -msgstr "Cookies и данные веб-сайта" +#: ../midori/main.c:2131 +msgid "Cookies" +msgstr "Фрагменты данных" + +#: ../midori/main.c:2134 +msgid "'Flash' Cookies" +msgstr "Фрагменты данных Flash" -#. TODO: Preserve page icons of search engines and merge privacy items -#: ../midori/main.c:2151 -#: ../midori/midori-websettings.c:1021 -#: ../extensions/web-cache.c:462 -#: ../extensions/web-cache.c:471 +#: ../midori/main.c:2137 +msgid "HTML5 _Databases" +msgstr "_Базы данных HTML5" + +#: ../midori/main.c:2140 ../midori/midori-websettings.c:932 +#: ../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:2142 +msgid "Offline Application Cache" +msgstr "Кэш веб-приложений" -#: ../midori/main.c:2258 +#: ../midori/main.c:2245 msgid "An unknown error occured" msgstr "Неизвестная ошибка" -#: ../midori/main.c:2365 +#: ../midori/main.c:2354 msgid "An instance of Midori is already running but not responding.\n" msgstr "Midori уже запущена, но не отвечает.\n" -#: ../midori/main.c:2399 +#: ../midori/main.c:2390 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Не удалось загрузить закладки: %s\n" -#: ../midori/main.c:2432 +#: ../midori/main.c:2438 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Не удалось загрузить содержимое корзины: %s\n" -#: ../midori/main.c:2445 +#: ../midori/main.c:2451 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Не удалось загрузить журнал: %s\n" -#: ../midori/main.c:2460 +#: ../midori/main.c:2467 msgid "The following errors occured:" msgstr "Обнаружены следующие ошибки:" -#: ../midori/main.c:2476 +#: ../midori/main.c:2483 msgid "_Ignore" msgstr "_Игнорировать" -#: ../midori/midori-app.c:1155 -#: ../midori/midori-browser.c:557 -#, c-format -msgid "Unexpected action '%s'." -msgstr "Неожиданное действие «%s»." +#: ../midori/midori-app.c:1320 +msgid "_Bookmark" +msgstr "_Закладка" -#: ../midori/midori-app.c:1459 -#: ../midori/midori-browser.c:6452 +#: ../midori/midori-app.c:1321 ../midori/midori-browser.c:6061 msgid "_Bookmarks" msgstr "_Закладки" -#: ../midori/midori-app.c:1460 +#: ../midori/midori-app.c:1322 msgid "Add Boo_kmark" msgstr "_Добавить закладку" -#: ../midori/midori-app.c:1461 +#: ../midori/midori-app.c:1323 +msgid "_Console" +msgstr "_Консоль" + +#: ../midori/midori-app.c:1324 msgid "_Extensions" msgstr "_Дополнения" #. i18n: Browsing history, visited web pages, closed tabs -#: ../midori/midori-app.c:1462 -#: ../midori/midori-browser.c:4905 +#: ../midori/midori-app.c:1325 ../midori/midori-browser.c:4606 msgid "_History" msgstr "_Журнал" -#: ../midori/midori-app.c:1463 +#: ../midori/midori-app.c:1326 +msgid "_Homepage" +msgstr "_Домашняя страница" + +#: ../midori/midori-app.c:1327 msgid "_Userscripts" msgstr "_Пользовательские сценарии" -#: ../midori/midori-app.c:1464 -msgid "User_styles" -msgstr "С_тили пользователя" - -#: ../midori/midori-app.c:1465 +#: ../midori/midori-app.c:1328 msgid "New _Tab" msgstr "Но_вая вкладка" -#: ../midori/midori-app.c:1466 +#: ../midori/midori-app.c:1329 msgid "_Transfers" msgstr "_Передачи" -#: ../midori/midori-app.c:1467 +#: ../midori/midori-app.c:1330 msgid "Netscape p_lugins" msgstr "_Модули Netscape" -#: ../midori/midori-app.c:1468 +#: ../midori/midori-app.c:1331 msgid "_Closed Tabs" msgstr "За_крытые вкладки" -#: ../midori/midori-app.c:1469 -#: ../midori/midori-browser.c:5588 +#: ../midori/midori-app.c:1332 ../midori/midori-browser.c:5194 msgid "New _Window" msgstr "_Новое окно" -#: ../midori/midori-app.c:1470 +#: ../midori/midori-app.c:1333 msgid "New _Folder" msgstr "Новая папка" -#: ../midori/midori-app.c:1499 -msgid "[Addresses]" -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 +#: ../midori/midori-array.c:547 ../midori/midori-array.c:586 +#: ../midori/midori-array.c:609 ../midori/midori-array.c:619 msgid "Malformed document." msgstr "Плохо сформированный документ." @@ -393,1758 +378,1765 @@ msgstr "Плохо сформированный документ." msgid "Unrecognized bookmark format." msgstr "Неизвестный формат закладок." -#: ../midori/midori-array.c:915 +#: ../midori/midori-array.c:916 msgid "Writing failed." msgstr "Ошибка записи." -#: ../midori/midori-browser.c:359 -#: ../midori/midori-browser.c:5676 -#: ../midori/midori-browser.c:5685 +#: ../midori/midori-browser.c:328 ../midori/midori-browser.c:5279 +#: ../midori/midori-browser.c:5288 msgid "Reload the current page" msgstr "Обновить страницу" -#: ../midori/midori-browser.c:368 -#: ../midori/midori-browser.c:5682 +#: ../midori/midori-browser.c:339 ../midori/midori-browser.c:5285 msgid "Stop loading the current page" msgstr "Прекратить загрузку страницы" -#: ../midori/midori-browser.c:376 -#: ../midori/midori-browser.c:5727 -msgid "Go forward to the next page" -msgstr "На следующую страницу" - -#. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:383 -#: ../midori/midori-browser.c:5735 -#: ../midori/midori-browser.c:5738 -msgid "Go to the next sub-page" -msgstr "На следующую подстраницу" - -#: ../midori/midori-browser.c:542 +#: ../midori/midori-browser.c:466 #, c-format msgid "Failed to update title: %s\n" msgstr "Не удалось обновить заголовок: %s\n" -#: ../midori/midori-browser.c:637 +#: ../midori/midori-browser.c:479 +#, c-format +msgid "Unexpected action '%s'." +msgstr "Неожиданное действие «%s»." + +#: ../midori/midori-browser.c:580 #, c-format msgid "%s (Private Browsing)" msgstr "%s (конфиденциальный режим)" -#: ../midori/midori-browser.c:747 -#: ../midori/midori-browser.c:789 -#: ../panels/midori-bookmarks.c:114 -msgid "Bookmarks" -msgstr "Закладки" +#: ../midori/midori-browser.c:691 ../midori/midori-browser.c:724 +msgid "Toplevel folder" +msgstr "Корневая папка" -#: ../midori/midori-browser.c:849 +#: ../midori/midori-browser.c:781 msgid "New folder" msgstr "Создание папки" -#: ../midori/midori-browser.c:849 +#: ../midori/midori-browser.c:781 msgid "Edit folder" msgstr "Изменить папку" -#: ../midori/midori-browser.c:851 +#: ../midori/midori-browser.c:783 msgid "New bookmark" msgstr "Новая закладка" -#: ../midori/midori-browser.c:851 +#: ../midori/midori-browser.c:783 msgid "Edit bookmark" msgstr "Изменение закладки" -#: ../midori/midori-browser.c:885 -msgid "Type a name for this bookmark and choose where to keep it." -msgstr "Выберите имя для закладки и место для её хранения." +#: ../midori/midori-browser.c:814 +msgid "_Title:" +msgstr "_Заголовок:" -#: ../midori/midori-browser.c:946 +#: ../midori/midori-browser.c:834 ../midori/midori-searchaction.c:968 +#: ../extensions/feed-panel/main.c:377 +msgid "_Address:" +msgstr "_Адрес:" + +#: ../midori/midori-browser.c:857 ../midori/midori-browser.c:4341 +msgid "_Folder:" +msgstr "_Папка:" + +#: ../midori/midori-browser.c:873 msgid "Add to _Speed Dial" msgstr "Добавить в _быстрый набор" -#: ../midori/midori-browser.c:952 +#: ../midori/midori-browser.c:886 msgid "Show in the tool_bar" msgstr "По_казывать на панели закладок" -#: ../midori/midori-browser.c:960 +#: ../midori/midori-browser.c:901 msgid "Run as _web application" msgstr "Запускать как _веб-приложение" -#: ../midori/midori-browser.c:1031 +#: ../midori/midori-browser.c:972 #, c-format msgid "The file \"%s\" can't be saved in this folder." msgstr "Файл «%s» не может быть сохранён в данную папку." -#: ../midori/midori-browser.c:1033 +#: ../midori/midori-browser.c:974 #, c-format msgid "You don't have permission to write in this location." msgstr "У вас недостаточно прав для записи указанного файла." -#: ../midori/midori-browser.c:1040 +#: ../midori/midori-browser.c:981 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Не хватает свободного места для загрузки \"%s\"." -#: ../midori/midori-browser.c:1043 +#: ../midori/midori-browser.c:984 #, c-format msgid "The file needs %s but only %s are left." msgstr "Файл требует %s а %s доступно" -#: ../midori/midori-browser.c:1179 -#: ../midori/midori-browser.c:4709 +#: ../midori/midori-browser.c:1028 ../midori/midori-browser.c:4411 msgid "Save file as" msgstr "Сохранить файл как" -#: ../midori/midori-browser.c:1185 -msgid "Save associated _resources" -msgstr "Сохранить связаннные ресурсы" +#: ../midori/midori-browser.c:1344 +msgid "New Window" +msgstr "Новое окно" -#: ../midori/midori-browser.c:1488 +#: ../midori/midori-browser.c:1344 msgid "A new window has been opened" msgstr "Открыто новое окно" -#: ../midori/midori-browser.c:1491 +#: ../midori/midori-browser.c:1347 +msgid "New Tab" +msgstr "Новая вкладка" + +#: ../midori/midori-browser.c:1347 msgid "A new tab has been opened" msgstr "Открыта новая вкладка" -#: ../midori/midori-browser.c:1508 -msgid "Error opening the image!" -msgstr "Ошибка при открытии изображения!" - -#: ../midori/midori-browser.c:1509 -msgid "Can not open selected image in a default viewer." -msgstr "Выделенное изображение не удалось открыть в программе просмотра по умолчанию." - -#: ../midori/midori-browser.c:1515 -msgid "Error downloading the image!" -msgstr "Ошибка при загрузке изображения!" - -#: ../midori/midori-browser.c:1516 -msgid "Can not download selected image." -msgstr "Не удалось загрузить выделенное изображение." - -#: ../midori/midori-browser.c:1637 +#: ../midori/midori-browser.c:1384 msgid "Save file" msgstr "Сохранить файл" -#: ../midori/midori-browser.c:2540 +#: ../midori/midori-browser.c:2274 msgid "Open file" msgstr "Открыть файл" -#: ../midori/midori-browser.c:2672 +#: ../midori/midori-browser.c:2404 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:2678 -#: ../extensions/feed-panel/main.c:365 +#: ../midori/midori-browser.c:2410 ../extensions/feed-panel/main.c:365 msgid "New feed" msgstr "Новая лента" -#: ../midori/midori-browser.c:2721 -#: ../midori/midori-browser.c:5751 -#: ../panels/midori-bookmarks.c:527 +#: ../midori/midori-browser.c:2453 ../midori/midori-browser.c:5348 +#: ../panels/midori-bookmarks.c:463 msgid "Add a new bookmark" msgstr "Новая закладка" -#: ../midori/midori-browser.c:3265 -#: ../midori/midori-searchaction.c:487 +#: ../midori/midori-browser.c:3016 ../midori/midori-searchaction.c:489 msgid "Empty" msgstr "Очистить" -#: ../midori/midori-browser.c:3711 -#: ../midori/midori-browser.c:3712 -msgid "Toggle text cursor navigation" -msgstr "Режим перемещения по странице при помощи текстового курсора" - -#: ../midori/midori-browser.c:3714 -msgid "Pressing F7 toggles Caret Browsing. When active, a text cursor appears in all websites." -msgstr "Нажатие F7 переключает перемещение курсором. Если включен, курсор отображается на всех сайтах." - -#: ../midori/midori-browser.c:3717 -msgid "_Enable Caret Browsing" -msgstr "Перемещение к_урсором" - -#: ../midori/midori-browser.c:4109 -#: ../midori/midori-browser.c:6145 +#: ../midori/midori-browser.c:3807 ../midori/midori-browser.c:5758 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Не удалось добавить запись в журнал: %s\n" -#: ../midori/midori-browser.c:4435 -#: ../panels/midori-bookmarks.c:850 -#: ../panels/midori-history.c:806 +#: ../midori/midori-browser.c:4138 ../panels/midori-bookmarks.c:779 +#: ../panels/midori-history.c:747 msgid "Open all in _Tabs" msgstr "Открыть всё в отдельных _вкладках" -#: ../midori/midori-browser.c:4442 -#: ../panels/midori-bookmarks.c:856 -#: ../panels/midori-history.c:812 -#: ../extensions/feed-panel/feed-panel.c:528 +#: ../midori/midori-browser.c:4145 ../panels/midori-bookmarks.c:785 +#: ../panels/midori-history.c:753 ../extensions/feed-panel/feed-panel.c:528 msgid "Open in New _Tab" msgstr "Открыть в новой _вкладке" -#: ../midori/midori-browser.c:4445 -#: ../midori/midori-view.c:2944 -#: ../midori/midori-view.c:5082 -#: ../panels/midori-bookmarks.c:858 -#: ../panels/midori-history.c:814 -#: ../extensions/feed-panel/feed-panel.c:530 +#: ../midori/midori-browser.c:4148 ../midori/midori-view.c:2534 +#: ../midori/midori-view.c:4349 ../panels/midori-bookmarks.c:787 +#: ../panels/midori-history.c:755 ../extensions/feed-panel/feed-panel.c:530 msgid "Open in New _Window" msgstr "Открыть в новом _окне" -#: ../midori/midori-browser.c:4534 +#: ../midori/midori-browser.c:4228 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4535 +#: ../midori/midori-browser.c:4229 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4536 +#: ../midori/midori-browser.c:4230 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4537 +#: ../midori/midori-browser.c:4231 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4538 +#: ../midori/midori-browser.c:4232 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4539 +#: ../midori/midori-browser.c:4233 #, c-format msgid "Firefox (%s)" msgstr "Firefox (%s)" -#: ../midori/midori-browser.c:4540 -msgid "Midori 0.2.6" -msgstr "Midori 0.2.6" - -#: ../midori/midori-browser.c:4561 -msgid "Import bookmarks…" -msgstr "Импорт закладок…" +#: ../midori/midori-browser.c:4254 +msgid "Import bookmarks..." +msgstr "Импорт закладок..." -#: ../midori/midori-browser.c:4564 -#: ../midori/midori-browser.c:5756 +#: ../midori/midori-browser.c:4257 ../midori/midori-browser.c:5353 msgid "_Import bookmarks" msgstr "_Импортировать закладки" -#: ../midori/midori-browser.c:4575 +#: ../midori/midori-browser.c:4268 msgid "_Application:" msgstr "_Приложение:" -#: ../midori/midori-browser.c:4640 +#: ../midori/midori-browser.c:4333 msgid "Import from XBEL or HTML file" msgstr "Импортировать из файла XBEL или HTML" -#: ../midori/midori-browser.c:4668 +#: ../midori/midori-browser.c:4368 msgid "Import from a file" msgstr "Импортировать из файла" -#: ../midori/midori-browser.c:4680 +#: ../midori/midori-browser.c:4380 msgid "Failed to import bookmarks" msgstr "Не удалось импортировать закладки" -#: ../midori/midori-browser.c:4714 +#: ../midori/midori-browser.c:4416 msgid "XBEL Bookmarks" msgstr "Закладки XBEL" -#: ../midori/midori-browser.c:4719 +#: ../midori/midori-browser.c:4421 msgid "Netscape Bookmarks" msgstr "Закладки Netscape" -#: ../midori/midori-browser.c:4733 +#: ../midori/midori-browser.c:4435 msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)" -msgstr "Midori может сохранять закладки только в форматах XBEL (*.xbel) и Netscape (*.html)" +msgstr "" +"Midori может сохранять закладки только в форматах XBEL (*.xbel) и Netscape " +"(*.html)" -#: ../midori/midori-browser.c:4748 +#: ../midori/midori-browser.c:4451 msgid "Failed to export bookmarks" msgstr "Не удалось экспортировать закладки" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4870 +#: ../midori/midori-browser.c:4573 msgid "Clear Private Data" msgstr "Удаление личных данных" -#: ../midori/midori-browser.c:4874 +#: ../midori/midori-browser.c:4577 msgid "_Clear private data" msgstr "_Удалить личные данные" -#: ../midori/midori-browser.c:4889 +#: ../midori/midori-browser.c:4590 msgid "Clear the following data:" msgstr "Удалить следующие данные:" -#: ../midori/midori-browser.c:4899 +#: ../midori/midori-browser.c:4600 msgid "Last open _tabs" msgstr "Открытые _вкладки" -#: ../midori/midori-browser.c:4925 +#: ../midori/midori-browser.c:4626 msgid "Clear private data when _quitting Midori" msgstr "Удалять личные данные _при закрытии Midori" -#: ../midori/midori-browser.c:5140 +#: ../midori/midori-browser.c:4802 msgid "A lightweight web browser." msgstr "Легковесный Интернет-обозреватель." -#: ../midori/midori-browser.c:5141 +#: ../midori/midori-browser.c:4803 msgid "See about:version for version info." -msgstr "Посетите страницу about:version для получения информации о текущей версии." +msgstr "" +"Посетите страницу about:version для получения информации о текущей версии." -#: ../midori/midori-browser.c:5143 -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:4805 +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:5173 +#: ../midori/midori-browser.c:4826 msgid "translator-credits" msgstr "" "Команда переводчиков Xfce\n" "" -#: ../midori/midori-browser.c:5586 +#: ../midori/midori-browser.c:5192 msgid "_File" msgstr "_Файл" -#: ../midori/midori-browser.c:5589 +#: ../midori/midori-browser.c:5195 msgid "Open a new window" msgstr "Открыть в новом окне" -#: ../midori/midori-browser.c:5592 +#: ../midori/midori-browser.c:5198 msgid "Open a new tab" msgstr "Открыть в новой вкладке" -#: ../midori/midori-browser.c:5594 +#: ../midori/midori-browser.c:5200 msgid "New P_rivate Browsing Window" msgstr "Новое кон_фиденциальное окно" -#: ../midori/midori-browser.c:5598 +#: ../midori/midori-browser.c:5201 +msgid "Don't save any private data while browsing" +msgstr "Не сохранять персональные данные во время навигации" + +#: ../midori/midori-browser.c:5205 msgid "Open a file" msgstr "Открыть файл" -#: ../midori/midori-browser.c:5600 -msgid "_Save Page As…" -msgstr "Сохранить страницу _как…" +#: ../midori/midori-browser.c:5207 +msgid "_Save Page As..." +msgstr "Сохранить страницу _как..." -#: ../midori/midori-browser.c:5601 +#: ../midori/midori-browser.c:5208 msgid "Save to a file" msgstr "Сохранить в файл" -#: ../midori/midori-browser.c:5603 +#: ../midori/midori-browser.c:5210 msgid "Add to Speed _dial" msgstr "Добавить в _быстрый набор" -#: ../midori/midori-browser.c:5607 +#: ../midori/midori-browser.c:5211 +msgid "Add shortcut to speed dial" +msgstr "Добавить страницу в панель быстрого набора" + +#: ../midori/midori-browser.c:5214 msgid "Add Shortcut to the _desktop" msgstr "Добавить кнопку запуска на _рабочий стол" -#: ../midori/midori-browser.c:5609 +#: ../midori/midori-browser.c:5215 +msgid "Add shortcut to the desktop" +msgstr "Добавить кнопку запуска на рабочий стол" + +#: ../midori/midori-browser.c:5217 msgid "Create _Launcher" msgstr "Создать кнопку _запуска" -#: ../midori/midori-browser.c:5613 +#: ../midori/midori-browser.c:5218 +msgid "Create a launcher" +msgstr "Создать кнопку запуска" + +#: ../midori/midori-browser.c:5221 msgid "Subscribe to News _feed" msgstr "Подписаться на _ленту новостей" -#: ../midori/midori-browser.c:5619 +#: ../midori/midori-browser.c:5222 +msgid "Subscribe to this news feed" +msgstr "Подписаться на эту ленту новостей" + +#: ../midori/midori-browser.c:5227 msgid "_Close Tab" msgstr "_Закрыть вкладку" -#: ../midori/midori-browser.c:5620 +#: ../midori/midori-browser.c:5228 msgid "Close the current tab" msgstr "Закрыть данную вкладку" -#: ../midori/midori-browser.c:5622 +#: ../midori/midori-browser.c:5230 msgid "C_lose Window" msgstr "З_акрыть окно" -#: ../midori/midori-browser.c:5626 -msgid "_Share" -msgstr "_Поделиться" +#: ../midori/midori-browser.c:5231 +msgid "Close this window" +msgstr "Закрыть данное окно" -#: ../midori/midori-browser.c:5631 +#: ../midori/midori-browser.c:5234 msgid "Print the current page" msgstr "Распечатать страницу" -#: ../midori/midori-browser.c:5634 +#: ../midori/midori-browser.c:5236 msgid "Close a_ll Windows" msgstr "З_акрыть все окна" -#: ../midori/midori-browser.c:5637 +#: ../midori/midori-browser.c:5237 +msgid "Close all open windows" +msgstr "Закрыть все открытые окна" + +#: ../midori/midori-browser.c:5239 msgid "_Edit" msgstr "_Правка" -#: ../midori/midori-browser.c:5660 -msgid "_Find…" -msgstr "_Найти…" +#: ../midori/midori-browser.c:5242 +msgid "Undo the last modification" +msgstr "Отменить последнее изменение" + +#: ../midori/midori-browser.c:5245 +msgid "Redo the last modification" +msgstr "Повторить последнее изменение" + +#: ../midori/midori-browser.c:5248 +msgid "Cut the selected text" +msgstr "Вырезать выделенный текст" + +#: ../midori/midori-browser.c:5251 +msgid "Copy the selected text" +msgstr "Копировать выделенный текст" -#: ../midori/midori-browser.c:5661 +#: ../midori/midori-browser.c:5254 +msgid "Paste text from the clipboard" +msgstr "Вставить текст из буфера обмена" + +#: ../midori/midori-browser.c:5257 +msgid "Delete the selected text" +msgstr "Удалить выделенный текст" + +#: ../midori/midori-browser.c:5260 +msgid "Select all text" +msgstr "Выделить весь текст" + +#: ../midori/midori-browser.c:5262 +msgid "_Find..." +msgstr "_Найти..." + +#: ../midori/midori-browser.c:5263 msgid "Find a word or phrase in the page" msgstr "Поиск слова или фразы на странице" -#: ../midori/midori-browser.c:5663 +#: ../midori/midori-browser.c:5265 msgid "Find _Next" msgstr "Найти _следующее" -#: ../midori/midori-browser.c:5666 +#: ../midori/midori-browser.c:5266 +msgid "Find the next occurrence of a word or phrase" +msgstr "Найти следующее местонахождение слова или фразы" + +#: ../midori/midori-browser.c:5268 msgid "Find _Previous" msgstr "Найти _предыдущее" -#: ../midori/midori-browser.c:5670 +#: ../midori/midori-browser.c:5269 +msgid "Find the previous occurrence of a word or phrase" +msgstr "Найти предыдущее местонахождение слова или фразы" + +#: ../midori/midori-browser.c:5273 msgid "Configure the application preferences" msgstr "Настройка приложения" -#: ../midori/midori-browser.c:5672 +#: ../midori/midori-browser.c:5275 msgid "_View" msgstr "_Вид" -#: ../midori/midori-browser.c:5673 +#: ../midori/midori-browser.c:5276 msgid "_Toolbars" msgstr "_Панели инструментов" -#: ../midori/midori-browser.c:5678 +#: ../midori/midori-browser.c:5281 ../midori/midori-browser.c:5282 msgid "Reload page without caching" msgstr "Обновить страницу без кэширования" -#: ../midori/midori-browser.c:5688 +#: ../midori/midori-browser.c:5291 msgid "Increase the zoom level" msgstr "Увеличить масштаб" -#: ../midori/midori-browser.c:5691 +#: ../midori/midori-browser.c:5294 msgid "Decrease the zoom level" msgstr "Уменьшить масштаб" -#: ../midori/midori-browser.c:5695 +#: ../midori/midori-browser.c:5297 +msgid "Reset the zoom level" +msgstr "Сбросить значение масштаба" + +#: ../midori/midori-browser.c:5298 msgid "_Encoding" msgstr "_Кодировка" -#: ../midori/midori-browser.c:5697 +#: ../midori/midori-browser.c:5300 msgid "View So_urce" msgstr "Ис_ходный код страницы" -#: ../midori/midori-browser.c:5700 +#: ../midori/midori-browser.c:5301 +msgid "View the source code of the page" +msgstr "Просмотр исходного кода страницы" + +#: ../midori/midori-browser.c:5303 msgid "Ca_ret Browsing" msgstr "Перемещение к_урсором" -#: ../midori/midori-browser.c:5704 +#: ../midori/midori-browser.c:5304 +msgid "Toggle text cursor navigation" +msgstr "Режим перемещения по странице при помощи текстового курсора" + +#: ../midori/midori-browser.c:5307 msgid "Toggle fullscreen view" msgstr "Переключить полноэкранный режим" -#: ../midori/midori-browser.c:5706 +#: ../midori/midori-browser.c:5309 msgid "Scroll _Left" msgstr "Смещение _влево" -#: ../midori/midori-browser.c:5709 +#: ../midori/midori-browser.c:5310 +msgid "Scroll to the left" +msgstr "Сместить влево" + +#: ../midori/midori-browser.c:5312 msgid "Scroll _Down" msgstr "Смещение _вниз" -#: ../midori/midori-browser.c:5712 +#: ../midori/midori-browser.c:5313 +msgid "Scroll down" +msgstr "Сместить вниз" + +#: ../midori/midori-browser.c:5315 msgid "Scroll _Up" msgstr "Смещение _вверх" -#: ../midori/midori-browser.c:5715 +#: ../midori/midori-browser.c:5316 +msgid "Scroll up" +msgstr "Сместить вверх" + +#: ../midori/midori-browser.c:5318 msgid "Scroll _Right" msgstr "Смещение _вправо" -#: ../midori/midori-browser.c:5718 -#, fuzzy -msgid "_Readable" -msgstr "_Читаемый вид" +#: ../midori/midori-browser.c:5319 +msgid "Scroll to the right" +msgstr "Сместить вправо" -#: ../midori/midori-browser.c:5721 +#: ../midori/midori-browser.c:5321 msgid "_Go" msgstr "П_ереход" -#: ../midori/midori-browser.c:5724 +#: ../midori/midori-browser.c:5324 msgid "Go back to the previous page" msgstr "На предыдущую страницу" +#: ../midori/midori-browser.c:5327 +msgid "Go forward to the next page" +msgstr "На следующую страницу" + #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5731 +#: ../midori/midori-browser.c:5331 msgid "Go to the previous sub-page" msgstr "На предыдущую подстраницу" -#: ../midori/midori-browser.c:5740 -msgid "_Homepage" -msgstr "_Домашняя страница" +#. i18n: Visit the following logical page, ie. in a forum or blog +#: ../midori/midori-browser.c:5335 +msgid "Go to the next sub-page" +msgstr "На следующую подстраницу" -#: ../midori/midori-browser.c:5741 +#: ../midori/midori-browser.c:5338 msgid "Go to your homepage" msgstr "На домашнюю страницу" -#: ../midori/midori-browser.c:5743 +#: ../midori/midori-browser.c:5340 msgid "Empty Trash" msgstr "Очистить" -#: ../midori/midori-browser.c:5746 +#: ../midori/midori-browser.c:5341 +msgid "Delete the contents of the trash" +msgstr "Удалить содержимое корзины" + +#: ../midori/midori-browser.c:5343 msgid "Undo _Close Tab" msgstr "О_тменить закрытие вкладки" -#: ../midori/midori-browser.c:5753 +#: ../midori/midori-browser.c:5344 +msgid "Open the last closed tab" +msgstr "Открыть последнюю закрытую вкладку" + +#: ../midori/midori-browser.c:5350 msgid "Add a new _folder" msgstr "_Создать папку" -#: ../midori/midori-browser.c:5759 +#: ../midori/midori-browser.c:5351 +msgid "Add a new bookmark folder" +msgstr "Создать папку закладок" + +#: ../midori/midori-browser.c:5356 msgid "_Export bookmarks" msgstr "_Экспортировать закладки" -#: ../midori/midori-browser.c:5762 -#: ../midori/midori-searchaction.c:496 +#: ../midori/midori-browser.c:5359 ../midori/midori-searchaction.c:498 msgid "_Manage Search Engines" msgstr "_Управление средствами поиска" -#: ../midori/midori-browser.c:5765 +#: ../midori/midori-browser.c:5360 +msgid "Add, edit and remove search engines..." +msgstr "Добавление, правка и удаление средства поиска..." + +#: ../midori/midori-browser.c:5363 msgid "_Clear Private Data" msgstr "Уда_лить личные данные" -#: ../midori/midori-browser.c:5768 +#: ../midori/midori-browser.c:5364 +msgid "Clear private data..." +msgstr "Удалить личные данные..." + +#: ../midori/midori-browser.c:5367 msgid "_Inspect Page" msgstr "_Информация о странице" -#: ../midori/midori-browser.c:5772 +#: ../midori/midori-browser.c:5368 +msgid "Inspect page details and access developer tools..." +msgstr "Показать информацию о странице и инструменты разработчика..." + +#: ../midori/midori-browser.c:5372 msgid "_Previous Tab" msgstr "_Предыдущая вкладка" -#: ../midori/midori-browser.c:5775 +#: ../midori/midori-browser.c:5373 +msgid "Switch to the previous tab" +msgstr "Переключиться на предыдущую вкладку" + +#: ../midori/midori-browser.c:5375 msgid "_Next Tab" msgstr "_Следующая вкладка" -#: ../midori/midori-browser.c:5777 +#: ../midori/midori-browser.c:5376 +msgid "Switch to the next tab" +msgstr "Переключиться на следующую вкладку" + +#: ../midori/midori-browser.c:5377 msgid "Move Tab _Backward" msgstr "Переместить вкладку _назад" -#: ../midori/midori-browser.c:5779 +#: ../midori/midori-browser.c:5378 +msgid "Move tab behind the previous tab" +msgstr "Поменять предыдущую и текущую вкладку местами" + +#: ../midori/midori-browser.c:5379 msgid "_Move Tab Forward" msgstr "Переместить вкладку _вперёд" -#: ../midori/midori-browser.c:5782 +#: ../midori/midori-browser.c:5380 +msgid "Move tab in front of the next tab" +msgstr "Поменять текущую и следующую вкладку местами" + +#: ../midori/midori-browser.c:5382 msgid "Focus _Current Tab" msgstr "_Фокус на текущую вкладку" -#: ../midori/midori-browser.c:5785 +#: ../midori/midori-browser.c:5383 +msgid "Focus the current tab" +msgstr "Перевести фокус ввода на текущую вкладку" + +#: ../midori/midori-browser.c:5385 msgid "Focus _Next view" -msgstr "_Фокус на следующую вкладку" +msgstr "" + +#: ../midori/midori-browser.c:5386 +msgid "Cycle focus between views" +msgstr "" -#: ../midori/midori-browser.c:5788 +#: ../midori/midori-browser.c:5388 msgid "Only show the Icon of the _Current Tab" msgstr "Показывать иконку только текущей вкладки" -#: ../midori/midori-browser.c:5791 +#: ../midori/midori-browser.c:5389 +msgid "Only show the icon of the current tab" +msgstr "Показывать иконку только данной вкладки" + +#: ../midori/midori-browser.c:5391 msgid "_Duplicate Current Tab" msgstr "_Сделать копию текущей вкладки" -#: ../midori/midori-browser.c:5794 +#: ../midori/midori-browser.c:5392 +msgid "Duplicate the current tab" +msgstr "Сделать копию текущей вкладки" + +#: ../midori/midori-browser.c:5394 msgid "Close Ot_her Tabs" msgstr "З_акрыть остальные" -#: ../midori/midori-browser.c:5797 +#: ../midori/midori-browser.c:5395 +msgid "Close all tabs except the current tab" +msgstr "Закрыть все вкладки кроме текущей" + +#: ../midori/midori-browser.c:5397 msgid "Open last _session" msgstr "Открыть предыдущий _сеанс" -#: ../midori/midori-browser.c:5800 +#: ../midori/midori-browser.c:5398 +msgid "Open the tabs saved in the last session" +msgstr "Открыть вкладки из предыдущего сеанса" + +#: ../midori/midori-browser.c:5400 msgid "_Help" msgstr "_Справка" -#: ../midori/midori-browser.c:5802 +#: ../midori/midori-browser.c:5402 msgid "_Frequent Questions" msgstr "_Часто задаваемые вопросы" -#: ../midori/midori-browser.c:5805 -msgid "_Report a Problem…" -msgstr "_Сообщить об ошибке…" +#: ../midori/midori-browser.c:5403 +msgid "Show the Frequently Asked Questions" +msgstr "Часто задаваемые вопросы (в сети)" -#: ../midori/midori-browser.c:5810 -#: ../midori/midori-browser.c:6471 -msgid "_Tools" -msgstr "_Инструменты" +#: ../midori/midori-browser.c:5405 +msgid "_Report a Problem..." +msgstr "_Сообщить об ошибке..." + +#: ../midori/midori-browser.c:5406 +msgid "Open Midori's bug tracker" +msgstr "Открыть систему отчётов об ошибках Midori" -#: ../midori/midori-browser.c:5817 +#: ../midori/midori-browser.c:5409 +msgid "Show information about the program" +msgstr "О программе" + +#: ../midori/midori-browser.c:5417 msgid "_Menubar" msgstr "Панель _меню" -#: ../midori/midori-browser.c:5821 +#: ../midori/midori-browser.c:5418 +msgid "Show menubar" +msgstr "Показать строку меню" + +#: ../midori/midori-browser.c:5421 msgid "_Navigationbar" msgstr "Панель _навигации" -#: ../midori/midori-browser.c:5825 +#: ../midori/midori-browser.c:5422 +msgid "Show navigationbar" +msgstr "Показать панель навигации" + +#: ../midori/midori-browser.c:5425 msgid "Side_panel" msgstr "_Боковая панель" -#: ../midori/midori-browser.c:5826 -msgid "Sidepanel" -msgstr "Боковая панель" +#: ../midori/midori-browser.c:5426 +msgid "Show sidepanel" +msgstr "Показать боковую панель" -#: ../midori/midori-browser.c:5829 +#: ../midori/midori-browser.c:5429 msgid "_Bookmarkbar" msgstr "Панель _закладок" -#: ../midori/midori-browser.c:5833 +#: ../midori/midori-browser.c:5430 +msgid "Show bookmarkbar" +msgstr "Показать панель закладок" + +#: ../midori/midori-browser.c:5433 msgid "_Statusbar" msgstr "_Строка состояния" -#: ../midori/midori-browser.c:5842 -#: ../midori/midori-websettings.c:315 +#: ../midori/midori-browser.c:5434 +msgid "Show statusbar" +msgstr "Показать строку состояния" + +#: ../midori/midori-browser.c:5442 ../midori/midori-websettings.c:298 msgid "_Automatic" msgstr "_Автоматически" -#: ../midori/midori-browser.c:5845 -#: ../midori/midori-websettings.c:239 -msgid "Chinese Traditional (BIG5)" -msgstr "Китайская традиционная (Big5)" - -#: ../midori/midori-browser.c:5848 -#: ../midori/midori-websettings.c:240 -msgid "Chinese Simplified (GB18030)" -msgstr "Китайская упрощённая (GB18030)" +#: ../midori/midori-browser.c:5445 ../midori/midori-websettings.c:223 +msgid "Chinese (BIG5)" +msgstr "Китайская (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5852 +#: ../midori/midori-browser.c:5449 msgid "Japanese (SHIFT__JIS)" msgstr "Японская (SHIFT__JIS)" -#: ../midori/midori-browser.c:5855 -#: ../midori/midori-websettings.c:242 +#: ../midori/midori-browser.c:5452 ../midori/midori-websettings.c:225 msgid "Korean (EUC-KR)" msgstr "Корейская (EUC-KR)" -#: ../midori/midori-browser.c:5858 -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-browser.c:5455 ../midori/midori-websettings.c:226 msgid "Russian (KOI8-R)" msgstr "Кириллица (KOI8-R)" -#: ../midori/midori-browser.c:5861 -#: ../midori/midori-websettings.c:244 +#: ../midori/midori-browser.c:5458 ../midori/midori-websettings.c:227 msgid "Unicode (UTF-8)" msgstr "Юникод (UTF-8)" -#: ../midori/midori-browser.c:5864 -#: ../midori/midori-websettings.c:245 +#: ../midori/midori-browser.c:5461 ../midori/midori-websettings.c:228 msgid "Western (ISO-8859-1)" msgstr "Западно-европейская (ISO-8859-1)" -#: ../midori/midori-browser.c:5867 -msgid "Custom…" -msgstr "Выбрать…" +#: ../midori/midori-browser.c:5464 ../midori/midori-websettings.c:229 +#: ../midori/midori-websettings.c:304 ../katze/katze-utils.c:635 +msgid "Custom..." +msgstr "Выбрать..." -#: ../midori/midori-browser.c:6377 +#: ../midori/midori-browser.c:5994 msgid "_Separator" msgstr "_Разделитель" -#: ../midori/midori-browser.c:6384 -msgid "_Location…" -msgstr "_Адрес…" +#: ../midori/midori-browser.c:6001 +msgid "_Location..." +msgstr "_Адрес..." -#: ../midori/midori-browser.c:6386 +#: ../midori/midori-browser.c:6003 msgid "Open a particular location" msgstr "Открыть определённый адрес" -#: ../midori/midori-browser.c:6408 -msgid "_Web Search…" -msgstr "_Поиск в сети…" +#: ../midori/midori-browser.c:6025 +msgid "_Web Search..." +msgstr "_Поиск в сети..." -#: ../midori/midori-browser.c:6410 +#: ../midori/midori-browser.c:6027 msgid "Run a web search" msgstr "Запустить поиск в сети" -#: ../midori/midori-browser.c:6437 +#: ../midori/midori-browser.c:6048 msgid "Reopen a previously closed tab or window" msgstr "Открыть ранее закрытые вкладки или окна" -#: ../midori/midori-browser.c:6454 +#: ../midori/midori-browser.c:6063 msgid "Show the saved bookmarks" msgstr "Показать все сохранённые закладки" -#: ../midori/midori-browser.c:6487 +#: ../midori/midori-browser.c:6077 +msgid "_Tools" +msgstr "_Инструменты" + +#: ../midori/midori-browser.c:6092 msgid "_Window" msgstr "_Окно" -#: ../midori/midori-browser.c:6489 +#: ../midori/midori-browser.c:6094 msgid "Show a list of all open tabs" msgstr "Показать список всех открытых вкладок" -#: ../midori/midori-browser.c:6503 +#: ../midori/midori-browser.c:6108 msgid "_Menu" msgstr "_Меню" -#: ../midori/midori-browser.c:6505 +#: ../midori/midori-browser.c:6110 msgid "Menu" msgstr "Меню" -#: ../midori/midori-browser.c:7330 +#: ../midori/midori-browser.c:6677 #, c-format msgid "Unexpected setting '%s'" msgstr "Неожиданный параметр «%s»" -#: ../midori/midori-extension.c:329 +#: ../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:747 -#: ../midori/midori-extension.c:844 -#: ../midori/midori-extension.c:941 -#: ../midori/midori-extension.c:1053 -#: ../extensions/addons.c:1688 +#: ../midori/midori-extension.c:708 ../midori/midori-extension.c:805 +#: ../midori/midori-extension.c:902 ../midori/midori-extension.c:1014 +#: ../extensions/addons.c:1712 #, c-format msgid "The configuration of the extension '%s' couldn't be saved: %s\n" msgstr "Не удалось сохранить настройки дополнения «%s»: %s\n" -#: ../midori/midori-locationaction.c:398 -#, c-format -msgid "Search with %s" -msgstr "Найти с помощью %s" - -#: ../midori/midori-locationaction.c:418 -msgid "Search with…" -msgstr "Найти с помощью…" - -#: ../midori/midori-locationaction.c:545 +#: ../midori/midori-locationaction.c:425 #, c-format msgid "Failed to select from history\n" msgstr "Не удалось найти в истории\n" -#: ../midori/midori-locationaction.c:632 +#: ../midori/midori-locationaction.c:509 #, c-format msgid "Search for %s" msgstr "Поиск %s" -#: ../midori/midori-locationaction.c:1227 -msgid "Export certificate" -msgstr "Экспорт сертификата" - -#: ../midori/midori-locationaction.c:1259 -msgid "The signing certificate authority is not known." -msgstr "Центр сертификации неизвестен." - -#: ../midori/midori-locationaction.c:1261 -msgid "The certificate does not match the expected identity of the site that it was retrieved from." -msgstr "Имя, указанное в сертификате, не соответствует имени сайта, с которого он был получен." - -#: ../midori/midori-locationaction.c:1263 -msgid "The certificate's activation time is still in the future." -msgstr "Срок действия сертификата ещё не наступил." - -#: ../midori/midori-locationaction.c:1265 -msgid "The certificate has expired" -msgstr "Истёк срок действия сертификата" - -#: ../midori/midori-locationaction.c:1267 -msgid "The certificate has been revoked according to the GTlsConnection's certificate revocation list." -msgstr "Согласно списку отзыва сертификатов, этот сертификат объявлен недействительным." - -#: ../midori/midori-locationaction.c:1269 -msgid "The certificate's algorithm is considered insecure." -msgstr "Алгоритм, используемый сертификатом, считается небезопасным." - -#: ../midori/midori-locationaction.c:1271 -msgid "Some other error occurred validating the certificate." -msgstr "Произошли другие ошибки при проверке сертификата." - -#: ../midori/midori-locationaction.c:1318 -msgid "_Export certificate" -msgstr "Э_кспорт сертификата" - -#: ../midori/midori-locationaction.c:1333 -msgid "Self-signed" -msgstr "Самоподписный" - -#: ../midori/midori-locationaction.c:1367 -msgid "Security details" -msgstr "Сведения о безопасности" +#: ../midori/midori-locationaction.c:535 +#, c-format +msgid "Search with %s" +msgstr "Найти с помощью %s" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1650 +#: ../midori/midori-locationaction.c:1285 msgid "Paste and p_roceed" msgstr "Вс&тавить и перейти" -#: ../midori/midori-locationaction.c:1974 +#: ../midori/midori-locationaction.c:1680 msgid "Not verified" msgstr "Непроверенное соединение" -#: ../midori/midori-locationaction.c:1982 +#: ../midori/midori-locationaction.c:1695 msgid "Verified and encrypted connection" msgstr "Проверенное защищённое соединение" -#: ../midori/midori-locationaction.c:1989 -msgid "Open, unencrypted connection" -msgstr "Открытое, незашифрованное соединение" - -#: ../midori/midori-panel.c:317 -#: ../midori/midori-panel.c:319 -#: ../midori/midori-panel.c:483 -#: ../midori/midori-panel.c:486 +#: ../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:329 -#: ../midori/midori-panel.c:330 +#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410 msgid "Close panel" msgstr "Закрыть панель" -#: ../midori/midori-panel.c:484 -#: ../midori/midori-panel.c:487 +#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566 msgid "Align sidepanel to the left" msgstr "Расположить панель слева" -#: ../midori/midori-websettings.c:221 +#: ../midori/midori-websettings.c:205 msgid "Show Speed Dial" msgstr "Показать быстрый набор" -#: ../midori/midori-websettings.c:222 +#: ../midori/midori-websettings.c:206 msgid "Show Homepage" msgstr "Открыть домашнюю страницу" -#: ../midori/midori-websettings.c:241 +#: ../midori/midori-websettings.c:224 msgid "Japanese (SHIFT_JIS)" msgstr "Японская (SHIFT_JIS)" -#: ../midori/midori-websettings.c:246 -#: ../midori/midori-websettings.c:322 -#: ../katze/katze-utils.c:633 -msgid "Custom..." -msgstr "Другая…" - -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:244 msgid "New tab" msgstr "Новая вкладка" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:245 msgid "New window" msgstr "Новое окно" -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:246 msgid "Current tab" msgstr "Текущая вкладка" -#: ../midori/midori-websettings.c:278 +#: ../midori/midori-websettings.c:261 msgid "Default" msgstr "По умолчанию" -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-websettings.c:262 msgid "Icons" msgstr "Только значки" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:263 msgid "Small icons" msgstr "Маленькие значки" -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:264 msgid "Text" msgstr "Только текст" -#: ../midori/midori-websettings.c:282 +#: ../midori/midori-websettings.c:265 msgid "Icons and text" msgstr "Текст под значками" -#: ../midori/midori-websettings.c:283 +#: ../midori/midori-websettings.c:266 msgid "Text beside icons" msgstr "Текст рядом со значками" -#: ../midori/midori-websettings.c:298 +#: ../midori/midori-websettings.c:281 msgid "Automatic (GNOME or environment)" msgstr "Автоматически (GNOME или переменные окружения)" -#: ../midori/midori-websettings.c:299 +#: ../midori/midori-websettings.c:282 msgid "HTTP proxy server" msgstr "Прокси-сервер HTTP" -#: ../midori/midori-websettings.c:300 +#: ../midori/midori-websettings.c:283 msgid "No proxy server" msgstr "Не использовать прокси" -#: ../midori/midori-websettings.c:317 -msgid "Chrome" -msgstr "Chrome" - -#: ../midori/midori-websettings.c:318 +#: ../midori/midori-websettings.c:300 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:319 +#: ../midori/midori-websettings.c:301 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:320 +#: ../midori/midori-websettings.c:302 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:321 +#: ../midori/midori-websettings.c:303 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:405 +#: ../midori/midori-websettings.c:356 msgid "Remember last window size" msgstr "Запоминать размер окна" -#: ../midori/midori-websettings.c:406 +#: ../midori/midori-websettings.c:357 msgid "Whether to save the last window size" msgstr "Запоминать размер окна при закрытии" -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:365 msgid "Last window width" msgstr "Ширина окна" -#: ../midori/midori-websettings.c:415 +#: ../midori/midori-websettings.c:366 msgid "The last saved window width" msgstr "Последняя сохранённая ширина окна" -#: ../midori/midori-websettings.c:423 +#: ../midori/midori-websettings.c:374 msgid "Last window height" msgstr "Высота окна" -#: ../midori/midori-websettings.c:424 +#: ../midori/midori-websettings.c:375 msgid "The last saved window height" msgstr "Последняя сохранённая высота окна" -#: ../midori/midori-websettings.c:449 +#: ../midori/midori-websettings.c:400 msgid "Last panel position" msgstr "Позиция панели" -#: ../midori/midori-websettings.c:450 +#: ../midori/midori-websettings.c:401 msgid "The last saved panel position" msgstr "Последняя сохранённая позиция панели" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:459 +#: ../midori/midori-websettings.c:410 msgid "Last panel page" msgstr "Последняя страница панели" -#: ../midori/midori-websettings.c:460 +#: ../midori/midori-websettings.c:411 msgid "The last saved panel page" msgstr "Последняя сохранённая страница панели" -#: ../midori/midori-websettings.c:468 +#: ../midori/midori-websettings.c:419 msgid "Last Web search" msgstr "Последний поисковый запрос" -#: ../midori/midori-websettings.c:469 +#: ../midori/midori-websettings.c:420 msgid "The last saved Web search" msgstr "Последний сохранённый поисковый запрос" -#: ../midori/midori-websettings.c:493 +#: ../midori/midori-websettings.c:429 msgid "Show Menubar" msgstr "Показать меню" -#: ../midori/midori-websettings.c:494 +#: ../midori/midori-websettings.c:430 msgid "Whether to show the menubar" msgstr "Показывать панель меню" -#: ../midori/midori-websettings.c:502 +#: ../midori/midori-websettings.c:438 msgid "Show Navigationbar" msgstr "Показать панель навигации" -#: ../midori/midori-websettings.c:503 +#: ../midori/midori-websettings.c:439 msgid "Whether to show the navigationbar" msgstr "Показывать панель навигации" -#: ../midori/midori-websettings.c:511 +#: ../midori/midori-websettings.c:447 msgid "Show Bookmarkbar" msgstr "Показать закладки" -#: ../midori/midori-websettings.c:512 +#: ../midori/midori-websettings.c:448 msgid "Whether to show the bookmarkbar" msgstr "Показывать закладки" -#: ../midori/midori-websettings.c:520 +#: ../midori/midori-websettings.c:456 msgid "Show Panel" msgstr "Показать панель" -#: ../midori/midori-websettings.c:521 +#: ../midori/midori-websettings.c:457 msgid "Whether to show the panel" msgstr "Показывать панель" -#: ../midori/midori-websettings.c:529 +#: ../midori/midori-websettings.c:465 msgid "Show Statusbar" msgstr "Показать строку состояния" -#: ../midori/midori-websettings.c:530 +#: ../midori/midori-websettings.c:466 msgid "Whether to show the statusbar" msgstr "Показывать строку состояния" -#: ../midori/midori-websettings.c:539 +#: ../midori/midori-websettings.c:475 msgid "Toolbar Style:" msgstr "Стиль панели инструментов:" -#: ../midori/midori-websettings.c:540 +#: ../midori/midori-websettings.c:476 msgid "The style of the toolbar" msgstr "Стиль панели инструментов" -#: ../midori/midori-websettings.c:549 +#: ../midori/midori-websettings.c:485 msgid "Toolbar Items" msgstr "Элементы панели навигации" -#: ../midori/midori-websettings.c:550 +#: ../midori/midori-websettings.c:486 msgid "The items to show on the toolbar" msgstr "Элементы, которые будут показаны на панели инструментов" -#: ../midori/midori-websettings.c:558 +#: ../midori/midori-websettings.c:494 msgid "Compact Sidepanel" msgstr "Компактная боковая панель" -#: ../midori/midori-websettings.c:559 +#: ../midori/midori-websettings.c:495 msgid "Whether to make the sidepanel compact" msgstr "Не показывать подписи к значкам в боковой панели" -#: ../midori/midori-websettings.c:574 +#: ../midori/midori-websettings.c:510 msgid "Align sidepanel on the right" msgstr "Расположить панель справа" -#: ../midori/midori-websettings.c:575 +#: ../midori/midori-websettings.c:511 msgid "Whether to align the sidepanel on the right" msgstr "Расположить боковую панель справа" -#: ../midori/midori-websettings.c:590 +#: ../midori/midori-websettings.c:526 msgid "Open panels in separate windows" msgstr "Открывать панели в отдельных окнах" -#: ../midori/midori-websettings.c:591 +#: ../midori/midori-websettings.c:527 msgid "Whether to always open panels in separate windows" msgstr "Панели при открытии будут отделены от главного окна" -#: ../midori/midori-websettings.c:600 +#: ../midori/midori-websettings.c:536 msgid "When Midori starts:" msgstr "При запуске:" -#: ../midori/midori-websettings.c:601 +#: ../midori/midori-websettings.c:537 msgid "What to do when Midori starts" msgstr "Действия, выполняемые при запуске Midori" -#: ../midori/midori-websettings.c:610 +#: ../midori/midori-websettings.c:546 msgid "Homepage:" msgstr "Домашняя страница:" -#: ../midori/midori-websettings.c:611 +#: ../midori/midori-websettings.c:547 msgid "The homepage" msgstr "Домашняя страница" -#: ../midori/midori-websettings.c:626 +#: ../midori/midori-websettings.c:562 msgid "Show crash dialog" msgstr "Показывать окно действий после сбоя" -#: ../midori/midori-websettings.c:627 +#: ../midori/midori-websettings.c:563 msgid "Show a dialog after Midori crashed" msgstr "Показывать окно действий после аварийного завершения работы" -#: ../midori/midori-websettings.c:635 +#: ../midori/midori-websettings.c:571 msgid "Save downloaded files to:" msgstr "Сохранять загружаемые файлы в:" -#: ../midori/midori-websettings.c:636 +#: ../midori/midori-websettings.c:572 msgid "The folder downloaded files are saved to" msgstr "Папка, в которую будут сохраняться файлы" -#: ../midori/midori-websettings.c:644 +#: ../midori/midori-websettings.c:580 msgid "Text Editor" msgstr "Текстовый редактор" -#: ../midori/midori-websettings.c:645 +#: ../midori/midori-websettings.c:581 msgid "An external text editor" msgstr "Пользовательский текстовый редактор" -#: ../midori/midori-websettings.c:660 +#: ../midori/midori-websettings.c:596 msgid "News Aggregator" msgstr "Программа чтения лент новостей" -#: ../midori/midori-websettings.c:661 +#: ../midori/midori-websettings.c:597 msgid "An external news aggregator" msgstr "Программа чтения новостей" -#: ../midori/midori-websettings.c:669 +#: ../midori/midori-websettings.c:605 msgid "Location entry Search" msgstr "Поиск из адресной строки" -#: ../midori/midori-websettings.c:670 +#: ../midori/midori-websettings.c:606 msgid "The search to perform inside the location entry" msgstr "Поиск, производимый при вводе фразы в адресную строку" -#: ../midori/midori-websettings.c:678 +#: ../midori/midori-websettings.c:614 msgid "Preferred Encoding" msgstr "Предпочтительная кодировка" -#: ../midori/midori-websettings.c:679 +#: ../midori/midori-websettings.c:615 msgid "The preferred character encoding" msgstr "Предпочтительная кодировка символов" -#: ../midori/midori-websettings.c:689 +#: ../midori/midori-websettings.c:625 msgid "Always Show Tabbar" msgstr "Всегда показывать строку вкладок" -#: ../midori/midori-websettings.c:690 +#: ../midori/midori-websettings.c:626 msgid "Always show the tabbar" msgstr "Всегда показывать строку закладок" -#: ../midori/midori-websettings.c:703 +#: ../midori/midori-websettings.c:634 msgid "Close Buttons on Tabs" msgstr "Кнопки закрытия на вкладках" -#: ../midori/midori-websettings.c:704 +#: ../midori/midori-websettings.c:635 msgid "Whether tabs have close buttons" msgstr "Наличие кнопки закрытия на вкладках" -#: ../midori/midori-websettings.c:729 +#: ../midori/midori-websettings.c:660 msgid "Open new pages in:" msgstr "Открывать новые страницы в:" -#: ../midori/midori-websettings.c:730 +#: ../midori/midori-websettings.c:661 msgid "Where to open new pages" msgstr "Расположение новых страниц при открытии" -#: ../midori/midori-websettings.c:739 +#: ../midori/midori-websettings.c:670 msgid "Middle click opens Selection" msgstr "Переходить на выделенный адрес по средней кнопке" -#: ../midori/midori-websettings.c:740 +#: ../midori/midori-websettings.c:671 msgid "Load an address from the selection via middle click" msgstr "Загружать выделенный адрес средней кнопкой мыши" -#: ../midori/midori-websettings.c:748 +#: ../midori/midori-websettings.c:679 msgid "Open tabs in the background" msgstr "Открывать вкладки в фоне" -#: ../midori/midori-websettings.c:749 +#: ../midori/midori-websettings.c:680 msgid "Whether to open new tabs in the background" msgstr "Открывать новые вкладки в фоне" -#: ../midori/midori-websettings.c:757 +#: ../midori/midori-websettings.c:688 msgid "Open Tabs next to Current" msgstr "Открывать новые вкладки рядом с текущей" -#: ../midori/midori-websettings.c:758 +#: ../midori/midori-websettings.c:689 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Открывать новую вкладку в следующей за данной или за последней" -#: ../midori/midori-websettings.c:766 +#: ../midori/midori-websettings.c:697 msgid "Open popups in tabs" msgstr "Открывать всплывающие окна во вкладках" -#: ../midori/midori-websettings.c:767 +#: ../midori/midori-websettings.c:698 msgid "Whether to open popup windows in tabs" msgstr "Открывать всплывающие окна во вкладках" -#: ../midori/midori-websettings.c:777 -#: ../extensions/statusbar-features.c:155 +#: ../midori/midori-websettings.c:708 ../extensions/statusbar-features.c:131 msgid "Load images automatically" msgstr "Загружать изображения автоматически" -#: ../midori/midori-websettings.c:778 +#: ../midori/midori-websettings.c:709 msgid "Load and display images automatically" msgstr "Загружать и отображать изображения автоматически" -#: ../midori/midori-websettings.c:785 -#: ../extensions/statusbar-features.c:165 +#: ../midori/midori-websettings.c:716 ../extensions/statusbar-features.c:140 msgid "Enable scripts" msgstr "Выполнять сценарии" -#: ../midori/midori-websettings.c:786 +#: ../midori/midori-websettings.c:717 msgid "Enable embedded scripting languages" msgstr "Выполнять встроенные сценарии на страницах" -#: ../midori/midori-websettings.c:793 -#: ../extensions/statusbar-features.c:177 +#: ../midori/midori-websettings.c:724 ../extensions/statusbar-features.c:149 msgid "Enable Netscape plugins" msgstr "Использовать модули Netscape" -#: ../midori/midori-websettings.c:794 +#: ../midori/midori-websettings.c:725 msgid "Enable embedded Netscape plugin objects" msgstr "Разрешить встроенные объекты модулей Netscape на страницах" -#: ../midori/midori-websettings.c:809 +#: ../midori/midori-websettings.c:745 msgid "Enable Spell Checking" msgstr "Проверять орфографию" -#: ../midori/midori-websettings.c:810 +#: ../midori/midori-websettings.c:746 msgid "Enable spell checking while typing" msgstr "Проверять правописание вводимого текста" -#: ../midori/midori-websettings.c:816 +#: ../midori/midori-websettings.c:752 msgid "Enable HTML5 database support" msgstr "Включить поддержку баз данных HTML5" -#: ../midori/midori-websettings.c:817 +#: ../midori/midori-websettings.c:753 msgid "Whether to enable HTML5 database support" msgstr "Включить поддержку баз данных стандарта HTML5" -#: ../midori/midori-websettings.c:823 +#: ../midori/midori-websettings.c:759 msgid "Enable HTML5 local storage support" msgstr "Включить поддержку локального хранилища HTML5" -#: ../midori/midori-websettings.c:824 +#: ../midori/midori-websettings.c:760 msgid "Whether to enable HTML5 local storage support" msgstr "Включить поддержку локального хранилища (localStorage) стандарта HTML5" -#: ../midori/midori-websettings.c:830 +#: ../midori/midori-websettings.c:766 msgid "Enable offline web application cache" msgstr "Включить кэш веб-приложений" -#: ../midori/midori-websettings.c:831 +#: ../midori/midori-websettings.c:767 msgid "Whether to enable offline web application cache" msgstr "Кэшировать данные веб-приложений для автономной работы" -#: ../midori/midori-websettings.c:852 +#: ../midori/midori-websettings.c:783 msgid "Flash window on background tabs" -msgstr "Мигать окном при открытии фоновой вкладки" +msgstr "Вспышка при открытии фоновой вкладки" -#: ../midori/midori-websettings.c:853 +#: ../midori/midori-websettings.c:784 msgid "Flash the browser window if a new tab was opened in the background" -msgstr "Окно браузера будет кратковременно менять прозрачность при открытии вкладки в фоне" - -#: ../midori/midori-websettings.c:861 -msgid "Enable WebGL support" -msgstr "Включить поддержку WebGL" - -#: ../midori/midori-websettings.c:862 -msgid "Allow websites to use OpenGL rendering" -msgstr "Разрешить сайтам использовать графику OpenGL" +msgstr "" +"Окно браузера будет кратковременно менять прозрачность при открытии вкладки " +"в фоне" -#: ../midori/midori-websettings.c:888 +#: ../midori/midori-websettings.c:799 msgid "Zoom Text and Images" msgstr "Масштабировать изображения" -#: ../midori/midori-websettings.c:889 +#: ../midori/midori-websettings.c:800 msgid "Whether to zoom text and images" msgstr "Изменять масштаб изображений при масштабировании страницы" -#: ../midori/midori-websettings.c:904 +#: ../midori/midori-websettings.c:815 msgid "Find inline while typing" msgstr "Искать текст на странице по мере его набора" -#: ../midori/midori-websettings.c:905 +#: ../midori/midori-websettings.c:816 msgid "Whether to automatically find inline while typing" -msgstr "По мере ввода текста на странице будет осуществляться быстрый поиск по фразе" +msgstr "" +"По мере ввода текста на странице будет осуществляться быстрый поиск по фразе" -#: ../midori/midori-websettings.c:920 +#: ../midori/midori-websettings.c:831 msgid "Kinetic scrolling" msgstr "Инерционная прокрутка" -#: ../midori/midori-websettings.c:921 +#: ../midori/midori-websettings.c:832 msgid "Whether scrolling should kinetically move according to speed" msgstr "Должна ли прокрутка продолжаться по инерции с учётом скорости" -#: ../midori/midori-websettings.c:929 +#: ../midori/midori-websettings.c:840 msgid "Delete old Cookies after:" msgstr "Удалять старые фрагменты данных через:" -#: ../midori/midori-websettings.c:930 +#: ../midori/midori-websettings.c:841 msgid "The maximum number of days to save cookies for" msgstr "Срок хранения фрагментов данных" -#: ../midori/midori-websettings.c:946 +#: ../midori/midori-websettings.c:857 msgid "Only accept Cookies from sites you visit" msgstr "Принимать фрагменты данных только с посещаемых сайтов" -#: ../midori/midori-websettings.c:947 +#: ../midori/midori-websettings.c:858 msgid "Block cookies sent by third-party websites" msgstr "Блокировать фрагменты данных от посторонних сайтов" -#: ../midori/midori-websettings.c:961 +#: ../midori/midori-websettings.c:872 msgid "Delete pages from history after:" msgstr "Хранить историю посещений:" -#: ../midori/midori-websettings.c:962 +#: ../midori/midori-websettings.c:873 msgid "The maximum number of days to save the history for" msgstr "Срок хранения записей в журнале" -#: ../midori/midori-websettings.c:977 +#: ../midori/midori-websettings.c:888 msgid "Proxy server" msgstr "Прокси-сервер" -#: ../midori/midori-websettings.c:978 +#: ../midori/midori-websettings.c:889 msgid "The type of proxy server to use" msgstr "Тип прокси-сервера" -#: ../midori/midori-websettings.c:987 +#: ../midori/midori-websettings.c:898 msgid "HTTP Proxy Server" msgstr "Прокси-сервер HTTP" -#: ../midori/midori-websettings.c:988 +#: ../midori/midori-websettings.c:899 msgid "The proxy server used for HTTP connections" msgstr "Прокси-сервер для соединений по HTTP" -#: ../midori/midori-websettings.c:1003 +#: ../midori/midori-websettings.c:914 msgid "Port" msgstr "Порт" -#: ../midori/midori-websettings.c:1004 +#: ../midori/midori-websettings.c:915 msgid "The proxy server port used for HTTP connections" msgstr "Порт прокси-сервера для соединений по HTTP" -#: ../midori/midori-websettings.c:1022 +#: ../midori/midori-websettings.c:933 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:950 msgid "Identify as" msgstr "Представляться как" -#: ../midori/midori-websettings.c:1040 +#: ../midori/midori-websettings.c:951 msgid "What to identify as to web pages" msgstr "Строка, которая будет посылаться на запросы идентификации обозревателя" -#: ../midori/midori-websettings.c:1056 +#: ../midori/midori-websettings.c:967 msgid "Identification string" msgstr "Строка идентификации" -#: ../midori/midori-websettings.c:1057 +#: ../midori/midori-websettings.c:968 msgid "The application identification string" msgstr "Строка идентификации приложения" -#: ../midori/midori-websettings.c:1073 +#: ../midori/midori-websettings.c:984 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:985 +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:1000 msgid "Clear private data" msgstr "Удалить личные данные" -#: ../midori/midori-websettings.c:1090 +#: ../midori/midori-websettings.c:1001 msgid "The private data selected for deletion" msgstr "Выбранные для удаления личные данные" -#: ../midori/midori-websettings.c:1105 +#: ../midori/midori-websettings.c:1016 msgid "Clear data" msgstr "Удалить данные" -#: ../midori/midori-websettings.c:1106 +#: ../midori/midori-websettings.c:1017 msgid "The data selected for deletion" msgstr "Выбранные для удаления данные" #. i18n: Reworded: Shorten details propagated when going to another page -#: ../midori/midori-websettings.c:1155 +#: ../midori/midori-websettings.c:1050 msgid "Strip referrer details sent to websites" msgstr "Передавать в «referer» только название сайта" #. i18n: Referer here is not a typo but a technical term -#: ../midori/midori-websettings.c:1157 +#: ../midori/midori-websettings.c:1052 msgid "Whether the \"Referer\" header should be shortened to the hostname" -msgstr "Заголовок «Referer» будет содержать только домен, а не адрес конкретной страницы" +msgstr "" +"Заголовок «Referer» будет содержать только домен, а не адрес конкретной " +"страницы" -#: ../midori/midori-websettings.c:1171 +#: ../midori/midori-websettings.c:1066 msgid "Always use my font choices" msgstr "Всегда использовать" -#: ../midori/midori-websettings.c:1172 +#: ../midori/midori-websettings.c:1067 msgid "Override fonts picked by websites with user preferences" msgstr "Использовать шрифты пользователя вместо предлагаемых сайтом" -#: ../midori/midori-view.c:1002 -#: ../midori/midori-view.c:1140 -msgid "Trust this website" -msgstr "Доверять этому сайту" - -#: ../midori/midori-view.c:1138 -msgid "Security unknown" -msgstr "Неизвестный уровень безопасности" - -#: ../midori/midori-view.c:1436 +#: ../midori/midori-view.c:1347 #, c-format msgid "%s wants to save an HTML5 database." msgstr "%s запрашивает доступ к базе данных HTML5." -#: ../midori/midori-view.c:1440 -#: ../midori/midori-view.c:1474 +#: ../midori/midori-view.c:1351 ../midori/midori-view.c:1380 msgid "_Deny" msgstr "_Запретить" -#: ../midori/midori-view.c:1440 -#: ../midori/midori-view.c:1474 +#: ../midori/midori-view.c:1351 ../midori/midori-view.c:1380 msgid "_Allow" msgstr "_Разрешить" -#: ../midori/midori-view.c:1469 +#: ../midori/midori-view.c:1376 #, c-format msgid "%s wants to know your location." msgstr "%s хочет знать ваше местоположение." -#: ../midori/midori-view.c:1565 +#: ../midori/midori-view.c:1463 #, c-format msgid "Error - %s" msgstr "Ошибка — %s" -#: ../midori/midori-view.c:1566 +#: ../midori/midori-view.c:1464 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "Не удалось открыть страницу «%s»." -#: ../midori/midori-view.c:1568 +#: ../midori/midori-view.c:1466 msgid "Try again" msgstr "Попытаться снова" -#: ../midori/midori-view.c:1766 -#: ../midori/midori-view.c:2879 +#: ../midori/midori-view.c:1628 ../midori/midori-view.c:2475 #, c-format msgid "Send a message to %s" msgstr "Отправить сообщение %s" -#: ../midori/midori-view.c:2665 -msgid "Add _search engine..." -msgstr "Добавить поисковую систему..." - -#: ../midori/midori-view.c:2709 -#: ../midori/midori-view.c:3035 +#: ../midori/midori-view.c:2315 ../midori/midori-view.c:2628 msgid "Inspect _Element" msgstr "Исследовать _элемент" -#: ../midori/midori-view.c:2761 +#: ../midori/midori-view.c:2365 msgid "Open Link in New _Tab" msgstr "Открыть ссылку в новой _вкладке" -#: ../midori/midori-view.c:2765 +#: ../midori/midori-view.c:2369 msgid "Open Link in _Foreground Tab" msgstr "Открыть ссылку в новой _активной вкладке" -#: ../midori/midori-view.c:2766 +#: ../midori/midori-view.c:2370 msgid "Open Link in _Background Tab" msgstr "Открыть ссылку в _фоновой вкладке" -#: ../midori/midori-view.c:2769 +#: ../midori/midori-view.c:2373 msgid "Open Link in New _Window" msgstr "Открыть ссылку в _новом окне" -#: ../midori/midori-view.c:2772 +#: ../midori/midori-view.c:2376 msgid "Open Link as Web A_pplication" msgstr "Открыть ссылку как веб-_приложение" -#: ../midori/midori-view.c:2777 +#: ../midori/midori-view.c:2379 msgid "Copy Link de_stination" msgstr "_Копировать адрес ссылки" -#: ../midori/midori-view.c:2793 +#: ../midori/midori-view.c:2391 msgid "Open _Image in New Tab" msgstr "Открыть изображение в новой _вкладке" -#: ../midori/midori-view.c:2796 +#: ../midori/midori-view.c:2394 msgid "Copy Image _Address" msgstr "Копировать _адрес изображения" -#: ../midori/midori-view.c:2799 +#: ../midori/midori-view.c:2397 msgid "Save I_mage" msgstr "Сохранить _изображение" -#: ../midori/midori-view.c:2802 -msgid "Open in Image _Viewer" -msgstr "Открыть изображение в программе прос_мотра" - -#: ../midori/midori-view.c:2809 +#: ../midori/midori-view.c:2404 msgid "Copy Video _Address" msgstr "Копировать _адрес видео" -#: ../midori/midori-view.c:2812 +#: ../midori/midori-view.c:2407 msgid "Save _Video" msgstr "Сохранить _видео" -#: ../midori/midori-view.c:2812 +#: ../midori/midori-view.c:2407 msgid "Download _Video" msgstr "Загрузить _видео" -#: ../midori/midori-view.c:2838 +#: ../midori/midori-view.c:2433 msgid "Search _with" msgstr "Найти _с помощью" -#: ../midori/midori-view.c:2870 +#: ../midori/midori-view.c:2467 msgid "_Search the Web" msgstr "_Найти в сети" -#: ../midori/midori-view.c:2887 +#: ../midori/midori-view.c:2483 msgid "Open Address in New _Tab" msgstr "Открыть ссылку в новой _вкладке" -#: ../midori/midori-view.c:2940 -msgid "Open _Frame in New Tab" -msgstr "Открыть _фрейм в новой вкладке" - -#: ../midori/midori-view.c:3201 -#, c-format -msgid "Open or download file from %s" -msgstr "Открыть или загрузить файл с %s" - -#: ../midori/midori-view.c:3225 -#, c-format -msgid "File Name: %s" -msgstr "Имя файла: «%s»" +#: ../midori/midori-view.c:2767 +msgid "Open or download file" +msgstr "Открыть или сохранить файл" -#: ../midori/midori-view.c:3230 +#: ../midori/midori-view.c:2786 #, c-format msgid "File Type: '%s'" msgstr "Тип файла: «%s»" -#: ../midori/midori-view.c:3232 +#: ../midori/midori-view.c:2788 #, c-format msgid "File Type: %s ('%s')" msgstr "Тип файла: %s («%s»)" -#: ../midori/midori-view.c:3267 -#, c-format -msgid "Size: %s" -msgstr "Размер: %s" +#: ../midori/midori-view.c:2799 +msgid "MD5-Checksum:" +msgstr "Контрольная сумма MD5:" + +#: ../midori/midori-view.c:2806 +msgid "SHA1-Checksum:" +msgstr "Контрольная сумма SHA1:" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:3278 +#: ../midori/midori-view.c:2816 #, c-format msgid "Open %s" msgstr "Файл %s" -#: ../midori/midori-view.c:3897 +#: ../midori/midori-view.c:3402 #, c-format msgid "Inspect page - %s" msgstr "Информация о странице — %s" -#: ../midori/midori-view.c:4252 +#: ../midori/midori-view.c:3689 msgid "Speed Dial" msgstr "Быстрый набор" -#: ../midori/midori-view.c:4253 -#: ../midori/midori-view.c:4359 +#: ../midori/midori-view.c:3690 ../midori/midori-view.c:3775 msgid "Click to add a shortcut" msgstr "Нажмите, чтобы добавить закладку" -#: ../midori/midori-view.c:4254 +#: ../midori/midori-view.c:3691 msgid "Enter shortcut address" msgstr "Введите адрес страницы" -#: ../midori/midori-view.c:4255 +#: ../midori/midori-view.c:3692 msgid "Enter shortcut title" msgstr "Введите название закладки" -#: ../midori/midori-view.c:4256 +#: ../midori/midori-view.c:3693 msgid "Are you sure you want to delete this shortcut?" msgstr "Удалить визуальную закладку?" -#: ../midori/midori-view.c:4429 +#: ../midori/midori-view.c:3852 #, c-format msgid "No documentation installed" msgstr "Документация не установлена" -#: ../midori/midori-view.c:4506 -msgid "Midori doesn't store any personal data:" -msgstr "Midori не сохраняет личные данные:" - -#: ../midori/midori-view.c:4507 -msgid "No history or web cookies are being saved." -msgstr "Не было сохранено ни истории, ни cookies." - -#: ../midori/midori-view.c:4508 -msgid "Extensions are disabled." -msgstr "Дополнения отключены." - -#: ../midori/midori-view.c:4509 -msgid "HTML5 storage, local database and application caches are disabled." -msgstr "Хранилище HTML5, локальная база данных и кэши приложений отключены." - -#: ../midori/midori-view.c:4510 -msgid "Midori prevents websites from tracking the user:" -msgstr "Midori затрудняет отслеживание сайтами пользователя:" - -#: ../midori/midori-view.c:4511 -msgid "Referrer URLs are stripped down to the hostname." -msgstr "Исходные адреса усекаются до имени узла." - -#: ../midori/midori-view.c:4512 -msgid "DNS prefetching is disabled." -msgstr "Упреждающие запросы DNS отключены." - -#: ../midori/midori-view.c:4513 -msgid "The language and timezone are not revealed to websites." -msgstr "Сайтам не передается язык и часовой пояс." - -#: ../midori/midori-view.c:4514 -msgid "Flash and other Netscape plugins cannot be listed by websites." -msgstr "Сайтам не сообщается о наличии Flash и прочих модулей Netscape." - -#: ../midori/midori-view.c:4603 +#: ../midori/midori-view.c:3902 msgid "Version numbers in brackets show the version used at runtime." msgstr "Числа в скобках обозначают используемые в данный момент версии." -#: ../midori/midori-view.c:4653 +#: ../midori/midori-view.c:3947 msgid "Page loading delayed" msgstr "Загрузка страницы отложена" -#: ../midori/midori-view.c:4654 +#: ../midori/midori-view.c:3948 msgid "Loading delayed either due to a recent crash or startup preferences." -msgstr "Загрузка страницы была отложена из-за сбоя или как следствие соответствующей настройки." +msgstr "" +"Загрузка страницы была отложена из-за сбоя или как следствие соответствующей " +"настройки." -#: ../midori/midori-view.c:4655 +#: ../midori/midori-view.c:3949 msgid "Load Page" msgstr "Загрузить страницу" -#: ../midori/midori-view.c:4822 +#: ../midori/midori-view.c:4089 msgid "Blank page" msgstr "Пустая страница" -#: ../midori/midori-view.c:5086 +#: ../midori/midori-view.c:4353 msgid "_Duplicate Tab" msgstr "Сделать _копию" -#: ../midori/midori-view.c:5091 +#: ../midori/midori-view.c:4358 msgid "Show Tab _Label" msgstr "_Показать заголовок" -#: ../midori/midori-view.c:5091 +#: ../midori/midori-view.c:4358 msgid "Show Tab _Icon Only" msgstr "_Скрыть заголовок" -#: ../midori/midori-view.c:5098 -msgid "Close Ot_her Tab" -msgid_plural "Close Ot_her Tabs" -msgstr[0] "З_акрыть остальные" -msgstr[1] "З_акрыть остальные" -msgstr[2] "З_акрыть остальные" +#: ../midori/midori-view.c:4364 +msgid "Close ot_her Tabs" +msgstr "З_акрыть остальные" #. i18n: word stem of "previous page" type links, case is not important -#: ../midori/midori-view.c:5928 +#: ../midori/midori-view.c:4981 msgid "previous" msgstr "назад" #. i18n: word stem of "next page" type links, case is not important -#: ../midori/midori-view.c:5947 +#: ../midori/midori-view.c:5000 msgid "next" msgstr "далее" -#: ../midori/midori-view.c:5960 +#: ../midori/midori-view.c:5013 msgid "Print background images" msgstr "Печатать фоновые изображения" -#: ../midori/midori-view.c:5961 +#: ../midori/midori-view.c:5014 msgid "Whether background images should be printed" msgstr "Должны ли быть выведены на печать фоновые изображения" -#: ../midori/midori-view.c:5993 +#: ../midori/midori-view.c:5046 msgid "Features" msgstr "Возможности" -#: ../midori/midori-preferences.c:298 +#: ../midori/midori-preferences.c:297 msgid "Startup" msgstr "Запуск" -#: ../midori/midori-preferences.c:311 +#: ../midori/midori-preferences.c:310 msgid "Use _current page" msgstr "Т_екущая страница" -#: ../midori/midori-preferences.c:315 +#: ../midori/midori-preferences.c:314 msgid "Use current page as homepage" msgstr "Установить текущую страницу в качестве домашней" #. Page "Appearance" -#: ../midori/midori-preferences.c:324 +#: ../midori/midori-preferences.c:323 msgid "Fonts" msgstr "Шрифты" -#: ../midori/midori-preferences.c:327 +#: ../midori/midori-preferences.c:326 msgid "Proportional Font Family" msgstr "Семейство пропорционального шрифта" -#: ../midori/midori-preferences.c:331 +#: ../midori/midori-preferences.c:330 msgid "The default font family used to display text" msgstr "Семейство шрифта для отображения текста по умолчанию" -#: ../midori/midori-preferences.c:334 +#: ../midori/midori-preferences.c:333 msgid "The default font size used to display text" msgstr "Размер шрифта для отображения текста по умолчанию" -#: ../midori/midori-preferences.c:336 +#: ../midori/midori-preferences.c:335 msgid "Fixed-width Font Family" msgstr "Семейство моноширинного шрифта" -#: ../midori/midori-preferences.c:340 +#: ../midori/midori-preferences.c:339 msgid "The font family used to display fixed-width text" msgstr "Семейство моноширинного шрифта для отображения текста" -#: ../midori/midori-preferences.c:343 +#: ../midori/midori-preferences.c:342 msgid "The font size used to display fixed-width text" msgstr "Размер моноширинного шрифта для отображения текста" -#: ../midori/midori-preferences.c:345 +#: ../midori/midori-preferences.c:344 msgid "Minimum Font Size" msgstr "Минимальный размер шрифта" -#: ../midori/midori-preferences.c:349 +#: ../midori/midori-preferences.c:348 msgid "The minimum font size used to display text" msgstr "Наименьший размер шрифта для отображения текста" #. Page "Behavior" -#: ../midori/midori-preferences.c:360 +#: ../midori/midori-preferences.c:359 msgid "Behavior" msgstr "Поведение" -#: ../midori/midori-preferences.c:386 +#: ../midori/midori-preferences.c:385 msgid "Allow scripts to open popups" msgstr "Разрешить сценариям открывать всплывающие окна" -#: ../midori/midori-preferences.c:387 +#: ../midori/midori-preferences.c:386 msgid "Whether scripts are allowed to open popup windows automatically" -msgstr "Разрешено ли сценариям открывать всплывающие окна без вмешательства пользователя" +msgstr "" +"Разрешено ли сценариям открывать всплывающие окна без вмешательства " +"пользователя" #. Page "Interface" -#: ../midori/midori-preferences.c:418 +#: ../midori/midori-preferences.c:409 msgid "Browsing" msgstr "Навигация" #. Page "Network" -#: ../midori/midori-preferences.c:458 +#: ../midori/midori-preferences.c:447 msgid "Network" msgstr "Сеть" -#: ../midori/midori-preferences.c:465 +#: ../midori/midori-preferences.c:454 msgid "Hostname" msgstr "Адрес" -#: ../midori/midori-preferences.c:489 +#: ../midori/midori-preferences.c:478 msgid "MB" msgstr "МБ" -#: ../midori/midori-searchaction.c:957 +#: ../midori/midori-searchaction.c:909 msgid "Add search engine" msgstr "Добавление средства поиска" -#: ../midori/midori-searchaction.c:957 +#: ../midori/midori-searchaction.c:909 msgid "Edit search engine" msgstr "Правка средства поиска" -#: ../midori/midori-searchaction.c:985 +#: ../midori/midori-searchaction.c:938 msgid "_Name:" msgstr "_Имя:" -#: ../midori/midori-searchaction.c:1000 +#: ../midori/midori-searchaction.c:954 msgid "_Description:" msgstr "_Описание:" -#: ../midori/midori-searchaction.c:1013 -#: ../extensions/feed-panel/main.c:377 -msgid "_Address:" -msgstr "_Адрес:" +#: ../midori/midori-searchaction.c:987 +msgid "_Icon:" +msgstr "_Значок:" -#: ../midori/midori-searchaction.c:1032 +#: ../midori/midori-searchaction.c:1001 msgid "_Token:" msgstr "_Признак:" -#: ../midori/midori-searchaction.c:1330 +#: ../midori/midori-searchaction.c:1301 msgid "Manage Search Engines" msgstr "Управление средствами поиска" -#: ../midori/midori-searchaction.c:1432 +#: ../midori/midori-searchaction.c:1401 msgid "Use as _default" msgstr "Использовать _по умолчанию" -#: ../midori/sokoke.c:346 +#: ../midori/sokoke.c:406 msgid "Open with" msgstr "Открыть с помощью" -#: ../midori/sokoke.c:354 +#: ../midori/sokoke.c:414 #, c-format msgid "Choose an application or command to open \"%s\":" msgstr "Выберите приложение или команду для «%s»:" -#: ../midori/sokoke.c:468 -#: ../midori/sokoke.c:482 +#: ../midori/sokoke.c:455 ../midori/sokoke.c:465 ../midori/sokoke.c:493 +#: ../midori/sokoke.c:522 ../midori/sokoke.c:536 msgid "Could not run external program." msgstr "Не удалось выполнить внешнюю программу." -#: ../midori/sokoke.c:1443 +#: ../midori/sokoke.c:1792 #, c-format msgid "%d hour" msgid_plural "%d hours" @@ -2152,7 +2144,7 @@ msgstr[0] "%d час" msgstr[1] "%d часа" msgstr[2] "%d часов" -#: ../midori/sokoke.c:1444 +#: ../midori/sokoke.c:1793 #, c-format msgid "%d minute" msgid_plural "%d minutes" @@ -2160,7 +2152,7 @@ msgstr[0] "%d минута" msgstr[1] "%d минуты" msgstr[2] "%d минут" -#: ../midori/sokoke.c:1445 +#: ../midori/sokoke.c:1794 #, c-format msgid "%d second" msgid_plural "%d seconds" @@ -2169,31 +2161,30 @@ msgstr[1] "%d секунды" msgstr[2] "%d секунд" #. i18n: Download tooltip (size): 4KB of 43MB -#: ../midori/sokoke.c:1453 -#: ../panels/midori-transfers.c:268 +#: ../midori/sokoke.c:1802 ../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:1462 +#: ../midori/sokoke.c:1811 msgid "?B" msgstr "?Б" #. i18n: Download tooltip (transfer rate): (130KB/s) -#: ../midori/sokoke.c:1465 +#: ../midori/sokoke.c:1814 #, c-format msgid " (%s/s)" msgstr " (%s/s)" #. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning -#: ../midori/sokoke.c:1482 +#: ../midori/sokoke.c:1831 #, c-format msgid " - %s remaining" msgstr " - осталось %s" #. i18n: A panel at the bottom, to search text in pages -#: ../toolbars/midori-findbar.c:265 +#: ../toolbars/midori-findbar.c:260 msgid "_Inline Find:" msgstr "_Найти:" @@ -2217,89 +2208,77 @@ msgstr "Подсветить совпадения" msgid "Close Findbar" msgstr "Закрыть вкладку поиска" -#: ../toolbars/midori-transferbar.c:124 +#: ../toolbars/midori-transferbar.c:120 #, c-format msgid "The file '%s' has been downloaded." msgstr "Файл «%s» загружен." -#: ../toolbars/midori-transferbar.c:129 +#: ../toolbars/midori-transferbar.c:123 msgid "Transfer completed" msgstr "Загрузка завершена" -#: ../toolbars/midori-transferbar.c:201 +#: ../toolbars/midori-transferbar.c:212 msgid "The downloaded file is erroneous." msgstr "Загруженный файл повреждён." -#: ../toolbars/midori-transferbar.c:202 -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:213 +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:345 -#: ../panels/midori-transfers.c:142 +#: ../toolbars/midori-transferbar.c:350 ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "Убрать завершённые" -#: ../toolbars/midori-transferbar.c:382 -#: ../toolbars/midori-transferbar.c:384 +#: ../toolbars/midori-transferbar.c:387 ../toolbars/midori-transferbar.c:389 msgid "Some files are being downloaded" msgstr "Некоторые файлы загружаются" -#: ../toolbars/midori-transferbar.c:388 +#: ../toolbars/midori-transferbar.c:393 msgid "_Quit Midori" msgstr "В_ыйти из Midori" -#: ../toolbars/midori-transferbar.c:390 +#: ../toolbars/midori-transferbar.c:395 msgid "The transfers will be cancelled if Midori quits." msgstr "Загрузки будут отменены при закрытии Midori." -#: ../panels/midori-bookmarks.c:308 +#: ../panels/midori-bookmarks.c:113 +msgid "Bookmarks" +msgstr "Закладки" + +#: ../panels/midori-bookmarks.c:291 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "Не удалось добавить закладку: %s\n" -#: ../panels/midori-bookmarks.c:475 -#, c-format -msgid "Failed to update bookmark : %s\n" -msgstr "Не удалось обновить закладку: %s\n" - -#: ../panels/midori-bookmarks.c:535 +#: ../panels/midori-bookmarks.c:471 msgid "Edit the selected bookmark" msgstr "Редактировать закладку" -#: ../panels/midori-bookmarks.c:543 +#: ../panels/midori-bookmarks.c:479 msgid "Delete the selected bookmark" msgstr "Удалить закладку" -#: ../panels/midori-bookmarks.c:558 +#: ../panels/midori-bookmarks.c:494 msgid "Add a new folder" msgstr "Создать папку" -#: ../panels/midori-bookmarks.c:697 -#: ../panels/midori-history.c:638 +#: ../panels/midori-bookmarks.c:628 ../panels/midori-history.c:579 msgid "Separator" msgstr "Разделитель" -#. Create the filter entry -#: ../panels/midori-bookmarks.c:1027 -msgid "Search Bookmarks" -msgstr "Поиск в закладках" - -#: ../panels/midori-history.c:111 +#: ../panels/midori-history.c:110 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:142 +msgid "A week ago" +msgstr "Неделю назад" -#: ../panels/midori-history.c:162 -#: ../panels/midori-history.c:186 +#: ../panels/midori-history.c:144 #, c-format msgid "%d day ago" msgid_plural "%d days ago" @@ -2307,46 +2286,39 @@ msgstr[0] "%d день назад" msgstr[1] "%d дня назад" msgstr[2] "%d дней назад" -#: ../panels/midori-history.c:165 -#: ../panels/midori-history.c:184 -msgid "A week ago" -msgstr "Неделю назад" +#: ../panels/midori-history.c:147 +msgid "Today" +msgstr "Сегодня" -#: ../panels/midori-history.c:232 -#, c-format -msgid "Failed to remove history item: %s\n" -msgstr "Не удалось удалить запись из журнала: %s\n" +#: ../panels/midori-history.c:149 +msgid "Yesterday" +msgstr "Вчера" -#: ../panels/midori-history.c:360 +#: ../panels/midori-history.c:317 msgid "Are you sure you want to remove all history items?" msgstr "Удалить все записи в журнале?" -#: ../panels/midori-history.c:407 +#: ../panels/midori-history.c:363 msgid "Bookmark the selected history item" msgstr "Добавить выделенную запись в закладки" -#: ../panels/midori-history.c:416 +#: ../panels/midori-history.c:372 msgid "Delete the selected history item" msgstr "Удалить запись из журнала" -#: ../panels/midori-history.c:424 +#: ../panels/midori-history.c:380 msgid "Clear the entire history" msgstr "Очистить весь журнал" -#. Create the filter entry -#: ../panels/midori-history.c:997 -msgid "Search History" -msgstr "Поиск в истории" - -#: ../panels/midori-transfers.c:87 +#: ../panels/midori-transfers.c:86 msgid "Transfers" msgstr "Загрузки" -#: ../panels/midori-transfers.c:470 +#: ../panels/midori-transfers.c:467 msgid "Open Destination _Folder" msgstr "Открыть _папку загрузок" -#: ../panels/midori-transfers.c:473 +#: ../panels/midori-transfers.c:470 msgid "Copy Link Loc_ation" msgstr "Копировать _адрес ссылки" @@ -2374,96 +2346,97 @@ msgstr "Пароль" msgid "_Remember password" msgstr "_Запомнить пароль" -#: ../katze/katze-throbber.c:949 +#: ../katze/katze-throbber.c:942 #, c-format msgid "Named icon '%s' couldn't be loaded" msgstr "Не удалось загрузить именованный значок «%s»" -#: ../katze/katze-throbber.c:962 +#: ../katze/katze-throbber.c:955 #, c-format msgid "Stock icon '%s' couldn't be loaded" msgstr "Не удалось загрузить системный значок «%s»" -#: ../katze/katze-throbber.c:1042 +#: ../katze/katze-throbber.c:1035 msgid "Animation frames are broken" msgstr "Кадры анимации повреждены" -#: ../katze/katze-utils.c:443 -#: ../katze/katze-utils.c:867 +#: ../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:489 -#: ../katze/katze-utils.c:518 +#: ../katze/katze-utils.c:485 ../katze/katze-utils.c:514 #: ../extensions/addons.c:308 msgid "Choose file" msgstr "Выберите файл" -#: ../katze/katze-utils.c:504 +#: ../katze/katze-utils.c:500 msgid "Choose folder" msgstr "Выберите папку" -#: ../katze/katze-utils.c:602 +#: ../katze/katze-utils.c:604 msgid "None" msgstr "Нет" -#: ../katze/katze-utils.c:717 +#: ../katze/katze-utils.c:719 msgid "1 hour" msgstr "1 час" -#: ../katze/katze-utils.c:718 +#: ../katze/katze-utils.c:720 msgid "1 day" msgstr "1 день" -#: ../katze/katze-utils.c:719 +#: ../katze/katze-utils.c:721 msgid "1 week" msgstr "1 неделю" -#: ../katze/katze-utils.c:720 +#: ../katze/katze-utils.c:722 msgid "1 month" msgstr "1 месяц" -#: ../katze/katze-utils.c:721 +#: ../katze/katze-utils.c:723 msgid "1 year" msgstr "1 год" -#: ../katze/katze-preferences.c:98 -#: ../extensions/history-list.vala:235 +#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235 #, c-format msgid "Preferences for %s" msgstr "Параметры %s" -#: ../extensions/adblock.c:470 +#: ../extensions/adblock.c:429 msgid "Configure Advertisement filters" msgstr "Настройка рекламных фильтров" -#: ../extensions/adblock.c:503 +#: ../extensions/adblock.c:460 #, 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:917 +#: ../extensions/adblock.c:824 msgid "Edit rule" msgstr "Редактирование правила" -#: ../extensions/adblock.c:931 +#: ../extensions/adblock.c:838 msgid "_Rule:" msgstr "_Правило:" -#: ../extensions/adblock.c:985 +#: ../extensions/adblock.c:892 msgid "Bl_ock image" msgstr "Бл_окировать изображение" -#: ../extensions/adblock.c:990 +#: ../extensions/adblock.c:897 msgid "Bl_ock link" msgstr "Бл_окировать ссылку" -#: ../extensions/adblock.c:1689 +#: ../extensions/adblock.c:1484 msgid "Advertisement blocker" msgstr "Блокировка рекламы" -#: ../extensions/adblock.c:1690 +#: ../extensions/adblock.c:1485 msgid "Block advertisements according to a filter list" msgstr "Блокирует рекламу по списку фильтров" @@ -2489,118 +2462,116 @@ msgstr "_Установить пользовательский стиль" msgid "Don't install" msgstr "Не устанавливать" -#: ../extensions/addons.c:319 -#: ../extensions/addons.c:677 +#: ../extensions/addons.c:319 ../extensions/addons.c:681 msgid "Userscripts" msgstr "Пользовательские сценарии" -#: ../extensions/addons.c:324 -#: ../extensions/addons.c:679 +#: ../extensions/addons.c:324 ../extensions/addons.c:683 msgid "Userstyles" msgstr "Пользовательские стили" -#: ../extensions/addons.c:370 -#: ../extensions/addons.c:449 +#: ../extensions/addons.c:380 ../extensions/addons.c:459 #: ../extensions/feed-panel/main.c:129 msgid "Error" msgstr "Ошибка" -#: ../extensions/addons.c:411 +#: ../extensions/addons.c:421 #, c-format msgid "Do you want to delete '%s'?" msgstr "Удалить «%s»?" -#: ../extensions/addons.c:417 +#: ../extensions/addons.c:427 msgid "Delete user script" msgstr "Удаление сценария" -#: ../extensions/addons.c:418 +#: ../extensions/addons.c:428 msgid "Delete user style" msgstr "Удаление стиля" -#: ../extensions/addons.c:421 +#: ../extensions/addons.c:431 #, c-format msgid "The file %s will be permanently deleted." msgstr "Файл «%s» будет удалён безвозвратно." -#: ../extensions/addons.c:566 -#: ../extensions/addons.c:643 +#: ../extensions/addons.c:570 ../extensions/addons.c:647 msgid "Open in Text Editor" msgstr "Открыть в текстовом редакторе" -#: ../extensions/addons.c:568 -#: ../extensions/addons.c:652 +#: ../extensions/addons.c:572 ../extensions/addons.c:656 msgid "Open Target Folder" msgstr "Открыть папку с файлом" -#: ../extensions/addons.c:634 +#: ../extensions/addons.c:638 msgid "Add new addon" msgstr "Добавить дополнение" -#: ../extensions/addons.c:660 +#: ../extensions/addons.c:664 msgid "Remove selected addon" msgstr "Удалить выбранное дополнение" -#: ../extensions/addons.c:1689 -#: ../extensions/addons.c:1907 +#: ../extensions/addons.c:1713 ../extensions/addons.c:1884 msgid "User addons" msgstr "Пользовательские дополнения" -#: ../extensions/addons.c:1819 +#: ../extensions/addons.c:1837 #, c-format msgid "Can't monitor folder '%s': %s" msgstr "Отслеживание изменений в «%s» отключено: %s" -#: ../extensions/addons.c:1908 +#: ../extensions/addons.c:1885 msgid "Support for userscripts and userstyles" msgstr "Поддержка пользовательских сценариев и стилей" -#: ../extensions/colorful-tabs.c:201 +#: ../extensions/colorful-tabs.c:202 msgid "Colorful Tabs" msgstr "Цветные вкладки" -#: ../extensions/colorful-tabs.c:202 +#: ../extensions/colorful-tabs.c:203 msgid "Tint each tab distinctly" msgstr "Каждая вкладка имеет свой цвет" -#: ../extensions/cookie-manager/cookie-manager-page.c:73 +#: ../extensions/cookie-manager/cookie-manager-page.c:80 #: ../extensions/cookie-manager/main.c:35 msgid "Cookie Manager" msgstr "Менеджер фрагментов данных" -#: ../extensions/cookie-manager/cookie-manager-page.c:103 +#: ../extensions/cookie-manager/cookie-manager-page.c:110 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:112 +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 +#: ../extensions/cookie-manager/cookie-manager-page.c:127 msgid "Expand All" msgstr "Развернуть всё" -#: ../extensions/cookie-manager/cookie-manager-page.c:127 +#: ../extensions/cookie-manager/cookie-manager-page.c:134 msgid "Collapse All" msgstr "Свернуть всё" -#: ../extensions/cookie-manager/cookie-manager-page.c:572 +#: ../extensions/cookie-manager/cookie-manager-page.c:576 msgid "Do you really want to delete all cookies?" msgstr "Удалить все сохранённые фрагменты данных?" -#: ../extensions/cookie-manager/cookie-manager-page.c:574 +#: ../extensions/cookie-manager/cookie-manager-page.c:578 msgid "Question" msgstr "Вопрос" -#: ../extensions/cookie-manager/cookie-manager-page.c:583 +#: ../extensions/cookie-manager/cookie-manager-page.c:587 msgid "Only cookies which match the filter will be deleted." msgstr "Будут удалены только фрагменты, удовлетворяющие условиям фильтра." -#: ../extensions/cookie-manager/cookie-manager-page.c:671 +#: ../extensions/cookie-manager/cookie-manager-page.c:675 msgid "At the end of the session" msgstr "В конце сеанса" -#: ../extensions/cookie-manager/cookie-manager-page.c:674 +#: ../extensions/cookie-manager/cookie-manager-page.c:678 #, c-format msgid "" "Host: %s\n" @@ -2617,15 +2588,15 @@ msgstr "" "Защищённый: %s\n" "Срок истекает: %s" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:684 msgid "Yes" msgstr "Да" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:684 msgid "No" msgstr "Нет" -#: ../extensions/cookie-manager/cookie-manager-page.c:694 +#: ../extensions/cookie-manager/cookie-manager-page.c:698 #, c-format msgid "" "Domain: %s\n" @@ -2634,21 +2605,27 @@ msgstr "" "Домен: %s\n" "Фрагментов данных: %d" -#: ../extensions/cookie-manager/cookie-manager-page.c:1017 +#: ../extensions/cookie-manager/cookie-manager-page.c:1028 msgid "Name" msgstr "Имя" -#: ../extensions/cookie-manager/cookie-manager-page.c:1069 +#: ../extensions/cookie-manager/cookie-manager-page.c:1081 msgid "_Expand All" msgstr "_Развернуть всё" -#: ../extensions/cookie-manager/cookie-manager-page.c:1077 +#: ../extensions/cookie-manager/cookie-manager-page.c:1089 msgid "_Collapse All" msgstr "_Свернуть всё" -#: ../extensions/cookie-manager/cookie-manager-page.c:1129 -msgid "Search Cookies by Name or Domain" -msgstr "Искать фрагменты данных по имени или домену" +#: ../extensions/cookie-manager/cookie-manager-page.c:1142 +msgid "Filter:" +msgstr "Фильтр:" + +#: ../extensions/cookie-manager/cookie-manager-page.c:1147 +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" @@ -2746,70 +2723,44 @@ msgstr "Панель лент новостей" msgid "Read Atom/ RSS feeds" msgstr "Чтение лент RSS/Atom" -#: ../extensions/formhistory/formhistory.c:39 +#: ../extensions/formhistory.c:143 #, 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 +#: ../extensions/formhistory.c:295 msgid "Toggle form history state" msgstr "Хранить данные форм" -#: ../extensions/formhistory/formhistory.c:438 +#: ../extensions/formhistory.c:296 msgid "Activate or deactivate form history for the current tab." msgstr "Включение хранения данных форм для текущей вкладки." -#: ../extensions/formhistory/formhistory.c:549 -#: ../extensions/formhistory/formhistory.c:553 +#: ../extensions/formhistory.c:430 ../extensions/formhistory.c:434 #, 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.c:509 +msgid "only activate form history via hotkey (Ctrl+Shift+F) per tab" +msgstr "Вручную включать дополнение для каждой вкладки (Ctrl+Shift+F)" -#: ../extensions/formhistory/formhistory.c:669 +#: ../extensions/formhistory.c:568 msgid "Stores history of entered form data" msgstr "Хранит данные, введённые ранее в формы ввода" -#: ../extensions/formhistory/formhistory-gdom-frontend.c:225 -#: ../extensions/formhistory/formhistory-js-frontend.c:106 +#: ../extensions/formhistory.c:572 #, c-format -msgid "Failed to select suggestions\n" -msgstr "Не удалось выбрать предложения\n" +msgid "Not available: %s" +msgstr "Недоступно: %s" + +#: ../extensions/formhistory.c:573 +msgid "Resource files not installed" +msgstr "Файлы ресурсов не установлены" + +#: ../extensions/formhistory.c:579 +msgid "Form history filler" +msgstr "История форм ввода" #: ../extensions/history-list.vala:197 msgid "There are no unvisited tabs" @@ -2885,15 +2836,15 @@ msgstr "Обновить/остановить обновление страни msgid "Customize Keyboard shortcuts" msgstr "Настройка комбинаций клавиш" -#: ../extensions/shortcuts.c:283 +#: ../extensions/shortcuts.c:285 msgid "Customize Sh_ortcuts..." -msgstr "Настроить со_четания клавиш…" +msgstr "_Настроить клавиши..." -#: ../extensions/shortcuts.c:320 +#: ../extensions/shortcuts.c:322 msgid "Shortcuts" msgstr "Комбинации клавиш" -#: ../extensions/shortcuts.c:321 +#: ../extensions/shortcuts.c:323 msgid "View and edit keyboard shortcuts" msgstr "Просмотр и изменение «горячих клавиш»" @@ -2905,36 +2856,35 @@ msgstr "Часы в строке состояния" msgid "Display date and time in the statusbar" msgstr "Показывать дату и время в строке состояния" -#: ../extensions/statusbar-features.c:152 +#: ../extensions/statusbar-features.c:128 msgid "Images" msgstr "Изображения" -#: ../extensions/statusbar-features.c:162 +#: ../extensions/statusbar-features.c:137 msgid "Scripts" msgstr "Сценарии" -#: ../extensions/statusbar-features.c:174 +#: ../extensions/statusbar-features.c:146 msgid "Netscape plugins" msgstr "Модули Netscape" -#: ../extensions/statusbar-features.c:259 +#: ../extensions/statusbar-features.c:192 msgid "Statusbar Features" msgstr "Настройка возможностей" -#: ../extensions/statusbar-features.c:260 +#: ../extensions/statusbar-features.c:193 msgid "Easily toggle features on web pages on and off" msgstr "Быстрая настройка режимов отображения страниц" -#: ../extensions/tab-panel.c:589 -#: ../extensions/tab-panel.c:676 +#: ../extensions/tab-panel.c:596 ../extensions/tab-panel.c:683 msgid "Tab Panel" msgstr "Панель вкладок" -#: ../extensions/tab-panel.c:659 +#: ../extensions/tab-panel.c:666 msgid "T_ab Panel" msgstr "П_анель вкладок" -#: ../extensions/tab-panel.c:677 +#: ../extensions/tab-panel.c:684 msgid "Show tabs in a vertical panel" msgstr "Показ вкладок в боковой панели" @@ -2946,31 +2896,37 @@ msgstr "Только значок на новых вкладках" msgid "New tabs have no label by default" msgstr "У новых вкладок скрыт заголовок и виден только значок" -#: ../extensions/toolbar-editor.c:395 +#: ../extensions/toolbar-editor.c:393 msgid "Customize Toolbar" msgstr "Настройка панели инструментов" -#: ../extensions/toolbar-editor.c:411 -msgid "Select items to be displayed on the toolbar. Items can be reordered by drag and drop." +#: ../extensions/toolbar-editor.c:413 +msgid "" +"Select items to be displayed on the toolbar. Items can be reodered by drag " +"and drop." msgstr "Выбрать и изменить порядок элементов можно с помощью мыши." -#: ../extensions/toolbar-editor.c:427 +#: ../extensions/toolbar-editor.c:429 msgid "Available Items" msgstr "Доступные элементы" -#: ../extensions/toolbar-editor.c:448 +#: ../extensions/toolbar-editor.c:450 msgid "Displayed Items" msgstr "Отображаемые элементы" -#: ../extensions/toolbar-editor.c:588 -msgid "_Customize Toolbar…" -msgstr "Настроить _панель инструментов…" +#: ../extensions/toolbar-editor.c:585 +msgid "Customize _Toolbar..." +msgstr "Настроить панель _инструментов..." -#: ../extensions/toolbar-editor.c:617 +#: ../extensions/toolbar-editor.c:601 +msgid "_Customize..." +msgstr "Н_астроить..." + +#: ../extensions/toolbar-editor.c:631 msgid "Toolbar Editor" msgstr "Редактор панели инструментов" -#: ../extensions/toolbar-editor.c:618 +#: ../extensions/toolbar-editor.c:632 msgid "Easily edit the toolbar layout" msgstr "Простой редактор панели инструментов" @@ -2978,206 +2934,6 @@ msgstr "Простой редактор панели инструментов" 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 "_Bookmark" -#~ msgstr "_Закладка" - -#~ msgid "_Console" -#~ msgstr "_Консоль" - -#~ msgid "Toplevel folder" -#~ msgstr "Корневая папка" - -#~ msgid "_Title:" -#~ msgstr "_Заголовок:" - -#~ msgid "_Folder:" -#~ msgstr "_Папка:" - -#~ msgid "Close ot_her Tabs" -#~ msgstr "З_акрыть остальные" - -#~ msgid "_Icon:" -#~ msgstr "_Значок:" - -#~ msgid "Filter:" -#~ msgstr "Фильтр:" - -#~ msgid "" -#~ "Enter a filter string to show only cookies whose name or domain field " -#~ "match the entered filter" -#~ msgstr "Строка для фильтрации по имени фрагмента или адресу веб-сайта" - -#~ msgid "_Customize…" -#~ msgstr "Н_астроить…" - -#~ 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 "Имя файла не задано" @@ -3205,6 +2961,9 @@ msgstr "Кэширует принятые данные (HTTP) на диске" #~ msgid "Reset the last _session" #~ msgstr "Удалить _данные последнего сеанса" +#~ msgid "Midori (Private Browsing)" +#~ msgstr "Midori (конфиденциальный режим)" + #~ msgid "Failed to execute database statement\n" #~ msgstr "Не удалось выполнить запрос к базе данных\n" @@ -3328,12 +3087,15 @@ msgstr "Кэширует принятые данные (HTTP) на диске" #~ msgid "%s of %s, %s/s" #~ msgstr "%s из %s, %s/s" -#~ msgid "Configure _Advertisement filters…" -#~ msgstr "_Настроить рекламные фильтры…" +#~ msgid "Configure _Advertisement filters..." +#~ msgstr "_Настроить рекламные фильтры..." #~ msgid "Open target folder for selected addon" #~ msgstr "Открыть папку с выбранным дополнением" +#~ msgid "_Form History" +#~ msgstr "_История форм ввода" + #~ msgid "Next Tab (History List)" #~ msgstr "Следующая вкладка (история вкладок)" @@ -3530,6 +3292,9 @@ msgstr "Кэширует принятые данные (HTTP) на диске" #~ msgid "Enable special extensions for developers" #~ msgstr "Включить особые расширения для разработчиков" +#~ msgid "DNS prefetching" +#~ msgstr "Упреждающие запросы DNS" + #~ msgid "Prefetch IP addresses of hovered links" #~ msgstr "Упреждающие запросы DNS при наведении на ссылки" @@ -3566,6 +3331,9 @@ msgstr "Кэширует принятые данные (HTTP) на диске" #~ msgid "Whether text areas are resizable" #~ msgstr "Текстовые поля могут изменять размер" +#~ msgid "User_styles" +#~ msgstr "С_тили пользователя" + #~ msgid "Both" #~ msgstr "Значки и текст" @@ -3575,8 +3343,11 @@ msgstr "Кэширует принятые данные (HTTP) на диске" #~ msgid "Load on Startup" #~ msgstr "Загружать при запуске" -#~ msgid "Configure _Toolbar…" -#~ msgstr "Настроить панель _инструментов…" +#~ msgid "Configure _Toolbar..." +#~ msgstr "Настроить панель _инструментов..." + +#~ msgid "_Enable" +#~ msgstr "_Включить" #~ msgid "Enable" #~ msgstr "Включить" @@ -3663,8 +3434,8 @@ msgstr "Кэширует принятые данные (HTTP) на диске" #~ msgid "Manage search engines" #~ msgstr "Управление средствами поиска" -#~ msgid "Open in Page_holder…" -#~ msgstr "Открыть в _контейнере…" +#~ msgid "Open in Page_holder..." +#~ msgstr "Открыть в _контейнере..." #~ msgid "Last pageholder URI" #~ msgstr "Текущий индекс URI" diff --git a/po/sk.po b/po/sk.po index 82ef652a..44014062 100644 --- a/po/sk.po +++ b/po/sk.po @@ -2,114 +2,120 @@ # 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. -# +# Tomáš Vadina , 2011. +# msgid "" msgstr "" "Project-Id-Version: Midori 0.3.6-1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-15 10:15+0000\n" -"PO-Revision-Date: 2012-05-15 16:39+0200\n" +"POT-Creation-Date: 2011-11-23 06:38+0000\n" +"PO-Revision-Date: 2011-08-26 14:45+0200\n" "Last-Translator: Tomáš Vadina \n" -"Language-Team: slovenčina \n" -"Language: sk\n" +"Language-Team: Slovak \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: sk\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 "Browse the Web" -msgstr "Prehliadať internet" - -#: ../data/midori.desktop.in.h:2 -msgid "Internet;WWW;Explorer" -msgstr "Internet; WWW; Prehliadač" +msgid "Lightweight web browser" +msgstr "Ľahký internetový prehliadač" -#: ../data/midori.desktop.in.h:3 ../midori/main.c:1972 ../midori/main.c:1996 -#: ../midori/main.c:2010 ../midori/midori-websettings.c:313 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:2009 ../midori/main.c:2029 +#: ../midori/main.c:2045 ../midori/midori-websettings.c:303 msgid "Midori" msgstr "Midori" -#: ../data/midori.desktop.in.h:4 +#: ../data/midori.desktop.in.h:3 msgid "Web Browser" msgstr "Internetový prehliadač" #: ../data/midori-private.desktop.in.h:1 msgid "Midori Private Browsing" -msgstr "Midori - súkromné prehliadanie" +msgstr "Súkromné prehliadanie Midori" #: ../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:4210 +#: ../data/midori-private.desktop.in.h:3 msgid "Private Browsing" msgstr "Súkromné prehliadanie" -#: ../midori/main.c:97 ../midori/main.c:103 +#: ../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:156 ../midori/main.c:260 +#: ../midori/main.c:155 ../midori/main.c:261 #, c-format msgid "Invalid configuration value '%s'" msgstr "Neplatná hodnota '%s' v konfigurácii" -#: ../midori/main.c:381 +#: ../midori/main.c:366 #, 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:435 +#: ../midori/main.c:420 #, c-format msgid "Failed to clear history: %s\n" msgstr "Nepodarilo sa zmazať históriu: %s\n" -#: ../midori/main.c:455 ../extensions/formhistory/formhistory.c:531 +#: ../midori/main.c:440 ../midori/main.c:561 ../extensions/formhistory.c:417 #, 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:525 +#: ../midori/main.c:504 #, 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:547 +#: ../midori/main.c:544 ../panels/midori-history.c:189 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "Nepodarilo sa odstrániť položku histórie: %s\n" + +#: ../midori/main.c:591 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "Záložky sa nepodarilo uložiť. %s" + +#: ../midori/main.c:624 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Nastavenie sa nepodarilo uložiť. %s" -#: ../midori/main.c:582 +#: ../midori/main.c:659 #, 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:619 +#: ../midori/main.c:685 ../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:660 ../panels/midori-extensions.c:91 +#: ../midori/main.c:739 ../panels/midori-extensions.c:91 msgid "Extensions" msgstr "Rozšírenia" -#: ../midori/main.c:674 +#: ../midori/main.c:753 msgid "Privacy" msgstr "Súkromie" -#: ../midori/main.c:686 +#: ../midori/main.c:765 msgid "" "Cookies store login data, saved games, or user profiles for advertisement " "purposes." @@ -117,19 +123,19 @@ msgstr "" "V cookies sa ukladajú prihlasovacie údaje, zostavy hier alebo používateľské " "dáta pre reklamu." -#: ../midori/main.c:742 +#: ../midori/main.c:821 #, c-format msgid "The session couldn't be saved. %s" msgstr "Sedenie sa nepodarilo uložiť. %s" -#: ../midori/main.c:960 +#: ../midori/main.c:1031 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:1036 +#: ../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." @@ -137,225 +143,240 @@ 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:1055 +#: ../midori/main.c:1118 msgid "Modify _preferences" msgstr "Zmeniť _predvoľby" -#: ../midori/main.c:1059 +#: ../midori/main.c:1122 msgid "Disable all _extensions" msgstr "Zakázať všetky _rozšírenia" -#: ../midori/main.c:1072 +#: ../midori/main.c:1135 msgid "Discard old tabs" msgstr "Zahodiť staré karty" -#: ../midori/main.c:1073 ../midori/midori-websettings.c:221 +#: ../midori/main.c:1136 ../midori/midori-websettings.c:212 msgid "Show last tabs without loading" msgstr "Zobraziť naposledy otvorené karty bez načítania" -#: ../midori/main.c:1074 ../midori/midori-websettings.c:220 +#: ../midori/main.c:1137 ../midori/midori-websettings.c:211 msgid "Show last open tabs" msgstr "Zobraziť naposledy otvorené karty" -#: ../midori/main.c:1321 ../midori/main.c:2399 +#: ../midori/main.c:1347 ../midori/main.c:2417 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Sedenie nie je možné načítať: %s\n" -#: ../midori/main.c:1459 +#: ../midori/main.c:1488 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Snímok uložený do: %s\n" -#: ../midori/main.c:1875 +#: ../midori/main.c:1912 msgid "Run ADDRESS as a web application" msgstr "Spustiť ADDRESS ako webovú aplikáciu" -#: ../midori/main.c:1875 +#: ../midori/main.c:1912 msgid "ADDRESS" msgstr "ADRESA" -#: ../midori/main.c:1878 +#: ../midori/main.c:1915 msgid "Use FOLDER as configuration folder" msgstr "Použiť PRIEČINOK ako konfiguračný priečinok" -#: ../midori/main.c:1878 +#: ../midori/main.c:1915 msgid "FOLDER" msgstr "PRIEČINOK" -#: ../midori/main.c:1881 +#: ../midori/main.c:1918 msgid "Private browsing, no changes are saved" msgstr "Súkromné prehliadanie, nič sa neukladá" -#: ../midori/main.c:1883 +#: ../midori/main.c:1920 msgid "Show a diagnostic dialog" msgstr "Zobraziť dialóg po spadnutí" -#: ../midori/main.c:1885 +#: ../midori/main.c:1922 msgid "Run the specified filename as javascript" msgstr "Spustiť zadaný názov súboru ako javaskript" -#: ../midori/main.c:1887 +#: ../midori/main.c:1924 msgid "Take a snapshot of the specified URI" msgstr "Urobiť snímok požadovanej URI" -#: ../midori/main.c:1889 +#: ../midori/main.c:1926 msgid "Execute the specified command" msgstr "Spustiť zadaný príkaz" -#: ../midori/main.c:1891 +#: ../midori/main.c:1928 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:1893 +#: ../midori/main.c:1930 msgid "Display program version" msgstr "Zobraziť verziu programu" -#: ../midori/main.c:1895 +#: ../midori/main.c:1932 msgid "Addresses" msgstr "Adresy" -#: ../midori/main.c:1897 +#: ../midori/main.c:1934 msgid "Block URIs according to regular expression PATTERN" msgstr "Blokovať adresy URI pomocou regulárneho výrazu REGVÝRAZ" -#: ../midori/main.c:1897 +#: ../midori/main.c:1934 msgid "PATTERN" msgstr "REGVÝRAZ" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1901 +#: ../midori/main.c:1938 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "Resetovať Midori po SEKUNDY sekundy nečinnosti" -#: ../midori/main.c:1901 +#: ../midori/main.c:1938 msgid "SECONDS" msgstr "SEKUNDY" -#: ../midori/main.c:1904 +#: ../midori/main.c:1941 msgid "Redirects console warnings to the specified FILENAME" msgstr "Presmeruje varovania konzoly do zadaného MENA_SÚBORU" -#: ../midori/main.c:1904 +#: ../midori/main.c:1941 msgid "FILENAME" msgstr "MENO_SÚBORU" -#: ../midori/main.c:1969 +#: ../midori/main.c:2006 msgid "[Addresses]" msgstr "[Adresy]" -#: ../midori/main.c:2011 +#: ../midori/main.c:2016 +msgid "The specified configuration folder is invalid." +msgstr "Vybraný konfiguračný priečinok nie je platný." + +#: ../midori/main.c:2046 msgid "Please report comments, suggestions and bugs to:" msgstr "Vaše komentáre, požiadavky a chyby prosím posielajte na:" -#: ../midori/main.c:2013 +#: ../midori/main.c:2048 msgid "Check for new versions at:" msgstr "Skontrolovať nové verzie na:" +#: ../midori/main.c:2131 +msgid "Website icons" +msgstr "Ikony webových stránok" + #. i18n: Logins and passwords in websites and web forms -#: ../midori/main.c:2108 +#: ../midori/main.c:2134 msgid "Saved logins and _passwords" msgstr "Uložené _prihlasovacie mená a heslá" -#: ../midori/main.c:2110 -msgid "Cookies and Website data" -msgstr "Cookies a dáta webstránky" +#: ../midori/main.c:2136 +msgid "Cookies" +msgstr "Cookies" + +#: ../midori/main.c:2139 +msgid "'Flash' Cookies" +msgstr "Cookies z Flash" -#. TODO: Preserve page icons of search engines and merge privacy items -#: ../midori/main.c:2114 ../midori/midori-websettings.c:997 +#: ../midori/main.c:2142 +msgid "HTML5 _Databases" +msgstr "HTML5 _databázy" + +#: ../midori/main.c:2145 ../midori/midori-websettings.c:936 #: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471 msgid "Web Cache" msgstr "Vyrovnávacia pamäť stránok" -#: ../midori/main.c:2117 -msgid "Website icons" -msgstr "Ikony webových stránok" +#: ../midori/main.c:2147 +msgid "Offline Application Cache" +msgstr "Vyrovnávacia pamäť offline aplikácie" -#: ../midori/main.c:2223 +#: ../midori/main.c:2250 msgid "An unknown error occured" msgstr "Vyskytla sa neznáma chyba" -#: ../midori/main.c:2330 +#: ../midori/main.c:2348 msgid "An instance of Midori is already running but not responding.\n" msgstr "Midori síce beží, ale neodpovedá.\n" -#: ../midori/main.c:2366 +#: ../midori/main.c:2384 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Záložky nemôžu byť načítané: %s\n" -#: ../midori/main.c:2414 +#: ../midori/main.c:2432 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Zatvorené karty nemôžu byť načítane: %s\n" -#: ../midori/main.c:2427 +#: ../midori/main.c:2445 #, 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:2443 +#: ../midori/main.c:2461 msgid "The following errors occured:" msgstr "Došlo k nasledujúcim chybám:" -#: ../midori/main.c:2459 +#: ../midori/main.c:2477 msgid "_Ignore" msgstr "_Ignorovať" -#: ../midori/midori-app.c:1339 +#: ../midori/midori-app.c:1329 msgid "_Bookmark" msgstr "_Záložka" -#: ../midori/midori-app.c:1340 ../midori/midori-browser.c:6066 +#: ../midori/midori-app.c:1330 ../midori/midori-browser.c:5980 msgid "_Bookmarks" msgstr "_Záložky" -#: ../midori/midori-app.c:1341 +#: ../midori/midori-app.c:1331 msgid "Add Boo_kmark" msgstr "Pridať záložku" -#: ../midori/midori-app.c:1342 +#: ../midori/midori-app.c:1332 msgid "_Console" msgstr "_Konzola" -#: ../midori/midori-app.c:1343 +#: ../midori/midori-app.c:1333 msgid "_Extensions" msgstr "_Rozšírenia" #. i18n: Browsing history, visited web pages, closed tabs -#: ../midori/midori-app.c:1344 ../midori/midori-browser.c:4591 +#: ../midori/midori-app.c:1334 ../midori/midori-browser.c:4575 msgid "_History" msgstr "_História" -#: ../midori/midori-app.c:1345 +#: ../midori/midori-app.c:1335 msgid "_Homepage" msgstr "_Domovská stránka" -#: ../midori/midori-app.c:1346 +#: ../midori/midori-app.c:1336 msgid "_Userscripts" msgstr "_Užívateľské skripty" -#: ../midori/midori-app.c:1347 +#: ../midori/midori-app.c:1337 msgid "New _Tab" msgstr "Nová _karta" -#: ../midori/midori-app.c:1348 +#: ../midori/midori-app.c:1338 msgid "_Transfers" msgstr "_Prenosy" -#: ../midori/midori-app.c:1349 +#: ../midori/midori-app.c:1339 msgid "Netscape p_lugins" msgstr "Pluginy _Netscape" -#: ../midori/midori-app.c:1350 +#: ../midori/midori-app.c:1340 msgid "_Closed Tabs" msgstr "_Zatvorené karty" -#: ../midori/midori-app.c:1351 ../midori/midori-browser.c:5218 +#: ../midori/midori-app.c:1341 ../midori/midori-browser.c:5163 msgid "New _Window" msgstr "Nové _okno" -#: ../midori/midori-app.c:1352 +#: ../midori/midori-app.c:1342 msgid "New _Folder" msgstr "Nový _priečinok" @@ -376,141 +397,124 @@ msgstr "Neznámy formát záložiek" msgid "Writing failed." msgstr "Zapisovanie zlyhalo." -#: ../midori/midori-browser.c:350 ../midori/midori-browser.c:5300 -#: ../midori/midori-browser.c:5309 +#: ../midori/midori-browser.c:329 ../midori/midori-browser.c:5245 +#: ../midori/midori-browser.c:5254 msgid "Reload the current page" msgstr "Obnoviť aktuálnu stránku" -#: ../midori/midori-browser.c:359 ../midori/midori-browser.c:5306 +#: ../midori/midori-browser.c:337 ../midori/midori-browser.c:5251 msgid "Stop loading the current page" msgstr "Zastaviť načítanie aktuálnej stránky" -#: ../midori/midori-browser.c:476 +#: ../midori/midori-browser.c:462 #, c-format msgid "Failed to update title: %s\n" msgstr "Nepodarilo sa aktualizovať titulok: %s\n" -#: ../midori/midori-browser.c:489 +#: ../midori/midori-browser.c:475 #, c-format msgid "Unexpected action '%s'." msgstr "Neočakávaná akcia '%s'." -#: ../midori/midori-browser.c:569 +#: ../midori/midori-browser.c:576 #, c-format msgid "%s (Private Browsing)" msgstr "%s (Súkromné prehliadanie)" -#: ../midori/midori-browser.c:683 ../midori/midori-browser.c:716 +#: ../midori/midori-browser.c:687 ../midori/midori-browser.c:720 msgid "Toplevel folder" msgstr "Priečinok najvyššej úrovne" -#: ../midori/midori-browser.c:774 +#: ../midori/midori-browser.c:777 msgid "New folder" msgstr "Nový priečinok" -#: ../midori/midori-browser.c:774 +#: ../midori/midori-browser.c:777 msgid "Edit folder" msgstr "Upraviť priečinok" -#: ../midori/midori-browser.c:776 +#: ../midori/midori-browser.c:779 msgid "New bookmark" msgstr "Nová záložka" -#: ../midori/midori-browser.c:776 +#: ../midori/midori-browser.c:779 msgid "Edit bookmark" msgstr "Upraviť záložku" -#: ../midori/midori-browser.c:818 +#: ../midori/midori-browser.c:810 msgid "_Title:" msgstr "_Názov:" -#: ../midori/midori-browser.c:838 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:830 ../midori/midori-searchaction.c:966 #: ../extensions/feed-panel/main.c:377 msgid "_Address:" msgstr "_Adresa:" -#: ../midori/midori-browser.c:861 ../midori/midori-browser.c:4328 +#: ../midori/midori-browser.c:853 ../midori/midori-browser.c:4310 msgid "_Folder:" msgstr "_Priečinok:" -#: ../midori/midori-browser.c:877 +#: ../midori/midori-browser.c:869 msgid "Add to _Speed Dial" msgstr "Pridať do _rýchleho prístupu" -#: ../midori/midori-browser.c:890 +#: ../midori/midori-browser.c:882 msgid "Show in the tool_bar" msgstr "Zobraziť v paneli _nástrojov" -#: ../midori/midori-browser.c:905 +#: ../midori/midori-browser.c:897 msgid "Run as _web application" msgstr "Spustiť ako _webovú aplikáciu" -#: ../midori/midori-browser.c:976 +#: ../midori/midori-browser.c:968 #, 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 +#: ../midori/midori-browser.c:970 #, 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 +#: ../midori/midori-browser.c:977 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Nie je dosť miesta pre stiahnutie \"%s\"." -#: ../midori/midori-browser.c:988 +#: ../midori/midori-browser.c:980 #, 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:1026 ../midori/midori-browser.c:4397 +#: ../midori/midori-browser.c:1024 ../midori/midori-browser.c:4380 msgid "Save file as" msgstr "Uložiť súbor ako" -#: ../midori/midori-browser.c:1320 +#: ../midori/midori-browser.c:1333 msgid "New Window" msgstr "Nové okno" -#: ../midori/midori-browser.c:1320 +#: ../midori/midori-browser.c:1333 msgid "A new window has been opened" msgstr "Bolo otvorené nové okno" -#: ../midori/midori-browser.c:1323 +#: ../midori/midori-browser.c:1336 msgid "New Tab" msgstr "Nová karta" -#: ../midori/midori-browser.c:1323 +#: ../midori/midori-browser.c:1336 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 +#: ../midori/midori-browser.c:1373 msgid "Save file" msgstr "Uložiť súbor" -#: ../midori/midori-browser.c:2367 +#: ../midori/midori-browser.c:2263 msgid "Open file" msgstr "Otvoriť súbor" -#: ../midori/midori-browser.c:2499 +#: ../midori/midori-browser.c:2394 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" @@ -525,141 +529,141 @@ msgstr "" "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:2505 ../extensions/feed-panel/main.c:365 +#: ../midori/midori-browser.c:2400 ../extensions/feed-panel/main.c:365 msgid "New feed" msgstr "Nový kanál" -#: ../midori/midori-browser.c:2548 ../midori/midori-browser.c:5369 -#: ../panels/midori-bookmarks.c:427 +#: ../midori/midori-browser.c:2443 ../midori/midori-browser.c:5314 +#: ../panels/midori-bookmarks.c:432 msgid "Add a new bookmark" msgstr "Pridať novú záložku" -#: ../midori/midori-browser.c:3047 ../midori/midori-searchaction.c:488 +#: ../midori/midori-browser.c:2969 ../midori/midori-searchaction.c:487 msgid "Empty" msgstr "Prázdne" -#: ../midori/midori-browser.c:3469 +#: ../midori/midori-browser.c:3459 msgid "Toggle text cursor navigation" msgstr "Prepína navigáciu pomocou kurzora" -#: ../midori/midori-browser.c:3784 ../midori/midori-browser.c:5759 +#: ../midori/midori-browser.c:3771 ../midori/midori-browser.c:5721 #, 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:4116 ../panels/midori-bookmarks.c:745 -#: ../panels/midori-history.c:803 +#: ../midori/midori-browser.c:4107 ../panels/midori-bookmarks.c:748 +#: ../panels/midori-history.c:747 msgid "Open all in _Tabs" msgstr "Otvoriť všetky na _kartách" -#: ../midori/midori-browser.c:4123 ../panels/midori-bookmarks.c:751 -#: ../panels/midori-history.c:809 ../extensions/feed-panel/feed-panel.c:528 +#: ../midori/midori-browser.c:4114 ../panels/midori-bookmarks.c:754 +#: ../panels/midori-history.c:753 ../extensions/feed-panel/feed-panel.c:528 msgid "Open in New _Tab" msgstr "Otvoriť na novej _karte" -#: ../midori/midori-browser.c:4126 ../midori/midori-view.c:2690 -#: ../midori/midori-view.c:4765 ../panels/midori-bookmarks.c:753 -#: ../panels/midori-history.c:811 ../extensions/feed-panel/feed-panel.c:530 +#: ../midori/midori-browser.c:4117 ../midori/midori-view.c:2530 +#: ../midori/midori-view.c:4357 ../panels/midori-bookmarks.c:756 +#: ../panels/midori-history.c:755 ../extensions/feed-panel/feed-panel.c:530 msgid "Open in New _Window" msgstr "Otvoriť v novom _okne" -#: ../midori/midori-browser.c:4215 +#: ../midori/midori-browser.c:4197 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4216 +#: ../midori/midori-browser.c:4198 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4217 +#: ../midori/midori-browser.c:4199 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4218 +#: ../midori/midori-browser.c:4200 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4219 +#: ../midori/midori-browser.c:4201 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4220 +#: ../midori/midori-browser.c:4202 #, c-format msgid "Firefox (%s)" msgstr "Firefox (%s)" -#: ../midori/midori-browser.c:4241 -msgid "Import bookmarks…" -msgstr "Importovať záložky…" +#: ../midori/midori-browser.c:4223 +msgid "Import bookmarks..." +msgstr "Importovať záložky..." -#: ../midori/midori-browser.c:4244 ../midori/midori-browser.c:5374 +#: ../midori/midori-browser.c:4226 ../midori/midori-browser.c:5319 msgid "_Import bookmarks" msgstr "_Importovať záložky" -#: ../midori/midori-browser.c:4255 +#: ../midori/midori-browser.c:4237 msgid "_Application:" msgstr "_Aplikácia:" -#: ../midori/midori-browser.c:4320 +#: ../midori/midori-browser.c:4302 msgid "Import from XBEL or HTML file" msgstr "Importovať zo súboru typu XBEL, alebo HTML" -#: ../midori/midori-browser.c:4355 +#: ../midori/midori-browser.c:4337 msgid "Import from a file" msgstr "Importovať zo súboru" -#: ../midori/midori-browser.c:4367 +#: ../midori/midori-browser.c:4349 msgid "Failed to import bookmarks" msgstr "Nepodarilo sa importovať záložky" -#: ../midori/midori-browser.c:4402 +#: ../midori/midori-browser.c:4385 msgid "XBEL Bookmarks" msgstr "Záložky vo formáte XBEL" -#: ../midori/midori-browser.c:4407 +#: ../midori/midori-browser.c:4390 msgid "Netscape Bookmarks" msgstr "Záložky z Netscape" -#: ../midori/midori-browser.c:4421 +#: ../midori/midori-browser.c:4404 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:4436 +#: ../midori/midori-browser.c:4420 msgid "Failed to export bookmarks" msgstr "Nepodarilo sa exportovať záložky" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4558 +#: ../midori/midori-browser.c:4542 msgid "Clear Private Data" msgstr "Odstrániť súkromné údaje" -#: ../midori/midori-browser.c:4562 +#: ../midori/midori-browser.c:4546 msgid "_Clear private data" msgstr "_Odstrániť súkromné údaje" -#: ../midori/midori-browser.c:4575 +#: ../midori/midori-browser.c:4559 msgid "Clear the following data:" msgstr "Odstrániť nasledujúce údaje:" -#: ../midori/midori-browser.c:4585 +#: ../midori/midori-browser.c:4569 msgid "Last open _tabs" msgstr "Naposledy otvorené _karty" -#: ../midori/midori-browser.c:4611 +#: ../midori/midori-browser.c:4595 msgid "Clear private data when _quitting Midori" msgstr "Odstrániť súkromné údaje pri _ukončení Midori" -#: ../midori/midori-browser.c:4806 +#: ../midori/midori-browser.c:4771 msgid "A lightweight web browser." msgstr "Ľahký internetový prehliadač." -#: ../midori/midori-browser.c:4807 +#: ../midori/midori-browser.c:4772 msgid "See about:version for version info." msgstr "about:version v adresnom riadku zobrazí informácie o verzii." -#: ../midori/midori-browser.c:4809 +#: ../midori/midori-browser.c:4774 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 " @@ -671,421 +675,409 @@ msgstr "" "Foundation; či už verzie 2.1, alebo alebo (podľa uváženia) akejkoľvek " "neskoršej verzie." -#: ../midori/midori-browser.c:4830 +#: ../midori/midori-browser.c:4795 msgid "translator-credits" msgstr "" "Robert Hartl , 2009\n" "Tomáš Vadina , 2011" -#: ../midori/midori-browser.c:5216 +#: ../midori/midori-browser.c:5161 msgid "_File" msgstr "_Súbor" -#: ../midori/midori-browser.c:5219 +#: ../midori/midori-browser.c:5164 msgid "Open a new window" msgstr "Otvoriť nové okno" -#: ../midori/midori-browser.c:5222 +#: ../midori/midori-browser.c:5167 msgid "Open a new tab" msgstr "Otvoriť novú kartu" -#: ../midori/midori-browser.c:5224 +#: ../midori/midori-browser.c:5169 msgid "New P_rivate Browsing Window" msgstr "Nové okno súk_romného prehliadania" -#: ../midori/midori-browser.c:5228 +#: ../midori/midori-browser.c:5173 msgid "Open a file" msgstr "Otvoriť súbor" -#: ../midori/midori-browser.c:5230 -msgid "_Save Page As…" -msgstr "Uložiť _stránku ako…" +#: ../midori/midori-browser.c:5175 +msgid "_Save Page As..." +msgstr "Uložiť _stránku ako..." -#: ../midori/midori-browser.c:5231 +#: ../midori/midori-browser.c:5176 msgid "Save to a file" msgstr "Uložiť do súboru" -#: ../midori/midori-browser.c:5233 +#: ../midori/midori-browser.c:5178 msgid "Add to Speed _dial" msgstr "Pridať do _Rýchleho prístupu" -#: ../midori/midori-browser.c:5237 +#: ../midori/midori-browser.c:5182 msgid "Add Shortcut to the _desktop" msgstr "Pridať záložku na _plochu" -#: ../midori/midori-browser.c:5239 +#: ../midori/midori-browser.c:5184 msgid "Create _Launcher" msgstr "Vytvoriť _spúšťač" -#: ../midori/midori-browser.c:5243 +#: ../midori/midori-browser.c:5188 msgid "Subscribe to News _feed" msgstr "Pridať _kanál" -#: ../midori/midori-browser.c:5249 +#: ../midori/midori-browser.c:5194 msgid "_Close Tab" msgstr "_Zatvoriť kartu" -#: ../midori/midori-browser.c:5250 +#: ../midori/midori-browser.c:5195 msgid "Close the current tab" msgstr "Zatvoriť aktívnu kartu" -#: ../midori/midori-browser.c:5252 +#: ../midori/midori-browser.c:5197 msgid "C_lose Window" msgstr "_Zatvoriť okno" -#: ../midori/midori-browser.c:5256 +#: ../midori/midori-browser.c:5201 msgid "Print the current page" msgstr "Vytlačiť aktuálnu stránku" -#: ../midori/midori-browser.c:5258 +#: ../midori/midori-browser.c:5203 msgid "Close a_ll Windows" msgstr "Z_atvoriť všetky okná" -#: ../midori/midori-browser.c:5261 +#: ../midori/midori-browser.c:5206 msgid "_Edit" msgstr "_Upraviť" -#: ../midori/midori-browser.c:5284 -msgid "_Find…" -msgstr "_Nájsť…" +#: ../midori/midori-browser.c:5229 +msgid "_Find..." +msgstr "_Nájsť..." -#: ../midori/midori-browser.c:5285 +#: ../midori/midori-browser.c:5230 msgid "Find a word or phrase in the page" msgstr "Hľadať slovo alebo frázu na stránke" -#: ../midori/midori-browser.c:5287 +#: ../midori/midori-browser.c:5232 msgid "Find _Next" msgstr "Hľadať _ďalšie" -#: ../midori/midori-browser.c:5290 +#: ../midori/midori-browser.c:5235 msgid "Find _Previous" msgstr "Hľadať _predchádzajúce" -#: ../midori/midori-browser.c:5294 +#: ../midori/midori-browser.c:5239 msgid "Configure the application preferences" msgstr "Nastaviť možnosti aplikácie" -#: ../midori/midori-browser.c:5296 +#: ../midori/midori-browser.c:5241 msgid "_View" msgstr "_Zobraziť" -#: ../midori/midori-browser.c:5297 +#: ../midori/midori-browser.c:5242 msgid "_Toolbars" msgstr "_Panely s nástrojmi" -#: ../midori/midori-browser.c:5302 +#: ../midori/midori-browser.c:5247 msgid "Reload page without caching" msgstr "Obnoviť stránku bez použitia vyrovnávacej pamäte" -#: ../midori/midori-browser.c:5312 +#: ../midori/midori-browser.c:5257 msgid "Increase the zoom level" msgstr "Priblížiť" -#: ../midori/midori-browser.c:5315 +#: ../midori/midori-browser.c:5260 msgid "Decrease the zoom level" msgstr "Oddialiť" -#: ../midori/midori-browser.c:5319 +#: ../midori/midori-browser.c:5264 msgid "_Encoding" msgstr "_Kódovanie" -#: ../midori/midori-browser.c:5321 +#: ../midori/midori-browser.c:5266 msgid "View So_urce" msgstr "Zobraziť _zdrojový kód" -#: ../midori/midori-browser.c:5324 +#: ../midori/midori-browser.c:5269 msgid "Ca_ret Browsing" msgstr "Prehliadanie ku_rzorom" -#: ../midori/midori-browser.c:5328 +#: ../midori/midori-browser.c:5273 msgid "Toggle fullscreen view" msgstr "Prepnúť zobrazenie na celú obrazovku" -#: ../midori/midori-browser.c:5330 +#: ../midori/midori-browser.c:5275 msgid "Scroll _Left" msgstr "Rolovať _vľavo" -#: ../midori/midori-browser.c:5333 +#: ../midori/midori-browser.c:5278 msgid "Scroll _Down" msgstr "Rolovať _dole" -#: ../midori/midori-browser.c:5336 +#: ../midori/midori-browser.c:5281 msgid "Scroll _Up" msgstr "Rolovať na_hore" -#: ../midori/midori-browser.c:5339 +#: ../midori/midori-browser.c:5284 msgid "Scroll _Right" msgstr "Rolovať v_pravo" -#: ../midori/midori-browser.c:5342 +#: ../midori/midori-browser.c:5287 msgid "_Go" msgstr "P_rejsť" -#: ../midori/midori-browser.c:5345 +#: ../midori/midori-browser.c:5290 msgid "Go back to the previous page" msgstr "Späť na predchádzajúcu stránku" -#: ../midori/midori-browser.c:5348 +#: ../midori/midori-browser.c:5293 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:5352 +#: ../midori/midori-browser.c:5297 msgid "Go to the previous sub-page" msgstr "Prejsť na predchádzajúcu podstránku" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5356 +#: ../midori/midori-browser.c:5301 msgid "Go to the next sub-page" msgstr "Prejsť na nasledujúcu podstránku" -#: ../midori/midori-browser.c:5359 +#: ../midori/midori-browser.c:5304 msgid "Go to your homepage" msgstr "Ísť na domovskú stránku" -#: ../midori/midori-browser.c:5361 +#: ../midori/midori-browser.c:5306 msgid "Empty Trash" msgstr "Vysypať kôš" -#: ../midori/midori-browser.c:5364 +#: ../midori/midori-browser.c:5309 msgid "Undo _Close Tab" msgstr "Obnoviť _zatvorenú kartu" -#: ../midori/midori-browser.c:5371 +#: ../midori/midori-browser.c:5316 msgid "Add a new _folder" msgstr "Pridať nový priečinok" -#: ../midori/midori-browser.c:5377 +#: ../midori/midori-browser.c:5322 msgid "_Export bookmarks" msgstr "_Exportovať záložky" -#: ../midori/midori-browser.c:5380 ../midori/midori-searchaction.c:497 +#: ../midori/midori-browser.c:5325 ../midori/midori-searchaction.c:496 msgid "_Manage Search Engines" msgstr "_Správca vyhľadávacích modulov" -#: ../midori/midori-browser.c:5383 +#: ../midori/midori-browser.c:5328 msgid "_Clear Private Data" msgstr "_Odstrániť súkromné údaje" -#: ../midori/midori-browser.c:5386 +#: ../midori/midori-browser.c:5331 msgid "_Inspect Page" msgstr "_Preskúmať stránku" -#: ../midori/midori-browser.c:5390 +#: ../midori/midori-browser.c:5335 msgid "_Previous Tab" msgstr "_Predchádzajúca karta" -#: ../midori/midori-browser.c:5393 +#: ../midori/midori-browser.c:5338 msgid "_Next Tab" msgstr "_Ďalšia karta" -#: ../midori/midori-browser.c:5395 +#: ../midori/midori-browser.c:5340 msgid "Move Tab _Backward" msgstr "Presunúť kartu do_zadu" -#: ../midori/midori-browser.c:5397 +#: ../midori/midori-browser.c:5342 msgid "_Move Tab Forward" msgstr "Presunúť kartu do_predu" -#: ../midori/midori-browser.c:5400 +#: ../midori/midori-browser.c:5345 msgid "Focus _Current Tab" msgstr "Zamerať _aktuálnu kartu" -#: ../midori/midori-browser.c:5403 +#: ../midori/midori-browser.c:5348 msgid "Focus _Next view" msgstr "Prepnúť _na ďalšiu" -#: ../midori/midori-browser.c:5406 +#: ../midori/midori-browser.c:5351 msgid "Only show the Icon of the _Current Tab" msgstr "Zobraziť iba ikonu a_ktuálnej karty" -#: ../midori/midori-browser.c:5409 +#: ../midori/midori-browser.c:5354 msgid "_Duplicate Current Tab" msgstr "Z_dvojiť aktuálnu kartu" -#: ../midori/midori-browser.c:5412 +#: ../midori/midori-browser.c:5357 msgid "Close Ot_her Tabs" msgstr "_Zatvoriť ostatné karty" -#: ../midori/midori-browser.c:5415 +#: ../midori/midori-browser.c:5360 msgid "Open last _session" msgstr "Otvoriť posledné _sedenie" -#: ../midori/midori-browser.c:5418 +#: ../midori/midori-browser.c:5363 msgid "_Help" msgstr "_Pomocník" -#: ../midori/midori-browser.c:5420 +#: ../midori/midori-browser.c:5365 msgid "_Frequent Questions" msgstr "_Časté otázky" -#: ../midori/midori-browser.c:5423 -msgid "_Report a Problem…" +#: ../midori/midori-browser.c:5368 +msgid "_Report a Problem..." msgstr "_Ohlásiť chybu" -#: ../midori/midori-browser.c:5435 +#: ../midori/midori-browser.c:5380 msgid "_Menubar" msgstr "Panel _ponuky" -#: ../midori/midori-browser.c:5439 +#: ../midori/midori-browser.c:5384 msgid "_Navigationbar" msgstr "_Navigačný panel" -#: ../midori/midori-browser.c:5443 +#: ../midori/midori-browser.c:5388 msgid "Side_panel" msgstr "_Bočný panel" -#: ../midori/midori-browser.c:5444 +#: ../midori/midori-browser.c:5389 msgid "Sidepanel" msgstr "Bočný panel" -#: ../midori/midori-browser.c:5447 +#: ../midori/midori-browser.c:5392 msgid "_Bookmarkbar" msgstr "Panel _záložiek" -#: ../midori/midori-browser.c:5451 +#: ../midori/midori-browser.c:5396 msgid "_Statusbar" msgstr "_Stavový riadok" -#: ../midori/midori-browser.c:5460 ../midori/midori-websettings.c:312 +#: ../midori/midori-browser.c:5405 ../midori/midori-websettings.c:302 msgid "_Automatic" msgstr "_Automatické" -#: ../midori/midori-browser.c:5463 ../midori/midori-websettings.c:236 -msgid "Chinese Traditional (BIG5)" -msgstr "Tradičné čínske (BIG5)" - -#: ../midori/midori-browser.c:5466 ../midori/midori-websettings.c:237 -msgid "Chinese Simplified (GB18030)" -msgstr "Zjednodušené čínske (GB18030)" +#: ../midori/midori-browser.c:5408 ../midori/midori-websettings.c:227 +msgid "Chinese (BIG5)" +msgstr "Čínske (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5470 +#: ../midori/midori-browser.c:5412 msgid "Japanese (SHIFT__JIS)" msgstr "Japonské (SHIFT_JIS)" -#: ../midori/midori-browser.c:5473 ../midori/midori-websettings.c:239 +#: ../midori/midori-browser.c:5415 ../midori/midori-websettings.c:229 msgid "Korean (EUC-KR)" msgstr "Kórejské (EUC-KR)" -#: ../midori/midori-browser.c:5476 ../midori/midori-websettings.c:240 +#: ../midori/midori-browser.c:5418 ../midori/midori-websettings.c:230 msgid "Russian (KOI8-R)" msgstr "Ruské (KOI8-R)" -#: ../midori/midori-browser.c:5479 ../midori/midori-websettings.c:241 +#: ../midori/midori-browser.c:5421 ../midori/midori-websettings.c:231 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5482 ../midori/midori-websettings.c:242 +#: ../midori/midori-browser.c:5424 ../midori/midori-websettings.c:232 msgid "Western (ISO-8859-1)" msgstr "Západné (ISO-8859-1)" -#: ../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:5427 ../midori/midori-websettings.c:233 +#: ../midori/midori-websettings.c:308 ../katze/katze-utils.c:635 +msgid "Custom..." +msgstr "Vlastné..." -#: ../midori/midori-browser.c:5991 +#: ../midori/midori-browser.c:5907 msgid "_Separator" msgstr "_Oddeľovač" -#: ../midori/midori-browser.c:5998 -msgid "_Location…" -msgstr "_Umiestnenie…" +#: ../midori/midori-browser.c:5914 +msgid "_Location..." +msgstr "_Umiestnenie..." -#: ../midori/midori-browser.c:6000 +#: ../midori/midori-browser.c:5916 msgid "Open a particular location" msgstr "Otvoriť umiestnenie" -#: ../midori/midori-browser.c:6022 -msgid "_Web Search…" -msgstr "_Hľadať na webe…" +#: ../midori/midori-browser.c:5938 +msgid "_Web Search..." +msgstr "_Hľadať na webe..." -#: ../midori/midori-browser.c:6024 +#: ../midori/midori-browser.c:5940 msgid "Run a web search" msgstr "Spustí vyhľadávanie na webe" -#: ../midori/midori-browser.c:6051 +#: ../midori/midori-browser.c:5967 msgid "Reopen a previously closed tab or window" msgstr "Znovu otvoriť zatvorenú kartu alebo okno" -#: ../midori/midori-browser.c:6068 +#: ../midori/midori-browser.c:5982 msgid "Show the saved bookmarks" msgstr "Zobrazí uložené záložky" -#: ../midori/midori-browser.c:6085 +#: ../midori/midori-browser.c:5996 msgid "_Tools" msgstr "_Nástroje" -#: ../midori/midori-browser.c:6101 +#: ../midori/midori-browser.c:6011 msgid "_Window" msgstr "_Okno" -#: ../midori/midori-browser.c:6103 +#: ../midori/midori-browser.c:6013 msgid "Show a list of all open tabs" msgstr "Zobraziť zoznam všetkých otvorených kariet" -#: ../midori/midori-browser.c:6117 +#: ../midori/midori-browser.c:6027 msgid "_Menu" msgstr "_Ponuka" -#: ../midori/midori-browser.c:6119 +#: ../midori/midori-browser.c:6029 msgid "Menu" msgstr "_Ponuka" -#: ../midori/midori-browser.c:6933 +#: ../midori/midori-browser.c:6671 #, c-format msgid "Unexpected setting '%s'" msgstr "Neočakávané nastavenie '%s'" -#: ../midori/midori-extension.c:329 +#: ../midori/midori-extension.c:310 #, c-format 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-extension.c:747 ../midori/midori-extension.c:844 -#: ../midori/midori-extension.c:941 ../midori/midori-extension.c:1053 -#: ../extensions/addons.c:1695 +#: ../midori/midori-extension.c:721 ../midori/midori-extension.c:818 +#: ../midori/midori-extension.c:915 ../midori/midori-extension.c:1027 +#: ../extensions/addons.c:1690 #, c-format 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:394 -#, c-format -msgid "Search with %s" -msgstr "Hľadať s %s" - -#: ../midori/midori-locationaction.c:412 -msgid "Search with…" -msgstr "Hľadať pomocou…" - -#: ../midori/midori-locationaction.c:537 +#: ../midori/midori-locationaction.c:425 #, c-format msgid "Failed to select from history\n" msgstr "Nepodarilo sa vybrať z histórie\n" -#: ../midori/midori-locationaction.c:624 +#: ../midori/midori-locationaction.c:509 #, c-format msgid "Search for %s" msgstr "Hľadať %s" +#: ../midori/midori-locationaction.c:535 +#, c-format +msgid "Search with %s" +msgstr "Hľadať s %s" + #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1398 +#: ../midori/midori-locationaction.c:1287 msgid "Paste and p_roceed" msgstr "Vložiť a s_pustiť" -#: ../midori/midori-locationaction.c:1739 +#: ../midori/midori-locationaction.c:1656 msgid "Not verified" msgstr "Neoverené" -#: ../midori/midori-locationaction.c:1759 +#: ../midori/midori-locationaction.c:1671 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:397 ../midori/midori-panel.c:399 #: ../midori/midori-panel.c:562 ../midori/midori-panel.c:565 msgid "Align sidepanel to the right" @@ -1099,501 +1091,493 @@ msgstr "Zatvoriť panel" msgid "Align sidepanel to the left" msgstr "Umiestnenie bočného panelu vľavo" -#: ../midori/midori-websettings.c:218 +#: ../midori/midori-websettings.c:209 msgid "Show Speed Dial" msgstr "Zobraziť rýchly prístup" -#: ../midori/midori-websettings.c:219 +#: ../midori/midori-websettings.c:210 msgid "Show Homepage" msgstr "Zobraziť domovskú stránku" -#: ../midori/midori-websettings.c:238 +#: ../midori/midori-websettings.c:228 msgid "Japanese (SHIFT_JIS)" msgstr "Japonské (SHIFT_JIS)" -#: ../midori/midori-websettings.c:258 +#: ../midori/midori-websettings.c:248 msgid "New tab" msgstr "novej karte" -#: ../midori/midori-websettings.c:259 +#: ../midori/midori-websettings.c:249 msgid "New window" msgstr "novom okne" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:250 msgid "Current tab" msgstr "aktuálnej karte" -#: ../midori/midori-websettings.c:275 +#: ../midori/midori-websettings.c:265 msgid "Default" msgstr "Predvolený" -#: ../midori/midori-websettings.c:276 +#: ../midori/midori-websettings.c:266 msgid "Icons" msgstr "Ikony" -#: ../midori/midori-websettings.c:277 +#: ../midori/midori-websettings.c:267 msgid "Small icons" msgstr "Malé ikony" -#: ../midori/midori-websettings.c:278 +#: ../midori/midori-websettings.c:268 msgid "Text" msgstr "Text" -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-websettings.c:269 msgid "Icons and text" msgstr "Ikony a text" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:270 msgid "Text beside icons" msgstr "Text pod ikonami" -#: ../midori/midori-websettings.c:295 +#: ../midori/midori-websettings.c:285 msgid "Automatic (GNOME or environment)" msgstr "Automaticky (GNOME alebo iné prostredie)" -#: ../midori/midori-websettings.c:296 +#: ../midori/midori-websettings.c:286 msgid "HTTP proxy server" msgstr "HTTTP proxy server" -#: ../midori/midori-websettings.c:297 +#: ../midori/midori-websettings.c:287 msgid "No proxy server" msgstr "Žiadny" -#: ../midori/midori-websettings.c:314 +#: ../midori/midori-websettings.c:304 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:315 +#: ../midori/midori-websettings.c:305 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:316 +#: ../midori/midori-websettings.c:306 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:317 +#: ../midori/midori-websettings.c:307 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:401 +#: ../midori/midori-websettings.c:360 msgid "Remember last window size" msgstr "Zapamätať si poslednú veľkosť okna" -#: ../midori/midori-websettings.c:402 +#: ../midori/midori-websettings.c:361 msgid "Whether to save the last window size" msgstr "Či ukladať poslednú veľkosť okna" -#: ../midori/midori-websettings.c:410 +#: ../midori/midori-websettings.c:369 msgid "Last window width" msgstr "Posledná šírka okna" -#: ../midori/midori-websettings.c:411 +#: ../midori/midori-websettings.c:370 msgid "The last saved window width" msgstr "Naposledy uložená šírka okna" -#: ../midori/midori-websettings.c:419 +#: ../midori/midori-websettings.c:378 msgid "Last window height" msgstr "Posledná výška okna" -#: ../midori/midori-websettings.c:420 +#: ../midori/midori-websettings.c:379 msgid "The last saved window height" msgstr "Naposledy uložená výška okna" -#: ../midori/midori-websettings.c:445 +#: ../midori/midori-websettings.c:404 msgid "Last panel position" msgstr "Posledná pozícia panela" -#: ../midori/midori-websettings.c:446 +#: ../midori/midori-websettings.c:405 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:455 +#: ../midori/midori-websettings.c:414 msgid "Last panel page" msgstr "Posledná stránka panelu" -#: ../midori/midori-websettings.c:456 +#: ../midori/midori-websettings.c:415 msgid "The last saved panel page" msgstr "Posledná uložená stránka panala" -#: ../midori/midori-websettings.c:464 +#: ../midori/midori-websettings.c:423 msgid "Last Web search" msgstr "Rýchle hľadanie na webe" -#: ../midori/midori-websettings.c:465 +#: ../midori/midori-websettings.c:424 msgid "The last saved Web search" msgstr "Uložené posledné vyhľadávanie na webe" -#: ../midori/midori-websettings.c:474 +#: ../midori/midori-websettings.c:433 msgid "Show Menubar" msgstr "Zobraziť panel pouky" -#: ../midori/midori-websettings.c:475 +#: ../midori/midori-websettings.c:434 msgid "Whether to show the menubar" msgstr "Či Zobrazovať ponuku" -#: ../midori/midori-websettings.c:483 +#: ../midori/midori-websettings.c:442 msgid "Show Navigationbar" msgstr "Zobraziť vyhľadávaciu lištu" -#: ../midori/midori-websettings.c:484 +#: ../midori/midori-websettings.c:443 msgid "Whether to show the navigationbar" msgstr "Či zobrazovať vyhľadávaciu lištu" -#: ../midori/midori-websettings.c:492 +#: ../midori/midori-websettings.c:451 msgid "Show Bookmarkbar" msgstr "Zobraziť záložky" -#: ../midori/midori-websettings.c:493 +#: ../midori/midori-websettings.c:452 msgid "Whether to show the bookmarkbar" msgstr "Či zobrazovať panel záložiek" -#: ../midori/midori-websettings.c:501 +#: ../midori/midori-websettings.c:460 msgid "Show Panel" msgstr "Zobraziť panel" -#: ../midori/midori-websettings.c:502 +#: ../midori/midori-websettings.c:461 msgid "Whether to show the panel" msgstr "Či zobrazovať panel" -#: ../midori/midori-websettings.c:510 +#: ../midori/midori-websettings.c:469 msgid "Show Statusbar" msgstr "Zobraziť stavový riadok" -#: ../midori/midori-websettings.c:511 +#: ../midori/midori-websettings.c:470 msgid "Whether to show the statusbar" msgstr "Či zobraziť stavový riadok" -#: ../midori/midori-websettings.c:520 +#: ../midori/midori-websettings.c:479 msgid "Toolbar Style:" msgstr "Štýl panelu s nástrojmi:" -#: ../midori/midori-websettings.c:521 +#: ../midori/midori-websettings.c:480 msgid "The style of the toolbar" msgstr "Štýl panelu s nástrojmi" -#: ../midori/midori-websettings.c:530 +#: ../midori/midori-websettings.c:489 msgid "Toolbar Items" msgstr "Položky panelu nástrojov" -#: ../midori/midori-websettings.c:531 +#: ../midori/midori-websettings.c:490 msgid "The items to show on the toolbar" msgstr "Položky, ktoré sa budú zobrazovať na paneli nástrojov" -#: ../midori/midori-websettings.c:539 +#: ../midori/midori-websettings.c:498 msgid "Compact Sidepanel" msgstr "Kompaktný bočný panel" -#: ../midori/midori-websettings.c:540 +#: ../midori/midori-websettings.c:499 msgid "Whether to make the sidepanel compact" msgstr "Či zobrazovať bočný panel kompaktne" -#: ../midori/midori-websettings.c:555 +#: ../midori/midori-websettings.c:514 msgid "Align sidepanel on the right" msgstr "Umiestniť bočný panel vpravo" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:515 msgid "Whether to align the sidepanel on the right" msgstr "Či presunúť bočný panel na opačnú stranu" -#: ../midori/midori-websettings.c:571 +#: ../midori/midori-websettings.c:530 msgid "Open panels in separate windows" msgstr "Otvoriť panely v samostatných oknách" -#: ../midori/midori-websettings.c:572 +#: ../midori/midori-websettings.c:531 msgid "Whether to always open panels in separate windows" msgstr "Či otvoriť panel v samostatnom okne" -#: ../midori/midori-websettings.c:581 +#: ../midori/midori-websettings.c:540 msgid "When Midori starts:" msgstr "Pri spustení Midori:" -#: ../midori/midori-websettings.c:582 +#: ../midori/midori-websettings.c:541 msgid "What to do when Midori starts" msgstr "Čo robiť pri spustení Midori?" -#: ../midori/midori-websettings.c:591 +#: ../midori/midori-websettings.c:550 msgid "Homepage:" msgstr "Domovská stránka:" -#: ../midori/midori-websettings.c:592 +#: ../midori/midori-websettings.c:551 msgid "The homepage" msgstr "Domovská stránka" -#: ../midori/midori-websettings.c:607 +#: ../midori/midori-websettings.c:566 msgid "Show crash dialog" msgstr "Zobraziť dialóg po spadnutí" -#: ../midori/midori-websettings.c:608 +#: ../midori/midori-websettings.c:567 msgid "Show a dialog after Midori crashed" msgstr "Zobrazí dialóg po spadnutí Midori" -#: ../midori/midori-websettings.c:616 +#: ../midori/midori-websettings.c:575 msgid "Save downloaded files to:" msgstr "Uložiť stiahnuté súbory do:" -#: ../midori/midori-websettings.c:617 +#: ../midori/midori-websettings.c:576 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:625 +#: ../midori/midori-websettings.c:584 msgid "Text Editor" msgstr "Textový editor" -#: ../midori/midori-websettings.c:626 +#: ../midori/midori-websettings.c:585 msgid "An external text editor" msgstr "Externý textový editor" -#: ../midori/midori-websettings.c:641 +#: ../midori/midori-websettings.c:600 msgid "News Aggregator" msgstr "Čítačka RSS" -#: ../midori/midori-websettings.c:642 +#: ../midori/midori-websettings.c:601 msgid "An external news aggregator" msgstr "Externá čítačka správ RSS" -#: ../midori/midori-websettings.c:650 +#: ../midori/midori-websettings.c:609 msgid "Location entry Search" msgstr "Vyhľadávanie v adresnom riadku" -#: ../midori/midori-websettings.c:651 +#: ../midori/midori-websettings.c:610 msgid "The search to perform inside the location entry" msgstr "Vyhľadávanie použité v riadku s adresou" -#: ../midori/midori-websettings.c:659 +#: ../midori/midori-websettings.c:618 msgid "Preferred Encoding" msgstr "Preferované kódovanie" -#: ../midori/midori-websettings.c:660 +#: ../midori/midori-websettings.c:619 msgid "The preferred character encoding" msgstr "Preferované kódovanie znakov" -#: ../midori/midori-websettings.c:670 +#: ../midori/midori-websettings.c:629 msgid "Always Show Tabbar" msgstr "Vždy zobrazovať karty" -#: ../midori/midori-websettings.c:671 +#: ../midori/midori-websettings.c:630 msgid "Always show the tabbar" msgstr "Vždy zobrazí panel kariet" -#: ../midori/midori-websettings.c:684 +#: ../midori/midori-websettings.c:638 msgid "Close Buttons on Tabs" msgstr "Zatváracie tlačidlá na kartách" -#: ../midori/midori-websettings.c:685 +#: ../midori/midori-websettings.c:639 msgid "Whether tabs have close buttons" msgstr "Či zobraziť zatváracie tlačidlá na kartách" -#: ../midori/midori-websettings.c:710 +#: ../midori/midori-websettings.c:664 msgid "Open new pages in:" msgstr "Otvárať nové stránky v:" -#: ../midori/midori-websettings.c:711 +#: ../midori/midori-websettings.c:665 msgid "Where to open new pages" msgstr "Kde sa budú otvárať nové stránky" -#: ../midori/midori-websettings.c:720 +#: ../midori/midori-websettings.c:674 msgid "Middle click opens Selection" msgstr "Kliknutím prostredného. tlačítka otvoriť vybraný text" -#: ../midori/midori-websettings.c:721 +#: ../midori/midori-websettings.c:675 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:729 +#: ../midori/midori-websettings.c:683 msgid "Open tabs in the background" msgstr "Otvárať karty na pozadí" -#: ../midori/midori-websettings.c:730 +#: ../midori/midori-websettings.c:684 msgid "Whether to open new tabs in the background" msgstr "Či otvorené karty otvárať na pozadí" -#: ../midori/midori-websettings.c:738 +#: ../midori/midori-websettings.c:692 msgid "Open Tabs next to Current" msgstr "Otvoriť karty vedľa aktívnej" -#: ../midori/midori-websettings.c:739 +#: ../midori/midori-websettings.c:693 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Či novú kartu otvárať vedľa aktívnej" -#: ../midori/midori-websettings.c:747 +#: ../midori/midori-websettings.c:701 msgid "Open popups in tabs" msgstr "Otvárať vyskakujúce okná na kartách" -#: ../midori/midori-websettings.c:748 +#: ../midori/midori-websettings.c:702 msgid "Whether to open popup windows in tabs" msgstr "Či vyskakovacie okno otvárať v novej karte" -#: ../midori/midori-websettings.c:758 ../extensions/statusbar-features.c:134 +#: ../midori/midori-websettings.c:712 ../extensions/statusbar-features.c:131 msgid "Load images automatically" msgstr "Automaticky načítať obrázky" -#: ../midori/midori-websettings.c:759 +#: ../midori/midori-websettings.c:713 msgid "Load and display images automatically" msgstr "Načíta a zobrazí obrázky automaticky" -#: ../midori/midori-websettings.c:766 ../extensions/statusbar-features.c:143 +#: ../midori/midori-websettings.c:720 ../extensions/statusbar-features.c:140 msgid "Enable scripts" msgstr "Povoliť skripty" -#: ../midori/midori-websettings.c:767 +#: ../midori/midori-websettings.c:721 msgid "Enable embedded scripting languages" msgstr "Povolí vložené skriptové jazyky" -#: ../midori/midori-websettings.c:774 ../extensions/statusbar-features.c:154 +#: ../midori/midori-websettings.c:728 ../extensions/statusbar-features.c:149 msgid "Enable Netscape plugins" msgstr "Povoliť pluginy z Netscape (Mozilly)" -#: ../midori/midori-websettings.c:775 +#: ../midori/midori-websettings.c:729 msgid "Enable embedded Netscape plugin objects" msgstr "Povolí pluginové objekty prehliadača Netscape (Mozilla)" -#: ../midori/midori-websettings.c:790 +#: ../midori/midori-websettings.c:749 msgid "Enable Spell Checking" msgstr "Povoliť kontrolu pravopisu" -#: ../midori/midori-websettings.c:791 +#: ../midori/midori-websettings.c:750 msgid "Enable spell checking while typing" msgstr "Povolí kontrolu pravopisu pri písaní" -#: ../midori/midori-websettings.c:797 +#: ../midori/midori-websettings.c:756 msgid "Enable HTML5 database support" msgstr "Povoliť podporu databázy HTML5" -#: ../midori/midori-websettings.c:798 +#: ../midori/midori-websettings.c:757 msgid "Whether to enable HTML5 database support" msgstr "Či povoliť podporu databázy HTML5" -#: ../midori/midori-websettings.c:804 +#: ../midori/midori-websettings.c:763 msgid "Enable HTML5 local storage support" msgstr "Povoliť miestne úložisko pre HTML5" -#: ../midori/midori-websettings.c:805 +#: ../midori/midori-websettings.c:764 msgid "Whether to enable HTML5 local storage support" msgstr "Či povoliť miestne úložisko dát pre HTML5" -#: ../midori/midori-websettings.c:811 +#: ../midori/midori-websettings.c:770 msgid "Enable offline web application cache" msgstr "Povoliť cache pre offline aplikácie" -#: ../midori/midori-websettings.c:812 +#: ../midori/midori-websettings.c:771 msgid "Whether to enable offline web application cache" msgstr "Či povoliť používanie vyrovnávacej pamäte pre offline aplikácie" -#: ../midori/midori-websettings.c:828 +#: ../midori/midori-websettings.c:787 msgid "Flash window on background tabs" msgstr "Zablysnúť oknom prehliadača pri kartách na pozadí" -#: ../midori/midori-websettings.c:829 +#: ../midori/midori-websettings.c:788 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:837 -msgid "Enable WebGL support" -msgstr "Povoliť podporu WebGL" - -#: ../midori/midori-websettings.c:838 -msgid "Allow websites to use OpenGL rendering" -msgstr "Povoliť webovým stránkam používať vykresľovanie pomocou OpenGL" - -#: ../midori/midori-websettings.c:864 +#: ../midori/midori-websettings.c:803 msgid "Zoom Text and Images" msgstr "Zväčšovať text aj obrázky" -#: ../midori/midori-websettings.c:865 +#: ../midori/midori-websettings.c:804 msgid "Whether to zoom text and images" msgstr "Či upravovať text aj obrázky pri menení veľkosti" -#: ../midori/midori-websettings.c:880 +#: ../midori/midori-websettings.c:819 msgid "Find inline while typing" msgstr "Hľadať pri písaní" -#: ../midori/midori-websettings.c:881 +#: ../midori/midori-websettings.c:820 msgid "Whether to automatically find inline while typing" msgstr "Či hľadať text pri písaní" -#: ../midori/midori-websettings.c:896 +#: ../midori/midori-websettings.c:835 msgid "Kinetic scrolling" msgstr "Kinetické rolovanie" -#: ../midori/midori-websettings.c:897 +#: ../midori/midori-websettings.c:836 msgid "Whether scrolling should kinetically move according to speed" msgstr "Či naklonením zariadenia rolovať" -#: ../midori/midori-websettings.c:905 +#: ../midori/midori-websettings.c:844 msgid "Delete old Cookies after:" msgstr "Zmazať staré cookies po:" -#: ../midori/midori-websettings.c:906 +#: ../midori/midori-websettings.c:845 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:922 +#: ../midori/midori-websettings.c:861 msgid "Only accept Cookies from sites you visit" msgstr "Prijať cookies len z navštívených stránok" -#: ../midori/midori-websettings.c:923 +#: ../midori/midori-websettings.c:862 msgid "Block cookies sent by third-party websites" msgstr "Zablokovať cookies odoslané stránkami tretích strán" -#: ../midori/midori-websettings.c:937 +#: ../midori/midori-websettings.c:876 msgid "Delete pages from history after:" msgstr "Zmazať stránky z histórie po:" -#: ../midori/midori-websettings.c:938 +#: ../midori/midori-websettings.c:877 msgid "The maximum number of days to save the history for" msgstr "Maximálny počet dní, do ktorých sú cookies platné" -#: ../midori/midori-websettings.c:953 +#: ../midori/midori-websettings.c:892 msgid "Proxy server" msgstr "Proxy server" -#: ../midori/midori-websettings.c:954 +#: ../midori/midori-websettings.c:893 msgid "The type of proxy server to use" msgstr "Typ proxy servera" -#: ../midori/midori-websettings.c:963 +#: ../midori/midori-websettings.c:902 msgid "HTTP Proxy Server" msgstr "HTTP proxy server" -#: ../midori/midori-websettings.c:964 +#: ../midori/midori-websettings.c:903 msgid "The proxy server used for HTTP connections" msgstr "Nastavenie proxy serveru pre HTTP spojenie" -#: ../midori/midori-websettings.c:979 +#: ../midori/midori-websettings.c:918 msgid "Port" msgstr "Port" -#: ../midori/midori-websettings.c:980 +#: ../midori/midori-websettings.c:919 msgid "The proxy server port used for HTTP connections" msgstr "Nastavenie portu proxy servera pre HTTP spojenie" -#: ../midori/midori-websettings.c:998 +#: ../midori/midori-websettings.c:937 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:1015 +#: ../midori/midori-websettings.c:954 msgid "Identify as" msgstr "Identifikovať sa ako" -#: ../midori/midori-websettings.c:1016 +#: ../midori/midori-websettings.c:955 msgid "What to identify as to web pages" msgstr "Ako sa hlási webovým stránkam" -#: ../midori/midori-websettings.c:1032 +#: ../midori/midori-websettings.c:971 msgid "Identification string" msgstr "Identifikačný reťazec" -#: ../midori/midori-websettings.c:1033 +#: ../midori/midori-websettings.c:972 msgid "The application identification string" msgstr "Identifikačný reťazec aplikácie" -#: ../midori/midori-websettings.c:1049 +#: ../midori/midori-websettings.c:988 msgid "Preferred languages" msgstr "Uprednostňované jazyky" -#: ../midori/midori-websettings.c:1050 +#: ../midori/midori-websettings.c:989 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\"" @@ -1601,298 +1585,249 @@ 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:1065 +#: ../midori/midori-websettings.c:1004 msgid "Clear private data" msgstr "Odstrániť súkromné údaje" -#: ../midori/midori-websettings.c:1066 +#: ../midori/midori-websettings.c:1005 msgid "The private data selected for deletion" msgstr "Osobné dáta boli označené k vymazaniu" -#: ../midori/midori-websettings.c:1081 +#: ../midori/midori-websettings.c:1020 msgid "Clear data" msgstr "Vymazať dáta" -#: ../midori/midori-websettings.c:1082 +#: ../midori/midori-websettings.c:1021 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:1131 +#: ../midori/midori-websettings.c:1054 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:1133 +#: ../midori/midori-websettings.c:1056 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:1147 +#: ../midori/midori-websettings.c:1070 msgid "Always use my font choices" msgstr "Vždy použiť môj výber písma" -#: ../midori/midori-websettings.c:1148 +#: ../midori/midori-websettings.c:1071 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:1375 +#: ../midori/midori-view.c:1343 #, 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:1379 ../midori/midori-view.c:1413 +#: ../midori/midori-view.c:1347 ../midori/midori-view.c:1377 msgid "_Deny" msgstr "_Zakázať" -#: ../midori/midori-view.c:1379 ../midori/midori-view.c:1413 +#: ../midori/midori-view.c:1347 ../midori/midori-view.c:1377 msgid "_Allow" msgstr "_Povoliť" -#: ../midori/midori-view.c:1408 +#: ../midori/midori-view.c:1373 #, c-format msgid "%s wants to know your location." msgstr "%s požaduje zistenie Vašej polohy." -#: ../midori/midori-view.c:1502 +#: ../midori/midori-view.c:1461 #, c-format msgid "Error - %s" msgstr "Chyba - %s" -#: ../midori/midori-view.c:1503 +#: ../midori/midori-view.c:1462 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "Stránka '%s' sa nedá načítať." -#: ../midori/midori-view.c:1505 +#: ../midori/midori-view.c:1464 msgid "Try again" msgstr "Skúsiť znovu" -#: ../midori/midori-view.c:1703 ../midori/midori-view.c:2625 +#: ../midori/midori-view.c:1626 ../midori/midori-view.c:2471 #, c-format msgid "Send a message to %s" msgstr "Poslať %s správu" -#: ../midori/midori-view.c:2455 ../midori/midori-view.c:2781 +#: ../midori/midori-view.c:2313 ../midori/midori-view.c:2624 msgid "Inspect _Element" msgstr "Preskúmať _prvok" -#: ../midori/midori-view.c:2507 +#: ../midori/midori-view.c:2363 msgid "Open Link in New _Tab" msgstr "Otvoriť odkaz na novej _karte" -#: ../midori/midori-view.c:2511 +#: ../midori/midori-view.c:2367 msgid "Open Link in _Foreground Tab" msgstr "Otvoriť odkaz v novej _karte" -#: ../midori/midori-view.c:2512 +#: ../midori/midori-view.c:2368 msgid "Open Link in _Background Tab" msgstr "Otvoriť odkaz v novej karte na pozadí" -#: ../midori/midori-view.c:2515 +#: ../midori/midori-view.c:2371 msgid "Open Link in New _Window" msgstr "Otvoriť odkaz v novom _okne" -#: ../midori/midori-view.c:2518 +#: ../midori/midori-view.c:2374 msgid "Open Link as Web A_pplication" msgstr "Otvoriť odkaz ako _webovú aplikáciu" -#: ../midori/midori-view.c:2523 +#: ../midori/midori-view.c:2377 msgid "Copy Link de_stination" msgstr "Kopírovať _cieľ odkazu" -#: ../midori/midori-view.c:2539 +#: ../midori/midori-view.c:2389 msgid "Open _Image in New Tab" msgstr "Otvoriť _obrázok na novej karte" -#: ../midori/midori-view.c:2542 +#: ../midori/midori-view.c:2392 msgid "Copy Image _Address" msgstr "Kopírovať _adresu obrázka" -#: ../midori/midori-view.c:2545 +#: ../midori/midori-view.c:2395 msgid "Save I_mage" msgstr "Uložiť _obrázok" -#: ../midori/midori-view.c:2548 -msgid "Open in Image _Viewer" -msgstr "Otvoriť obrázok v prehliadači _obrázkov" - -#: ../midori/midori-view.c:2555 +#: ../midori/midori-view.c:2402 msgid "Copy Video _Address" msgstr "Kopírovať _adresu videa" -#: ../midori/midori-view.c:2558 +#: ../midori/midori-view.c:2405 msgid "Save _Video" msgstr "Uložiť _video" -#: ../midori/midori-view.c:2558 +#: ../midori/midori-view.c:2405 msgid "Download _Video" msgstr "Stiahnuť v_ideo" -#: ../midori/midori-view.c:2584 +#: ../midori/midori-view.c:2431 msgid "Search _with" msgstr "Hľadať _pomocou" -#: ../midori/midori-view.c:2616 +#: ../midori/midori-view.c:2463 msgid "_Search the Web" msgstr "_Hľadať na webe" -#: ../midori/midori-view.c:2633 +#: ../midori/midori-view.c:2479 msgid "Open Address in New _Tab" msgstr "Otvoriť adresu v novej karte" -#: ../midori/midori-view.c:2686 -msgid "Open _Frame in New Tab" -msgstr "Otvoriť _rám na novej karte" - -#: ../midori/midori-view.c:2946 +#: ../midori/midori-view.c:2775 msgid "Open or download file" msgstr "Otvoriť alebo stiahnuť súbor" -#: ../midori/midori-view.c:2966 +#: ../midori/midori-view.c:2794 #, c-format msgid "File Type: '%s'" msgstr "Typ súboru: '%s'" -#: ../midori/midori-view.c:2968 +#: ../midori/midori-view.c:2796 #, c-format msgid "File Type: %s ('%s')" msgstr "Typ súboru: %s ('%s')" -#: ../midori/midori-view.c:2972 -#, c-format -msgid "File Name: %s" -msgstr "Typ súboru: %s" - -#: ../midori/midori-view.c:2999 +#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" +#: ../midori/midori-view.c:2813 #, c-format msgid "Open %s" msgstr "Otvoriť %s" -#: ../midori/midori-view.c:3622 +#: ../midori/midori-view.c:3405 #, c-format msgid "Inspect page - %s" msgstr "Inšpekcia stránky - %s" -#: ../midori/midori-view.c:3969 +#: ../midori/midori-view.c:3692 msgid "Speed Dial" msgstr "Rýchly prístup" -#: ../midori/midori-view.c:3970 ../midori/midori-view.c:4066 +#: ../midori/midori-view.c:3693 ../midori/midori-view.c:3789 msgid "Click to add a shortcut" msgstr "Kliknite pre pridanie odkazu" -#: ../midori/midori-view.c:3971 +#: ../midori/midori-view.c:3694 msgid "Enter shortcut address" msgstr "Zadajte adresu skratky" -#: ../midori/midori-view.c:3972 +#: ../midori/midori-view.c:3695 msgid "Enter shortcut title" msgstr "Zadajte titulok skratky" -#: ../midori/midori-view.c:3973 +#: ../midori/midori-view.c:3696 msgid "Are you sure you want to delete this shortcut?" msgstr "Naozaj chcete zmazať túto záložku?" -#: ../midori/midori-view.c:4135 +#: ../midori/midori-view.c:3860 #, c-format msgid "No documentation installed" msgstr "Dokumentácia nie je nainštalovaná" -#: ../midori/midori-view.c:4211 -msgid "Midori doesn't store any personal data:" -msgstr "Midori neukladá žiadne osobné dáta:" - -#: ../midori/midori-view.c:4212 -msgid "No history or web cookies are being saved." -msgstr "Neukladá sa história ani cookies." - -#: ../midori/midori-view.c:4213 -msgid "Extensions are disabled." -msgstr "Rozšírenia sú vypnuté." - -#: ../midori/midori-view.c:4214 -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:4215 -msgid "Midori prevents websites from tracking the user:" -msgstr "Midori odmieta sledovanie používateľa zo stránok:" - -#: ../midori/midori-view.c:4216 -msgid "Referrer URLs are stripped down to the hostname." -msgstr "Z URL sú odstránené údaje o odkazoch." - -#: ../midori/midori-view.c:4217 -msgid "DNS prefetching is disabled." -msgstr "Prednačítanie DNS záznamov je zakázané." - -#: ../midori/midori-view.c:4218 -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:4219 -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:4289 +#: ../midori/midori-view.c:3910 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:4339 +#: ../midori/midori-view.c:3955 msgid "Page loading delayed" msgstr "Načítanie stránky oneskorené" -#: ../midori/midori-view.c:4340 +#: ../midori/midori-view.c:3956 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:4341 +#: ../midori/midori-view.c:3957 msgid "Load Page" msgstr "Načítať stránku" -#: ../midori/midori-view.c:4507 +#: ../midori/midori-view.c:4097 msgid "Blank page" msgstr "Prázdnu stránku" -#: ../midori/midori-view.c:4769 +#: ../midori/midori-view.c:4361 msgid "_Duplicate Tab" msgstr "Z_dvojiť kartu" -#: ../midori/midori-view.c:4774 +#: ../midori/midori-view.c:4366 msgid "Show Tab _Label" msgstr "Zobraziť _popisok karty" -#: ../midori/midori-view.c:4774 +#: ../midori/midori-view.c:4366 msgid "Show Tab _Icon Only" msgstr "Zobraziť len _ikonu karty" -#: ../midori/midori-view.c:4780 +#: ../midori/midori-view.c:4372 msgid "Close ot_her Tabs" msgstr "_Zatvorí ostatné karty" #. i18n: word stem of "previous page" type links, case is not important -#: ../midori/midori-view.c:5593 +#: ../midori/midori-view.c:4989 msgid "previous" msgstr "predchádzajúce" #. i18n: word stem of "next page" type links, case is not important -#: ../midori/midori-view.c:5612 +#: ../midori/midori-view.c:5008 msgid "next" msgstr "nasledujúce" -#: ../midori/midori-view.c:5625 +#: ../midori/midori-view.c:5021 msgid "Print background images" msgstr "Tlačiť obrázky na pozadí" -#: ../midori/midori-view.c:5626 +#: ../midori/midori-view.c:5022 msgid "Whether background images should be printed" msgstr "Či tlačiť obrázky na pozadí" -#: ../midori/midori-view.c:5658 +#: ../midori/midori-view.c:5054 msgid "Features" msgstr "Funkcie" @@ -1959,70 +1894,70 @@ msgid "Whether scripts are allowed to open popup windows automatically" msgstr "Či skripty môžu otvárať vyskakovacie okná automaticky" #. Page "Interface" -#: ../midori/midori-preferences.c:416 +#: ../midori/midori-preferences.c:409 msgid "Browsing" msgstr "Prehliadanie" #. Page "Network" -#: ../midori/midori-preferences.c:456 +#: ../midori/midori-preferences.c:447 msgid "Network" msgstr "Sieť" -#: ../midori/midori-preferences.c:463 +#: ../midori/midori-preferences.c:454 msgid "Hostname" msgstr "Počítač" -#: ../midori/midori-preferences.c:487 +#: ../midori/midori-preferences.c:478 msgid "MB" msgstr "MB" -#: ../midori/midori-searchaction.c:902 +#: ../midori/midori-searchaction.c:907 msgid "Add search engine" msgstr "Pridať vyhľadávací modul" -#: ../midori/midori-searchaction.c:902 +#: ../midori/midori-searchaction.c:907 msgid "Edit search engine" msgstr "Upraviť vyhľadávací modul" -#: ../midori/midori-searchaction.c:931 +#: ../midori/midori-searchaction.c:936 msgid "_Name:" msgstr "_Názov:" -#: ../midori/midori-searchaction.c:947 +#: ../midori/midori-searchaction.c:952 msgid "_Description:" msgstr "_Poznámka:" -#: ../midori/midori-searchaction.c:981 +#: ../midori/midori-searchaction.c:985 msgid "_Icon:" msgstr "_Ikona:" -#: ../midori/midori-searchaction.c:995 +#: ../midori/midori-searchaction.c:999 msgid "_Token:" msgstr "_Token:" -#: ../midori/midori-searchaction.c:1295 +#: ../midori/midori-searchaction.c:1299 msgid "Manage Search Engines" msgstr "Správca vyhľadávacích modulov" -#: ../midori/midori-searchaction.c:1395 +#: ../midori/midori-searchaction.c:1399 msgid "Use as _default" msgstr "Použiť ako _predvolený" -#: ../midori/sokoke.c:354 +#: ../midori/sokoke.c:406 msgid "Open with" msgstr "Otvoriť pomocou" -#: ../midori/sokoke.c:362 +#: ../midori/sokoke.c:414 #, c-format msgid "Choose an application or command to open \"%s\":" msgstr "Vyberte aplikáciu alebo príkaz pre otvorenie \"%s\":" -#: ../midori/sokoke.c:403 ../midori/sokoke.c:413 ../midori/sokoke.c:441 -#: ../midori/sokoke.c:470 ../midori/sokoke.c:484 +#: ../midori/sokoke.c:455 ../midori/sokoke.c:465 ../midori/sokoke.c:493 +#: ../midori/sokoke.c:522 ../midori/sokoke.c:536 msgid "Could not run external program." msgstr "Nie je možné spustiť externý program" -#: ../midori/sokoke.c:1595 +#: ../midori/sokoke.c:1673 #, c-format msgid "%d hour" msgid_plural "%d hours" @@ -2030,7 +1965,7 @@ msgstr[0] "%d hodín" msgstr[1] "%d hodina" msgstr[2] "%d hodiny" -#: ../midori/sokoke.c:1596 +#: ../midori/sokoke.c:1674 #, c-format msgid "%d minute" msgid_plural "%d minutes" @@ -2038,7 +1973,7 @@ msgstr[0] "%d minút" msgstr[1] "%d minúta" msgstr[2] "%d minúty" -#: ../midori/sokoke.c:1597 +#: ../midori/sokoke.c:1675 #, c-format msgid "%d second" msgid_plural "%d seconds" @@ -2047,50 +1982,50 @@ msgstr[1] "%d sekunda" msgstr[2] "%d sekundy" #. i18n: Download tooltip (size): 4KB of 43MB -#: ../midori/sokoke.c:1605 ../panels/midori-transfers.c:268 +#: ../midori/sokoke.c:1683 ../panels/midori-transfers.c:267 #, c-format msgid "%s of %s" msgstr "%s z %s" #. i18n: Unknown number of bytes, used for transfer rate like ?B/s -#: ../midori/sokoke.c:1614 +#: ../midori/sokoke.c:1692 msgid "?B" msgstr "?B" #. i18n: Download tooltip (transfer rate): (130KB/s) -#: ../midori/sokoke.c:1617 +#: ../midori/sokoke.c:1695 #, c-format msgid " (%s/s)" msgstr " (%s/s)" #. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning -#: ../midori/sokoke.c:1634 +#: ../midori/sokoke.c:1712 #, c-format msgid " - %s remaining" msgstr " - %s ostáva" #. i18n: A panel at the bottom, to search text in pages -#: ../toolbars/midori-findbar.c:291 +#: ../toolbars/midori-findbar.c:264 msgid "_Inline Find:" msgstr "_Rýchle hľadanie" -#: ../toolbars/midori-findbar.c:317 +#: ../toolbars/midori-findbar.c:291 msgid "Previous" msgstr "Predchádzajúce" -#: ../toolbars/midori-findbar.c:323 +#: ../toolbars/midori-findbar.c:297 msgid "Next" msgstr "Ďalšie" -#: ../toolbars/midori-findbar.c:327 +#: ../toolbars/midori-findbar.c:301 msgid "Match Case" msgstr "Rozlišovať veľkosť písma" -#: ../toolbars/midori-findbar.c:336 +#: ../toolbars/midori-findbar.c:310 msgid "Highlight Matches" msgstr "Zvýrazniť" -#: ../toolbars/midori-findbar.c:347 +#: ../toolbars/midori-findbar.c:321 msgid "Close Findbar" msgstr "Zatvoriť vyhľadávaciu lištu" @@ -2116,60 +2051,56 @@ msgstr "" "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 +#: ../toolbars/midori-transferbar.c:331 ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "Zmazať všetko" -#: ../toolbars/midori-transferbar.c:371 ../toolbars/midori-transferbar.c:373 +#: ../toolbars/midori-transferbar.c:368 ../toolbars/midori-transferbar.c:370 msgid "Some files are being downloaded" msgstr "Ešte sa sťahujú nejaké súbory" -#: ../toolbars/midori-transferbar.c:377 +#: ../toolbars/midori-transferbar.c:374 msgid "_Quit Midori" msgstr "_Ukončiť Midori" -#: ../toolbars/midori-transferbar.c:379 +#: ../toolbars/midori-transferbar.c:376 msgid "The transfers will be cancelled if Midori quits." msgstr "Ukončením Midori budú prenosy zrušené." -#: ../panels/midori-bookmarks.c:114 +#: ../panels/midori-bookmarks.c:113 msgid "Bookmarks" msgstr "Záložky" -#: ../panels/midori-bookmarks.c:257 +#: ../panels/midori-bookmarks.c:260 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "Záložku sa nepodarilo pridať: %s\n" -#: ../panels/midori-bookmarks.c:435 +#: ../panels/midori-bookmarks.c:440 msgid "Edit the selected bookmark" msgstr "Upraviť vybranú záložku" -#: ../panels/midori-bookmarks.c:443 +#: ../panels/midori-bookmarks.c:448 msgid "Delete the selected bookmark" msgstr "Vymazať označenú záložku" -#: ../panels/midori-bookmarks.c:458 +#: ../panels/midori-bookmarks.c:463 msgid "Add a new folder" msgstr "Pridať nový priečinok" -#: ../panels/midori-bookmarks.c:594 ../panels/midori-history.c:635 +#: ../panels/midori-bookmarks.c:597 ../panels/midori-history.c:579 msgid "Separator" msgstr "Oddeľovač" -#: ../panels/midori-history.c:111 +#: ../panels/midori-history.c:110 msgid "History" msgstr "História" -#: ../panels/midori-history.c:158 ../panels/midori-history.c:189 -msgid "Today" -msgstr "Dnes" - -#: ../panels/midori-history.c:160 ../panels/midori-history.c:191 -msgid "Yesterday" -msgstr "Včera" +#: ../panels/midori-history.c:142 +msgid "A week ago" +msgstr "Pred týždňom" -#: ../panels/midori-history.c:162 ../panels/midori-history.c:186 +#: ../panels/midori-history.c:144 #, c-format msgid "%d day ago" msgid_plural "%d days ago" @@ -2177,28 +2108,27 @@ msgstr[0] "Pred %d dňom" msgstr[1] "Pred %d dňami" msgstr[2] "Pred %d dňami" -#: ../panels/midori-history.c:165 ../panels/midori-history.c:184 -msgid "A week ago" -msgstr "Pred týždňom" +#: ../panels/midori-history.c:147 +msgid "Today" +msgstr "Dnes" -#: ../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" +#: ../panels/midori-history.c:149 +msgid "Yesterday" +msgstr "Včera" -#: ../panels/midori-history.c:360 +#: ../panels/midori-history.c:317 msgid "Are you sure you want to remove all history items?" msgstr "Naozaj si želáte vymazať celú históriu?" -#: ../panels/midori-history.c:407 +#: ../panels/midori-history.c:363 msgid "Bookmark the selected history item" msgstr "Pridať do záložiek vybranú položku histórie" -#: ../panels/midori-history.c:416 +#: ../panels/midori-history.c:372 msgid "Delete the selected history item" msgstr "Odstrániť označenú položku v histórii" -#: ../panels/midori-history.c:424 +#: ../panels/midori-history.c:380 msgid "Clear the entire history" msgstr "Zmazať celú históriu" @@ -2206,11 +2136,11 @@ msgstr "Zmazať celú históriu" msgid "Transfers" msgstr "Prenosy" -#: ../panels/midori-transfers.c:469 +#: ../panels/midori-transfers.c:467 msgid "Open Destination _Folder" msgstr "Otvoriť cieľový _priečinok" -#: ../panels/midori-transfers.c:472 +#: ../panels/midori-transfers.c:470 msgid "Copy Link Loc_ation" msgstr "Kopírovať _umiestnenie" @@ -2236,55 +2166,55 @@ msgstr "Heslo" msgid "_Remember password" msgstr "Zapamätať _heslo" -#: ../katze/katze-throbber.c:949 +#: ../katze/katze-throbber.c:942 #, c-format msgid "Named icon '%s' couldn't be loaded" msgstr "Ikona „%s“ nemôže byť načítaná" -#: ../katze/katze-throbber.c:962 +#: ../katze/katze-throbber.c:955 #, c-format msgid "Stock icon '%s' couldn't be loaded" msgstr "Uložená ikona „%s“ nemôže byť načítaná" -#: ../katze/katze-throbber.c:1042 +#: ../katze/katze-throbber.c:1035 msgid "Animation frames are broken" msgstr "Snímky animácie sú porušené" -#: ../katze/katze-utils.c:445 ../katze/katze-utils.c:879 +#: ../katze/katze-utils.c:439 ../katze/katze-utils.c:873 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Vlastnosť '%s' nie je platná pre %s" -#: ../katze/katze-utils.c:491 ../katze/katze-utils.c:520 +#: ../katze/katze-utils.c:485 ../katze/katze-utils.c:514 #: ../extensions/addons.c:308 msgid "Choose file" msgstr "Vyberte súbor" -#: ../katze/katze-utils.c:506 +#: ../katze/katze-utils.c:500 msgid "Choose folder" msgstr "Vyberte priečinok" -#: ../katze/katze-utils.c:610 +#: ../katze/katze-utils.c:604 msgid "None" msgstr "Žiadne" -#: ../katze/katze-utils.c:725 +#: ../katze/katze-utils.c:719 msgid "1 hour" msgstr "1 hodine" -#: ../katze/katze-utils.c:726 +#: ../katze/katze-utils.c:720 msgid "1 day" msgstr "1 dni" -#: ../katze/katze-utils.c:727 +#: ../katze/katze-utils.c:721 msgid "1 week" msgstr "1 týždni" -#: ../katze/katze-utils.c:728 +#: ../katze/katze-utils.c:722 msgid "1 month" msgstr "1 mesiaci" -#: ../katze/katze-utils.c:729 +#: ../katze/katze-utils.c:723 msgid "1 year" msgstr "1 roku" @@ -2293,11 +2223,11 @@ msgstr "1 roku" msgid "Preferences for %s" msgstr "Predvoľby pre %s" -#: ../extensions/adblock.c:473 +#: ../extensions/adblock.c:434 msgid "Configure Advertisement filters" msgstr "Nastaviť filtre na reklamu" -#: ../extensions/adblock.c:504 +#: ../extensions/adblock.c:465 #, c-format msgid "" "Type the address of a preconfigured filter list in the text entry and click " @@ -2307,27 +2237,27 @@ msgstr "" "\"Pridať\" ju pridáte do zoznamu. Viac pripravených filtrov nájdete na " "adrese %s." -#: ../extensions/adblock.c:882 +#: ../extensions/adblock.c:831 msgid "Edit rule" msgstr "Upraviť pravidlo" -#: ../extensions/adblock.c:896 +#: ../extensions/adblock.c:845 msgid "_Rule:" msgstr "_Pravidlo:" -#: ../extensions/adblock.c:950 +#: ../extensions/adblock.c:899 msgid "Bl_ock image" msgstr "_Blokovať obrázok" -#: ../extensions/adblock.c:955 +#: ../extensions/adblock.c:904 msgid "Bl_ock link" msgstr "_Blokovať odkaz" -#: ../extensions/adblock.c:1670 +#: ../extensions/adblock.c:1495 msgid "Advertisement blocker" msgstr "Blokovač reklamy" -#: ../extensions/adblock.c:1671 +#: ../extensions/adblock.c:1496 msgid "Block advertisements according to a filter list" msgstr "Blokovať reklamy podľa zoznamu filtorv" @@ -2404,37 +2334,37 @@ msgstr "Pridať nový plugin" msgid "Remove selected addon" msgstr "Odstrániť vybraný plugin" -#: ../extensions/addons.c:1696 ../extensions/addons.c:1914 +#: ../extensions/addons.c:1691 ../extensions/addons.c:1909 msgid "User addons" msgstr "Používateľove rozšírenia" -#: ../extensions/addons.c:1826 +#: ../extensions/addons.c:1821 #, c-format msgid "Can't monitor folder '%s': %s" msgstr "Nemôžem sledovať priečinok: '%s': %s" -#: ../extensions/addons.c:1915 +#: ../extensions/addons.c:1910 msgid "Support for userscripts and userstyles" msgstr "Podpora pre userscripts a userstyles" -#: ../extensions/colorful-tabs.c:201 +#: ../extensions/colorful-tabs.c:202 msgid "Colorful Tabs" msgstr "Ofarebné karty" -#: ../extensions/colorful-tabs.c:202 +#: ../extensions/colorful-tabs.c:203 msgid "Tint each tab distinctly" msgstr "Ofarbiť každú kartu samostatne" -#: ../extensions/cookie-manager/cookie-manager-page.c:73 +#: ../extensions/cookie-manager/cookie-manager-page.c:80 #: ../extensions/cookie-manager/main.c:35 msgid "Cookie Manager" msgstr "Správca cookies" -#: ../extensions/cookie-manager/cookie-manager-page.c:103 +#: ../extensions/cookie-manager/cookie-manager-page.c:110 msgid "Delete All" msgstr "Odstrániť všetky" -#: ../extensions/cookie-manager/cookie-manager-page.c:105 +#: ../extensions/cookie-manager/cookie-manager-page.c:112 msgid "" "Deletes all shown cookies. If a filter is set, only those cookies are " "deleted which match the filter." @@ -2442,31 +2372,31 @@ 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:120 +#: ../extensions/cookie-manager/cookie-manager-page.c:127 msgid "Expand All" msgstr "Rozbaliť všetko" -#: ../extensions/cookie-manager/cookie-manager-page.c:127 +#: ../extensions/cookie-manager/cookie-manager-page.c:134 msgid "Collapse All" msgstr "Zbaliť všetko" -#: ../extensions/cookie-manager/cookie-manager-page.c:572 +#: ../extensions/cookie-manager/cookie-manager-page.c:576 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:574 +#: ../extensions/cookie-manager/cookie-manager-page.c:578 msgid "Question" msgstr "Otázka" -#: ../extensions/cookie-manager/cookie-manager-page.c:583 +#: ../extensions/cookie-manager/cookie-manager-page.c:587 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:671 +#: ../extensions/cookie-manager/cookie-manager-page.c:675 msgid "At the end of the session" msgstr "Na konci sedenia" -#: ../extensions/cookie-manager/cookie-manager-page.c:674 +#: ../extensions/cookie-manager/cookie-manager-page.c:678 #, c-format msgid "" "Host: %s\n" @@ -2483,15 +2413,15 @@ msgstr "" "Bezpečný: %s\n" "Vyprší: %s" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:684 msgid "Yes" msgstr "Áno" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:684 msgid "No" msgstr "Nie" -#: ../extensions/cookie-manager/cookie-manager-page.c:694 +#: ../extensions/cookie-manager/cookie-manager-page.c:698 #, c-format msgid "" "Domain: %s\n" @@ -2500,23 +2430,23 @@ msgstr "" "Doména: %s\n" "Cookies: %d" -#: ../extensions/cookie-manager/cookie-manager-page.c:1024 +#: ../extensions/cookie-manager/cookie-manager-page.c:1028 msgid "Name" msgstr "Názov" -#: ../extensions/cookie-manager/cookie-manager-page.c:1077 +#: ../extensions/cookie-manager/cookie-manager-page.c:1081 msgid "_Expand All" msgstr "_Rozbaliť všetko" -#: ../extensions/cookie-manager/cookie-manager-page.c:1085 +#: ../extensions/cookie-manager/cookie-manager-page.c:1089 msgid "_Collapse All" msgstr "_Zbaliť všetko" -#: ../extensions/cookie-manager/cookie-manager-page.c:1139 +#: ../extensions/cookie-manager/cookie-manager-page.c:1142 msgid "Filter:" msgstr "Filter:" -#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +#: ../extensions/cookie-manager/cookie-manager-page.c:1147 msgid "" "Enter a filter string to show only cookies whose name or domain field match " "the entered filter" @@ -2620,71 +2550,45 @@ msgstr "Panel kanálov" msgid "Read Atom/ RSS feeds" msgstr "Čítač Atom/RSS kanálov" -#: ../extensions/formhistory/formhistory.c:39 +#: ../extensions/formhistory.c:143 #, c-format msgid "Failed to add form value: %s\n" msgstr "Nepodarilo sa pridať položku formulára: %s\n" -#: ../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 +#: ../extensions/formhistory.c:295 msgid "Toggle form history state" msgstr "Stav prepnutia histórie formulárov" -#: ../extensions/formhistory/formhistory.c:438 +#: ../extensions/formhistory.c:296 msgid "Activate or deactivate form history for the current tab." msgstr "Aktivovať alebo deaktivovať históriu formulárov pre aktuálnu kartu." -#: ../extensions/formhistory/formhistory.c:549 -#: ../extensions/formhistory/formhistory.c:553 +#: ../extensions/formhistory.c:432 ../extensions/formhistory.c:436 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Nepodarilo sa spustiť databázový príkaz: %s\n" -#: ../extensions/formhistory/formhistory.c:629 -msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab" +#: ../extensions/formhistory.c:511 +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" +"aktivovať len históriu formulárov cez horúci kláves (Ctrl+Shift+F) na karte" -#: ../extensions/formhistory/formhistory.c:668 -msgid "Form history filler" -msgstr "Ukladanie hodnôt vo formulári" - -#: ../extensions/formhistory/formhistory.c:669 +#: ../extensions/formhistory.c:570 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 +#: ../extensions/formhistory.c:574 #, c-format -msgid "Failed to select suggestions\n" -msgstr "Nepodarilo sa vybrať návrh\n" +msgid "Not available: %s" +msgstr "Nie je k dispozícii: %s" + +#: ../extensions/formhistory.c:575 +msgid "Resource files not installed" +msgstr "Nie sú nainštalované súbory so zdrojom" + +#: ../extensions/formhistory.c:581 +msgid "Form history filler" +msgstr "Ukladanie hodnôt vo formulári" #: ../extensions/history-list.vala:197 msgid "There are no unvisited tabs" @@ -2759,15 +2663,15 @@ msgstr "Obnoviť stránku alebo zastaviť načítanie" msgid "Customize Keyboard shortcuts" msgstr "Nastavenie klávesových skratiek" -#: ../extensions/shortcuts.c:283 -msgid "Customize Sh_ortcuts…" -msgstr "Nastavenie skratky…" +#: ../extensions/shortcuts.c:285 +msgid "Customize Sh_ortcuts..." +msgstr "Nastavenie skratky..." -#: ../extensions/shortcuts.c:320 +#: ../extensions/shortcuts.c:322 msgid "Shortcuts" msgstr "Skratky" -#: ../extensions/shortcuts.c:321 +#: ../extensions/shortcuts.c:323 msgid "View and edit keyboard shortcuts" msgstr "Zobraziť a upraviť klávesové skratky" @@ -2779,35 +2683,35 @@ msgstr "Hodiny v stavovom riadku" msgid "Display date and time in the statusbar" msgstr "Zobrazuje dátum a čas v stavovom riadku" -#: ../extensions/statusbar-features.c:131 +#: ../extensions/statusbar-features.c:128 msgid "Images" msgstr "Obrázky" -#: ../extensions/statusbar-features.c:140 +#: ../extensions/statusbar-features.c:137 msgid "Scripts" msgstr "Skritpy" -#: ../extensions/statusbar-features.c:151 +#: ../extensions/statusbar-features.c:146 msgid "Netscape plugins" msgstr "Pluginy Netscape" -#: ../extensions/statusbar-features.c:199 +#: ../extensions/statusbar-features.c:192 msgid "Statusbar Features" msgstr "Rožšírenie stavového riadka" -#: ../extensions/statusbar-features.c:200 +#: ../extensions/statusbar-features.c:193 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:593 ../extensions/tab-panel.c:680 +#: ../extensions/tab-panel.c:596 ../extensions/tab-panel.c:683 msgid "Tab Panel" msgstr "Panel záložiek" -#: ../extensions/tab-panel.c:663 +#: ../extensions/tab-panel.c:666 msgid "T_ab Panel" msgstr "Panel _záložiek" -#: ../extensions/tab-panel.c:681 +#: ../extensions/tab-panel.c:684 msgid "Show tabs in a vertical panel" msgstr "Zobraziť karty vo vertikálnom panely" @@ -2823,35 +2727,35 @@ msgstr "Nové karty nebudú mať popisok" msgid "Customize Toolbar" msgstr "Upraviť panel" -#: ../extensions/toolbar-editor.c:409 +#: ../extensions/toolbar-editor.c:413 msgid "" -"Select items to be displayed on the toolbar. Items can be reordered by drag " +"Select items to be displayed on the toolbar. Items can be reodered 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:425 +#: ../extensions/toolbar-editor.c:429 msgid "Available Items" msgstr "Dostupné položky" -#: ../extensions/toolbar-editor.c:446 +#: ../extensions/toolbar-editor.c:450 msgid "Displayed Items" msgstr "Zobrazené položky" -#: ../extensions/toolbar-editor.c:581 -msgid "Customize _Toolbar…" -msgstr "Upraviť _panel…" +#: ../extensions/toolbar-editor.c:585 +msgid "Customize _Toolbar..." +msgstr "Upraviť _panel..." -#: ../extensions/toolbar-editor.c:597 -msgid "_Customize…" -msgstr "_Vlastný…" +#: ../extensions/toolbar-editor.c:601 +msgid "_Customize..." +msgstr "_Vlastný..." -#: ../extensions/toolbar-editor.c:627 +#: ../extensions/toolbar-editor.c:631 msgid "Toolbar Editor" msgstr "Editor panelu nástrojov" -#: ../extensions/toolbar-editor.c:628 +#: ../extensions/toolbar-editor.c:632 msgid "Easily edit the toolbar layout" msgstr "Umožňuje jednoducho zmeniť panel" @@ -2859,33 +2763,6 @@ msgstr "Umožňuje jednoducho zmeniť panel" msgid "Cache HTTP communication on disk" msgstr "Kešuje (ukladá) HTTP komunikáciu na disk" -#~ msgid "The bookmarks couldn't be saved. %s" -#~ msgstr "Záložky sa nepodarilo uložiť. %s" - -#~ 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" @@ -2961,14 +2838,14 @@ msgstr "Kešuje (ukladá) HTTP komunikáciu na disk" #~ 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 "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 "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 "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" @@ -3069,7 +2946,7 @@ msgstr "Kešuje (ukladá) HTTP komunikáciu na disk" #~ msgid "Enforce a video dot density of 96 DPI" #~ msgstr "Vnúti rozlíšenie obrazu 96 bodov na palec" -#~ msgid "Configure _Advertisement filters…" +#~ msgid "Configure _Advertisement filters..." #~ msgstr "_Blokovanie reklamy" #~ msgid "Switch tabs with Ctrl+Tab sorted by last usage" @@ -3159,6 +3036,9 @@ msgstr "Kešuje (ukladá) HTTP komunikáciu na disk" #~ msgid "%s of %s, %s/s" #~ msgstr "%s z %s" +#~ msgid "_Form History" +#~ msgstr "_História" + #~ msgid "Next Tab (History List)" #~ msgstr "Karta histórie" diff --git a/po/sr.po b/po/sr.po index 3883b247..2c84d3e5 100644 --- a/po/sr.po +++ b/po/sr.po @@ -2,361 +2,315 @@ # Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER # This file is distributed under the same license as the midori package. # Милош Поповић 2009 -# Мирослав Николић , 2012. +# msgid "" msgstr "" "Project-Id-Version: midori 0.1.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-04 17:06+0000\n" -"PO-Revision-Date: 2012-06-08 05:37+0200\n" -"Last-Translator: Мирослав Николић \n" -"Language-Team: Serbian \n" -"Language: sr\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" -"X-Generator: Virtaal 0.7.1\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 "Browse the Web" -msgstr "Прегледајте веб" +msgid "Lightweight web browser" +msgstr "Једноставан Интернет прегледник" -#: ../data/midori.desktop.in.h:2 -msgid "Internet;WWW;Explorer" -msgstr "Интернет;ВВВ;Истраживач" - -#: ../data/midori.desktop.in.h:3 ../midori/main.c:1970 ../midori/main.c:1994 -#: ../midori/main.c:2008 ../midori/midori-websettings.c:313 +#: ../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 "Мидори" -#: ../data/midori.desktop.in.h:4 +#: ../data/midori.desktop.in.h:3 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:4228 -msgid "Private Browsing" -msgstr "Приватно прегледање" - -#: ../midori/main.c:97 ../midori/main.c:103 +#: ../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:156 ../midori/main.c:260 +#: ../midori/main.c:159 ../midori/main.c:252 #, c-format msgid "Invalid configuration value '%s'" msgstr "Неисправна је вредност „%s“ у подешавањима" -#: ../midori/main.c:381 +#: ../midori/main.c:357 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Не могу да учитам претраживаче. %s\n" -#: ../midori/main.c:435 +#: ../midori/main.c:411 #, c-format msgid "Failed to clear history: %s\n" msgstr "Не могу да очистим историјат: %s\n" -#: ../midori/main.c:455 ../extensions/formhistory/formhistory.c:531 +#: ../midori/main.c:433 ../midori/main.c:554 ../extensions/formhistory.c:443 #, 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:525 +#: ../midori/main.c:497 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Не могу да уклоним старе ставке из историјата: %s\n" -#: ../midori/main.c:547 +#: ../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:582 +#: ../midori/main.c:650 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Не могу да сачувам претраживаче. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:619 +#: ../midori/main.c:676 ../midori/main.c:696 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Не могу да сачувам документ. %s" -#: ../midori/main.c:660 ../panels/midori-extensions.c:90 +#: ../midori/main.c:716 ../panels/midori-extensions.c:91 msgid "Extensions" msgstr "Проширења" -#: ../midori/main.c:674 +#: ../midori/main.c:751 msgid "Privacy" msgstr "Приватност" -#: ../midori/main.c:686 -msgid "" -"Cookies store login data, saved games, or user profiles for advertisement " -"purposes." +#: ../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:742 +#: ../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:960 -msgid "" -"No root certificate file is available. SSL certificates cannot be verified." +#: ../midori/main.c:1059 +msgid "No root certificate file is available. SSL certificates cannot be verified." msgstr "" -"Није доступна корена датотека уверења. ССЛ уверења не могу бити проверена." -#: ../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: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:1055 +#: ../midori/main.c:1159 msgid "Modify _preferences" msgstr "Измени пос_тавке" -#: ../midori/main.c:1059 +#: ../midori/main.c:1163 +msgid "Reset the last _session" +msgstr "Врати последњу сесију" + +#: ../midori/main.c:1168 msgid "Disable all _extensions" msgstr "Искључи сва п_роширења" -#: ../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:1319 ../midori/main.c:2395 +#: ../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:1457 +#: ../midori/main.c:1510 +msgid "No filename specified" +msgstr "Није изабрано име датотеке" + +#: ../midori/main.c:1529 +msgid "An unknown error occured." +msgstr "Непозната грешка." + +#: ../midori/main.c:1559 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Снимак је сачуван у: %s\n" -#: ../midori/main.c:1873 +#: ../midori/main.c:1905 msgid "Run ADDRESS as a web application" msgstr "Покреће АДРЕСУ као веб програм" -#: ../midori/main.c:1873 +#: ../midori/main.c:1905 msgid "ADDRESS" msgstr "АДРЕСА" -#: ../midori/main.c:1876 +#: ../midori/main.c:1908 msgid "Use FOLDER as configuration folder" msgstr "Користи ФАСЦИКЛУ за чување подешавања" -#: ../midori/main.c:1876 +#: ../midori/main.c:1908 msgid "FOLDER" msgstr "ФАСЦИКЛА" -#: ../midori/main.c:1879 +#: ../midori/main.c:1911 msgid "Private browsing, no changes are saved" -msgstr "Приватно разгледање, никакве измене се не чувају" +msgstr "" -#: ../midori/main.c:1881 +#: ../midori/main.c:1913 +#, fuzzy msgid "Show a diagnostic dialog" -msgstr "Приказује прозорче за дијагнозу" +msgstr "Прикажи прозорче приликом пада програма" -#: ../midori/main.c:1883 +#: ../midori/main.c:1915 msgid "Run the specified filename as javascript" msgstr "Покреће изабрану датотеку као јава скрипту" -#: ../midori/main.c:1885 +#: ../midori/main.c:1918 msgid "Take a snapshot of the specified URI" msgstr "Прави снимак изабране адресе" -#: ../midori/main.c:1887 +#: ../midori/main.c:1921 msgid "Execute the specified command" -msgstr "Извршава наведену наредбу" +msgstr "" -#: ../midori/main.c:1889 +#: ../midori/main.c:1923 msgid "List available commands to execute with -e/ --execute" -msgstr "Исписује доступне наредбе за извршавање са -e/ --execute" +msgstr "" -#: ../midori/main.c:1891 +#: ../midori/main.c:1925 msgid "Display program version" msgstr "Исписује издање програма" -#: ../midori/main.c:1893 +#: ../midori/main.c:1927 msgid "Addresses" msgstr "Адресе" -#: ../midori/main.c:1895 +#: ../midori/main.c:1929 msgid "Block URIs according to regular expression PATTERN" -msgstr "Блокира адресе сходно ОБРАСЦУ регуларног израза" +msgstr "" -#: ../midori/main.c:1895 +#: ../midori/main.c:1929 msgid "PATTERN" -msgstr "ОБРАЗАЦ" +msgstr "" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1899 +#: ../midori/main.c:1933 msgid "Reset Midori after SECONDS seconds of inactivity" -msgstr "Поново поставља Мидори нако" +msgstr "" -#: ../midori/main.c:1899 +#: ../midori/main.c:1933 msgid "SECONDS" -msgstr "СЕКУНДЕ" - -#: ../midori/main.c:1902 -msgid "Redirects console warnings to the specified FILENAME" -msgstr "Преусмерава упозорења конзоле на наведену ДАТОТЕКУ НАЗИВА" - -#: ../midori/main.c:1902 -msgid "FILENAME" -msgstr "НАЗИВ ДАТОТЕКЕ" +msgstr "" -#: ../midori/main.c:1967 +#: ../midori/main.c:2017 msgid "[Addresses]" msgstr "[Адресе]" -#: ../midori/main.c:2009 +#: ../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 "Пошаљите примедбе, предлоге и грешке на:" +msgstr "Пошаљите коментар, преглог и извештај грешке на:" -#: ../midori/main.c:2011 +#: ../midori/main.c:2064 msgid "Check for new versions at:" msgstr "Преузмите новије издање са:" -#. i18n: Logins and passwords in websites and web forms -#: ../midori/main.c:2106 -msgid "Saved logins and _passwords" -msgstr "Сачувана пријављивања и _лозинке" +#: ../midori/main.c:2128 +msgid "Website icons" +msgstr "Иконице веб страница" -#: ../midori/main.c:2108 -msgid "Cookies and Website data" -msgstr "Колачићи и подаци веб сајта" +#: ../midori/main.c:2130 +msgid "Cookies" +msgstr "Колачићи" -#. TODO: Preserve page icons of search engines and merge privacy items -#: ../midori/main.c:2112 ../midori/midori-websettings.c:997 -#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471 -msgid "Web Cache" -msgstr "Веб кеш" +#: ../midori/main.c:2133 +msgid "'Flash' Cookies" +msgstr "Флеш колачићи" -#: ../midori/main.c:2115 -msgid "Website icons" -msgstr "Иконице веб сајта" +#: ../midori/main.c:2137 +msgid "HTML5 _Databases" +msgstr "" -#: ../midori/main.c:2219 -msgid "An unknown error occured" -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:2326 +#: ../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" +msgstr "Већ је покренут један Мидори прозор, али не даје одзив.\n" -#: ../midori/main.c:2362 -#, c-format +#: ../midori/main.c:2346 +#, fuzzy, c-format msgid "Bookmarks couldn't be loaded: %s\n" -msgstr "Не могу да учитам обележивач: %s\n" +msgstr "Не могу да учитам обележиваче: %s\n" -#: ../midori/main.c:2410 +#: ../midori/main.c:2394 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Не могу да учитам смеће: %s\n" -#: ../midori/main.c:2423 +#: ../midori/main.c:2407 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Не могу да учитам историјат: %s\n" -#: ../midori/main.c:2439 +#: ../midori/main.c:2422 msgid "The following errors occured:" msgstr "Јавиле су се следеће грешке:" -#: ../midori/main.c:2455 +#: ../midori/main.c:2438 msgid "_Ignore" msgstr "_Занемари" -#: ../midori/midori-app.c:1424 -msgid "_Bookmark" -msgstr "_Обележивач" - -#: ../midori/midori-app.c:1425 ../midori/midori-browser.c:6102 -msgid "_Bookmarks" -msgstr "_Обележивачи" - -#: ../midori/midori-app.c:1426 -msgid "Add Boo_kmark" -msgstr "_Додај обележивач" - -#: ../midori/midori-app.c:1427 -msgid "_Console" -msgstr "_Конзола" - -#: ../midori/midori-app.c:1428 -msgid "_Extensions" -msgstr "П_роширења" - -#. i18n: Browsing history, visited web pages, closed tabs -#: ../midori/midori-app.c:1429 ../midori/midori-browser.c:4626 -msgid "_History" -msgstr "_Историјат" - -#: ../midori/midori-app.c:1430 -msgid "_Homepage" -msgstr "По_четна страница" - -#: ../midori/midori-app.c:1431 -msgid "_Userscripts" -msgstr "Личне _скрипте" - -#: ../midori/midori-app.c:1432 -msgid "New _Tab" -msgstr "Нови _лист" - -#: ../midori/midori-app.c:1433 -msgid "_Transfers" -msgstr "Пр_еноси" - -#: ../midori/midori-app.c:1434 -msgid "Netscape p_lugins" -msgstr "Нетскејп _додаци" - -#: ../midori/midori-app.c:1435 -msgid "_Closed Tabs" -msgstr "_Затворени листови" - -#: ../midori/midori-app.c:1436 ../midori/midori-browser.c:5253 -msgid "New _Window" -msgstr "_Нови прозор" - -#: ../midori/midori-app.c:1437 -msgid "New _Folder" -msgstr "Нова _фасцикла" - #: ../midori/midori-array.c:522 msgid "File not found." msgstr "Није нађена датотека." @@ -364,2024 +318,2274 @@ 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 "Документ је лоше форматиран." +msgstr "Документ је лошег форматиран." #: ../midori/midori-array.c:628 msgid "Unrecognized bookmark format." -msgstr "Непознат формат обележивача." +msgstr "" -#: ../midori/midori-array.c:915 +#: ../midori/midori-array.c:916 msgid "Writing failed." -msgstr "Није успело уписивање." +msgstr "Неуспешан упис." -#: ../midori/midori-browser.c:349 ../midori/midori-browser.c:5335 -#: ../midori/midori-browser.c:5344 +#: ../midori/midori-browser.c:328 ../midori/midori-browser.c:5122 +#: ../midori/midori-browser.c:5131 msgid "Reload the current page" -msgstr "Поново учитајте тренутну страницу" +msgstr "Освежава страницу коју сте отворили" -#: ../midori/midori-browser.c:358 ../midori/midori-browser.c:5341 +#: ../midori/midori-browser.c:339 ../midori/midori-browser.c:5128 msgid "Stop loading the current page" -msgstr "Зауставите учитавање тренутне странице" +msgstr "Прекида странице на којој се налазите" -#: ../midori/midori-browser.c:475 -#, c-format +#: ../midori/midori-browser.c:466 +#, fuzzy, c-format msgid "Failed to update title: %s\n" -msgstr "Нисам успео да ажурирам наслов: %s\n" +msgstr "Не могу да отворим базу података: %s\n" -#: ../midori/midori-browser.c:488 +#: ../midori/midori-browser.c:479 #, 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:682 ../midori/midori-browser.c:715 -msgid "Toplevel folder" -msgstr "Највиша фасцикла" - -#: ../midori/midori-browser.c:773 +#: ../midori/midori-browser.c:734 msgid "New folder" msgstr "Нова фасцикла" -#: ../midori/midori-browser.c:773 +#: ../midori/midori-browser.c:734 msgid "Edit folder" msgstr "Уреди фасциклу" -#: ../midori/midori-browser.c:775 +#: ../midori/midori-browser.c:736 msgid "New bookmark" msgstr "Нови обележивач" -#: ../midori/midori-browser.c:775 +#: ../midori/midori-browser.c:736 msgid "Edit bookmark" msgstr "Уреди обележивач" -#: ../midori/midori-browser.c:817 +#: ../midori/midori-browser.c:767 msgid "_Title:" msgstr "_Наслов:" -#: ../midori/midori-browser.c:837 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:784 ../midori/midori-searchaction.c:953 +msgid "_Description:" +msgstr "_Опис:" + +#: ../midori/midori-browser.c:803 ../midori/midori-searchaction.c:967 #: ../extensions/feed-panel/main.c:377 msgid "_Address:" msgstr "_Адреса:" -#: ../midori/midori-browser.c:860 ../midori/midori-browser.c:4363 +#: ../midori/midori-browser.c:835 ../midori/midori-browser.c:4184 msgid "_Folder:" msgstr "_Фасцикла:" +#: ../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:876 +#, fuzzy msgid "Add to _Speed Dial" msgstr "Додај у _брзе посете" #: ../midori/midori-browser.c:889 +#, fuzzy msgid "Show in the tool_bar" -msgstr "Прикажи у траци _алата" +msgstr "Ставке приказане у траци са алаткама" #: ../midori/midori-browser.c:904 +#, fuzzy msgid "Run as _web application" -msgstr "Покрени као _веб програм" +msgstr "Покреће АДРЕСУ као веб програм" -#: ../midori/midori-browser.c:975 +#: ../midori/midori-browser.c:980 #, c-format msgid "The file \"%s\" can't be saved in this folder." -msgstr "Датотека „%s“ не може бити сачувана у овој фасцикли." +msgstr "" -#: ../midori/midori-browser.c:977 +#: ../midori/midori-browser.c:982 #, c-format msgid "You don't have permission to write in this location." -msgstr "Немате дозволу да пишете овде." +msgstr "" -#: ../midori/midori-browser.c:984 +#: ../midori/midori-browser.c:989 #, c-format msgid "There is not enough free space to download \"%s\"." -msgstr "Нема довољно слободног места за преузимање „%s“." +msgstr "" -#: ../midori/midori-browser.c:987 +#: ../midori/midori-browser.c:992 #, c-format msgid "The file needs %s but only %s are left." -msgstr "Датотека захтева %s али је преостало само %s." +msgstr "" -#: ../midori/midori-browser.c:1024 ../midori/midori-browser.c:4432 +#: ../midori/midori-browser.c:1054 ../midori/midori-browser.c:4268 msgid "Save file as" msgstr "Сачувај датотеку као" -#: ../midori/midori-browser.c:1336 +#: ../midori/midori-browser.c:1357 +#, fuzzy msgid "New Window" -msgstr "Нови прозор" +msgstr "_Нови прозор" -#: ../midori/midori-browser.c:1336 +#: ../midori/midori-browser.c:1357 msgid "A new window has been opened" -msgstr "Нови прозор је отворен" +msgstr "" -#: ../midori/midori-browser.c:1339 +#: ../midori/midori-browser.c:1360 +#, fuzzy msgid "New Tab" -msgstr "Нови лист" +msgstr "Нови _лист" -#: ../midori/midori-browser.c:1339 +#: ../midori/midori-browser.c:1360 +#, fuzzy msgid "A new tab has been opened" -msgstr "Нови лист је отворен" +msgstr "Обавести ме по завршеном преносу" -#: ../midori/midori-browser.c:1356 -msgid "Error opening the image!" -msgstr "Грешка приликом отварања слике!" - -#: ../midori/midori-browser.c:1357 -msgid "Can not open selected image in a default viewer." -msgstr "Не могу да отворим изабрану слику у основном прегледачу." - -#: ../midori/midori-browser.c:1363 -msgid "Error downloading the image!" -msgstr "Грешка у преузимању слике!" - -#: ../midori/midori-browser.c:1364 -msgid "Can not download selected image." -msgstr "Не могу да преузмем изабрану слику." - -#: ../midori/midori-browser.c:1490 +#: ../midori/midori-browser.c:1399 +#, fuzzy msgid "Save file" -msgstr "Сачувај датотеку" +msgstr "Сачувај датотеку као" -#: ../midori/midori-browser.c:2379 +#: ../midori/midori-browser.c:2233 msgid "Open file" -msgstr "Отворите датотеку" +msgstr "Отвори датотеку" -#: ../midori/midori-browser.c:2511 +#: ../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 "" -"Да користите горњу адресу отворите придруживача вести. Постоји обично " -"изборник или дугме „New Subscription“ (Нова претплата), „New News Feed“ " -"(Нови довод вести) или слично.\n" -"Или идите на „Поставке, Разгледање“ у Мидорију, и изаберите „Читач вести“. " -"Следећи пут када кликнете на иконицу довода вести, биће аутоматски додат." - -#: ../midori/midori-browser.c:2517 ../extensions/feed-panel/main.c:365 +"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:2560 ../midori/midori-browser.c:5404 -#: ../panels/midori-bookmarks.c:427 +#: ../midori/midori-browser.c:2399 ../midori/midori-browser.c:5195 +#: ../panels/midori-bookmarks.c:454 msgid "Add a new bookmark" -msgstr "Додајте обележивач" +msgstr "Додај обележивач" -#: ../midori/midori-browser.c:3059 ../midori/midori-searchaction.c:488 +#: ../midori/midori-browser.c:2963 ../midori/midori-searchaction.c:488 msgid "Empty" msgstr "Празно" -#: ../midori/midori-browser.c:3489 ../midori/midori-browser.c:3490 -msgid "Toggle text cursor navigation" -msgstr "Искључује навигацију текста курсором" - -#: ../midori/midori-browser.c:3492 -msgid "" -"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in " -"all websites." -msgstr "" -"Притисак на Ф7 пребацује прегледање курсорим. Када је активан, текстуални " -"курсор се појављује на свим вебсајтовима." - -#: ../midori/midori-browser.c:3495 -msgid "_Enable Caret Browsing" -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:3819 ../midori/midori-browser.c:5795 -#, c-format +#: ../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" +msgstr "Не могу да уклоним ставку из историјата: %s\n" -#: ../midori/midori-browser.c:4151 ../panels/midori-bookmarks.c:745 -#: ../panels/midori-history.c:803 +#: ../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:4158 ../panels/midori-bookmarks.c:751 -#: ../panels/midori-history.c:809 ../extensions/feed-panel/feed-panel.c:528 +#: ../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 "Отвори у новом _листу" +msgstr "Отвору у новом _листу" -#: ../midori/midori-browser.c:4161 ../midori/midori-view.c:2690 -#: ../midori/midori-view.c:4783 ../panels/midori-bookmarks.c:753 -#: ../panels/midori-history.c:811 ../extensions/feed-panel/feed-panel.c:530 +#: ../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:4250 +#: ../midori/midori-browser.c:4106 +#, fuzzy msgid "Arora" -msgstr "Арора" +msgstr "Грешка" -#: ../midori/midori-browser.c:4251 +#: ../midori/midori-browser.c:4107 msgid "Kazehakase" -msgstr "Кејзхакејз" +msgstr "" -#: ../midori/midori-browser.c:4252 +#: ../midori/midori-browser.c:4108 msgid "Opera" -msgstr "Опера" +msgstr "" -#: ../midori/midori-browser.c:4253 +#: ../midori/midori-browser.c:4109 msgid "Konqueror" -msgstr "К‑освајач" +msgstr "" -#: ../midori/midori-browser.c:4254 +#: ../midori/midori-browser.c:4110 msgid "Epiphany" -msgstr "Спознаја" - -#: ../midori/midori-browser.c:4255 -#, c-format -msgid "Firefox (%s)" -msgstr "Фајерфокс (%s)" +msgstr "" -#: ../midori/midori-browser.c:4276 -msgid "Import bookmarks…" -msgstr "Увези обележиваче…" +#: ../midori/midori-browser.c:4135 +#, fuzzy +msgid "Import bookmarks..." +msgstr "Уреди обележивач" -#: ../midori/midori-browser.c:4279 ../midori/midori-browser.c:5409 +#: ../midori/midori-browser.c:4138 ../midori/midori-browser.c:5200 +#, fuzzy msgid "_Import bookmarks" -msgstr "Увези _обележиваче" +msgstr "Уреди обележивач" -#: ../midori/midori-browser.c:4290 +#: ../midori/midori-browser.c:4149 +#, fuzzy msgid "_Application:" -msgstr "_Програм:" +msgstr "Програми" -#: ../midori/midori-browser.c:4355 +#: ../midori/midori-browser.c:4176 msgid "Import from XBEL or HTML file" -msgstr "Увези из ИксБЕЛ или ХТМЛ датотеке" +msgstr "" -#: ../midori/midori-browser.c:4390 +#: ../midori/midori-browser.c:4225 msgid "Import from a file" -msgstr "Увези из датотеке" +msgstr "" -#: ../midori/midori-browser.c:4402 +#: ../midori/midori-browser.c:4237 +#, fuzzy msgid "Failed to import bookmarks" -msgstr "Нисам успео да увезем обележиваче" +msgstr "Уреди обележивач" -#: ../midori/midori-browser.c:4437 +#: ../midori/midori-browser.c:4273 +#, fuzzy msgid "XBEL Bookmarks" -msgstr "ИксБЕЛ обележивачи" +msgstr "Обележивачи" -#: ../midori/midori-browser.c:4442 +#: ../midori/midori-browser.c:4278 +#, fuzzy msgid "Netscape Bookmarks" -msgstr "Нетскејп обележивачи" +msgstr "Нови обележивач" -#: ../midori/midori-browser.c:4456 +#: ../midori/midori-browser.c:4292 msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)" -msgstr "Мидори може само да извезе у ИксБЕЛ (*.xbel) и Нетскејп (*.html)" +msgstr "" -#: ../midori/midori-browser.c:4471 +#: ../midori/midori-browser.c:4308 msgid "Failed to export bookmarks" -msgstr "Нисам успео да извезем обележиваче" +msgstr "" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4593 +#: ../midori/midori-browser.c:4425 msgid "Clear Private Data" -msgstr "Очистите личне податке" +msgstr "Очисти личне податке" -#: ../midori/midori-browser.c:4597 +#: ../midori/midori-browser.c:4429 msgid "_Clear private data" msgstr "О_чисти личне податке" -#: ../midori/midori-browser.c:4610 +#: ../midori/midori-browser.c:4442 msgid "Clear the following data:" -msgstr "Очисти следеће податке:" +msgstr "Чишћење следећих података:" -#: ../midori/midori-browser.c:4620 -msgid "Last open _tabs" -msgstr "Последњи отворени _листови" +#. i18n: Browsing history, visited web pages +#: ../midori/midori-browser.c:4453 ../midori/sokoke.c:1514 +msgid "_History" +msgstr "_Историјат" + +#: ../midori/midori-browser.c:4458 ../midori/sokoke.c:1520 +#, fuzzy +msgid "_Closed Tabs" +msgstr "З_атвори лист" -#: ../midori/midori-browser.c:4646 +#: ../midori/midori-browser.c:4478 +#, fuzzy msgid "Clear private data when _quitting Midori" -msgstr "Очисти приватне податке приликом _напуштања Мидорија" +msgstr "О_чисти личне податке" -#: ../midori/midori-browser.c:4841 +#: ../midori/midori-browser.c:4654 msgid "A lightweight web browser." msgstr "Једноставан Интернет прегледник." -#: ../midori/midori-browser.c:4842 +#: ../midori/midori-browser.c:4655 msgid "See about:version for version info." -msgstr "Погледајте „about:version“ за податке о издању." +msgstr "" -#: ../midori/midori-browser.c:4844 -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: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 "" -"Ова библиотека је слободан софтвер; можете је расподељивати и/или мењати под " -"условима Гнуове мање опште јавне лиценце како је објављује Задужбина " -"слободног софтвера; било верзије 2.1 те лиценце, или (према вашем мишљењу) " -"било које новије верзије." -#: ../midori/midori-browser.c:4865 +#: ../midori/midori-browser.c:4676 msgid "translator-credits" msgstr "" "Милош Поповић \n" "\n" "http://prevod.org — превод на српски језик." -#: ../midori/midori-browser.c:5251 +#: ../midori/midori-browser.c:5033 msgid "_File" msgstr "_Датотека" -#: ../midori/midori-browser.c:5254 +#: ../midori/midori-browser.c:5035 ../midori/sokoke.c:1521 +msgid "New _Window" +msgstr "_Нови прозор" + +#: ../midori/midori-browser.c:5036 msgid "Open a new window" -msgstr "Отворите нови прозор" +msgstr "Отвори нови прозор" -#: ../midori/midori-browser.c:5257 +#: ../midori/midori-browser.c:5039 msgid "Open a new tab" -msgstr "Отворите нови лист" +msgstr "Отвара нови лист" -#: ../midori/midori-browser.c:5259 -msgid "New P_rivate Browsing Window" -msgstr "Нови прозор _приватног прегледања" +#: ../midori/midori-browser.c:5041 +msgid "P_rivate Browsing" +msgstr "Чување прива_тности" -#: ../midori/midori-browser.c:5263 -msgid "Open a file" -msgstr "Отворите датотеку" +#: ../midori/midori-browser.c:5042 +msgid "Don't save any private data while browsing" +msgstr "Не чува никакве личне податке током разгледања Интернета" -#: ../midori/midori-browser.c:5265 -msgid "_Save Page As…" -msgstr "_Сачувај страницу као…" +#: ../midori/midori-browser.c:5046 +msgid "Open a file" +msgstr "Отвори датотеку" -#: ../midori/midori-browser.c:5266 +#: ../midori/midori-browser.c:5049 msgid "Save to a file" -msgstr "Сачувајте у датотеку" +msgstr "Сачувај у датотеку" -#: ../midori/midori-browser.c:5268 +#: ../midori/midori-browser.c:5051 msgid "Add to Speed _dial" msgstr "Додај у _брзе посете" -#: ../midori/midori-browser.c:5272 +#: ../midori/midori-browser.c:5052 +msgid "Add shortcut to speed dial" +msgstr "Додаје ову адресу у брзе посете" + +#: ../midori/midori-browser.c:5055 +#, fuzzy msgid "Add Shortcut to the _desktop" -msgstr "Додај пречицу на _радну површ" +msgstr "Додаје ову адресу у брзе посете" -#: ../midori/midori-browser.c:5274 +#: ../midori/midori-browser.c:5056 +#, fuzzy +msgid "Add shortcut to the desktop" +msgstr "Додаје ову адресу у брзе посете" + +#: ../midori/midori-browser.c:5058 msgid "Create _Launcher" -msgstr "Направи _покретач" +msgstr "" -#: ../midori/midori-browser.c:5278 +#: ../midori/midori-browser.c:5059 +msgid "Create a launcher" +msgstr "" + +#: ../midori/midori-browser.c:5062 msgid "Subscribe to News _feed" -msgstr "Претплати се на _довод вести" +msgstr "" -#: ../midori/midori-browser.c:5284 +#: ../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:5285 +#: ../midori/midori-browser.c:5069 msgid "Close the current tab" -msgstr "Затворите тренутни лист" +msgstr "Затвара овај лист" -#: ../midori/midori-browser.c:5287 +#: ../midori/midori-browser.c:5071 msgid "C_lose Window" msgstr "_Затвори прозор" -#: ../midori/midori-browser.c:5291 +#: ../midori/midori-browser.c:5072 +msgid "Close this window" +msgstr "Затвара овај прозор" + +#: ../midori/midori-browser.c:5075 msgid "Print the current page" -msgstr "Штампајте тренутну страницу" +msgstr "Штампај текућу страницу" -#: ../midori/midori-browser.c:5293 +#: ../midori/midori-browser.c:5077 +#, fuzzy msgid "Close a_ll Windows" -msgstr "Затвори _све прозоре" +msgstr "_Затвори прозор" + +#: ../midori/midori-browser.c:5078 +#, fuzzy +msgid "Close all open windows" +msgstr "_Затворени листови и прозори" -#: ../midori/midori-browser.c:5296 +#: ../midori/midori-browser.c:5080 msgid "_Edit" msgstr "_Уређивање" -#: ../midori/midori-browser.c:5319 -msgid "_Find…" -msgstr "_Пронађи…" +#: ../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:5094 +msgid "Copy the selected text" +msgstr "Умножава изабрани текст у списак исечака" + +#: ../midori/midori-browser.c:5097 +msgid "Paste text from the clipboard" +msgstr "Убацује текст из списка исечака" -#: ../midori/midori-browser.c:5320 +#: ../midori/midori-browser.c:5100 +msgid "Delete the selected text" +msgstr "Брише изабрани текст" + +#: ../midori/midori-browser.c:5103 +msgid "Select all text" +msgstr "Изабире сав текст" + +#: ../midori/midori-browser.c:5106 msgid "Find a word or phrase in the page" -msgstr "Пронађите жељену реч или израз унутар странице" +msgstr "Тражи жељену реч или израз унутар страници" -#: ../midori/midori-browser.c:5322 +#: ../midori/midori-browser.c:5108 msgid "Find _Next" -msgstr "Нађи _следеће" +msgstr "Тражи _следеће" + +#: ../midori/midori-browser.c:5109 +msgid "Find the next occurrence of a word or phrase" +msgstr "Проналази следећу појаву речи или израза" -#: ../midori/midori-browser.c:5325 +#: ../midori/midori-browser.c:5111 msgid "Find _Previous" -msgstr "Нађи _претходно" +msgstr "Тражи _претходно" -#: ../midori/midori-browser.c:5329 +#: ../midori/midori-browser.c:5112 +msgid "Find the previous occurrence of a word or phrase" +msgstr "Проналази претходну појаву речи или израза" + +#: ../midori/midori-browser.c:5116 msgid "Configure the application preferences" msgstr "Подесите поставке програма" -#: ../midori/midori-browser.c:5331 +#: ../midori/midori-browser.c:5118 msgid "_View" msgstr "П_реглед" -#: ../midori/midori-browser.c:5332 +#: ../midori/midori-browser.c:5119 msgid "_Toolbars" -msgstr "Траке _алата" +msgstr "Палете а_лата" -#: ../midori/midori-browser.c:5337 +#: ../midori/midori-browser.c:5124 ../midori/midori-browser.c:5125 msgid "Reload page without caching" -msgstr "Учитај страницу без причувавања" +msgstr "" -#: ../midori/midori-browser.c:5347 +#: ../midori/midori-browser.c:5134 msgid "Increase the zoom level" -msgstr "Увећајте ниво приказа" +msgstr "Увећај приказ" -#: ../midori/midori-browser.c:5350 +#: ../midori/midori-browser.c:5137 msgid "Decrease the zoom level" -msgstr "Умањите ниво приказа" +msgstr "Умањи приказ" -#: ../midori/midori-browser.c:5354 +#: ../midori/midori-browser.c:5140 +msgid "Reset the zoom level" +msgstr "Врати величину приказа" + +#: ../midori/midori-browser.c:5141 msgid "_Encoding" msgstr "_Кодирање" -#: ../midori/midori-browser.c:5356 +#: ../midori/midori-browser.c:5143 +#, fuzzy msgid "View So_urce" -msgstr "Прикажи _извор" +msgstr "_Изворно издање странице" -#: ../midori/midori-browser.c:5359 +#: ../midori/midori-browser.c:5144 +msgid "View the source code of the page" +msgstr "Приказује изворни код странице" + +#: ../midori/midori-browser.c:5147 +#, fuzzy msgid "Ca_ret Browsing" -msgstr "Прегледање _курсором" +msgstr "Чување прива_тности" -#: ../midori/midori-browser.c:5363 +#: ../midori/midori-browser.c:5148 +msgid "Toggle text cursor navigation" +msgstr "" + +#: ../midori/midori-browser.c:5152 msgid "Toggle fullscreen view" -msgstr "Пребаците приказ преко целог екрана" +msgstr "Приказује програм преко целог екрана" -#: ../midori/midori-browser.c:5365 +#: ../midori/midori-browser.c:5155 msgid "Scroll _Left" -msgstr "Клизај ле_во" +msgstr "" -#: ../midori/midori-browser.c:5368 +#: ../midori/midori-browser.c:5156 +#, fuzzy +msgid "Scroll to the left" +msgstr "Иде на наредни лист" + +#: ../midori/midori-browser.c:5158 msgid "Scroll _Down" -msgstr "Клизај до_ле" +msgstr "" + +#: ../midori/midori-browser.c:5159 +msgid "Scroll down" +msgstr "" -#: ../midori/midori-browser.c:5371 +#: ../midori/midori-browser.c:5161 msgid "Scroll _Up" -msgstr "Клизај го_ре" +msgstr "" + +#: ../midori/midori-browser.c:5162 +msgid "Scroll up" +msgstr "" -#: ../midori/midori-browser.c:5374 +#: ../midori/midori-browser.c:5164 msgid "Scroll _Right" -msgstr "Клизај де_сно" +msgstr "" + +#: ../midori/midori-browser.c:5165 +msgid "Scroll to the right" +msgstr "" -#: ../midori/midori-browser.c:5377 +#: ../midori/midori-browser.c:5168 msgid "_Go" msgstr "_Иди" -#: ../midori/midori-browser.c:5380 +#: ../midori/midori-browser.c:5171 msgid "Go back to the previous page" -msgstr "Идите на претходну страницу" +msgstr "Иде на претходну страницу" -#: ../midori/midori-browser.c:5383 +#: ../midori/midori-browser.c:5174 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:5387 +#: ../midori/midori-browser.c:5178 +#, fuzzy 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:5391 +#: ../midori/midori-browser.c:5182 +#, fuzzy msgid "Go to the next sub-page" -msgstr "Идите на следећу садржану страницу" +msgstr "Иде на следећу страницу" -#: ../midori/midori-browser.c:5394 +#: ../midori/midori-browser.c:5185 msgid "Go to your homepage" -msgstr "Идите на почетну страницу" +msgstr "Иде на почетну страну" -#: ../midori/midori-browser.c:5396 +#: ../midori/midori-browser.c:5187 msgid "Empty Trash" msgstr "Испразни смеће" -#: ../midori/midori-browser.c:5399 +#: ../midori/midori-browser.c:5188 +msgid "Delete the contents of the trash" +msgstr "Брише сав садржај из смећа" + +#: ../midori/midori-browser.c:5190 +#, fuzzy msgid "Undo _Close Tab" -msgstr "_Опозови затварање листа" +msgstr "Врати лист" -#: ../midori/midori-browser.c:5406 +#: ../midori/midori-browser.c:5191 +msgid "Open the last closed tab" +msgstr "Отвара лист који сте последњи затворили" + +#: ../midori/midori-browser.c:5197 +#, fuzzy msgid "Add a new _folder" -msgstr "Додај нову _фасциклу" +msgstr "Додај нову фасциклу" + +#: ../midori/midori-browser.c:5198 +msgid "Add a new bookmark folder" +msgstr "Додаје нову фасциклу за обележиваче" -#: ../midori/midori-browser.c:5412 +#: ../midori/midori-browser.c:5203 +#, fuzzy msgid "_Export bookmarks" -msgstr "_Извези обележиваче" +msgstr "Уреди обележивач" -#: ../midori/midori-browser.c:5415 ../midori/midori-searchaction.c:497 +#: ../midori/midori-browser.c:5206 ../midori/midori-searchaction.c:497 msgid "_Manage Search Engines" msgstr "По_деси претраживаче" -#: ../midori/midori-browser.c:5418 +#: ../midori/midori-browser.c:5207 +msgid "Add, edit and remove search engines..." +msgstr "Отвара прозорче за додавање, уређивање или уклањање претраживача." + +#: ../midori/midori-browser.c:5210 msgid "_Clear Private Data" msgstr "Очисти _личне податке" -#: ../midori/midori-browser.c:5421 +#: ../midori/midori-browser.c:5211 +msgid "Clear private data..." +msgstr "Брише све личне податке." + +#: ../midori/midori-browser.c:5215 +#, fuzzy msgid "_Inspect Page" -msgstr "_Прегледај страницу" +msgstr "Инспекција странице — %s" + +#: ../midori/midori-browser.c:5216 +msgid "Inspect page details and access developer tools..." +msgstr "" -#: ../midori/midori-browser.c:5425 +#: ../midori/midori-browser.c:5221 msgid "_Previous Tab" msgstr "_Претходни лист" -#: ../midori/midori-browser.c:5428 +#: ../midori/midori-browser.c:5222 +msgid "Switch to the previous tab" +msgstr "Иде на претходни лист" + +#: ../midori/midori-browser.c:5224 msgid "_Next Tab" msgstr "_Следећи лист" -#: ../midori/midori-browser.c:5430 +#: ../midori/midori-browser.c:5225 +msgid "Switch to the next tab" +msgstr "Иде на наредни лист" + +#: ../midori/midori-browser.c:5226 msgid "Move Tab _Backward" -msgstr "Премести лист уна_зад" +msgstr "" + +#: ../midori/midori-browser.c:5227 +#, fuzzy +msgid "Move tab behind the previous tab" +msgstr "Иде на претходни лист" -#: ../midori/midori-browser.c:5432 +#: ../midori/midori-browser.c:5228 msgid "_Move Tab Forward" -msgstr "Премести лист уна_пред" +msgstr "" -#: ../midori/midori-browser.c:5435 +#: ../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 "Приближи _тренутни лист" +msgstr "тренутном листу" + +#: ../midori/midori-browser.c:5232 +#, fuzzy +msgid "Focus the current tab" +msgstr "Затвара овај лист" -#: ../midori/midori-browser.c:5438 +#: ../midori/midori-browser.c:5234 msgid "Focus _Next view" -msgstr "Приближи _следећи преглед" +msgstr "" -#: ../midori/midori-browser.c:5441 +#: ../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 "Прикажи само иконицу _тренутног листа" +msgstr "" + +#: ../midori/midori-browser.c:5238 +#, fuzzy +msgid "Only show the icon of the current tab" +msgstr "Затвара овај лист" -#: ../midori/midori-browser.c:5444 +#: ../midori/midori-browser.c:5240 +#, fuzzy msgid "_Duplicate Current Tab" -msgstr "_Удвостручи тренутни лист" +msgstr "тренутном листу" -#: ../midori/midori-browser.c:5447 +#: ../midori/midori-browser.c:5241 +#, fuzzy +msgid "Duplicate the current tab" +msgstr "Затвара овај лист" + +#: ../midori/midori-browser.c:5243 +#, fuzzy msgid "Close Ot_her Tabs" -msgstr "Затвори _друге листове" +msgstr "Затвара овај лист" -#: ../midori/midori-browser.c:5450 +#: ../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 "Отвори последњу _сесију" +msgstr "Врати последњу сесију" + +#: ../midori/midori-browser.c:5247 +#, fuzzy +msgid "Open the tabs saved in the last session" +msgstr "Врати последњу сесију" -#: ../midori/midori-browser.c:5453 +#: ../midori/midori-browser.c:5249 msgid "_Help" msgstr "_Помоћ" -#: ../midori/midori-browser.c:5455 +#: ../midori/midori-browser.c:5251 msgid "_Frequent Questions" msgstr "_Честа питања" -#: ../midori/midori-browser.c:5458 -msgid "_Report a Problem…" -msgstr "Пријавите _проблем…" +#: ../midori/midori-browser.c:5252 +msgid "Show the Frequently Asked Questions" +msgstr "Приказује често постављена питања" -#: ../midori/midori-browser.c:5463 ../midori/midori-browser.c:6121 -msgid "_Tools" -msgstr "_Алати" +#: ../midori/midori-browser.c:5254 +#, fuzzy +msgid "_Report a Problem..." +msgstr "Пријави _грешку" -#: ../midori/midori-browser.c:5470 +#: ../midori/midori-browser.c:5255 +msgid "Open Midori's bug tracker" +msgstr "Отвара Мидоријеву страницу за пријаву грешки" + +#: ../midori/midori-browser.c:5258 +msgid "Show information about the program" +msgstr "Приказује податке о програму" + +#: ../midori/midori-browser.c:5266 msgid "_Menubar" -msgstr "Трака _избора" +msgstr "Трака са _менијем" + +#: ../midori/midori-browser.c:5267 +msgid "Show menubar" +msgstr "Приказује мени програма" -#: ../midori/midori-browser.c:5474 +#: ../midori/midori-browser.c:5270 msgid "_Navigationbar" -msgstr "Трака _кретања" +msgstr "_Главна трака" -#: ../midori/midori-browser.c:5478 +#: ../midori/midori-browser.c:5271 +msgid "Show navigationbar" +msgstr "Приказује површ за кретање кроз веб странице" + +#: ../midori/midori-browser.c:5274 msgid "Side_panel" msgstr "Бочна _површ" -#: ../midori/midori-browser.c:5479 -msgid "Sidepanel" -msgstr "Бочна површ" +#: ../midori/midori-browser.c:5275 +msgid "Show sidepanel" +msgstr "Приказује бочну површ" -#: ../midori/midori-browser.c:5482 +#: ../midori/midori-browser.c:5278 msgid "_Bookmarkbar" -msgstr "Трака _обележивача" +msgstr "_Обележивачи" + +#: ../midori/midori-browser.c:5279 +msgid "Show bookmarkbar" +msgstr "Приказује површ са обележивачима" -#: ../midori/midori-browser.c:5486 +#: ../midori/midori-browser.c:5282 msgid "_Statusbar" -msgstr "Трака _стања" +msgstr "Трака са ста_њем" -#: ../midori/midori-browser.c:5495 ../midori/midori-websettings.c:312 -msgid "_Automatic" -msgstr "_Самостално" +#: ../midori/midori-browser.c:5283 +msgid "Show statusbar" +msgstr "Приказује или сакрива траку са стањем" -#: ../midori/midori-browser.c:5498 ../midori/midori-websettings.c:236 -msgid "Chinese Traditional (BIG5)" -msgstr "Кинески Традиционални (BIG5)" +#: ../midori/midori-browser.c:5291 +msgid "_Automatic" +msgstr "_Сам одреди" -#: ../midori/midori-browser.c:5501 ../midori/midori-websettings.c:237 -msgid "Chinese Simplified (GB18030)" -msgstr "Кинески поједностављени (GB18030)" +#: ../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:5505 +#: ../midori/midori-browser.c:5298 +#, fuzzy msgid "Japanese (SHIFT__JIS)" -msgstr "Јапански (SHIFT__JIS)" +msgstr "Јапански (_Shift_JIS)" -#: ../midori/midori-browser.c:5508 ../midori/midori-websettings.c:239 +#: ../midori/midori-browser.c:5301 ../midori/midori-websettings.c:236 msgid "Korean (EUC-KR)" -msgstr "Корејски (EUC-KR)" +msgstr "" -#: ../midori/midori-browser.c:5511 ../midori/midori-websettings.c:240 +#: ../midori/midori-browser.c:5304 ../midori/midori-websettings.c:237 msgid "Russian (KOI8-R)" msgstr "Руски (KOI8-R)" -#: ../midori/midori-browser.c:5514 ../midori/midori-websettings.c:241 +#: ../midori/midori-browser.c:5307 ../midori/midori-websettings.c:238 msgid "Unicode (UTF-8)" msgstr "Уникод (UTF-_8)" -#: ../midori/midori-browser.c:5517 ../midori/midori-websettings.c:242 +#: ../midori/midori-browser.c:5310 ../midori/midori-websettings.c:239 msgid "Western (ISO-8859-1)" msgstr "Западни (I_SO-8859-1)" -#: ../midori/midori-browser.c:5520 ../midori/midori-websettings.c:243 -#: ../midori/midori-websettings.c:318 ../katze/katze-utils.c:641 -msgid "Custom…" -msgstr "Произвољно…" +#: ../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:6027 +#: ../midori/midori-browser.c:5848 msgid "_Separator" msgstr "_Раздвајач" -#: ../midori/midori-browser.c:6034 -msgid "_Location…" -msgstr "На _адресу…" +#: ../midori/midori-browser.c:5855 +msgid "_Location..." +msgstr "На _адресу..." -#: ../midori/midori-browser.c:6036 +#: ../midori/midori-browser.c:5857 msgid "Open a particular location" -msgstr "Отворите нарочиту адресу" +msgstr "Отвара изабрану адресу" -#: ../midori/midori-browser.c:6058 -msgid "_Web Search…" -msgstr "П_ретражи Интернет…" +#: ../midori/midori-browser.c:5879 +msgid "_Web Search..." +msgstr "П_ретражи Интернет..." -#: ../midori/midori-browser.c:6060 +#: ../midori/midori-browser.c:5881 msgid "Run a web search" -msgstr "Покрените претрагу веба" +msgstr "Иде на страницу за претрагу Интернета" -#: ../midori/midori-browser.c:6087 +#: ../midori/midori-browser.c:5902 msgid "Reopen a previously closed tab or window" -msgstr "Вратите претходно затворене прозоре и листове" +msgstr "Врати претходне прозоре и листове читача" -#: ../midori/midori-browser.c:6104 +#: ../midori/midori-browser.c:5915 ../midori/sokoke.c:1510 +msgid "_Bookmarks" +msgstr "_Обележивачи" + +#: ../midori/midori-browser.c:5917 msgid "Show the saved bookmarks" -msgstr "Прикажите сачуване обележиваче" +msgstr "Приказује сачуване обележиваче" -#: ../midori/midori-browser.c:6137 +#: ../midori/midori-browser.c:5931 +msgid "_Tools" +msgstr "_Алати" + +#: ../midori/midori-browser.c:5946 msgid "_Window" msgstr "_Прозор" -#: ../midori/midori-browser.c:6139 +#: ../midori/midori-browser.c:5948 msgid "Show a list of all open tabs" -msgstr "Прикажите списак свих отворених листова" +msgstr "Приказује списак свих отворених листова" -#: ../midori/midori-browser.c:6153 +#: ../midori/midori-browser.c:5962 +#, fuzzy msgid "_Menu" -msgstr "_Изборник" +msgstr "Трака са _менијем" -#: ../midori/midori-browser.c:6155 +#: ../midori/midori-browser.c:5964 +#, fuzzy msgid "Menu" -msgstr "Изборник" +msgstr "Трака са _менијем" -#: ../midori/midori-browser.c:6969 +#: ../midori/midori-browser.c:6537 #, c-format msgid "Unexpected setting '%s'" msgstr "Неочекивана поставка „%s“" -#: ../midori/midori-extension.c:329 -#, c-format +#: ../midori/midori-extension.c:286 +#, fuzzy, c-format msgid "The configuration of the extension '%s' couldn't be loaded: %s\n" -msgstr "Подешавање проширења „%s“ не може бити учитано: %s\n" +msgstr "Не могу да учитам подешавања: %s\n" -#: ../midori/midori-extension.c:747 ../midori/midori-extension.c:844 -#: ../midori/midori-extension.c:941 ../midori/midori-extension.c:1053 -#: ../extensions/addons.c:1698 -#, c-format +#: ../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“ не може бити сачувано: %s\n" - -#: ../midori/midori-locationaction.c:394 -#, c-format -msgid "Search with %s" -msgstr "Претражи помоћу %s" - -#: ../midori/midori-locationaction.c:412 -msgid "Search with…" -msgstr "Претражи помоћу…" +msgstr "Не могу да сачувам подешавања. %s" -#: ../midori/midori-locationaction.c:537 -#, c-format +#: ../midori/midori-locationaction.c:396 +#, fuzzy, c-format msgid "Failed to select from history\n" -msgstr "Нисам успео да изаберем из историјата\n" +msgstr "Не могу да очистим историјат: %s\n" -#: ../midori/midori-locationaction.c:624 -#, c-format +#: ../midori/midori-locationaction.c:480 +#, fuzzy, c-format msgid "Search for %s" -msgstr "Потражи %s" +msgstr "Поставке за %s" + +#: ../midori/midori-locationaction.c:506 +#, fuzzy, c-format +msgid "Search with %s" +msgstr "Пре_тражи са" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1398 +#: ../midori/midori-locationaction.c:1254 msgid "Paste and p_roceed" -msgstr "Налепи и _настави" +msgstr "" -#: ../midori/midori-locationaction.c:1739 +#: ../midori/midori-locationaction.c:1649 msgid "Not verified" -msgstr "Непроверено" +msgstr "" -#: ../midori/midori-locationaction.c:1759 +#: ../midori/midori-locationaction.c:1664 msgid "Verified and encrypted connection" -msgstr "Проверена и шифрована веза" - -#: ../midori/midori-locationaction.c:1771 -msgid "Open, unencrypted connection" -msgstr "Отворена, нешифрована веза" +msgstr "" -#: ../midori/midori-panel.c:316 ../midori/midori-panel.c:318 -#: ../midori/midori-panel.c:481 ../midori/midori-panel.c:484 +#: ../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 "Поставите бочну површ на десну страну" +msgstr "Постави бочну површ десно" -#: ../midori/midori-panel.c:328 ../midori/midori-panel.c:329 +#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410 msgid "Close panel" -msgstr "Затворите површ" +msgstr "Затвори површ" -#: ../midori/midori-panel.c:482 ../midori/midori-panel.c:485 +#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566 +#, fuzzy msgid "Align sidepanel to the left" -msgstr "Поставите бочну површ на леву страну" +msgstr "Постави бочну површ десно" -#: ../midori/midori-websettings.c:218 +#: ../midori/midori-websettings.c:214 +#, fuzzy msgid "Show Speed Dial" -msgstr "Прикажи брзе посете" +msgstr "Додај у _брзе посете" -#: ../midori/midori-websettings.c:219 +#: ../midori/midori-websettings.c:215 +#, fuzzy msgid "Show Homepage" -msgstr "Прикажи почетну страницу" +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:238 +#: ../midori/midori-websettings.c:235 msgid "Japanese (SHIFT_JIS)" -msgstr "Јапански (SHIFT_JIS)" +msgstr "Јапански (_Shift_JIS)" -#: ../midori/midori-websettings.c:258 +#: ../midori/midori-websettings.c:255 msgid "New tab" msgstr "новом листу" -#: ../midori/midori-websettings.c:259 +#: ../midori/midori-websettings.c:256 msgid "New window" msgstr "новом прозору" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:257 msgid "Current tab" msgstr "тренутном листу" -#: ../midori/midori-websettings.c:275 +#: ../midori/midori-websettings.c:272 msgid "Default" msgstr "Уобичајено" -#: ../midori/midori-websettings.c:276 +#: ../midori/midori-websettings.c:273 msgid "Icons" msgstr "Иконице" -#: ../midori/midori-websettings.c:277 +#: ../midori/midori-websettings.c:274 msgid "Small icons" -msgstr "Мале иконице" +msgstr "" -#: ../midori/midori-websettings.c:278 +#: ../midori/midori-websettings.c:275 msgid "Text" msgstr "Текст" -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-websettings.c:276 msgid "Icons and text" -msgstr "Иконице и текст" +msgstr "" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:277 +#, fuzzy msgid "Text beside icons" -msgstr "Текст поред иконица" +msgstr "Иконице веб страница" -#: ../midori/midori-websettings.c:295 +#: ../midori/midori-websettings.c:292 msgid "Automatic (GNOME or environment)" -msgstr "Самостално (Гном или окружење)" +msgstr "" -#: ../midori/midori-websettings.c:296 +#: ../midori/midori-websettings.c:293 +#, fuzzy msgid "HTTP proxy server" -msgstr "ХТТП сервер посредник" +msgstr "Прокси сервер" -#: ../midori/midori-websettings.c:297 +#: ../midori/midori-websettings.c:294 +#, fuzzy msgid "No proxy server" -msgstr "Без посредничког сервера" +msgstr "Прокси сервер" + +#: ../midori/midori-websettings.c:309 +msgid "All cookies" +msgstr "Све колачиће" + +#: ../midori/midori-websettings.c:310 +msgid "Session cookies" +msgstr "Колачиће сесије" + +#: ../midori/midori-websettings.c:311 ../katze/katze-utils.c:675 +msgid "None" +msgstr "Ништа" -#: ../midori/midori-websettings.c:314 +#: ../midori/midori-websettings.c:327 msgid "Safari" msgstr "Сафари" -#: ../midori/midori-websettings.c:315 +#: ../midori/midori-websettings.c:328 +#, fuzzy msgid "iPhone" -msgstr "иФон" +msgstr "Ништа" -#: ../midori/midori-websettings.c:316 +#: ../midori/midori-websettings.c:329 msgid "Firefox" -msgstr "Фајерфокс" +msgstr "Firefox" -#: ../midori/midori-websettings.c:317 +#: ../midori/midori-websettings.c:330 msgid "Internet Explorer" -msgstr "Интернет експлорер" +msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:401 +#: ../midori/midori-websettings.c:383 msgid "Remember last window size" -msgstr "Запамти последњу величину прозора" +msgstr "Запамти величину прозора" -#: ../midori/midori-websettings.c:402 +#: ../midori/midori-websettings.c:384 msgid "Whether to save the last window size" -msgstr "Да ли ће бити сачувана последња величина прозора" +msgstr "Да ли да сачувам последњу величину прозора" -#: ../midori/midori-websettings.c:410 +#: ../midori/midori-websettings.c:392 msgid "Last window width" -msgstr "Последња ширина прозора" +msgstr "Ширина прозора" -#: ../midori/midori-websettings.c:411 +#: ../midori/midori-websettings.c:393 msgid "The last saved window width" -msgstr "Последња ширина сачуваног прозора" +msgstr "Последња сачувана ширина прозора" -#: ../midori/midori-websettings.c:419 +#: ../midori/midori-websettings.c:401 msgid "Last window height" -msgstr "Последњег висина прозора" +msgstr "Висина прозора" -#: ../midori/midori-websettings.c:420 +#: ../midori/midori-websettings.c:402 msgid "The last saved window height" -msgstr "Последња висина сачуваног прозора" +msgstr "Последња сачувана висина прозора" -#: ../midori/midori-websettings.c:445 +#: ../midori/midori-websettings.c:427 msgid "Last panel position" -msgstr "Последњи положај панела" +msgstr "Место панела" -#: ../midori/midori-websettings.c:446 +#: ../midori/midori-websettings.c:428 msgid "The last saved panel position" -msgstr "Последњи сачувани положај панела" +msgstr "Последње сачувано место панела" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:455 +#: ../midori/midori-websettings.c:437 msgid "Last panel page" msgstr "Последња станица панела" -#: ../midori/midori-websettings.c:456 +#: ../midori/midori-websettings.c:438 msgid "The last saved panel page" -msgstr "Последња сачувана страница панела" +msgstr "Последња сачувана страница у панелу" -#: ../midori/midori-websettings.c:464 +#: ../midori/midori-websettings.c:446 msgid "Last Web search" msgstr "Последња претрага" -#: ../midori/midori-websettings.c:465 +#: ../midori/midori-websettings.c:447 msgid "The last saved Web search" -msgstr "Последња сачувана претрага веба" +msgstr "Последња сачувана Интернет претрага" -#: ../midori/midori-websettings.c:474 +#: ../midori/midori-websettings.c:456 msgid "Show Menubar" -msgstr "Приказивање траке изборника" +msgstr "Прикажи мени" -#: ../midori/midori-websettings.c:475 +#: ../midori/midori-websettings.c:457 msgid "Whether to show the menubar" -msgstr "Да ли ће бити приказана трака изборника" +msgstr "Одређује да ли је приказана трака са менијем" -#: ../midori/midori-websettings.c:483 +#: ../midori/midori-websettings.c:465 msgid "Show Navigationbar" -msgstr "Приказивање траке навигације" +msgstr "Прикажи главну траку" -#: ../midori/midori-websettings.c:484 +#: ../midori/midori-websettings.c:466 msgid "Whether to show the navigationbar" -msgstr "Да ли ће бити приказана трака навигације" +msgstr "Одређује да ли је приказана главна трака" -#: ../midori/midori-websettings.c:492 +#: ../midori/midori-websettings.c:474 msgid "Show Bookmarkbar" -msgstr "Приказивање обележивача" +msgstr "Прикажи обележиваче" -#: ../midori/midori-websettings.c:493 +#: ../midori/midori-websettings.c:475 msgid "Whether to show the bookmarkbar" -msgstr "Да ли ће бити приказани обележивачи" +msgstr "Одређује да ли су приказани обележивачи" -#: ../midori/midori-websettings.c:501 +#: ../midori/midori-websettings.c:483 msgid "Show Panel" -msgstr "Приказивање бочне површи" +msgstr "Прикажи бочну површ" -#: ../midori/midori-websettings.c:502 +#: ../midori/midori-websettings.c:484 msgid "Whether to show the panel" -msgstr "Да ли ће бити приказана бочна површ" +msgstr "Одређује да ли је приказана бочна површ" + +#: ../midori/midori-websettings.c:501 +msgid "Show Transferbar" +msgstr "Прикажи преносе" + +#: ../midori/midori-websettings.c:502 +msgid "Whether to show the transferbar" +msgstr "Одређује да ли је приказана трака са преносима" #: ../midori/midori-websettings.c:510 msgid "Show Statusbar" -msgstr "Приказивање траке стања" +msgstr "Прикажи траку са стањем" #: ../midori/midori-websettings.c:511 msgid "Whether to show the statusbar" -msgstr "Да ли ће бити приказана трака стања" +msgstr "Одређује да ли је приказана трака са стањем" #: ../midori/midori-websettings.c:520 +#, fuzzy msgid "Toolbar Style:" -msgstr "Стил траке алата:" +msgstr "Изглед траке са алаткама" #: ../midori/midori-websettings.c:521 msgid "The style of the toolbar" -msgstr "Одређује изглед траке алата" +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:530 +#: ../midori/midori-websettings.c:548 msgid "Toolbar Items" -msgstr "Ставке траке алата" +msgstr "Ставке у траци са алаткама" -#: ../midori/midori-websettings.c:531 +#: ../midori/midori-websettings.c:549 msgid "The items to show on the toolbar" -msgstr "Ставке које ће бити приказане у траци алата" +msgstr "Ставке приказане у траци са алаткама" -#: ../midori/midori-websettings.c:539 +#: ../midori/midori-websettings.c:557 msgid "Compact Sidepanel" -msgstr "Збијена бочна површ" +msgstr "Сабиј бочну површ" -#: ../midori/midori-websettings.c:540 +#: ../midori/midori-websettings.c:558 msgid "Whether to make the sidepanel compact" -msgstr "Да ли ће бочну површ учинити збијеном" +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:555 +#: ../midori/midori-websettings.c:591 msgid "Align sidepanel on the right" -msgstr "Постављање бочне површи на десно" +msgstr "Постави бочну површ десно" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:592 msgid "Whether to align the sidepanel on the right" -msgstr "Да ли ће бочна површ бити поравната на десно" +msgstr "Одређује да ли да се бочна површ равна са десном страном" -#: ../midori/midori-websettings.c:571 +#: ../midori/midori-websettings.c:607 +#, fuzzy msgid "Open panels in separate windows" -msgstr "Површи у засебним прозорима" +msgstr "Отвори нови прозор" -#: ../midori/midori-websettings.c:572 +#: ../midori/midori-websettings.c:608 +#, fuzzy msgid "Whether to always open panels in separate windows" -msgstr "Да ли ће увек отварати површи у засебним прозорима" +msgstr "Откачује изабрану површ из прозора" -#: ../midori/midori-websettings.c:581 +#: ../midori/midori-websettings.c:617 msgid "When Midori starts:" -msgstr "Када се Мидори покрене:" +msgstr "" -#: ../midori/midori-websettings.c:582 +#: ../midori/midori-websettings.c:618 +#, fuzzy msgid "What to do when Midori starts" -msgstr "Шта да се ради када се покрене Мидори" +msgstr "Одређује шта се учитава по покретању" -#: ../midori/midori-websettings.c:591 +#: ../midori/midori-websettings.c:627 +#, fuzzy msgid "Homepage:" -msgstr "Матична страница:" +msgstr "Почетна страница" -#: ../midori/midori-websettings.c:592 +#: ../midori/midori-websettings.c:628 msgid "The homepage" msgstr "Почетна страница" -#: ../midori/midori-websettings.c:607 +#: ../midori/midori-websettings.c:643 msgid "Show crash dialog" -msgstr "Прикажи прозорче падова програма" +msgstr "Прикажи прозорче приликом пада програма" -#: ../midori/midori-websettings.c:608 +#: ../midori/midori-websettings.c:644 msgid "Show a dialog after Midori crashed" -msgstr "Приказује прозорче након пада Мидорија" +msgstr "Прикажи прозорче при паду Мидорија" + +#. i18n: Speed dial, webpage shortcuts, named for the phone function +#: ../midori/midori-websettings.c:662 +msgid "Show speed dial in new tabs" +msgstr "Прикажи брзе посете у новим листовима" + +#: ../midori/midori-websettings.c:663 +msgid "Show speed dial in newly opened tabs" +msgstr "Укључује приказ брзих адреса у новим листовима" -#: ../midori/midori-websettings.c:616 +#: ../midori/midori-websettings.c:671 +#, fuzzy msgid "Save downloaded files to:" -msgstr "Сачувај преузете датотеке у:" +msgstr "Запамти последње преузете датотеке" -#: ../midori/midori-websettings.c:617 +#: ../midori/midori-websettings.c:672 msgid "The folder downloaded files are saved to" -msgstr "Фасцикла у којој ће бити сачуване преузете датотеке" +msgstr "Фасцикле у коју се смештају преузете датотеке" + +#: ../midori/midori-websettings.c:691 +msgid "Download Manager" +msgstr "Преузимач датотека" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:692 +msgid "An external download manager" +msgstr "Спољни програм за преузимање датотека" + +#: ../midori/midori-websettings.c:700 msgid "Text Editor" msgstr "Уређивач текста" -#: ../midori/midori-websettings.c:626 +#: ../midori/midori-websettings.c:701 msgid "An external text editor" msgstr "Спољни програм за уређивање текста" -#: ../midori/midori-websettings.c:641 +#: ../midori/midori-websettings.c:716 msgid "News Aggregator" msgstr "Читач вести" -#: ../midori/midori-websettings.c:642 +#: ../midori/midori-websettings.c:717 msgid "An external news aggregator" msgstr "Спољни програм за читање вести" -#: ../midori/midori-websettings.c:650 +#: ../midori/midori-websettings.c:725 msgid "Location entry Search" -msgstr "Претрага поља за адресе" +msgstr "Претрага у поље за адресе" -#: ../midori/midori-websettings.c:651 +#: ../midori/midori-websettings.c:726 msgid "The search to perform inside the location entry" -msgstr "Претрага која ће бити обављена из поља за унос адреса" +msgstr "Додаје могућност претраге из поља за унос адреса" -#: ../midori/midori-websettings.c:659 +#: ../midori/midori-websettings.c:734 msgid "Preferred Encoding" -msgstr "Омиљено кодирање" +msgstr "Предност кодирању" -#: ../midori/midori-websettings.c:660 +#: ../midori/midori-websettings.c:735 msgid "The preferred character encoding" msgstr "Кодирање знакова које ће бити у предности" -#: ../midori/midori-websettings.c:670 +#: ../midori/midori-websettings.c:745 msgid "Always Show Tabbar" -msgstr "Увек прикажи листове" +msgstr "Увек прикажи језичке" -#: ../midori/midori-websettings.c:671 +#: ../midori/midori-websettings.c:746 msgid "Always show the tabbar" -msgstr "Увек приказује траку листова" +msgstr "Увек приказује траку са језичцима" -#: ../midori/midori-websettings.c:684 +#: ../midori/midori-websettings.c:754 msgid "Close Buttons on Tabs" -msgstr "Дугме за затварање листова" +msgstr "Прикажи дугме за затварање листова" -#: ../midori/midori-websettings.c:685 +#: ../midori/midori-websettings.c:755 msgid "Whether tabs have close buttons" -msgstr "Да ли ће листови имати дугмад за затварање" +msgstr "Приказује дугме за затварање на сваком листу" # bug(slobo): једноставно разлистај? -#: ../midori/midori-websettings.c:710 +#: ../midori/midori-websettings.c:780 +#, fuzzy msgid "Open new pages in:" -msgstr "Отвори нове странице у:" +msgstr "Отвори нове странице у" -#: ../midori/midori-websettings.c:711 +#: ../midori/midori-websettings.c:781 msgid "Where to open new pages" -msgstr "Где ће бити отворене нове странице" +msgstr "Одређује где да се отварају нове странице" + +#: ../midori/midori-websettings.c:797 +#, fuzzy +msgid "Open external pages in:" +msgstr "Отвори спољне странице у" + +#: ../midori/midori-websettings.c:798 +msgid "Where to open externally opened pages" +msgstr "Одређује где се отварају спољне странице" -#: ../midori/midori-websettings.c:720 +#: ../midori/midori-websettings.c:807 msgid "Middle click opens Selection" -msgstr "Средњи клик отвара избор" +msgstr "Отвори изабрано на средњи клик" -#: ../midori/midori-websettings.c:721 +#: ../midori/midori-websettings.c:808 msgid "Load an address from the selection via middle click" -msgstr "Учитава адресу из избора на средњи клик мишем" +msgstr "Учитава адресу из изабраног на средњи клик мишем" -#: ../midori/midori-websettings.c:729 +#: ../midori/midori-websettings.c:816 msgid "Open tabs in the background" -msgstr "Отворите листове у позадини" +msgstr "Отвори листове у позадини" -#: ../midori/midori-websettings.c:730 +#: ../midori/midori-websettings.c:817 msgid "Whether to open new tabs in the background" -msgstr "Да ли ће нови листови бити отворени у позадини" +msgstr "Не прелази на нови лист већ га отвара у позадини" -#: ../midori/midori-websettings.c:738 +#: ../midori/midori-websettings.c:825 msgid "Open Tabs next to Current" -msgstr "Отворите листове поред тренутног" +msgstr "Отвори лист поред тренутног" -#: ../midori/midori-websettings.c:739 +#: ../midori/midori-websettings.c:826 msgid "Whether to open new tabs next to the current tab or after the last one" -msgstr "Да ли да отвори нове листове поред текућег или након последњег листа" +msgstr "Одређује да ли се нови лист отвара поред текућег или поред последњег листа" -#: ../midori/midori-websettings.c:747 +#: ../midori/midori-websettings.c:834 msgid "Open popups in tabs" -msgstr "Отворите искачуће прозоре у листовима" +msgstr "Смести искачуће прозоре у лист" -#: ../midori/midori-websettings.c:748 +#: ../midori/midori-websettings.c:835 msgid "Whether to open popup windows in tabs" -msgstr "Да ли да отвори искачуће прозоре у листовима" +msgstr "Отвара искачуће прозоре у новим листовима" -#: ../midori/midori-websettings.c:758 ../extensions/statusbar-features.c:134 +#: ../midori/midori-websettings.c:845 ../extensions/statusbar-features.c:132 msgid "Load images automatically" msgstr "Сам учитај слике" -#: ../midori/midori-websettings.c:759 +#: ../midori/midori-websettings.c:846 msgid "Load and display images automatically" -msgstr "Учитава и самостално приказује слике" +msgstr "Учитава и аутоматски приказује слике" -#: ../midori/midori-websettings.c:766 ../extensions/statusbar-features.c:143 +#: ../midori/midori-websettings.c:853 ../extensions/statusbar-features.c:141 msgid "Enable scripts" msgstr "Укључи скрипте" -#: ../midori/midori-websettings.c:767 +#: ../midori/midori-websettings.c:854 msgid "Enable embedded scripting languages" -msgstr "Укључује уметнуте језике за скрипте" +msgstr "укључује уметнуте језике за скрипте" -#: ../midori/midori-websettings.c:774 ../extensions/statusbar-features.c:154 +#: ../midori/midori-websettings.c:861 ../extensions/statusbar-features.c:150 msgid "Enable Netscape plugins" -msgstr "Укључи прикључке Нетскејпа" +msgstr "Укључи Netscape додатке" -#: ../midori/midori-websettings.c:775 +#: ../midori/midori-websettings.c:862 msgid "Enable embedded Netscape plugin objects" -msgstr "Укључује угнежђене објекте прикључака Нетскејпа" +msgstr "Омогућава објекте са угнежђеним Netscape додацима" -#: ../midori/midori-websettings.c:790 +#: ../midori/midori-websettings.c:878 msgid "Enable Spell Checking" msgstr "Укључи проверу писања" -#: ../midori/midori-websettings.c:791 +#: ../midori/midori-websettings.c:879 msgid "Enable spell checking while typing" -msgstr "Укључује проверу писања за време куцања" +msgstr "Укључи проверу писања док куцам" -#: ../midori/midori-websettings.c:797 +#: ../midori/midori-websettings.c:887 msgid "Enable HTML5 database support" -msgstr "Укључи подршку ХТМЛ5 базе података" +msgstr "" -#: ../midori/midori-websettings.c:798 +#: ../midori/midori-websettings.c:888 msgid "Whether to enable HTML5 database support" -msgstr "Да ли да укључи подршку ХТМЛ5 базе података" +msgstr "" -#: ../midori/midori-websettings.c:804 +#: ../midori/midori-websettings.c:894 msgid "Enable HTML5 local storage support" -msgstr "Укључи подршку ХТМЛ5 месног скалдиштења" +msgstr "" -#: ../midori/midori-websettings.c:805 +#: ../midori/midori-websettings.c:895 msgid "Whether to enable HTML5 local storage support" -msgstr "Да ли да укључи подршку ХТМЛ5 месног скалдиштења" +msgstr "" -#: ../midori/midori-websettings.c:811 +#: ../midori/midori-websettings.c:903 msgid "Enable offline web application cache" -msgstr "Укључи тренутну меморију веб програма ван мреже" +msgstr "" -#: ../midori/midori-websettings.c:812 +#: ../midori/midori-websettings.c:904 msgid "Whether to enable offline web application cache" -msgstr "Да ли да укључи тренутну меморију веб програма ван мреже" - -#: ../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 "Укључи ВебГЛ подршку" - -#: ../midori/midori-websettings.c:838 -msgid "Allow websites to use OpenGL rendering" -msgstr "Омогућава веб сајтовима да користе ОпенГЛ исцртавање" +msgstr "" -#: ../midori/midori-websettings.c:864 +#: ../midori/midori-websettings.c:929 msgid "Zoom Text and Images" msgstr "Увећај текст и слике" -#: ../midori/midori-websettings.c:865 +#: ../midori/midori-websettings.c:930 msgid "Whether to zoom text and images" -msgstr "Да ли да повећа текст и слике" +msgstr "Повећај текст и слике" -#: ../midori/midori-websettings.c:880 +#: ../midori/midori-websettings.c:945 msgid "Find inline while typing" -msgstr "Налази унутр за време куцања" +msgstr "Нађи док куцам" -#: ../midori/midori-websettings.c:881 +#: ../midori/midori-websettings.c:946 msgid "Whether to automatically find inline while typing" -msgstr "Да ли да самостално проналази унутар за време куцања" +msgstr "Аутоматски проверава писање док куцате текст" -#: ../midori/midori-websettings.c:896 +#: ../midori/midori-websettings.c:961 msgid "Kinetic scrolling" -msgstr "Кинетичко клизање" +msgstr "" -#: ../midori/midori-websettings.c:897 +#: ../midori/midori-websettings.c:962 msgid "Whether scrolling should kinetically move according to speed" -msgstr "Да ли клизање треба кинетички да се помера у складу са брзином" +msgstr "" -#: ../midori/midori-websettings.c:905 -msgid "Delete old Cookies after:" -msgstr "Обриши старе колачиће након:" +#: ../midori/midori-websettings.c:977 +msgid "Accept cookies" +msgstr "Прихвати колачиће" -#: ../midori/midori-websettings.c:906 -msgid "The maximum number of days to save cookies for" -msgstr "Највећи број дана за које ће бити причувани колачићи" +#: ../midori/midori-websettings.c:978 +msgid "What type of cookies to accept" +msgstr "Које колачиће да прихватим" -#: ../midori/midori-websettings.c:922 -msgid "Only accept Cookies from sites you visit" -msgstr "Прихвати колачиће само са сајтова које посетим" +#: ../midori/midori-websettings.c:987 +msgid "Maximum cookie age" +msgstr "Старост колачића" -#: ../midori/midori-websettings.c:923 -msgid "Block cookies sent by third-party websites" -msgstr "Блокира колачиће које пошаљу веб сајтови трећих страна" +#: ../midori/midori-websettings.c:988 +msgid "The maximum number of days to save cookies for" +msgstr "Број дана након чега се уклањају колачићи са рачунара" -#: ../midori/midori-websettings.c:937 -msgid "Delete pages from history after:" -msgstr "Обриши странице из историјата након:" +#: ../midori/midori-websettings.c:997 +msgid "Maximum history age" +msgstr "Старост историјата" -#: ../midori/midori-websettings.c:938 +#: ../midori/midori-websettings.c:998 msgid "The maximum number of days to save the history for" -msgstr "Највећи број дана за које ће бити причуван историјат" +msgstr "Број дана након којих се уклања историјат посета страница" + +#: ../midori/midori-websettings.c:1013 +msgid "Remember last downloaded files" +msgstr "Запамти последње преузете датотеке" -#: ../midori/midori-websettings.c:953 +#: ../midori/midori-websettings.c:1014 +msgid "Whether the last downloaded files are saved" +msgstr "Чува датотеке које сте последње преузели" + +#: ../midori/midori-websettings.c:1031 +#, fuzzy msgid "Proxy server" -msgstr "Сервер посредник" +msgstr "Прокси сервер" -#: ../midori/midori-websettings.c:954 +#: ../midori/midori-websettings.c:1032 msgid "The type of proxy server to use" -msgstr "Врста посредника сервера за коришћење" +msgstr "" -#: ../midori/midori-websettings.c:963 +#: ../midori/midori-websettings.c:1041 +#, fuzzy msgid "HTTP Proxy Server" -msgstr "ХТТП сервер посредник" +msgstr "Прокси сервер" -#: ../midori/midori-websettings.c:964 +#: ../midori/midori-websettings.c:1042 msgid "The proxy server used for HTTP connections" -msgstr "Сервер посредник коришћен за ХТТП везе" - -#: ../midori/midori-websettings.c:979 -msgid "Port" -msgstr "Прикључак" +msgstr "Прокси сервер за ХТТП везе" -#: ../midori/midori-websettings.c:980 -msgid "The proxy server port used for HTTP connections" -msgstr "Прикључак сервера посредника коришћеног за ХТТП везе" - -#: ../midori/midori-websettings.c:998 +#: ../midori/midori-websettings.c:1059 msgid "The maximum size of cached pages on disk" -msgstr "Највећа величина причуваних страница на диску" +msgstr "" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1015 +#: ../midori/midori-websettings.c:1076 msgid "Identify as" msgstr "Представи се као" -#: ../midori/midori-websettings.c:1016 +#: ../midori/midori-websettings.c:1077 msgid "What to identify as to web pages" -msgstr "Одређује како ће се програм представити веб страницама" +msgstr "Одређује како се програм представља веб страницама" -#: ../midori/midori-websettings.c:1032 +#: ../midori/midori-websettings.c:1093 msgid "Identification string" msgstr "Реченица за представање" -#: ../midori/midori-websettings.c:1033 +#: ../midori/midori-websettings.c:1094 msgid "The application identification string" msgstr "Реченица која одређује како веб странице препознају програм" -#: ../midori/midori-websettings.c:1049 +#: ../midori/midori-websettings.c:1110 +#, fuzzy msgid "Preferred languages" -msgstr "Пожељни језици" +msgstr "Предност кодирању" -#: ../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\"" +#: ../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 "" -"Зарезом одвојен списак пожељних језика за исцртавање вишејезичних веб " -"страница, на пример „de“, „ru,nl“ или „en-us;q=1.0, fr-fr;q=0.667“" -#: ../midori/midori-websettings.c:1065 +#: ../midori/midori-websettings.c:1126 +#, fuzzy msgid "Clear private data" -msgstr "Брисање личних података" +msgstr "О_чисти личне податке" -#: ../midori/midori-websettings.c:1066 +#: ../midori/midori-websettings.c:1127 msgid "The private data selected for deletion" -msgstr "Лични подаци изабрани за брисање" +msgstr "" -#: ../midori/midori-websettings.c:1081 +#: ../midori/midori-websettings.c:1142 +#, fuzzy msgid "Clear data" -msgstr "Брисање података" +msgstr "О_чисти личне податке" -#: ../midori/midori-websettings.c:1082 +#: ../midori/midori-websettings.c:1143 msgid "The data selected for deletion" -msgstr "Подаци изабрани за брисање" +msgstr "" #. i18n: Reworded: Shorten details propagated when going to another page -#: ../midori/midori-websettings.c:1131 -msgid "Strip referrer details sent to websites" -msgstr "Отцепи податке преусмеривача послате веб сајтовима" +#: ../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:1133 +#: ../midori/midori-websettings.c:1178 msgid "Whether the \"Referer\" header should be shortened to the hostname" -msgstr "Да ли заглавље преусмеривача треба да буде скраћено на назив домаћина" - -#: ../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 +#: ../midori/midori-view.c:1374 #, c-format msgid "%s wants to save an HTML5 database." -msgstr "%s жели да сачува ХТМЛ5 базу податдака." +msgstr "" -#: ../midori/midori-view.c:1379 ../midori/midori-view.c:1413 +#: ../midori/midori-view.c:1378 ../midori/midori-view.c:1408 msgid "_Deny" -msgstr "_Одбиј" +msgstr "" -#: ../midori/midori-view.c:1379 ../midori/midori-view.c:1413 +#: ../midori/midori-view.c:1378 ../midori/midori-view.c:1408 msgid "_Allow" -msgstr "_Допусти" +msgstr "" -#: ../midori/midori-view.c:1408 +#: ../midori/midori-view.c:1404 #, c-format msgid "%s wants to know your location." -msgstr "%s жели да зна ваше место." +msgstr "" -#: ../midori/midori-view.c:1502 -#, c-format +#. 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:1519 ../midori/midori-view.c:5161 +#: ../midori/midori-view.c:5165 +#, fuzzy, c-format msgid "Error - %s" -msgstr "Грешка — %s" +msgstr "Грешка" -#: ../midori/midori-view.c:1503 +#: ../midori/midori-view.c:1520 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "Не могу да учитам страницу „%s“." -#: ../midori/midori-view.c:1505 +#: ../midori/midori-view.c:1522 msgid "Try again" msgstr "Покушај поново" -#: ../midori/midori-view.c:1703 ../midori/midori-view.c:2625 +#. i18n: The title of the 404 - Not found error page +#: ../midori/midori-view.c:1540 #, c-format +msgid "Not found - %s" +msgstr "Није пронађено - %s" + +#: ../midori/midori-view.c:1730 ../midori/midori-view.c:2674 +#, fuzzy, c-format msgid "Send a message to %s" -msgstr "Пошаљи поруку %s" +msgstr "Снимак је сачуван у: %s\n" -#: ../midori/midori-view.c:2455 ../midori/midori-view.c:2781 +#: ../midori/midori-view.c:2465 ../midori/midori-view.c:2841 msgid "Inspect _Element" -msgstr "Провери _елемент" +msgstr "" -#: ../midori/midori-view.c:2507 +#: ../midori/midori-view.c:2517 ../midori/midori-view.c:2577 msgid "Open Link in New _Tab" msgstr "Отвори везу у новом _листу" -#: ../midori/midori-view.c:2511 +#: ../midori/midori-view.c:2521 +#, fuzzy msgid "Open Link in _Foreground Tab" -msgstr "Отвори везу у про_челном листу" +msgstr "Отвори везу у новом _листу" -#: ../midori/midori-view.c:2512 +#: ../midori/midori-view.c:2522 +#, fuzzy msgid "Open Link in _Background Tab" -msgstr "Отвори везу у по_задинском листу" +msgstr "Отвори везу у новом _листу" -#: ../midori/midori-view.c:2515 +#: ../midori/midori-view.c:2525 ../midori/midori-view.c:2584 msgid "Open Link in New _Window" msgstr "Отвори везу у _новом прозору" -#: ../midori/midori-view.c:2518 +#: ../midori/midori-view.c:2528 +#, fuzzy msgid "Open Link as Web A_pplication" -msgstr "Отвори везу као веб _програм" +msgstr "Покреће АДРЕСУ као веб програм" -#: ../midori/midori-view.c:2523 +#: ../midori/midori-view.c:2531 +#, fuzzy msgid "Copy Link de_stination" -msgstr "Умножи _одредиште везе" +msgstr "Сачувај ци_љну датотеку" # bug: no plural-forms -#: ../midori/midori-view.c:2539 +#: ../midori/midori-view.c:2543 +#, fuzzy msgid "Open _Image in New Tab" -msgstr "Отвори слику у _новом листу" +msgstr "Отвору у новом _листу" -#: ../midori/midori-view.c:2542 +#: ../midori/midori-view.c:2546 msgid "Copy Image _Address" -msgstr "Умножи _адресу слике" +msgstr "" -#: ../midori/midori-view.c:2545 +#: ../midori/midori-view.c:2549 msgid "Save I_mage" -msgstr "Сачувај _слику" - -# bug: no plural-forms -#: ../midori/midori-view.c:2548 -msgid "Open in Image _Viewer" -msgstr "Отвори у _прегледнику слика" +msgstr "" -#: ../midori/midori-view.c:2555 +#: ../midori/midori-view.c:2556 msgid "Copy Video _Address" -msgstr "Умножи _адресу снимка" +msgstr "" -#: ../midori/midori-view.c:2558 +#: ../midori/midori-view.c:2559 +#, fuzzy msgid "Save _Video" -msgstr "Сачувај _снимак" +msgstr "Сачувај датотеку као" -#: ../midori/midori-view.c:2558 +#: ../midori/midori-view.c:2559 +#, fuzzy msgid "Download _Video" -msgstr "Преузми _снимак" +msgstr "Фасцикла за преузето" -#: ../midori/midori-view.c:2584 +#: ../midori/midori-view.c:2619 msgid "Search _with" msgstr "Пре_тражи са" -#: ../midori/midori-view.c:2616 +#: ../midori/midori-view.c:2654 ../midori/midori-view.c:2661 msgid "_Search the Web" msgstr "П_ретражи Интернет" # bug: no plural-forms -#: ../midori/midori-view.c:2633 +#: ../midori/midori-view.c:2682 msgid "Open Address in New _Tab" msgstr "Отвору адресу у новом _листу" -# bug: no plural-forms -#: ../midori/midori-view.c:2686 -msgid "Open _Frame in New Tab" -msgstr "Отвори кадар у новом _листу" - -#: ../midori/midori-view.c:2943 +#: ../midori/midori-view.c:2990 msgid "Open or download file" -msgstr "Отворите или преузмите датотеку" - -#: ../midori/midori-view.c:2968 -#, c-format -msgid "File Name: %s" -msgstr "Назив датотеке: „%s“" +msgstr "Отвори или преузми датотеку" -#: ../midori/midori-view.c:2973 +#: ../midori/midori-view.c:3009 #, c-format msgid "File Type: '%s'" msgstr "Врста датотеке: „%s“" -#: ../midori/midori-view.c:2975 +#: ../midori/midori-view.c:3011 #, c-format msgid "File Type: %s ('%s')" msgstr "Врста датотеке: %s („%s“)" -#: ../midori/midori-view.c:3005 -#, c-format -msgid "Size: %s" -msgstr "Величина: %s" +#: ../midori/midori-view.c:3026 +msgid "MD5-Checksum:" +msgstr "" + +#: ../midori/midori-view.c:3033 +msgid "SHA1-Checksum:" +msgstr "" -#: ../midori/midori-view.c:3017 +#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" +#: ../midori/midori-view.c:3043 #, c-format msgid "Open %s" -msgstr "Отворите %s" +msgstr "Отвори %s" -#: ../midori/midori-view.c:3640 +#: ../midori/midori-view.c:3646 #, c-format msgid "Inspect page - %s" -msgstr "Провера странице — %s" +msgstr "Инспекција странице — %s" -#: ../midori/midori-view.c:3987 +#: ../midori/midori-view.c:4130 +#, fuzzy msgid "Speed Dial" -msgstr "Брза посета" +msgstr "Додај у _брзе посете" -#: ../midori/midori-view.c:3988 ../midori/midori-view.c:4084 +#: ../midori/midori-view.c:4131 msgid "Click to add a shortcut" -msgstr "Кликните да додате пречицу" +msgstr "Кликните за додавање пречице" -#: ../midori/midori-view.c:3989 +#: ../midori/midori-view.c:4132 msgid "Enter shortcut address" msgstr "Унесите адресу за пречицу" -#: ../midori/midori-view.c:3990 +#: ../midori/midori-view.c:4133 msgid "Enter shortcut title" msgstr "Унесите наслов за пречицу" -#: ../midori/midori-view.c:3991 +#: ../midori/midori-view.c:4134 msgid "Are you sure you want to delete this shortcut?" msgstr "Да ли заиста желите да обришете ову пречицу?" -#: ../midori/midori-view.c:4153 -#, c-format -msgid "No documentation installed" -msgstr "Није инсталирана помоћ" - -#: ../midori/midori-view.c:4229 -msgid "Midori doesn't store any personal data:" -msgstr "Мидори не чува никакве личне податке:" +#: ../midori/midori-view.c:4135 +msgid "Set number of columns and rows" +msgstr "" -#: ../midori/midori-view.c:4230 -msgid "No history or web cookies are being saved." -msgstr "Нису сачувани ни историјат ни веб колачићи." +#: ../midori/midori-view.c:4136 +msgid "Enter number of columns and rows:" +msgstr "" -#: ../midori/midori-view.c:4231 -msgid "Extensions are disabled." -msgstr "Проширења су искључена." +#: ../midori/midori-view.c:4137 +msgid "Invalid input for the size of the speed dial" +msgstr "" -#: ../midori/midori-view.c:4232 -msgid "HTML5 storage, local database and application caches are disabled." +#: ../midori/midori-view.c:4138 +msgid "Thumb size:" msgstr "" -"ХТМЛ5 скалдиштење, месна база података и причувавања програма су искључена." -#: ../midori/midori-view.c:4233 -msgid "Midori prevents websites from tracking the user:" -msgstr "Мидори спречава веб сајтове да прате корисника:" +#: ../midori/midori-view.c:4139 +msgid "Small" +msgstr "" -#: ../midori/midori-view.c:4234 -msgid "Referrer URLs are stripped down to the hostname." -msgstr "Адресе преусмеривача су отцепљене на назив домаћина." +#: ../midori/midori-view.c:4140 +msgid "Medium" +msgstr "" -#: ../midori/midori-view.c:4235 -msgid "DNS prefetching is disabled." -msgstr "ДНС довлачење је искључено." +#: ../midori/midori-view.c:4141 +msgid "Big" +msgstr "" -#: ../midori/midori-view.c:4236 -msgid "The language and timezone are not revealed to websites." -msgstr "Језик и временска зона нису откривени веб сајтовима." +#: ../midori/midori-view.c:4177 +#, c-format +msgid "Document cannot be displayed" +msgstr "Не могу да прикажем докумант" -#: ../midori/midori-view.c:4237 -msgid "Flash and other Netscape plugins cannot be listed by websites." -msgstr "Веб сајтови не могу да ислистају Флеш или друге Нетскејп прикључке." +#: ../midori/midori-view.c:4200 +#, c-format +msgid "No documentation installed" +msgstr "Није инсталирана помоћ" -#: ../midori/midori-view.c:4307 +#: ../midori/midori-view.c:4269 msgid "Version numbers in brackets show the version used at runtime." msgstr "" -"Бројеви издања у заградама приказују издање коришћено за време покретања." -#: ../midori/midori-view.c:4357 +#: ../midori/midori-view.c:4319 msgid "Page loading delayed" -msgstr "Учитавање странице је одложено" +msgstr "" -#: ../midori/midori-view.c:4358 +#: ../midori/midori-view.c:4320 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "" -"Учитавање је одложено или због недавног пада програма или због поставки " -"покретања." -#: ../midori/midori-view.c:4359 +#: ../midori/midori-view.c:4321 msgid "Load Page" -msgstr "Учитај страницу" +msgstr "" -#: ../midori/midori-view.c:4525 +#: ../midori/midori-view.c:4462 msgid "Blank page" -msgstr "Празна страница" +msgstr "Празна страна" -#: ../midori/midori-view.c:4787 +#: ../midori/midori-view.c:4702 msgid "_Duplicate Tab" -msgstr "_Удвостручи лист" +msgstr "" -#: ../midori/midori-view.c:4792 +#: ../midori/midori-view.c:4707 +#, fuzzy msgid "Show Tab _Label" -msgstr "Прикажи _натпис листа" +msgstr "Прикажи бочну површ" -#: ../midori/midori-view.c:4792 +#: ../midori/midori-view.c:4707 msgid "Show Tab _Icon Only" -msgstr "Прикажи само _иконицу листа" +msgstr "" -#: ../midori/midori-view.c:4798 +#: ../midori/midori-view.c:4713 +#, fuzzy msgid "Close ot_her Tabs" -msgstr "Затвори _друге листове" - -#. i18n: word stem of "previous page" type links, case is not important -#: ../midori/midori-view.c:5613 -msgid "previous" -msgstr "Претходно" +msgstr "Затвара овај лист" -#. i18n: word stem of "next page" type links, case is not important -#: ../midori/midori-view.c:5632 -msgid "next" -msgstr "Следеће" - -#: ../midori/midori-view.c:5645 +#: ../midori/midori-view.c:5348 msgid "Print background images" msgstr "Прикажи позадинске слике" -#: ../midori/midori-view.c:5646 +#: ../midori/midori-view.c:5349 msgid "Whether background images should be printed" msgstr "Одређује да ли треба приказати слике за позадину" -#: ../midori/midori-view.c:5678 +#: ../midori/midori-view.c:5385 msgid "Features" msgstr "Могућности" -#: ../midori/midori-preferences.c:298 +#. Page "General" +#: ../midori/midori-preferences.c:302 msgid "Startup" msgstr "Покретање" -#: ../midori/midori-preferences.c:311 -msgid "Use _current page" -msgstr "Користи _тренутну страницу" - -#: ../midori/midori-preferences.c:315 +#: ../midori/midori-preferences.c:318 ../midori/midori-preferences.c:325 msgid "Use current page as homepage" -msgstr "Искористи тренутну страницу као почетну" +msgstr "Искористи тренутну страницу" #. Page "Appearance" -#: ../midori/midori-preferences.c:324 -msgid "Fonts" -msgstr "Писма" +#: ../midori/midori-preferences.c:333 +msgid "Appearance" +msgstr "Изглед" -#: ../midori/midori-preferences.c:327 -msgid "Proportional Font Family" -msgstr "Породица сразмерног писма" +#: ../midori/midori-preferences.c:336 +msgid "Default Font Family" +msgstr "Уобичајени фонтови" -#: ../midori/midori-preferences.c:331 +#: ../midori/midori-preferences.c:339 msgid "The default font family used to display text" -msgstr "Основна породица писма за приказ текста" +msgstr "Подразумевани фонтови за приказ текста" -#: ../midori/midori-preferences.c:334 +#: ../midori/midori-preferences.c:342 msgid "The default font size used to display text" -msgstr "Основна величина писма за приказ текста" +msgstr "Подразумевани величина фонтова за приказ текста" -#: ../midori/midori-preferences.c:336 +#: ../midori/midori-preferences.c:344 msgid "Fixed-width Font Family" -msgstr "Породица писма сталне ширине" +msgstr "Фонтови задате ширине" -#: ../midori/midori-preferences.c:340 +#: ../midori/midori-preferences.c:347 msgid "The font family used to display fixed-width text" -msgstr "Породица писма за приказ текста сталне ширине" +msgstr "Подразумевани фонтови задате ширине за приказ текста" -#: ../midori/midori-preferences.c:343 +#: ../midori/midori-preferences.c:350 +#, fuzzy msgid "The font size used to display fixed-width text" -msgstr "Величина писма за приказ текста сталне ширине" +msgstr "Подразумевани фонтови задате ширине за приказ текста" -#: ../midori/midori-preferences.c:345 +#: ../midori/midori-preferences.c:352 msgid "Minimum Font Size" -msgstr "Најмања величина писма" +msgstr "Најмања величина фонта" -#: ../midori/midori-preferences.c:349 +#: ../midori/midori-preferences.c:355 msgid "The minimum font size used to display text" -msgstr "Најмања величина писма за приказ текста" +msgstr "најмања величина фонтова за приказ текста" #. Page "Behavior" -#: ../midori/midori-preferences.c:360 +#: ../midori/midori-preferences.c:364 msgid "Behavior" msgstr "Понашање" +#: ../midori/midori-preferences.c:373 +msgid "Enforce 96 dots per inch" +msgstr "Приморај 96 тачака по инчу" + +#: ../midori/midori-preferences.c:374 +msgid "Enforce a video dot density of 96 DPI" +msgstr "Приморава густину тачака екрана од 96 ТПИ" + #: ../midori/midori-preferences.c:386 msgid "Allow scripts to open popups" -msgstr "Омогући скриптама да отворе облачиће" +msgstr "" #: ../midori/midori-preferences.c:387 +#, fuzzy msgid "Whether scripts are allowed to open popup windows automatically" -msgstr "" -"Да ли ће скриптама бити допуштено да самостално отварају искачуће прозоре" +msgstr "Отвара искачуће прозоре у новим листовима" #. Page "Interface" -#: ../midori/midori-preferences.c:417 +#: ../midori/midori-preferences.c:412 msgid "Browsing" msgstr "Разгледање" +#: ../midori/midori-preferences.c:440 +msgid "Applications" +msgstr "Програми" + #. Page "Network" -#: ../midori/midori-preferences.c:457 +#: ../midori/midori-preferences.c:453 msgid "Network" msgstr "Мрежа" -#: ../midori/midori-preferences.c:464 +#: ../midori/midori-preferences.c:460 +#, fuzzy msgid "Hostname" -msgstr "Домаћин" +msgstr "Корисничко име" -#: ../midori/midori-preferences.c:488 +#: ../midori/midori-preferences.c:473 msgid "MB" -msgstr "MB" +msgstr "МБ" -#: ../midori/midori-searchaction.c:902 +#: ../midori/midori-searchaction.c:908 msgid "Add search engine" -msgstr "Додајте претраживач" +msgstr "Додај претраживач" -#: ../midori/midori-searchaction.c:902 +#: ../midori/midori-searchaction.c:908 msgid "Edit search engine" -msgstr "Уреди претраживач" +msgstr "Уреди претрачивач" -#: ../midori/midori-searchaction.c:931 +#: ../midori/midori-searchaction.c:937 msgid "_Name:" -msgstr "_Назив:" - -#: ../midori/midori-searchaction.c:947 -msgid "_Description:" -msgstr "_Опис:" +msgstr "_Име:" #: ../midori/midori-searchaction.c:981 msgid "_Icon:" -msgstr "_Иконица:" +msgstr "И_коница:" #: ../midori/midori-searchaction.c:995 msgid "_Token:" -msgstr "_Израз:" +msgstr "_Фраза:" #: ../midori/midori-searchaction.c:1295 msgid "Manage Search Engines" msgstr "Подеси претраживаче" -#: ../midori/midori-searchaction.c:1395 -msgid "Use as _default" -msgstr "_Постави за основни" +#: ../midori/midori-searchaction.c:1395 +msgid "Use as _default" +msgstr "_Постави као подразумевани" + +#: ../midori/sokoke.c:452 +#, fuzzy +msgid "Open with" +msgstr "Отвори датотеку" + +#: ../midori/sokoke.c:460 +#, c-format +msgid "Choose an application or command to open \"%s\":" +msgstr "" + +#: ../midori/sokoke.c:1509 +msgid "_Bookmark" +msgstr "_Обележивач" + +#: ../midori/sokoke.c:1511 +#, fuzzy +msgid "Add Boo_kmark" +msgstr "_Додај обележивач" + +#: ../midori/sokoke.c:1512 +msgid "_Console" +msgstr "_Конзола" + +#: ../midori/sokoke.c:1513 +msgid "_Extensions" +msgstr "П_роширења" + +#: ../midori/sokoke.c:1515 +msgid "_Homepage" +msgstr "На по_четну страницу" + +#: ../midori/sokoke.c:1516 +msgid "_Userscripts" +msgstr "Личне _скрипте" + +#: ../midori/sokoke.c:1517 +msgid "New _Tab" +msgstr "Нови _лист" -#: ../midori/sokoke.c:355 -msgid "Open with" -msgstr "Отвори програмом" +#: ../midori/sokoke.c:1518 +msgid "_Transfers" +msgstr "Пр_еноиси" -#: ../midori/sokoke.c:363 -#, c-format -msgid "Choose an application or command to open \"%s\":" -msgstr "Изаберите програм или наредбу којом ће бити отворено „%s“:" +#: ../midori/sokoke.c:1519 +msgid "Netscape p_lugins" +msgstr "Netscape _додаци" -#: ../midori/sokoke.c:404 ../midori/sokoke.c:414 ../midori/sokoke.c:442 -#: ../midori/sokoke.c:471 ../midori/sokoke.c:485 -msgid "Could not run external program." -msgstr "Не могу да покренем спољни програм." +#: ../midori/sokoke.c:1522 +#, fuzzy +msgid "New _Folder" +msgstr "Нова фасцикла" -#: ../midori/sokoke.c:1538 +#: ../midori/sokoke.c:2262 #, c-format msgid "%d hour" msgid_plural "%d hours" -msgstr[0] "%d сат" -msgstr[1] "%d сата" -msgstr[2] "%d сати" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" -#: ../midori/sokoke.c:1539 +#: ../midori/sokoke.c:2263 #, c-format msgid "%d minute" msgid_plural "%d minutes" -msgstr[0] "%d минут" -msgstr[1] "%d минута" -msgstr[2] "%d минута" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" -#: ../midori/sokoke.c:1540 +#: ../midori/sokoke.c:2264 #, c-format msgid "%d second" msgid_plural "%d seconds" -msgstr[0] "%d секунда" -msgstr[1] "%d секунде" -msgstr[2] "%d секунди" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" #. i18n: Download tooltip (size): 4KB of 43MB -#: ../midori/sokoke.c:1548 ../panels/midori-transfers.c:269 +#: ../midori/sokoke.c:2272 ../panels/midori-transfers.c:273 #, c-format msgid "%s of %s" msgstr "%s од %s" #. i18n: Unknown number of bytes, used for transfer rate like ?B/s -#: ../midori/sokoke.c:1557 +#: ../midori/sokoke.c:2281 msgid "?B" -msgstr "?B" +msgstr "" #. i18n: Download tooltip (transfer rate): (130KB/s) -#: ../midori/sokoke.c:1560 +#: ../midori/sokoke.c:2284 #, c-format msgid " (%s/s)" -msgstr " (%s/s)" +msgstr "" #. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning -#: ../midori/sokoke.c:1577 +#: ../midori/sokoke.c:2301 #, c-format msgid " - %s remaining" -msgstr " — преостало време: %s" +msgstr "" #. i18n: A panel at the bottom, to search text in pages -#: ../toolbars/midori-findbar.c:291 +#: ../toolbars/midori-findbar.c:231 msgid "_Inline Find:" -msgstr "_Потражите израз:" +msgstr "_Тражи израз:" -#: ../toolbars/midori-findbar.c:317 +#: ../toolbars/midori-findbar.c:265 msgid "Previous" msgstr "Претходно" -#: ../toolbars/midori-findbar.c:323 +#: ../toolbars/midori-findbar.c:271 msgid "Next" msgstr "Следеће" -#: ../toolbars/midori-findbar.c:327 +#: ../toolbars/midori-findbar.c:275 msgid "Match Case" msgstr "Упореди велчину слова" -#: ../toolbars/midori-findbar.c:336 +#: ../toolbars/midori-findbar.c:284 msgid "Highlight Matches" -msgstr "Истакни пронађено" +msgstr "Истакни нађено" -#: ../toolbars/midori-findbar.c:347 +#: ../toolbars/midori-findbar.c:295 msgid "Close Findbar" -msgstr "Затворите траку за претрагу" +msgstr "Затвара траку за претрагу странице" -#: ../toolbars/midori-transferbar.c:122 -#, c-format +#: ../toolbars/midori-transferbar.c:132 +#, fuzzy, c-format msgid "The file '%s' has been downloaded." -msgstr "Датотека „%s“ је преузета." +msgstr "Датотека %s је преузета." -#: ../toolbars/midori-transferbar.c:125 +#: ../toolbars/midori-transferbar.c:135 msgid "Transfer completed" -msgstr "Пренос је завршен" +msgstr "Преузимање је завршено" -#: ../toolbars/midori-transferbar.c:193 +#: ../toolbars/midori-transferbar.c:217 +#, fuzzy msgid "The downloaded file is erroneous." -msgstr "Преузета датотека је погрешна." +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." +#: ../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:334 ../panels/midori-transfers.c:142 +#: ../toolbars/midori-transferbar.c:327 ../panels/midori-transfers.c:144 +#, fuzzy msgid "Clear All" -msgstr "Очисти све" +msgstr "Сакупи све" -#: ../toolbars/midori-transferbar.c:371 ../toolbars/midori-transferbar.c:373 +#: ../toolbars/midori-transferbar.c:370 ../toolbars/midori-transferbar.c:372 +#, fuzzy msgid "Some files are being downloaded" -msgstr "Неке датотеке су преузете" +msgstr "Датотека %s је преузета." -#: ../toolbars/midori-transferbar.c:377 +#: ../toolbars/midori-transferbar.c:376 +#, fuzzy msgid "_Quit Midori" -msgstr "_Напусти Мидори" +msgstr "Мидори" -#: ../toolbars/midori-transferbar.c:379 +#: ../toolbars/midori-transferbar.c:378 msgid "The transfers will be cancelled if Midori quits." -msgstr "Преноси ће бити отказани ако затворите Мидори." +msgstr "" -#: ../panels/midori-bookmarks.c:114 +#: ../panels/midori-bookmarks.c:116 msgid "Bookmarks" msgstr "Обележивачи" -#: ../panels/midori-bookmarks.c:257 -#, c-format +#: ../panels/midori-bookmarks.c:282 +#, fuzzy, c-format msgid "Failed to add bookmark item: %s\n" -msgstr "Нисам успео да додам ставку обележивача: %s\n" +msgstr "Не могу да додам ставку у историјат: %s\n" -#: ../panels/midori-bookmarks.c:435 +#: ../panels/midori-bookmarks.c:462 msgid "Edit the selected bookmark" -msgstr "Уредите изабрани обележивач" +msgstr "Уреди изабрани обележивач" -#: ../panels/midori-bookmarks.c:443 +#: ../panels/midori-bookmarks.c:470 msgid "Delete the selected bookmark" -msgstr "Уклоните изабрани обележивач" +msgstr "Уклони изабрани обележивач" -#: ../panels/midori-bookmarks.c:458 +#: ../panels/midori-bookmarks.c:485 msgid "Add a new folder" -msgstr "Додајте нову фасциклу" +msgstr "Додај нову фасциклу" -#: ../panels/midori-bookmarks.c:594 ../panels/midori-history.c:635 +#: ../panels/midori-bookmarks.c:619 ../panels/midori-history.c:576 msgid "Separator" msgstr "Раздвајач" -#: ../panels/midori-history.c:111 +#: ../panels/midori-history.c:114 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:146 +msgid "A week ago" +msgstr "Пре недељу дана" -#: ../panels/midori-history.c:162 ../panels/midori-history.c:186 -#, c-format +#: ../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 дана" +msgstr[1] "Пре %d дан" +msgstr[2] "Пре %d дан" -#: ../panels/midori-history.c:165 ../panels/midori-history.c:184 -msgid "A week ago" -msgstr "Пре недељу дана" +#: ../panels/midori-history.c:151 +msgid "Today" +msgstr "Данас" -#: ../panels/midori-history.c:232 -#, c-format -msgid "Failed to remove history item: %s\n" -msgstr "Не могу да уклоним ставку историјата: %s\n" +#: ../panels/midori-history.c:153 +msgid "Yesterday" +msgstr "Јуче" -#: ../panels/midori-history.c:360 +#: ../panels/midori-history.c:315 msgid "Are you sure you want to remove all history items?" msgstr "Да ли заиста желите да уклоните све ставке из историјата?" -#: ../panels/midori-history.c:407 +#: ../panels/midori-history.c:360 msgid "Bookmark the selected history item" -msgstr "Обележите изабрану ставку историјата" +msgstr "Постави изабрани из историјата у обележиваче" -#: ../panels/midori-history.c:416 +#: ../panels/midori-history.c:369 msgid "Delete the selected history item" -msgstr "Уклоните изабрану ставку из историјата" +msgstr "Уклони изабрану ставку из историјата" -#: ../panels/midori-history.c:424 +#: ../panels/midori-history.c:377 msgid "Clear the entire history" -msgstr "Очистите сав историјат" +msgstr "Очисти историјат" #: ../panels/midori-transfers.c:87 msgid "Transfers" msgstr "Преноси" -#: ../panels/midori-transfers.c:470 +#: ../panels/midori-transfers.c:481 +#, fuzzy msgid "Open Destination _Folder" -msgstr "Отвори одредишну _фасциклу" +msgstr "Питај за одредишну фасциклу" -#: ../panels/midori-transfers.c:473 +#: ../panels/midori-transfers.c:484 msgid "Copy Link Loc_ation" -msgstr "_Умножи место везе" +msgstr "" -#: ../katze/katze-http-auth.c:210 +#: ../katze/katze-http-auth.c:213 msgid "Authentication Required" msgstr "Потребна је пријава" -#: ../katze/katze-http-auth.c:226 +#: ../katze/katze-http-auth.c:229 msgid "" "A username and a password are required\n" "to open this location:" msgstr "" -"Потребно је корисничко име и лозинка за\n" +"Потребно су корисничко име и лозинка за\n" "отварање ове странице:" -#: ../katze/katze-http-auth.c:240 +#: ../katze/katze-http-auth.c:243 msgid "Username" msgstr "Корисничко име" -#: ../katze/katze-http-auth.c:253 +#: ../katze/katze-http-auth.c:256 msgid "Password" msgstr "Лозинка" -#: ../katze/katze-http-auth.c:267 +#: ../katze/katze-http-auth.c:270 +#, fuzzy msgid "_Remember password" -msgstr "_Запамти лозинку" +msgstr "Запамти величину прозора" -#: ../katze/katze-throbber.c:949 -#, c-format +#: ../katze/katze-throbber.c:879 +#, fuzzy, c-format msgid "Named icon '%s' couldn't be loaded" -msgstr "Именована иконица „%s“ не може бити учитана" +msgstr "Не могу да именовану учитам иконицу „%s“" -#: ../katze/katze-throbber.c:962 -#, c-format +#: ../katze/katze-throbber.c:892 +#, fuzzy, c-format msgid "Stock icon '%s' couldn't be loaded" -msgstr "Стек иконица „%s“ не може бити учитана" +msgstr "Не могу да учитам сток иконицу „%s“" -#: ../katze/katze-throbber.c:1042 +#: ../katze/katze-throbber.c:964 msgid "Animation frames are broken" msgstr "Оквири са анимацијама су неисправни" -#: ../katze/katze-utils.c:445 ../katze/katze-utils.c:879 +#: ../katze/katze-utils.c:510 ../katze/katze-utils.c:918 #, c-format msgid "Property '%s' is invalid for %s" -msgstr "Вредност „%s“ није исправна за %s" +msgstr "Вредност „%s“ није исправна за %s" -#: ../katze/katze-utils.c:491 ../katze/katze-utils.c:520 +#: ../katze/katze-utils.c:556 ../katze/katze-utils.c:585 #: ../extensions/addons.c:308 msgid "Choose file" msgstr "Изаберите датотеку" -#: ../katze/katze-utils.c:506 +#: ../katze/katze-utils.c:571 msgid "Choose folder" msgstr "Изаберите фасциклу" -#: ../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 +#: ../katze/katze-preferences.c:95 #, c-format msgid "Preferences for %s" msgstr "Поставке за %s" -#: ../extensions/adblock.c:473 +#: ../extensions/adblock.c:415 msgid "Configure Advertisement filters" -msgstr "Подесите пропуснике реклама" +msgstr "" -#: ../extensions/adblock.c:504 +#: ../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." +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 "" -"Упишите адресу претподешеног списка филтера у поље за унос текста и кликните " -"„Додај“ да га додате на списак. Више спискова можете да пронађете на %s." -#: ../extensions/adblock.c:882 +#: ../extensions/adblock.c:847 +#, fuzzy msgid "Edit rule" -msgstr "Измени правило" +msgstr "Уреди фасциклу" -#: ../extensions/adblock.c:896 +#: ../extensions/adblock.c:860 +#, fuzzy msgid "_Rule:" -msgstr "_Правило:" +msgstr "_Наслов:" -#: ../extensions/adblock.c:950 +#: ../extensions/adblock.c:914 +#, fuzzy msgid "Bl_ock image" -msgstr "Блокирај _слику" +msgstr "Празна страна" -#: ../extensions/adblock.c:955 +#: ../extensions/adblock.c:919 msgid "Bl_ock link" -msgstr "Блокирај _везу" +msgstr "" -#: ../extensions/adblock.c:1670 +#: ../extensions/adblock.c:1498 msgid "Advertisement blocker" -msgstr "Зауставник реклама" +msgstr "" -#: ../extensions/adblock.c:1671 +#: ../extensions/adblock.c:1499 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 +#: ../extensions/addons.c:218 msgid "This page appears to contain a user script. Do you wish to install it?" msgstr "" -"Ова страница изгледа да садржи корисничку скрипту. Да ли желите да је " -"инсталирате?" -#: ../extensions/addons.c:222 +#: ../extensions/addons.c:219 +#, fuzzy msgid "_Install user script" -msgstr "_Инсталирај корисничку скрипту" +msgstr "Укључи скрипте" #. i18n: An infobar shows up when viewing a style on userstyles.org -#: ../extensions/addons.c:227 +#: ../extensions/addons.c:224 msgid "This page appears to contain a user style. Do you wish to install it?" msgstr "" -"Ова страница изгледа да садржи кориснички стил. Да ли желите да га " -"инсталирате?" -#: ../extensions/addons.c:228 +#: ../extensions/addons.c:225 msgid "_Install user style" -msgstr "_Инсталирај кориснички стил" +msgstr "" -#: ../extensions/addons.c:236 +#: ../extensions/addons.c:233 msgid "Don't install" -msgstr "Немој инсталирати" +msgstr "" -#: ../extensions/addons.c:319 ../extensions/addons.c:687 +#: ../extensions/addons.c:319 ../extensions/addons.c:681 msgid "Userscripts" msgstr "Личне скрипте" -#: ../extensions/addons.c:324 ../extensions/addons.c:689 +#: ../extensions/addons.c:324 ../extensions/addons.c:683 msgid "Userstyles" msgstr "Лични стилови" @@ -2391,51 +2595,56 @@ msgid "Error" msgstr "Грешка" #: ../extensions/addons.c:421 -#, c-format +#, fuzzy, c-format msgid "Do you want to delete '%s'?" -msgstr "Да ли желите да обришете „%s“?" +msgstr "Да ли желите да обришете све колачиће" #: ../extensions/addons.c:427 +#, fuzzy msgid "Delete user script" -msgstr "Обриши корисничку скрипту" +msgstr "Личне скрипте" #: ../extensions/addons.c:428 +#, fuzzy msgid "Delete user style" -msgstr "Обриши кориснички стил" +msgstr "Обричи довод" #: ../extensions/addons.c:431 -#, c-format +#, fuzzy, c-format msgid "The file %s will be permanently deleted." -msgstr "Датотека %s ће бити неповратно обрисана." +msgstr "Датотека %s је преузета." -#: ../extensions/addons.c:576 ../extensions/addons.c:653 +#: ../extensions/addons.c:570 ../extensions/addons.c:647 +#, fuzzy msgid "Open in Text Editor" -msgstr "Отворите у уређивачу текста" +msgstr "Уређивач текста" -#: ../extensions/addons.c:578 ../extensions/addons.c:662 +#: ../extensions/addons.c:572 ../extensions/addons.c:656 +#, fuzzy msgid "Open Target Folder" -msgstr "Отворите циљну фасциклу" +msgstr "Отвори датотеку" -#: ../extensions/addons.c:644 +#: ../extensions/addons.c:638 +#, fuzzy msgid "Add new addon" -msgstr "Додајте нови додатак" +msgstr "Додај нови довод" -#: ../extensions/addons.c:670 +#: ../extensions/addons.c:664 msgid "Remove selected addon" -msgstr "Уклоните изабрани додатак" +msgstr "" -#: ../extensions/addons.c:1699 ../extensions/addons.c:1917 +#: ../extensions/addons.c:1637 ../extensions/addons.c:1799 msgid "User addons" -msgstr "Кориснички додаци" +msgstr "" -#: ../extensions/addons.c:1829 +#: ../extensions/addons.c:1758 #, c-format msgid "Can't monitor folder '%s': %s" -msgstr "Не могу да надгледам фасциклу „%s“: %s" +msgstr "" -#: ../extensions/addons.c:1918 +#: ../extensions/addons.c:1800 msgid "Support for userscripts and userstyles" -msgstr "Подршка за корисничке скрипте и корисничке стилове" +msgstr "" #: ../extensions/colorful-tabs.c:201 msgid "Colorful Tabs" @@ -2443,50 +2652,46 @@ msgstr "Листови у боји" #: ../extensions/colorful-tabs.c:202 msgid "Tint each tab distinctly" -msgstr "Обојите сваки лист другачије" +msgstr "Боји сваку картицу другачије" -#: ../extensions/cookie-manager/cookie-manager-page.c:73 +#: ../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:103 +#: ../extensions/cookie-manager/cookie-manager-page.c:112 msgid "Delete All" -msgstr "Обриши све" +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: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:120 +#: ../extensions/cookie-manager/cookie-manager-page.c:129 msgid "Expand All" msgstr "Прошири све" -#: ../extensions/cookie-manager/cookie-manager-page.c:127 +#: ../extensions/cookie-manager/cookie-manager-page.c:136 msgid "Collapse All" msgstr "Сакупи све" -#: ../extensions/cookie-manager/cookie-manager-page.c:572 +#: ../extensions/cookie-manager/cookie-manager-page.c:578 msgid "Do you really want to delete all cookies?" -msgstr "Да ли желите да обришете све колачиће?" +msgstr "Да ли желите да обришете све колачиће" -#: ../extensions/cookie-manager/cookie-manager-page.c:574 +#: ../extensions/cookie-manager/cookie-manager-page.c:580 msgid "Question" msgstr "Питање" -#: ../extensions/cookie-manager/cookie-manager-page.c:583 +#: ../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:671 +#: ../extensions/cookie-manager/cookie-manager-page.c:677 msgid "At the end of the session" msgstr "На крају сесије" -#: ../extensions/cookie-manager/cookie-manager-page.c:674 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 #, c-format msgid "" "Host: %s\n" @@ -2497,106 +2702,101 @@ msgid "" "Expires: %s" msgstr "" "Домаћин: %s\n" -"Назив: %s\n" +"Име: %s\n" "Вредност: %s\n" "Путања: %s\n" "Сигурност: %s\n" "Истиче: %s" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:686 msgid "Yes" msgstr "Да" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:686 msgid "No" msgstr "Не" -#: ../extensions/cookie-manager/cookie-manager-page.c:694 +#: ../extensions/cookie-manager/cookie-manager-page.c:700 #, c-format msgid "" "Domain: %s\n" "Cookies: %d" msgstr "" -"Домен: %s\n" -"Колачићи: %d" -#: ../extensions/cookie-manager/cookie-manager-page.c:1024 +#: ../extensions/cookie-manager/cookie-manager-page.c:1030 msgid "Name" -msgstr "Назив" +msgstr "Име" -#: ../extensions/cookie-manager/cookie-manager-page.c:1077 +#: ../extensions/cookie-manager/cookie-manager-page.c:1083 msgid "_Expand All" msgstr "_Прошири све" -#: ../extensions/cookie-manager/cookie-manager-page.c:1085 +#: ../extensions/cookie-manager/cookie-manager-page.c:1091 msgid "_Collapse All" msgstr "_Сакупи све" -#: ../extensions/cookie-manager/cookie-manager-page.c:1139 +#: ../extensions/cookie-manager/cookie-manager-page.c:1144 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/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:36 msgid "List, view and delete cookies" msgstr "Исписује, уређује и уклања колачиће" -#: ../extensions/copy-tabs.c:38 +#: ../extensions/copy-tabs.c:39 +#, fuzzy msgid "Copy Tab _Addresses" -msgstr "Умножи _адресе листова" +msgstr "Адресе" # bug: no plural-forms -#: ../extensions/copy-tabs.c:95 +#: ../extensions/copy-tabs.c:96 +#, fuzzy msgid "Copy Addresses of Tabs" -msgstr "Умножте адресе листова" +msgstr "Отвору адресу у новом _листу" -#: ../extensions/copy-tabs.c:96 +#: ../extensions/copy-tabs.c:97 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 "" -"Нисам успео да пронађем потребне Атом „entry“ елементе у ИксМЛ подацима." +msgstr "Не могу да нађем потребни Атом „entry“ међу XML подацима." #: ../extensions/feed-panel/feed-atom.c:315 msgid "Failed to find required Atom \"feed\" elements in XML data." -msgstr "Нисам успео да пронађем потребне Атом „feed“ елементе у ИксМЛ подацима." +msgstr "Не могу да нађем потребни Атом „fees“ међу XML подацима." #. i18n: The local date a feed was last updated -#: ../extensions/feed-panel/feed-panel.c:387 +#: ../extensions/feed-panel/feed-panel.c:392 #, c-format msgctxt "Feed" msgid "Last updated: %s." -msgstr "Последње ажурирање: %s." +msgstr "Задњи пит ажуриран: %s." -#: ../extensions/feed-panel/feed-panel.c:653 +#: ../extensions/feed-panel/feed-panel.c:658 msgid "Feeds" msgstr "Доводи" -#: ../extensions/feed-panel/feed-panel.c:706 +#: ../extensions/feed-panel/feed-panel.c:711 msgid "Add new feed" -msgstr "Додајте нови довод" +msgstr "Додај нови довод" -#: ../extensions/feed-panel/feed-panel.c:713 +#: ../extensions/feed-panel/feed-panel.c:718 msgid "Delete feed" -msgstr "Обриши довод" +msgstr "Обричи довод" -#: ../extensions/feed-panel/feed-panel.c:795 +#: ../extensions/feed-panel/feed-panel.c:800 msgid "_Feeds" msgstr "_Доводи" #: ../extensions/feed-panel/feed-parse.c:195 #, c-format msgid "Failed to find root element in feed XML data." -msgstr "Не могу да нађем изворне податке међу ИксМЛ подацима." +msgstr "Не могу да нађем изворне податке међу XML подацима." #: ../extensions/feed-panel/feed-parse.c:235 #, c-format @@ -2606,11 +2806,11 @@ msgstr "Није подржан формат довода." #: ../extensions/feed-panel/feed-parse.c:265 #, c-format msgid "Failed to parse XML feed: %s" -msgstr "Не могу да обрадим ИксМЛ довод: %s" +msgstr "Не могу да обрадим XML довод: %s" #: ../extensions/feed-panel/feed-rss.c:46 msgid "Failed to find \"channel\" element in RSS XML data." -msgstr "Не могу да нађем елемент „channel“ међу РСС ИксМЛ подацима." +msgstr "Не могу да нађем елемент „channel“ међу XML подацима." #: ../extensions/feed-panel/feed-rss.c:51 msgid "Unsupported RSS version found." @@ -2618,11 +2818,11 @@ msgstr "Пронађено је неподржано издање вести." #: ../extensions/feed-panel/feed-rss.c:148 msgid "Failed to find required RSS \"item\" elements in XML data." -msgstr "Не могу да нађем потребни „item“ елемент вести међу ИксМЛ подацима." +msgstr "Не могу да нађем потребни „item“ елемент вести међу XML подацима." #: ../extensions/feed-panel/feed-rss.c:248 msgid "Failed to find required RSS \"channel\" elements in XML data." -msgstr "Не могу да нађем потребни „channel“ елемент вести међу ИксМЛ подацима." +msgstr "Не могу да нађем потребни „channel“ елемент вести међу XML подацима." #: ../extensions/feed-panel/main.c:131 #, c-format @@ -2632,7 +2832,7 @@ msgstr "Довод „%s“ већ постоји" #: ../extensions/feed-panel/main.c:208 #, c-format msgid "Error loading feed '%s'" -msgstr "Грешка учитавања додова „%s“" +msgstr "Грешка при учитавању додова „%s“" #: ../extensions/feed-panel/main.c:518 msgid "Feed Panel" @@ -2642,129 +2842,67 @@ msgstr "Површ са доводима" msgid "Read Atom/ RSS feeds" msgstr "Чита Атоме / доводе са вестима" -#: ../extensions/formhistory/formhistory.c:39 -#, c-format +#: ../extensions/formhistory.c:146 +#, fuzzy, 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 "Запамти" +msgstr "Не могу да додам ставку у историјат: %s\n" -#: ../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 +#: ../extensions/formhistory.c:458 ../extensions/formhistory.c:462 #, 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 "Укључи историјат обрасца само путем пречице (Ктрл+Шифт+Ф) по листу" - -#: ../extensions/formhistory/formhistory.c:668 -msgid "Form history filler" -msgstr "Пропусник историјата обрасца" - -#: ../extensions/formhistory/formhistory.c:669 +#: ../extensions/formhistory.c:520 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 "Нема непосећених листова" +msgstr "" -#: ../extensions/history-list.vala:235 +#: ../extensions/formhistory.c:524 #, c-format -msgid "History-List" -msgstr "Списак историјата" +msgid "Not available: %s" +msgstr "" -#: ../extensions/history-list.vala:275 -msgid "Tab closing behavior" -msgstr "Понашање затварања листа" +#: ../extensions/formhistory.c:525 +msgid "Resource files not installed" +msgstr "" -#: ../extensions/history-list.vala:283 -msgid "Do nothing" -msgstr "Не ради ништа" +#: ../extensions/formhistory.c:531 +msgid "Form history filler" +msgstr "" -#: ../extensions/history-list.vala:289 -msgid "Switch to last viewed tab" -msgstr "Пребаци на последњи виђени лист" +#. i18n: Data entered into web forms by the user +#: ../extensions/formhistory.c:543 +#, fuzzy +msgid "_Form History" +msgstr "_Историјат" -#: ../extensions/history-list.vala:295 -msgid "Switch to newest tab" -msgstr "Пребаци на најновији лист" +#: ../extensions/history-list.vala:149 +msgid "There are no unvisited tabs" +msgstr "" -#: ../extensions/history-list.vala:423 +#: ../extensions/history-list.vala:249 msgid "Next new Tab (History List)" -msgstr "Следећи нови лист (списак историјата)" +msgstr "" -#: ../extensions/history-list.vala:424 +#: ../extensions/history-list.vala:250 msgid "Next new tab from history" -msgstr "Следећи нови лист из историјата" +msgstr "" -#: ../extensions/history-list.vala:433 +#: ../extensions/history-list.vala:259 msgid "Previous new Tab (History List)" -msgstr "Претходни нови лист (списак историјата)" +msgstr "" -#: ../extensions/history-list.vala:434 +#: ../extensions/history-list.vala:260 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 "Прикажи текући изабрани лист у позадини" +msgstr "" -#: ../extensions/history-list.vala:569 +#: ../extensions/history-list.vala:359 +#, fuzzy msgid "History List" -msgstr "Списак историјата" +msgstr "Историјат" -#: ../extensions/history-list.vala:570 -msgid "Move to the last used tab when switching or closing tabs" +#: ../extensions/history-list.vala:360 +msgid "Switch tabs with Ctrl+Tab sorted by last usage" msgstr "" -"Прелази на последње коришћени лист приликом пребацивања или затварања " -"листова" #: ../extensions/mouse-gestures.c:301 msgid "Mouse Gestures" @@ -2774,340 +2912,119 @@ msgstr "Гестови миша" msgid "Control Midori by moving the mouse" msgstr "Управља Мидоријем помоћу миша" -#: ../extensions/shortcuts.c:109 +#: ../extensions/shortcuts.c:110 msgid "Reload page or stop loading" -msgstr "Поново учитај стараницу или заустави учитавање" +msgstr "" #: ../extensions/shortcuts.c:176 msgid "Customize Keyboard shortcuts" -msgstr "Подеси пречице са тастатуре" +msgstr "" -#: ../extensions/shortcuts.c:283 -msgid "Customize Sh_ortcuts…" -msgstr "Подеси _пречице…" +#: ../extensions/shortcuts.c:282 +msgid "Customize Sh_ortcuts..." +msgstr "" -#: ../extensions/shortcuts.c:320 +#: ../extensions/shortcuts.c:319 msgid "Shortcuts" -msgstr "Пречице" +msgstr "" -#: ../extensions/shortcuts.c:321 +#: ../extensions/shortcuts.c:320 msgid "View and edit keyboard shortcuts" -msgstr "Приказује и уређује пречице тастатуре" +msgstr "" #: ../extensions/status-clock.c:174 +#, fuzzy msgid "Statusbar Clock" -msgstr "Сат у траци стања" +msgstr "Трака са ста_њем" #: ../extensions/status-clock.c:175 msgid "Display date and time in the statusbar" -msgstr "Приказује датум и време у траци стања" +msgstr "" -#: ../extensions/statusbar-features.c:131 +#: ../extensions/statusbar-features.c:129 msgid "Images" -msgstr "Слике" +msgstr "" -#: ../extensions/statusbar-features.c:140 +#: ../extensions/statusbar-features.c:138 +#, fuzzy msgid "Scripts" -msgstr "Скрипте" +msgstr "Личне скрипте" -#: ../extensions/statusbar-features.c:151 +#: ../extensions/statusbar-features.c:147 msgid "Netscape plugins" -msgstr "Нетскејп прикључци" +msgstr "Netscape додаци" -#: ../extensions/statusbar-features.c:199 +#: ../extensions/statusbar-features.c:193 msgid "Statusbar Features" -msgstr "Могућности траке стања" +msgstr "Могућности линије са стањем" -#: ../extensions/statusbar-features.c:200 +#: ../extensions/statusbar-features.c:194 msgid "Easily toggle features on web pages on and off" msgstr "Једноставно укључује и искључује опције на веб страницама" -#: ../extensions/tab-panel.c:593 ../extensions/tab-panel.c:680 +#: ../extensions/tab-panel.c:597 ../extensions/tab-panel.c:684 +#, fuzzy msgid "Tab Panel" -msgstr "Бочна површ" +msgstr "Прикажи бочну површ" -#: ../extensions/tab-panel.c:663 +#: ../extensions/tab-panel.c:667 +#, fuzzy msgid "T_ab Panel" -msgstr "Бочна _површ" +msgstr "Прикажи бочну површ" -#: ../extensions/tab-panel.c:681 +#: ../extensions/tab-panel.c:685 +#, fuzzy msgid "Show tabs in a vertical panel" -msgstr "Приказује листове у усправној површи" +msgstr "Приказује бочну површ" -#: ../extensions/tabs-minimized.c:76 +#: ../extensions/tabs-minimized.c:77 msgid "Only Icons on Tabs by default" -msgstr "Само иконице на листовима по основи" +msgstr "" -#: ../extensions/tabs-minimized.c:77 +#: ../extensions/tabs-minimized.c:78 msgid "New tabs have no label by default" -msgstr "Нови листови немају ознаку по основи" +msgstr "Нове картице првобитно немају ознаку" -#: ../extensions/toolbar-editor.c:393 +#: ../extensions/toolbar-editor.c:391 +#, fuzzy msgid "Customize Toolbar" -msgstr "Подеси траку алата" +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:407 +msgid "Select items to be displayed on the toolbar. Items can be reodered by drag and drop." +msgstr "Изаберите ставке да буду приказане на траци са алаткама. Ставке могу бити аранжиране превлачењем и увацивањем." -#: ../extensions/toolbar-editor.c:425 +#: ../extensions/toolbar-editor.c:423 +#, fuzzy msgid "Available Items" -msgstr "Доступне ставке" +msgstr "Доступно ставке" -#: ../extensions/toolbar-editor.c:446 +#: ../extensions/toolbar-editor.c:444 +#, fuzzy msgid "Displayed Items" msgstr "Приказане ставке" -#: ../extensions/toolbar-editor.c:581 -msgid "Customize _Toolbar…" -msgstr "Подеси траку алата…" +#: ../extensions/toolbar-editor.c:579 +#, fuzzy +msgid "Customize _Toolbar..." +msgstr "Произвољно..." -#: ../extensions/toolbar-editor.c:597 -msgid "_Customize…" -msgstr "_Прилагоди…" +#: ../extensions/toolbar-editor.c:595 +#, fuzzy +msgid "_Customize..." +msgstr "Произвољно..." -#: ../extensions/toolbar-editor.c:627 +#: ../extensions/toolbar-editor.c:625 msgid "Toolbar Editor" -msgstr "Уређивач траке алата" +msgstr "" -#: ../extensions/toolbar-editor.c:628 +#: ../extensions/toolbar-editor.c:626 msgid "Easily edit the toolbar layout" -msgstr "Лако мењајте распоред траке алата" +msgstr "Лако мењајте распоред траке са алаткама" -#: ../extensions/web-cache.c:463 +#: ../extensions/web-cache.c:479 msgid "Cache HTTP communication on disk" -msgstr "Причувај ХТТП објављивања на диск" - -#~ msgid "Lightweight web browser" -#~ msgstr "Једноставан Интернет прегледник" - -#~ msgid "The bookmarks couldn't be saved. %s" -#~ msgstr "Не могу да сачувам обележиваче. %s" - -#~ msgid "days" -#~ msgstr "дана" - -#~ msgid "Reset the last _session" -#~ msgstr "Врати последњу сесију" - -#~ msgid "No filename specified" -#~ msgstr "Није изабрано име датотеке" - -#~ msgid "The specified configuration folder is invalid." -#~ msgstr "Изабрана фасцикла са подешавањима је неисправна." - -#~ msgid "Cookies" -#~ msgstr "Колачићи" - -#~ msgid "'Flash' Cookies" -#~ msgstr "Флеш колачићи" - -#~ msgid "Don't save any private data while browsing" -#~ msgstr "Не чува никакве личне податке током разгледања Интернета" - -#~ msgid "Add shortcut to speed dial" -#~ msgstr "Додаје ову адресу у брзе посете" - -#, fuzzy -#~ msgid "Add shortcut to the desktop" -#~ msgstr "Додаје ову адресу у брзе посете" - -#~ msgid "Close this window" -#~ msgstr "Затвара овај прозор" - -#, fuzzy -#~ msgid "Close all open windows" -#~ msgstr "_Затворени листови и прозори" - -#, fuzzy -#~ 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 "Приказује изворни код странице" - -#, fuzzy -#~ msgid "Scroll to the left" -#~ 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 "Иде на претходни лист" - -#, fuzzy -#~ msgid "Move tab behind the previous tab" -#~ msgstr "Иде на претходни лист" - -#, fuzzy -#~ msgid "Move tab in front of the next tab" -#~ msgstr "Иде на наредни лист" - -#, fuzzy -#~ msgid "Focus the current tab" -#~ msgstr "Затвара овај лист" - -#, fuzzy -#~ msgid "Only show the icon of the current tab" -#~ msgstr "Затвара овај лист" - -#, fuzzy -#~ msgid "Duplicate the current tab" -#~ msgstr "Затвара овај лист" - -#, fuzzy -#~ msgid "Close all tabs except the current tab" -#~ msgstr "Затвара овај лист" - -#, fuzzy -#~ 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 "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 "Приказује претраживаче у поље за унос адреса" - -#, fuzzy -#~ msgid "Show operating controls of the panel" -#~ msgstr "Приказује податке о програму" - -#, fuzzy -#~ 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 "Спољни програм за преузимање датотека" - -#, fuzzy -#~ 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 "Document cannot be displayed" -#~ msgstr "Не могу да прикажем докумант" - -#~ msgid "Appearance" -#~ msgstr "Изглед" - -#~ msgid "Enforce 96 dots per inch" -#~ msgstr "Приморај 96 тачака по инчу" - -#~ msgid "Enforce a video dot density of 96 DPI" -#~ msgstr "Приморава густину тачака екрана од 96 ТПИ" - -#~ msgid "Applications" -#~ msgstr "Програми" +msgstr "" #~ msgid "%d%% loaded" #~ msgstr "%d%% учитано" @@ -3148,6 +3065,9 @@ msgstr "Причувај ХТТП објављивања на диск" #~ msgid "Detach chosen panel from the window" #~ msgstr "Откачи површ из прозора" +#~ msgid "Last open pages" +#~ msgstr "Последње странице" + #~ msgid "Both" #~ msgstr "Текст испод иконица" @@ -3172,6 +3092,9 @@ msgstr "Причувај ХТТП објављивања на диск" #~ msgid "Original cookies only" #~ msgstr "Само оригиналне колачиће" +#~ msgid "Accept cookies from the original website only" +#~ msgstr "Прихвата колачиће само са оригиналних веб страница" + #~ msgid "Remember last visited pages" #~ msgstr "Запамти последње посећене странице" @@ -3187,8 +3110,7 @@ msgstr "Причувај ХТТП објављивања на диск" #~ 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 "Cache size" @@ -3242,12 +3164,8 @@ 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 "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 "Сучеље" diff --git a/po/sr@latin.po b/po/sr@latin.po index 1b5af042..ee5550b0 100644 --- a/po/sr@latin.po +++ b/po/sr@latin.po @@ -521,8 +521,8 @@ msgstr "Zapadni (I_SO-8859-1)" #: ../midori/midori-browser.c:3855 ../midori/midori-websettings.c:209 #: ../midori/midori-websettings.c:281 -msgid "Custom…" -msgstr "Proizvoljno…" +msgid "Custom..." +msgstr "Proizvoljno..." #: ../midori/midori-browser.c:3858 ../midori/midori-view.c:1275 msgid "View _Source" @@ -597,7 +597,7 @@ msgid "_Manage Search Engines" msgstr "Po_desi pretraživače" #: ../midori/midori-browser.c:3894 -msgid "Add, edit and remove search engines…" +msgid "Add, edit and remove search engines..." msgstr "Otvara prozorče za dodavanje, uređivanje ili uklanjanje pretraživača." #: ../midori/midori-browser.c:3897 @@ -605,7 +605,7 @@ msgid "_Clear Private Data" msgstr "Očisti _lične podatke" #: ../midori/midori-browser.c:3898 -msgid "Clear private data…" +msgid "Clear private data..." msgstr "Briše sve lične podatke." #: ../midori/midori-browser.c:3902 @@ -717,16 +717,16 @@ msgid "_Separator" msgstr "_Razdvajač" #: ../midori/midori-browser.c:4396 -msgid "_Location…" -msgstr "Na _adresu…" +msgid "_Location..." +msgstr "Na _adresu..." #: ../midori/midori-browser.c:4398 msgid "Open a particular location" msgstr "Otvara izabranu adresu" #: ../midori/midori-browser.c:4420 -msgid "_Web Search…" -msgstr "P_retraži Internet…" +msgid "_Web Search..." +msgstr "P_retraži Internet..." #: ../midori/midori-browser.c:4422 msgid "Run a web search" diff --git a/po/sv.po b/po/sv.po index 3ba52caa..2b0c4687 100644 --- a/po/sv.po +++ b/po/sv.po @@ -598,16 +598,16 @@ msgid "_Manage Search Engines" msgstr "_Hantera sökmotorer" #: ../midori/midori-browser.c:4282 -msgid "Add, edit and remove search engines…" -msgstr "Lägg till, ändra och ta bort sökmotorer…" +msgid "Add, edit and remove search engines..." +msgstr "Lägg till, ändra och ta bort sökmotorer..." #: ../midori/midori-browser.c:4285 msgid "_Clear Private Data" msgstr "_Rensa privat data" #: ../midori/midori-browser.c:4286 -msgid "Clear private data…" -msgstr "Rensa privat data…" +msgid "Clear private data..." +msgstr "Rensa privat data..." #: ../midori/midori-browser.c:4290 msgid "_Previous Tab" @@ -745,24 +745,24 @@ msgstr "Västerländsk (ISO-8859-1)" #: ../midori/midori-browser.c:4368 #: ../midori/midori-websettings.c:219 #: ../midori/midori-websettings.c:291 -msgid "Custom…" -msgstr "Anpassad…" +msgid "Custom..." +msgstr "Anpassad..." #: ../midori/midori-browser.c:4806 msgid "_Separator" msgstr "_Avskiljare" #: ../midori/midori-browser.c:4813 -msgid "_Location…" -msgstr "_Plats…" +msgid "_Location..." +msgstr "_Plats..." #: ../midori/midori-browser.c:4815 msgid "Open a particular location" msgstr "Öppna en plats" #: ../midori/midori-browser.c:4839 -msgid "_Web Search…" -msgstr "_Webbsökning…" +msgid "_Web Search..." +msgstr "_Webbsökning..." #: ../midori/midori-browser.c:4841 msgid "Run a web search" @@ -1963,8 +1963,8 @@ msgid "Configure Advertisement filters" msgstr "Redigera reklamblockeringsfilter" #: ../extensions/adblock.c:304 -msgid "Configure _Advertisement filters…" -msgstr "Redigera _reklamblockeringsfilter…" +msgid "Configure _Advertisement filters..." +msgstr "Redigera _reklamblockeringsfilter..." #: ../extensions/adblock.c:562 msgid "Advertisement blocker" @@ -2179,8 +2179,8 @@ msgid "Customize Keyboard shortcuts" msgstr "Ställ in tangentbordsgenvägar" #: ../extensions/shortcuts.c:264 -msgid "Customize Sh_ortcuts…" -msgstr "Ställ in gen_vägar…" +msgid "Customize Sh_ortcuts..." +msgstr "Ställ in gen_vägar..." #: ../extensions/shortcuts.c:303 msgid "Shortcuts" @@ -2224,7 +2224,7 @@ msgid "Customize Toolbar" msgstr "Redigera verktygsrad" #: ../extensions/toolbar-editor.c:407 -msgid "Select items to be displayed on the toolbar. Items can be reordered by drag and drop." +msgid "Select items to be displayed on the toolbar. Items can be reodered 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 @@ -2236,8 +2236,8 @@ msgid "Displayed Items" msgstr "Visade föremål" #: ../extensions/toolbar-editor.c:579 -msgid "Customize _Toolbar…" -msgstr "Redigera _verktygsrad…" +msgid "Customize _Toolbar..." +msgstr "Redigera _verktygsrad..." #: ../extensions/toolbar-editor.c:611 msgid "Toolbar Editor" @@ -2299,8 +2299,8 @@ msgstr "_Stängda tabbar och fönster" #~ msgstr "Ångra senaste ändringen" #~ msgid "_Manage Bookmarks" #~ msgstr "_Hantera bokmärken" -#~ msgid "Add, edit and remove bookmarks…" -#~ msgstr "Lägg till, ändra och ta bort bokmärken…" +#~ msgid "Add, edit and remove bookmarks..." +#~ msgstr "Lägg till, ändra och ta bort bokmärken..." #~ msgid "Tab _Overview" #~ msgstr "Flikö_versikt" #~ msgid "_Work Offline" diff --git a/po/tr.po b/po/tr.po index eaebbb39..e51f80d9 100644 --- a/po/tr.po +++ b/po/tr.po @@ -8,378 +8,301 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.1.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-25 11:18+0000\n" +"POT-Creation-Date: 2011-09-12 22:19+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 -#, fuzzy -msgid "Browse the Web" -msgstr "Web ara" - -#: ../data/midori.desktop.in.h:2 -#, fuzzy -msgid "Internet;WWW;Explorer" -msgstr "Internet Explorer" +msgid "Lightweight web browser" +msgstr "Hafif web tarayıcı " -#: ../data/midori.desktop.in.h:3 ../midori/main.c:1989 ../midori/main.c:2009 -#: ../midori/main.c:2023 ../midori/midori-websettings.c:308 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1431 ../midori/main.c:2005 +#: ../midori/main.c:2029 ../midori/main.c:2045 +#: ../midori/midori-websettings.c:293 msgid "Midori" msgstr "Midori" -#: ../data/midori.desktop.in.h:4 +#: ../data/midori.desktop.in.h:3 msgid "Web Browser" msgstr "Web Tarayıcı" -#: ../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 +#: ../midori/main.c:106 ../midori/main.c:112 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Ayarlar yüklenemedi: %s\n" -#: ../midori/main.c:150 +#: ../midori/main.c:160 #, c-format msgid "Value '%s' is invalid for %s" msgstr "'%s' değeri şunun için yanlış : %s" -#: ../midori/main.c:155 ../midori/main.c:259 +#: ../midori/main.c:165 ../midori/main.c:258 #, c-format msgid "Invalid configuration value '%s'" msgstr "Geçersiz yapılandırma değeri '%s'" -#: ../midori/main.c:364 +#: ../midori/main.c:363 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Arama motorları yüklenemedi. %s\n" -#: ../midori/main.c:418 +#: ../midori/main.c:417 #, 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 +#: ../midori/main.c:437 ../midori/main.c:558 ../extensions/formhistory.c:423 #, 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:505 +#: ../midori/main.c:501 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Eski geçmiş ögeleri silinemedi: %s\n" -#: ../midori/main.c:545 ../panels/midori-history.c:232 +#: ../midori/main.c:541 ../panels/midori-history.c:193 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Şu geçmiş öğesi silinemedi: %s\n" -#: ../midori/main.c:592 +#: ../midori/main.c:588 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Yer imleri kaydedilemedi. %s" -#: ../midori/main.c:614 +#: ../midori/main.c:622 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Ayarlar kaydedilemedi. %s" -#: ../midori/main.c:649 +#: ../midori/main.c:657 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Arama motorları kaydedilemedi. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:686 +#: ../midori/main.c:683 ../midori/main.c:703 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Çöp kutusu kaydedilemedi. %s" -#: ../midori/main.c:727 ../panels/midori-extensions.c:91 +#: ../midori/main.c:737 ../panels/midori-extensions.c:93 msgid "Extensions" msgstr "Ek Özellikler" -#: ../midori/main.c:741 +#: ../midori/main.c:751 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:759 +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 +#: ../midori/main.c:823 #, c-format msgid "The session couldn't be saved. %s" msgstr "Oturum kaydedilemedi. %s" -#: ../midori/main.c:1027 -msgid "" -"No root certificate file is available. SSL certificates cannot be verified." +#: ../midori/main.c:1017 +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: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:1079 +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:1115 +#: ../midori/main.c:1098 msgid "Modify _preferences" msgstr "_Tercihleri Değiştir" -#: ../midori/main.c:1119 +#: ../midori/main.c:1102 msgid "Disable all _extensions" msgstr "Tüm _eklentiler kapalı" -#: ../midori/main.c:1132 +#: ../midori/main.c:1115 msgid "Discard old tabs" msgstr "Eski sekmeleri çıkar" -#: ../midori/main.c:1133 ../midori/midori-websettings.c:217 +#: ../midori/main.c:1116 ../midori/midori-websettings.c:203 msgid "Show last tabs without loading" msgstr "Yüklemeden son sekmeyi göster" -#: ../midori/main.c:1134 ../midori/midori-websettings.c:216 +#: ../midori/main.c:1117 ../midori/midori-websettings.c:202 msgid "Show last open tabs" msgstr "Son açılan sekmeleri göster" -#: ../midori/main.c:1342 ../midori/main.c:2400 +#: ../midori/main.c:1310 ../midori/main.c:2366 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Oturum yüklenemedi: %s\n" -#: ../midori/main.c:1480 +#: ../midori/main.c:1431 +msgid "No filename specified" +msgstr "Dosya ismi belirtilmedi" + +#: ../midori/main.c:1450 +msgid "An unknown error occured." +msgstr "Bilinmeyen bir sorun oluştu." + +#: ../midori/main.c:1479 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Ekran görüntüsünü kaydet: %s\n" -#: ../midori/main.c:1892 +#: ../midori/main.c:1889 msgid "Run ADDRESS as a web application" msgstr "ADRES'i web uygulaması gibi çalıştır" -#: ../midori/main.c:1892 +#: ../midori/main.c:1889 msgid "ADDRESS" msgstr "ADRES" -#: ../midori/main.c:1895 +#: ../midori/main.c:1892 msgid "Use FOLDER as configuration folder" msgstr "KLASÖR'ü yapılandırma klasörü olarak kullan" -#: ../midori/main.c:1895 +#: ../midori/main.c:1892 msgid "FOLDER" msgstr "KLASÖR" -#: ../midori/main.c:1898 +#: ../midori/main.c:1895 msgid "Private browsing, no changes are saved" msgstr "Özel tarama, değişiklikler kaydedilmez." -#: ../midori/main.c:1900 +#: ../midori/main.c:1897 msgid "Show a diagnostic dialog" msgstr "Bir tanılama diyaloğu göster" -#: ../midori/main.c:1902 +#: ../midori/main.c:1899 msgid "Run the specified filename as javascript" msgstr "Belirtilen dosya ismini javascript olarak çalıştır" -#: ../midori/main.c:1904 +#: ../midori/main.c:1901 msgid "Take a snapshot of the specified URI" msgstr "Belirtilen URI'nin bir ekran görüntüsünü al" -#: ../midori/main.c:1906 +#: ../midori/main.c:1903 msgid "Execute the specified command" msgstr "Belirtilen komutu çalıştır" -#: ../midori/main.c:1908 +#: ../midori/main.c:1905 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 +#: ../midori/main.c:1907 msgid "Display program version" msgstr "Uygulama sürümünü göster" -#: ../midori/main.c:1912 +#: ../midori/main.c:1909 msgid "Addresses" msgstr "Adresler" -#: ../midori/main.c:1914 +#: ../midori/main.c:1911 msgid "Block URIs according to regular expression PATTERN" msgstr "ÖRNEK düzenli ifadeye göre URI engele" -#: ../midori/main.c:1914 +#: ../midori/main.c:1911 msgid "PATTERN" msgstr "ÖRNEK" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1918 +#: ../midori/main.c:1915 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:1918 +#: ../midori/main.c:1915 msgid "SECONDS" msgstr "SANİYELER" -#: ../midori/main.c:1921 +#: ../midori/main.c:1918 msgid "Redirects console warnings to the specified FILENAME" msgstr "Konsol uyarılarını belirtilen DOSYAADI'ne yönlendirir" -#: ../midori/main.c:1921 +#: ../midori/main.c:1918 msgid "FILENAME" msgstr "DOSYAADI" -#: ../midori/main.c:1986 +#: ../midori/main.c:2002 msgid "[Addresses]" msgstr "[Adresler]" -#: ../midori/main.c:1996 +#: ../midori/main.c:2016 msgid "The specified configuration folder is invalid." msgstr "Belirtilen yapılandırma dizini geçersiz." -#: ../midori/main.c:2024 +#: ../midori/main.c:2046 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:2026 +#: ../midori/main.c:2048 msgid "Check for new versions at:" msgstr "Yeni sürümler için şuraya bakın:" +#: ../midori/main.c:2115 +msgid "Website icons" +msgstr "Websitesi simgeleri" + #. i18n: Logins and passwords in websites and web forms -#: ../midori/main.c:2110 +#: ../midori/main.c:2118 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" +#: ../midori/main.c:2120 +msgid "Cookies" +msgstr "Çerezler" + +#: ../midori/main.c:2123 +msgid "'Flash' Cookies" +msgstr "'Flash' çerezleri" -#. 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 +#: ../midori/main.c:2126 +msgid "HTML5 _Databases" +msgstr "HTML5 veritabanı" + +#: ../midori/main.c:2129 ../midori/midori-websettings.c:887 +#: ../extensions/web-cache.c:470 ../extensions/web-cache.c:479 msgid "Web Cache" msgstr "Web Önbelleği" -#: ../midori/main.c:2119 -msgid "Website icons" -msgstr "Websitesi simgeleri" - -#: ../midori/main.c:2225 -#, fuzzy -msgid "An unknown error occured" -msgstr "Bilinmeyen bir sorun oluştu." +#: ../midori/main.c:2133 +msgid "Offline Application Cache" +msgstr "Çevrimdışı Uygulama Önbelleği " -#: ../midori/main.c:2331 +#: ../midori/main.c:2297 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:2367 +#: ../midori/main.c:2333 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Yer imleri yüklenemedi: %s\n" -#: ../midori/main.c:2415 +#: ../midori/main.c:2381 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Çöp kutusu yüklenemedi: %s\n" -#: ../midori/main.c:2428 +#: ../midori/main.c:2394 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Geçmiş yüklenemedi: %s\n" -#: ../midori/main.c:2444 +#: ../midori/main.c:2410 msgid "The following errors occured:" msgstr "Şu hatalar ortaya çıktı:" -#: ../midori/main.c:2460 +#: ../midori/main.c:2426 msgid "_Ignore" msgstr "_Yoksay" -#: ../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ı." @@ -393,712 +316,865 @@ msgstr "Kötü biçimlendirilmiş belge." msgid "Unrecognized bookmark format." msgstr "Tanımlanmayan yer imi biçimi." -#: ../midori/midori-array.c:915 +#: ../midori/midori-array.c:916 msgid "Writing failed." msgstr "Yazma işlemi gerçekleştirilemedi." -#: ../midori/midori-browser.c:331 ../midori/midori-browser.c:5277 -#: ../midori/midori-browser.c:5286 +#: ../midori/midori-browser.c:329 ../midori/midori-browser.c:5219 +#: ../midori/midori-browser.c:5228 msgid "Reload the current page" msgstr "Bu sayfayı yeniden yükle" -#: ../midori/midori-browser.c:340 ../midori/midori-browser.c:5283 +#: ../midori/midori-browser.c:340 ../midori/midori-browser.c:5225 msgid "Stop loading the current page" msgstr "Bu sayfayı yüklemeyi durdur" -#: ../midori/midori-browser.c:476 +#: ../midori/midori-browser.c:467 #, c-format msgid "Failed to update title: %s\n" msgstr "İsim güncelleme hatası: %s\n" -#: ../midori/midori-browser.c:489 +#: ../midori/midori-browser.c:480 #, c-format msgid "Unexpected action '%s'." msgstr "Beklenmedik eylem '%s'." -#: ../midori/midori-browser.c:579 +#: ../midori/midori-browser.c:581 #, 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 +#: ../midori/midori-browser.c:721 msgid "New folder" msgstr "Yeni Dizin" -#: ../midori/midori-browser.c:784 +#: ../midori/midori-browser.c:721 msgid "Edit folder" msgstr "Klasörü düzenle" -#: ../midori/midori-browser.c:786 +#: ../midori/midori-browser.c:723 msgid "New bookmark" msgstr "Yeni yer imi" -#: ../midori/midori-browser.c:786 +#: ../midori/midori-browser.c:723 msgid "Edit bookmark" msgstr "Yer imini düzenle" -#: ../midori/midori-browser.c:828 +#: ../midori/midori-browser.c:754 msgid "_Title:" msgstr "_Başlık:" -#: ../midori/midori-browser.c:848 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:774 ../midori/midori-searchaction.c:967 #: ../extensions/feed-panel/main.c:377 msgid "_Address:" msgstr "Adres:" -#: ../midori/midori-browser.c:871 ../midori/midori-browser.c:4303 +#: ../midori/midori-browser.c:807 ../midori/midori-browser.c:4264 msgid "_Folder:" msgstr "_Dizin:" -#: ../midori/midori-browser.c:887 +#: ../midori/midori-browser.c:817 ../midori/midori-browser.c:905 +#: ../midori/midori-browser.c:4269 ../midori/midori-browser.c:4297 +msgid "Toplevel folder" +msgstr "Üst Seviye Dizin" + +#: ../midori/midori-browser.c:848 msgid "Add to _Speed Dial" msgstr "_Hızlı aramaya Ekle" -#: ../midori/midori-browser.c:900 +#: ../midori/midori-browser.c:861 msgid "Show in the tool_bar" msgstr "Araç_çubuğunda göster" -#: ../midori/midori-browser.c:915 +#: ../midori/midori-browser.c:876 msgid "Run as _web application" msgstr "_Web uygulaması olarak çalıştır" -#: ../midori/midori-browser.c:986 +#: ../midori/midori-browser.c:949 #, c-format msgid "The file \"%s\" can't be saved in this folder." msgstr " \"%s\" Dosyası bu dizine kaydedilemedi." -#: ../midori/midori-browser.c:988 +#: ../midori/midori-browser.c:951 #, 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 +#: ../midori/midori-browser.c:958 #, 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:998 +#: ../midori/midori-browser.c:961 #, c-format msgid "The file needs %s but only %s are left." msgstr "Dosya %s ihtiyaç duyuyor ancak %s kaldı." -#: ../midori/midori-browser.c:1036 ../midori/midori-browser.c:4372 +#: ../midori/midori-browser.c:1003 ../midori/midori-browser.c:4348 msgid "Save file as" msgstr "Dosyayı kaydet" -#: ../midori/midori-browser.c:1330 +#: ../midori/midori-browser.c:1322 msgid "New Window" msgstr "Yeni Pencere" -#: ../midori/midori-browser.c:1330 +#: ../midori/midori-browser.c:1322 msgid "A new window has been opened" msgstr "Yeni bir pencere açıldı" -#: ../midori/midori-browser.c:1333 +#: ../midori/midori-browser.c:1325 msgid "New Tab" msgstr "Yeni Sekme" -#: ../midori/midori-browser.c:1333 +#: ../midori/midori-browser.c:1325 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:1376 -#, fuzzy -msgid "Can not download selected image." -msgstr "Seçilen resim indirilemiyor." - -#: ../midori/midori-browser.c:1479 +#: ../midori/midori-browser.c:1362 msgid "Save file" msgstr "Dosyayı kaydet" -#: ../midori/midori-browser.c:2346 +#: ../midori/midori-browser.c:2243 msgid "Open file" msgstr "Dosya aç" -#: ../midori/midori-browser.c:2478 +#: ../midori/midori-browser.c:2370 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:2484 ../extensions/feed-panel/main.c:365 +"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:2376 ../extensions/feed-panel/main.c:365 msgid "New feed" msgstr "Yeni kaynak" -#: ../midori/midori-browser.c:2527 ../midori/midori-browser.c:5346 -#: ../panels/midori-bookmarks.c:427 +#: ../midori/midori-browser.c:2419 ../midori/midori-browser.c:5288 +#: ../panels/midori-bookmarks.c:466 msgid "Add a new bookmark" msgstr "Yeni bir yer imi ekle" -#: ../midori/midori-browser.c:3026 ../midori/midori-searchaction.c:488 +#: ../midori/midori-browser.c:2978 ../midori/midori-searchaction.c:488 msgid "Empty" msgstr "Boş" -#: ../midori/midori-browser.c:3446 -msgid "Toggle text cursor navigation" -msgstr "Metin imleci navigasyonunu değiştir" - -#: ../midori/midori-browser.c:3762 ../midori/midori-browser.c:5732 +#: ../midori/midori-browser.c:3766 ../midori/midori-browser.c:5698 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Yeni geçmiş ögesi ekleme hatası: %s\n" -#: ../midori/midori-browser.c:4091 ../panels/midori-bookmarks.c:743 -#: ../panels/midori-history.c:801 +#: ../midori/midori-browser.c:4096 ../panels/midori-bookmarks.c:782 +#: ../panels/midori-history.c:751 msgid "Open all in _Tabs" msgstr "Hepsini _Sekmelerde aç" -#: ../midori/midori-browser.c:4098 ../panels/midori-bookmarks.c:749 -#: ../panels/midori-history.c:807 ../extensions/feed-panel/feed-panel.c:528 +#: ../midori/midori-browser.c:4103 ../panels/midori-bookmarks.c:788 +#: ../panels/midori-history.c:757 ../extensions/feed-panel/feed-panel.c:533 msgid "Open in New _Tab" msgstr "Yeni _Sekmede Aç" -#: ../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 +#: ../midori/midori-browser.c:4106 ../midori/midori-view.c:2523 +#: ../midori/midori-view.c:4371 ../panels/midori-bookmarks.c:790 +#: ../panels/midori-history.c:759 ../extensions/feed-panel/feed-panel.c:535 msgid "Open in New _Window" msgstr "Yeni _Pencerede aç" -#: ../midori/midori-browser.c:4190 +#: ../midori/midori-browser.c:4186 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4191 +#: ../midori/midori-browser.c:4187 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4192 +#: ../midori/midori-browser.c:4188 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4193 +#: ../midori/midori-browser.c:4189 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4194 +#: ../midori/midori-browser.c:4190 msgid "Epiphany" msgstr "Epiphany" -#: ../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:4215 +msgid "Import bookmarks..." +msgstr "Yerimleri içe aktarılıyor..." -#: ../midori/midori-browser.c:4219 ../midori/midori-browser.c:5351 +#: ../midori/midori-browser.c:4218 ../midori/midori-browser.c:5293 msgid "_Import bookmarks" msgstr "Yerimlerini içe aktar" -#: ../midori/midori-browser.c:4230 +#: ../midori/midori-browser.c:4229 msgid "_Application:" msgstr "_Uygulamadan:" -#: ../midori/midori-browser.c:4295 +#: ../midori/midori-browser.c:4256 msgid "Import from XBEL or HTML file" msgstr "XBEL ya da HTML dosyasından içeri aktar" -#: ../midori/midori-browser.c:4330 +#: ../midori/midori-browser.c:4305 msgid "Import from a file" msgstr "Dosyadan yükle" -#: ../midori/midori-browser.c:4342 +#: ../midori/midori-browser.c:4317 msgid "Failed to import bookmarks" msgstr "Yerimlerini içe aktarma hatası" -#: ../midori/midori-browser.c:4377 +#: ../midori/midori-browser.c:4353 msgid "XBEL Bookmarks" msgstr "XBEL yer imleri" -#: ../midori/midori-browser.c:4382 +#: ../midori/midori-browser.c:4358 msgid "Netscape Bookmarks" msgstr "Netscape yer imleri" -#: ../midori/midori-browser.c:4396 +#: ../midori/midori-browser.c:4372 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 +#: ../midori/midori-browser.c:4388 msgid "Failed to export bookmarks" msgstr "Yer imlerini dışarı aktarma hatası" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4533 +#: ../midori/midori-browser.c:4514 msgid "Clear Private Data" msgstr "Kişisel Verileri Temizle" -#: ../midori/midori-browser.c:4537 +#: ../midori/midori-browser.c:4518 msgid "_Clear private data" msgstr "_Kişisel verileri temizle" -#: ../midori/midori-browser.c:4550 +#: ../midori/midori-browser.c:4531 msgid "Clear the following data:" msgstr "Aşağıdaki verileri temizle:" -#: ../midori/midori-browser.c:4560 +#: ../midori/midori-browser.c:4541 msgid "Last open _tabs" msgstr "Son açılmış sekmeler" -#: ../midori/midori-browser.c:4586 +#. i18n: Browsing history, visited web pages +#: ../midori/midori-browser.c:4547 ../midori/sokoke.c:1520 +msgid "_History" +msgstr "_Geçmiş" + +#: ../midori/midori-browser.c:4552 ../midori/sokoke.c:1526 +msgid "_Closed Tabs" +msgstr "Sekmeleri _kapat" + +#: ../midori/midori-browser.c:4572 msgid "Clear private data when _quitting Midori" msgstr "Midori'den çıkıldığında kişisel verileri temizle" -#: ../midori/midori-browser.c:4781 +#: ../midori/midori-browser.c:4746 msgid "A lightweight web browser." msgstr "Hafif bir web tarayıcı." -#: ../midori/midori-browser.c:4782 +#: ../midori/midori-browser.c:4747 msgid "See about:version for version info." msgstr "Sürüm bilgisi için bakınız: 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 "" -"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:4749 +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 +#: ../midori/midori-browser.c:4768 msgid "translator-credits" msgstr "" "Mirat Can Bayrak \n" "Gökmen Görgen \n" "Ayhan YALÇINSOY " -#: ../midori/midori-browser.c:5193 +#: ../midori/midori-browser.c:5132 msgid "_File" msgstr "_Dosya" -#: ../midori/midori-browser.c:5196 +#: ../midori/midori-browser.c:5134 ../midori/sokoke.c:1527 +msgid "New _Window" +msgstr "Yeni _Pencere" + +#: ../midori/midori-browser.c:5135 msgid "Open a new window" msgstr "Yeni bir pencerede aç" -#: ../midori/midori-browser.c:5199 +#: ../midori/midori-browser.c:5138 msgid "Open a new tab" msgstr "Yeni bir sekmede aç" -#: ../midori/midori-browser.c:5201 +#: ../midori/midori-browser.c:5140 msgid "New P_rivate Browsing Window" msgstr "Yeni _Gizli Gezinme Penceresi" -#: ../midori/midori-browser.c:5205 +#: ../midori/midori-browser.c:5141 +msgid "Don't save any private data while browsing" +msgstr "Gezinirken hiç bir özel veriyi kaydetme" + +#: ../midori/midori-browser.c:5145 msgid "Open a file" msgstr "Bir dosya aç" -#: ../midori/midori-browser.c:5207 -msgid "_Save Page As…" -msgstr "Sayfayı Farklı _Kaydet…" +#: ../midori/midori-browser.c:5147 +msgid "_Save Page As..." +msgstr "Sayfayı Farklı _Kaydet..." -#: ../midori/midori-browser.c:5208 +#: ../midori/midori-browser.c:5148 msgid "Save to a file" msgstr "Bir dosyaya kaydet" -#: ../midori/midori-browser.c:5210 +#: ../midori/midori-browser.c:5150 msgid "Add to Speed _dial" msgstr "Hızlı aramaya _ekle" -#: ../midori/midori-browser.c:5214 +#: ../midori/midori-browser.c:5151 +msgid "Add shortcut to speed dial" +msgstr "Hızlı aramaya kısayol ekle" + +#: ../midori/midori-browser.c:5154 msgid "Add Shortcut to the _desktop" msgstr "_Masaüstüne Kısayol ekle" -#: ../midori/midori-browser.c:5216 +#: ../midori/midori-browser.c:5155 +msgid "Add shortcut to the desktop" +msgstr "Masaüstüne kısayol ekle" + +#: ../midori/midori-browser.c:5157 msgid "Create _Launcher" msgstr "_Başlatıcı Oluştur" -#: ../midori/midori-browser.c:5220 +#: ../midori/midori-browser.c:5158 +msgid "Create a launcher" +msgstr "Bir başlatıcı oluştur" + +#: ../midori/midori-browser.c:5161 msgid "Subscribe to News _feed" msgstr "Haber _kaynaksine üye ol" -#: ../midori/midori-browser.c:5226 +#: ../midori/midori-browser.c:5162 +msgid "Subscribe to this news feed" +msgstr "Bu haber kaynaksine üye ol" + +#: ../midori/midori-browser.c:5167 msgid "_Close Tab" msgstr "Sekmeyi _kapat" -#: ../midori/midori-browser.c:5227 +#: ../midori/midori-browser.c:5168 msgid "Close the current tab" msgstr "Geçerli sekmeyi kapat" -#: ../midori/midori-browser.c:5229 +#: ../midori/midori-browser.c:5170 msgid "C_lose Window" msgstr "Pen_cereyi Kapat" -#: ../midori/midori-browser.c:5233 +#: ../midori/midori-browser.c:5171 +msgid "Close this window" +msgstr "Bu pencereyi kapat" + +#: ../midori/midori-browser.c:5174 msgid "Print the current page" msgstr "Geçerli sayfayı yazdır" -#: ../midori/midori-browser.c:5235 +#: ../midori/midori-browser.c:5176 msgid "Close a_ll Windows" msgstr "Bütün Pen_cereleri Kapat" -#: ../midori/midori-browser.c:5238 +#: ../midori/midori-browser.c:5177 +msgid "Close all open windows" +msgstr "Bütün açık pencereleri kapat" + +#: ../midori/midori-browser.c:5179 msgid "_Edit" msgstr "_Düzenle" -#: ../midori/midori-browser.c:5261 -msgid "_Find…" +#: ../midori/midori-browser.c:5182 +msgid "Undo the last modification" +msgstr "Son değişikliği geri al" + +#: ../midori/midori-browser.c:5185 +msgid "Redo the last modification" +msgstr "Son değişikliği yeniden yap" + +#: ../midori/midori-browser.c:5188 +msgid "Cut the selected text" +msgstr "Seçili metni kes" + +#: ../midori/midori-browser.c:5191 +msgid "Copy the selected text" +msgstr "Seçili metni kopyala" + +#: ../midori/midori-browser.c:5194 +msgid "Paste text from the clipboard" +msgstr "Metni panodan yapıştır" + +#: ../midori/midori-browser.c:5197 +msgid "Delete the selected text" +msgstr "Seçili metni sil" + +#: ../midori/midori-browser.c:5200 +msgid "Select all text" +msgstr "Bütün metni seç" + +#: ../midori/midori-browser.c:5202 +msgid "_Find..." msgstr "_Bul,.." -#: ../midori/midori-browser.c:5262 +#: ../midori/midori-browser.c:5203 msgid "Find a word or phrase in the page" msgstr "Bir kelime yada ibareyi geçerli sayfada ara" -#: ../midori/midori-browser.c:5264 +#: ../midori/midori-browser.c:5205 msgid "Find _Next" msgstr "So_nrakini Bul" -#: ../midori/midori-browser.c:5267 +#: ../midori/midori-browser.c:5206 +msgid "Find the next occurrence of a word or phrase" +msgstr "Kelime ya da ibarenin sonraki örneğini bul" + +#: ../midori/midori-browser.c:5208 msgid "Find _Previous" msgstr "Öncekini Bu_l" -#: ../midori/midori-browser.c:5271 +#: ../midori/midori-browser.c:5209 +msgid "Find the previous occurrence of a word or phrase" +msgstr "Kelime ya da ibarenin sonraki örneğini bul" + +#: ../midori/midori-browser.c:5213 msgid "Configure the application preferences" msgstr "Uygulama tercihlerini yapılandır" -#: ../midori/midori-browser.c:5273 +#: ../midori/midori-browser.c:5215 msgid "_View" msgstr "_Görünüm" -#: ../midori/midori-browser.c:5274 +#: ../midori/midori-browser.c:5216 msgid "_Toolbars" msgstr "_Araç Çubukları" -#: ../midori/midori-browser.c:5279 +#: ../midori/midori-browser.c:5221 ../midori/midori-browser.c:5222 msgid "Reload page without caching" msgstr "Önbellek kullanmadan sayfayı yeniden yükle" -#: ../midori/midori-browser.c:5289 +#: ../midori/midori-browser.c:5231 msgid "Increase the zoom level" msgstr "Yakınlaştırma seviyesini arttır" -#: ../midori/midori-browser.c:5292 +#: ../midori/midori-browser.c:5234 msgid "Decrease the zoom level" msgstr "Yakınlaştırma seviyesini azalt" -#: ../midori/midori-browser.c:5296 +#: ../midori/midori-browser.c:5237 +msgid "Reset the zoom level" +msgstr "Yakınlaştırma oranını sıfırla" + +#: ../midori/midori-browser.c:5238 msgid "_Encoding" msgstr "_Kodlama" -#: ../midori/midori-browser.c:5298 +#: ../midori/midori-browser.c:5240 msgid "View So_urce" msgstr "Kaynağını görüntüle" -#: ../midori/midori-browser.c:5301 +#: ../midori/midori-browser.c:5241 +msgid "View the source code of the page" +msgstr "Geçerli sayfanın kaynak kodunu görüntüle" + +#: ../midori/midori-browser.c:5243 msgid "Ca_ret Browsing" msgstr "Düzenleme İşaretçisini Kullanarak Gezinme" -#: ../midori/midori-browser.c:5305 +#: ../midori/midori-browser.c:5244 +msgid "Toggle text cursor navigation" +msgstr "Metin imleci navigasyonunu değiştir" + +#: ../midori/midori-browser.c:5247 msgid "Toggle fullscreen view" msgstr "Tam ekran modunu aç / kapat" -#: ../midori/midori-browser.c:5307 +#: ../midori/midori-browser.c:5249 msgid "Scroll _Left" msgstr "So_l Kaydırma" -#: ../midori/midori-browser.c:5310 +#: ../midori/midori-browser.c:5250 +msgid "Scroll to the left" +msgstr "Sola kaydır" + +#: ../midori/midori-browser.c:5252 msgid "Scroll _Down" msgstr "Aşağı Kay_dırma" -#: ../midori/midori-browser.c:5313 +#: ../midori/midori-browser.c:5253 +msgid "Scroll down" +msgstr "Aşağı kaydır" + +#: ../midori/midori-browser.c:5255 msgid "Scroll _Up" msgstr "Y_ukarı kaydırma" -#: ../midori/midori-browser.c:5316 +#: ../midori/midori-browser.c:5256 +msgid "Scroll up" +msgstr "Yukarı kaydır" + +#: ../midori/midori-browser.c:5258 msgid "Scroll _Right" msgstr "Sağa Kaydı_rma" -#: ../midori/midori-browser.c:5319 +#: ../midori/midori-browser.c:5259 +msgid "Scroll to the right" +msgstr "Sağa kaydır" + +#: ../midori/midori-browser.c:5261 msgid "_Go" msgstr "_Git" -#: ../midori/midori-browser.c:5322 +#: ../midori/midori-browser.c:5264 msgid "Go back to the previous page" msgstr "Önceki sayfaya geri dön" -#: ../midori/midori-browser.c:5325 +#: ../midori/midori-browser.c:5267 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:5329 +#: ../midori/midori-browser.c:5271 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:5333 +#: ../midori/midori-browser.c:5275 msgid "Go to the next sub-page" msgstr "Sonraki sayfaya git" -#: ../midori/midori-browser.c:5336 +#: ../midori/midori-browser.c:5278 msgid "Go to your homepage" msgstr "Anasayfaya git" -#: ../midori/midori-browser.c:5338 +#: ../midori/midori-browser.c:5280 msgid "Empty Trash" msgstr "Çöp Kutusunu Boşalt" -#: ../midori/midori-browser.c:5341 +#: ../midori/midori-browser.c:5281 +msgid "Delete the contents of the trash" +msgstr "Çöp Kutusu içerisindeki bütün içeriği sil" + +#: ../midori/midori-browser.c:5283 msgid "Undo _Close Tab" msgstr "Sekme kapatmayı geri al" -#: ../midori/midori-browser.c:5348 +#: ../midori/midori-browser.c:5284 +msgid "Open the last closed tab" +msgstr "Son kapatılan sekmeyi aç" + +#: ../midori/midori-browser.c:5290 msgid "Add a new _folder" msgstr "Yeni bir _dizin ekle" -#: ../midori/midori-browser.c:5354 +#: ../midori/midori-browser.c:5291 +msgid "Add a new bookmark folder" +msgstr "Yeni bir yerimi dizini ekle" + +#: ../midori/midori-browser.c:5296 msgid "_Export bookmarks" msgstr "Yerimlerini _dışa aktar" -#: ../midori/midori-browser.c:5357 ../midori/midori-searchaction.c:497 +#: ../midori/midori-browser.c:5299 ../midori/midori-searchaction.c:497 msgid "_Manage Search Engines" msgstr "Arama _Motorlarını Yönet" -#: ../midori/midori-browser.c:5360 +#: ../midori/midori-browser.c:5300 +msgid "Add, edit and remove search engines..." +msgstr "Arama motorlarını ekle, sil ve düzenle..." + +#: ../midori/midori-browser.c:5303 msgid "_Clear Private Data" msgstr "Kişisel Verileri Temizle" -#: ../midori/midori-browser.c:5363 +#: ../midori/midori-browser.c:5304 +msgid "Clear private data..." +msgstr "Kişisel verileri temizle..." + +#: ../midori/midori-browser.c:5307 msgid "_Inspect Page" msgstr "Sayfayı _incele" -#: ../midori/midori-browser.c:5367 +#: ../midori/midori-browser.c:5308 +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:5312 msgid "_Previous Tab" msgstr "Ön_ceki Sekme" -#: ../midori/midori-browser.c:5370 +#: ../midori/midori-browser.c:5313 +msgid "Switch to the previous tab" +msgstr "Önceki sekmeye geç" + +#: ../midori/midori-browser.c:5315 msgid "_Next Tab" msgstr "So_nraki Sekme" -#: ../midori/midori-browser.c:5372 +#: ../midori/midori-browser.c:5316 +msgid "Switch to the next tab" +msgstr "Sonraki sekmeye geç" + +#: ../midori/midori-browser.c:5317 msgid "Move Tab _Backward" msgstr "Sekmeyi _Geri Taşı" -#: ../midori/midori-browser.c:5374 +#: ../midori/midori-browser.c:5318 +msgid "Move tab behind the previous tab" +msgstr "Sekmeyi önceki sekmenin arkasına taşı" + +#: ../midori/midori-browser.c:5319 msgid "_Move Tab Forward" msgstr "Sekmeyi İleri _Taaşı" -#: ../midori/midori-browser.c:5377 +#: ../midori/midori-browser.c:5320 +msgid "Move tab in front of the next tab" +msgstr "Sekmeyi sonraki sekmenin önüne taşı" + +#: ../midori/midori-browser.c:5322 msgid "Focus _Current Tab" msgstr "Geçerli Sekmeye Odaklan" -#: ../midori/midori-browser.c:5380 +#: ../midori/midori-browser.c:5323 +msgid "Focus the current tab" +msgstr "Geçerli sekmeye odaklan" + +#: ../midori/midori-browser.c:5325 msgid "Focus _Next view" msgstr "_Sonraki görünüme odaklan" -#: ../midori/midori-browser.c:5383 +#: ../midori/midori-browser.c:5326 +msgid "Cycle focus between views" +msgstr "Görünümler arasında dairesel odak" + +#: ../midori/midori-browser.c:5328 msgid "Only show the Icon of the _Current Tab" msgstr "Sadece şuan ki sekmenin simgesini göster" -#: ../midori/midori-browser.c:5386 +#: ../midori/midori-browser.c:5329 +msgid "Only show the icon of the current tab" +msgstr "Sadece şuan ki sekmenin simgesini göster" + +#: ../midori/midori-browser.c:5331 msgid "_Duplicate Current Tab" msgstr "Şuan ki sekmeyi Çoğalt" -#: ../midori/midori-browser.c:5389 +#: ../midori/midori-browser.c:5332 +msgid "Duplicate the current tab" +msgstr "Geçerli sekmeyi çoğalt" + +#: ../midori/midori-browser.c:5334 msgid "Close Ot_her Tabs" msgstr "_Diğer Sekmeleri Kapat" -#: ../midori/midori-browser.c:5392 +#: ../midori/midori-browser.c:5335 +msgid "Close all tabs except the current tab" +msgstr "Diğer sekmeleri kapat" + +#: ../midori/midori-browser.c:5337 msgid "Open last _session" msgstr "_Son oturumu aç" -#: ../midori/midori-browser.c:5395 +#: ../midori/midori-browser.c:5338 +msgid "Open the tabs saved in the last session" +msgstr "Son oturumda kaydedilmiş sekmeleri aç" + +#: ../midori/midori-browser.c:5340 msgid "_Help" msgstr "_Yardım" -#: ../midori/midori-browser.c:5397 +#: ../midori/midori-browser.c:5342 msgid "_Frequent Questions" msgstr "_Sık Sorulan Sorular" -#: ../midori/midori-browser.c:5400 -msgid "_Report a Problem…" -msgstr "Bir Hata _Raporla…" +#: ../midori/midori-browser.c:5343 +msgid "Show the Frequently Asked Questions" +msgstr "Sık Sorulan Soruları Göster" + +#: ../midori/midori-browser.c:5345 +msgid "_Report a Problem..." +msgstr "Bir Hata _Raporla..." + +#: ../midori/midori-browser.c:5346 +msgid "Open Midori's bug tracker" +msgstr "Midori'nin hata takip sistemini aç" -#: ../midori/midori-browser.c:5412 +#: ../midori/midori-browser.c:5349 +msgid "Show information about the program" +msgstr "Uygulama hakkında bilgi göster" + +#: ../midori/midori-browser.c:5357 msgid "_Menubar" msgstr "_Menü Çubuğu" -#: ../midori/midori-browser.c:5416 +#: ../midori/midori-browser.c:5358 +msgid "Show menubar" +msgstr "Menü çubuğunu göster" + +#: ../midori/midori-browser.c:5361 msgid "_Navigationbar" msgstr "Gezi_nti araç Çubuğu" -#: ../midori/midori-browser.c:5420 +#: ../midori/midori-browser.c:5362 +msgid "Show navigationbar" +msgstr "Gezinti araç çubuğunu göster" + +#: ../midori/midori-browser.c:5365 msgid "Side_panel" msgstr "Yan _panel" -#: ../midori/midori-browser.c:5421 -#, fuzzy -msgid "Sidepanel" -msgstr "Yan _panel" +#: ../midori/midori-browser.c:5366 +msgid "Show sidepanel" +msgstr "Yan paneli göster" -#: ../midori/midori-browser.c:5424 +#: ../midori/midori-browser.c:5369 msgid "_Bookmarkbar" msgstr "Yer imi araç çu_buğu" -#: ../midori/midori-browser.c:5428 +#: ../midori/midori-browser.c:5370 +msgid "Show bookmarkbar" +msgstr "Yer imi araç çubuğunu göster" + +#: ../midori/midori-browser.c:5373 msgid "_Statusbar" msgstr "_Durum Çubuğu" -#: ../midori/midori-browser.c:5437 ../midori/midori-websettings.c:307 +#: ../midori/midori-browser.c:5374 +msgid "Show statusbar" +msgstr "Durum çubuğunu göster" + +#: ../midori/midori-browser.c:5382 msgid "_Automatic" msgstr "Otom_atik" -#: ../midori/midori-browser.c:5440 ../midori/midori-websettings.c:232 +#: ../midori/midori-browser.c:5385 ../midori/midori-websettings.c:218 msgid "Chinese (BIG5)" msgstr "Çince (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5444 +#: ../midori/midori-browser.c:5389 msgid "Japanese (SHIFT__JIS)" msgstr "Japonca (SHIFT__JIS)" -#: ../midori/midori-browser.c:5447 ../midori/midori-websettings.c:234 +#: ../midori/midori-browser.c:5392 ../midori/midori-websettings.c:220 msgid "Korean (EUC-KR)" msgstr "Korece (EUC-KR)" -#: ../midori/midori-browser.c:5450 ../midori/midori-websettings.c:235 +#: ../midori/midori-browser.c:5395 ../midori/midori-websettings.c:221 msgid "Russian (KOI8-R)" msgstr "Rusça (KOI8-R)" -#: ../midori/midori-browser.c:5453 ../midori/midori-websettings.c:236 +#: ../midori/midori-browser.c:5398 ../midori/midori-websettings.c:222 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5456 ../midori/midori-websettings.c:237 +#: ../midori/midori-browser.c:5401 ../midori/midori-websettings.c:223 msgid "Western (ISO-8859-1)" msgstr "Batı Avrupa (ISO-8859-1)" -#: ../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:5404 ../midori/midori-websettings.c:224 +#: ../midori/midori-websettings.c:298 ../katze/katze-utils.c:732 +msgid "Custom..." +msgstr "Özel..." -#: ../midori/midori-browser.c:5964 +#: ../midori/midori-browser.c:5934 msgid "_Separator" msgstr "Ayraç" -#: ../midori/midori-browser.c:5971 -msgid "_Location…" -msgstr "Kon_um…" +#: ../midori/midori-browser.c:5941 +msgid "_Location..." +msgstr "Kon_um..." -#: ../midori/midori-browser.c:5973 +#: ../midori/midori-browser.c:5943 msgid "Open a particular location" msgstr "Belirli bir konumu aç" -#: ../midori/midori-browser.c:5995 -msgid "_Web Search…" -msgstr "_Web Arama…" +#: ../midori/midori-browser.c:5965 +msgid "_Web Search..." +msgstr "_Web Arama..." -#: ../midori/midori-browser.c:5997 +#: ../midori/midori-browser.c:5967 msgid "Run a web search" msgstr "Bir web arama gerçekleştir" -#: ../midori/midori-browser.c:6024 +#: ../midori/midori-browser.c:5988 msgid "Reopen a previously closed tab or window" msgstr "Daha önce kapatılmış pencereyi ya da sekmeyi yeniden aç" -#: ../midori/midori-browser.c:6041 +#: ../midori/midori-browser.c:6001 ../midori/sokoke.c:1516 +msgid "_Bookmarks" +msgstr "_Yer İmleri" + +#: ../midori/midori-browser.c:6003 msgid "Show the saved bookmarks" msgstr "Kaydedilmiş yer imlerini göster" -#: ../midori/midori-browser.c:6058 +#: ../midori/midori-browser.c:6017 msgid "_Tools" msgstr "_Araçlar" -#: ../midori/midori-browser.c:6074 +#: ../midori/midori-browser.c:6032 msgid "_Window" msgstr "_Pencere" -#: ../midori/midori-browser.c:6076 +#: ../midori/midori-browser.c:6034 msgid "Show a list of all open tabs" msgstr "Açık sekmelerin bir listesini göster" -#: ../midori/midori-browser.c:6090 +#: ../midori/midori-browser.c:6048 msgid "_Menu" msgstr "_Menü" -#: ../midori/midori-browser.c:6092 +#: ../midori/midori-browser.c:6050 msgid "Menu" msgstr "Menü" -#: ../midori/midori-browser.c:6904 +#: ../midori/midori-browser.c:6602 #, c-format msgid "Unexpected setting '%s'" msgstr "Beklenmedik ayar '%s'" -#: ../midori/midori-extension.c:310 +#: ../midori/midori-extension.c:305 #, c-format msgid "The configuration of the extension '%s' couldn't be loaded: %s\n" msgstr "'%s' ayarları yüklenemedi: %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 +#: ../midori/midori-extension.c:703 ../midori/midori-extension.c:800 +#: ../midori/midori-extension.c:897 ../midori/midori-extension.c:1009 +#: ../extensions/addons.c:1640 #, c-format 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:394 -#, c-format -msgid "Search with %s" -msgstr "%s ile ara" - -#: ../midori/midori-locationaction.c:412 -#, fuzzy -msgid "Search with…" -msgstr "_ile ara" - -#: ../midori/midori-locationaction.c:537 +#: ../midori/midori-locationaction.c:400 #, c-format msgid "Failed to select from history\n" msgstr "Geçmişten seçme hatası\n" -#: ../midori/midori-locationaction.c:624 +#: ../midori/midori-locationaction.c:484 #, c-format msgid "Search for %s" msgstr "%s için ara" +#: ../midori/midori-locationaction.c:510 +#, c-format +msgid "Search with %s" +msgstr "%s ile ara" + #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1400 +#: ../midori/midori-locationaction.c:1258 msgid "Paste and p_roceed" msgstr "Ya_pıştır ve ilerle" -#: ../midori/midori-locationaction.c:1768 +#: ../midori/midori-locationaction.c:1653 msgid "Not verified" msgstr "Doğrulanmadı" -#: ../midori/midori-locationaction.c:1788 +#: ../midori/midori-locationaction.c:1668 msgid "Verified and encrypted connection" msgstr "Doğrulanmış ve şifrelenmiş bağlantı" @@ -1115,954 +1191,924 @@ msgstr "Paneli kapat" msgid "Align sidepanel to the left" msgstr "Kenar panelini sola hizala" -#: ../midori/midori-websettings.c:214 +#: ../midori/midori-websettings.c:200 msgid "Show Speed Dial" msgstr "Hızlı Aramayı Göster" -#: ../midori/midori-websettings.c:215 +#: ../midori/midori-websettings.c:201 msgid "Show Homepage" msgstr "Anasayfa göster" -#: ../midori/midori-websettings.c:233 +#: ../midori/midori-websettings.c:219 msgid "Japanese (SHIFT_JIS)" msgstr "Japonca (Shift_JIS)" -#: ../midori/midori-websettings.c:253 +#: ../midori/midori-websettings.c:239 msgid "New tab" msgstr "Yeni sekme" -#: ../midori/midori-websettings.c:254 +#: ../midori/midori-websettings.c:240 msgid "New window" msgstr "Yeni pencere" -#: ../midori/midori-websettings.c:255 +#: ../midori/midori-websettings.c:241 msgid "Current tab" msgstr "Geçerli sekme" -#: ../midori/midori-websettings.c:270 +#: ../midori/midori-websettings.c:256 msgid "Default" msgstr "Öntanımlı" -#: ../midori/midori-websettings.c:271 +#: ../midori/midori-websettings.c:257 msgid "Icons" msgstr "Simgeler" -#: ../midori/midori-websettings.c:272 +#: ../midori/midori-websettings.c:258 msgid "Small icons" msgstr "Küçük simgeler" -#: ../midori/midori-websettings.c:273 +#: ../midori/midori-websettings.c:259 msgid "Text" msgstr "Metin" -#: ../midori/midori-websettings.c:274 +#: ../midori/midori-websettings.c:260 msgid "Icons and text" msgstr "Simgeler ve metin" -#: ../midori/midori-websettings.c:275 +#: ../midori/midori-websettings.c:261 msgid "Text beside icons" msgstr "Simgelerin yanında metin" -#: ../midori/midori-websettings.c:290 +#: ../midori/midori-websettings.c:276 msgid "Automatic (GNOME or environment)" msgstr "Otomatik (GNOME veya çevre)" -#: ../midori/midori-websettings.c:291 +#: ../midori/midori-websettings.c:277 msgid "HTTP proxy server" msgstr "HTTP vekil sunucu" -#: ../midori/midori-websettings.c:292 +#: ../midori/midori-websettings.c:278 msgid "No proxy server" msgstr "Vekil sunucu yok" -#: ../midori/midori-websettings.c:309 +#: ../midori/midori-websettings.c:294 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:310 +#: ../midori/midori-websettings.c:295 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:311 +#: ../midori/midori-websettings.c:296 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:312 +#: ../midori/midori-websettings.c:297 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:350 msgid "Remember last window size" msgstr "Son pencerenin ölçülerini hatırla" -#: ../midori/midori-websettings.c:389 +#: ../midori/midori-websettings.c:351 msgid "Whether to save the last window size" msgstr "Son pencere boyu kaydedilsin" -#: ../midori/midori-websettings.c:397 +#: ../midori/midori-websettings.c:359 msgid "Last window width" msgstr "Son pencerenin eni" -#: ../midori/midori-websettings.c:398 +#: ../midori/midori-websettings.c:360 msgid "The last saved window width" msgstr "Son kaydedilmiş pencere eni" -#: ../midori/midori-websettings.c:406 +#: ../midori/midori-websettings.c:368 msgid "Last window height" msgstr "Son pencere yüksekliği" -#: ../midori/midori-websettings.c:407 +#: ../midori/midori-websettings.c:369 msgid "The last saved window height" msgstr "Son kaydedilmiş pencere yüksekliği" -#: ../midori/midori-websettings.c:432 +#: ../midori/midori-websettings.c:394 msgid "Last panel position" msgstr "Son panel pozisyonu" -#: ../midori/midori-websettings.c:433 +#: ../midori/midori-websettings.c:395 msgid "The last saved panel position" msgstr "Son kaydedilen panel pozisyonu" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:442 +#: ../midori/midori-websettings.c:404 msgid "Last panel page" msgstr "Son panel sayfası" -#: ../midori/midori-websettings.c:443 +#: ../midori/midori-websettings.c:405 msgid "The last saved panel page" msgstr "Son kaydedilmiş panel sayfası" -#: ../midori/midori-websettings.c:451 +#: ../midori/midori-websettings.c:413 msgid "Last Web search" msgstr "Son Web Arama" -#: ../midori/midori-websettings.c:452 +#: ../midori/midori-websettings.c:414 msgid "The last saved Web search" msgstr "Kaydedilmiş son web arama" -#: ../midori/midori-websettings.c:461 +#: ../midori/midori-websettings.c:423 msgid "Show Menubar" msgstr "Menü Çubuğunu Göster" -#: ../midori/midori-websettings.c:462 +#: ../midori/midori-websettings.c:424 msgid "Whether to show the menubar" msgstr "Menü çubuğu gösterilsin" -#: ../midori/midori-websettings.c:470 +#: ../midori/midori-websettings.c:432 msgid "Show Navigationbar" msgstr "Gezinti Araç Çubuğunu Göster" -#: ../midori/midori-websettings.c:471 +#: ../midori/midori-websettings.c:433 msgid "Whether to show the navigationbar" msgstr "Navigasyon çubuğu gösterilsin" -#: ../midori/midori-websettings.c:479 +#: ../midori/midori-websettings.c:441 msgid "Show Bookmarkbar" msgstr "Yer İmi Araç Çubuğunu Göster" -#: ../midori/midori-websettings.c:480 +#: ../midori/midori-websettings.c:442 msgid "Whether to show the bookmarkbar" msgstr "Yer imi araç çubuğu gösterilsin" -#: ../midori/midori-websettings.c:488 +#: ../midori/midori-websettings.c:450 msgid "Show Panel" msgstr "Paneli Göster" -#: ../midori/midori-websettings.c:489 +#: ../midori/midori-websettings.c:451 msgid "Whether to show the panel" msgstr "Panel çubuğu gösterilsin" -#: ../midori/midori-websettings.c:497 +#: ../midori/midori-websettings.c:459 msgid "Show Statusbar" msgstr "Durum Çubuğunu Göster" -#: ../midori/midori-websettings.c:498 +#: ../midori/midori-websettings.c:460 msgid "Whether to show the statusbar" msgstr "Durum çubuğu gösterilsin" -#: ../midori/midori-websettings.c:507 +#: ../midori/midori-websettings.c:469 msgid "Toolbar Style:" msgstr "Araç Çubuğu Biçimi:" -#: ../midori/midori-websettings.c:508 +#: ../midori/midori-websettings.c:470 msgid "The style of the toolbar" msgstr "Araç çubuğunun biçimi" -#: ../midori/midori-websettings.c:517 +#: ../midori/midori-websettings.c:479 msgid "Toolbar Items" msgstr "Araç Çubuğu Öğeleri" -#: ../midori/midori-websettings.c:518 +#: ../midori/midori-websettings.c:480 msgid "The items to show on the toolbar" msgstr "Araç çubuğunun üzerinde gösterilecek ögeler" -#: ../midori/midori-websettings.c:526 +#: ../midori/midori-websettings.c:488 msgid "Compact Sidepanel" msgstr "Küçük Yan Panel" -#: ../midori/midori-websettings.c:527 +#: ../midori/midori-websettings.c:489 msgid "Whether to make the sidepanel compact" msgstr "Yan panel küçük gösterilsin" -#: ../midori/midori-websettings.c:542 +#: ../midori/midori-websettings.c:504 msgid "Align sidepanel on the right" msgstr "Kenar panelini sağda hizala" -#: ../midori/midori-websettings.c:543 +#: ../midori/midori-websettings.c:505 msgid "Whether to align the sidepanel on the right" msgstr "Kenar panelini sağa hizala açık/kapalı" -#: ../midori/midori-websettings.c:558 +#: ../midori/midori-websettings.c:520 msgid "Open panels in separate windows" msgstr "Panelleri ayrı pencerelerde aç" -#: ../midori/midori-websettings.c:559 +#: ../midori/midori-websettings.c:521 msgid "Whether to always open panels in separate windows" msgstr "Her zaman panelleri ayrı pencerelerde aç açık/kapalı" -#: ../midori/midori-websettings.c:568 +#: ../midori/midori-websettings.c:530 msgid "When Midori starts:" msgstr "Midori başlarken:" -#: ../midori/midori-websettings.c:569 +#: ../midori/midori-websettings.c:531 msgid "What to do when Midori starts" msgstr "Midori başlatılırken ne yapılacak" -#: ../midori/midori-websettings.c:578 +#: ../midori/midori-websettings.c:540 msgid "Homepage:" msgstr "Anasayfa:" -#: ../midori/midori-websettings.c:579 +#: ../midori/midori-websettings.c:541 msgid "The homepage" msgstr "Anasayfa" -#: ../midori/midori-websettings.c:594 +#: ../midori/midori-websettings.c:556 msgid "Show crash dialog" msgstr "Çökme diyaloğunu göster" -#: ../midori/midori-websettings.c:595 +#: ../midori/midori-websettings.c:557 msgid "Show a dialog after Midori crashed" msgstr "Midori çöktükten sonra bir diyalog göster" -#: ../midori/midori-websettings.c:603 +#: ../midori/midori-websettings.c:565 msgid "Save downloaded files to:" msgstr "İndirilen dosyaları kaydet:" -#: ../midori/midori-websettings.c:604 +#: ../midori/midori-websettings.c:566 msgid "The folder downloaded files are saved to" msgstr "İndirilen dosyaların kaydedileceği dizin" -#: ../midori/midori-websettings.c:612 +#: ../midori/midori-websettings.c:574 msgid "Text Editor" msgstr "Metin Düzenleyici" -#: ../midori/midori-websettings.c:613 +#: ../midori/midori-websettings.c:575 msgid "An external text editor" msgstr "Harici metin düzenleyici" -#: ../midori/midori-websettings.c:628 +#: ../midori/midori-websettings.c:590 msgid "News Aggregator" msgstr "Haber Toplayıcı" -#: ../midori/midori-websettings.c:629 +#: ../midori/midori-websettings.c:591 msgid "An external news aggregator" msgstr "Harici bir haber toplayıcıda" -#: ../midori/midori-websettings.c:637 +#: ../midori/midori-websettings.c:599 msgid "Location entry Search" msgstr "Konum Girişi Arama" -#: ../midori/midori-websettings.c:638 +#: ../midori/midori-websettings.c:600 msgid "The search to perform inside the location entry" msgstr "Konum girişi içinde yapılacak arama" -#: ../midori/midori-websettings.c:646 +#: ../midori/midori-websettings.c:608 msgid "Preferred Encoding" msgstr "Tercih Edilen Kodlama" -#: ../midori/midori-websettings.c:647 +#: ../midori/midori-websettings.c:609 msgid "The preferred character encoding" msgstr "Tercih edilen karakter kodlaması" -#: ../midori/midori-websettings.c:657 +#: ../midori/midori-websettings.c:619 msgid "Always Show Tabbar" msgstr "Sekme Çubuğunu Her Zaman Göster" -#: ../midori/midori-websettings.c:658 +#: ../midori/midori-websettings.c:620 msgid "Always show the tabbar" msgstr "Sekme çubuğunu her zaman göster" -#: ../midori/midori-websettings.c:671 +#: ../midori/midori-websettings.c:628 msgid "Close Buttons on Tabs" msgstr "Sekmelerde kapatma düğmesi" -#: ../midori/midori-websettings.c:672 +#: ../midori/midori-websettings.c:629 msgid "Whether tabs have close buttons" msgstr "Sekmelerde kapatma düğmesi olsun" -#: ../midori/midori-websettings.c:697 +#: ../midori/midori-websettings.c:654 msgid "Open new pages in:" msgstr "Yeni sayfaları aç:" -#: ../midori/midori-websettings.c:698 +#: ../midori/midori-websettings.c:655 msgid "Where to open new pages" msgstr "Yeni sayfaların açılacağı yer" -#: ../midori/midori-websettings.c:707 +#: ../midori/midori-websettings.c:664 msgid "Middle click opens Selection" msgstr "Orta tuşla seçimi aç" -#: ../midori/midori-websettings.c:708 +#: ../midori/midori-websettings.c:665 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:716 +#: ../midori/midori-websettings.c:673 msgid "Open tabs in the background" msgstr "Sekmeleri arkaplanda aç" -#: ../midori/midori-websettings.c:717 +#: ../midori/midori-websettings.c:674 msgid "Whether to open new tabs in the background" msgstr "Sekmeler arka planda açılsın" -#: ../midori/midori-websettings.c:725 +#: ../midori/midori-websettings.c:682 msgid "Open Tabs next to Current" msgstr "Sekmeleri geçerli sekmeden sonrakine aç" -#: ../midori/midori-websettings.c:726 +#: ../midori/midori-websettings.c:683 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:734 +#: ../midori/midori-websettings.c:691 msgid "Open popups in tabs" msgstr "Açılır pencereleri sekmelerde aç" -#: ../midori/midori-websettings.c:735 +#: ../midori/midori-websettings.c:692 msgid "Whether to open popup windows in tabs" msgstr "Açılır pencereler sekmelerde açılsın" -#: ../midori/midori-websettings.c:745 ../extensions/statusbar-features.c:134 +#: ../midori/midori-websettings.c:702 ../extensions/statusbar-features.c:132 msgid "Load images automatically" msgstr "Resimleri otomatik yükle" -#: ../midori/midori-websettings.c:746 +#: ../midori/midori-websettings.c:703 msgid "Load and display images automatically" msgstr "Resimleri otomatik yükle ve görüntüle" -#: ../midori/midori-websettings.c:753 ../extensions/statusbar-features.c:143 +#: ../midori/midori-websettings.c:710 ../extensions/statusbar-features.c:141 msgid "Enable scripts" msgstr "Betiklere izin ver" -#: ../midori/midori-websettings.c:754 +#: ../midori/midori-websettings.c:711 msgid "Enable embedded scripting languages" msgstr "Kodlama dilleri yerleştirmesi açık" -#: ../midori/midori-websettings.c:761 ../extensions/statusbar-features.c:154 +#: ../midori/midori-websettings.c:718 ../extensions/statusbar-features.c:150 msgid "Enable Netscape plugins" msgstr "Netscape eklentileri açık" -#: ../midori/midori-websettings.c:762 +#: ../midori/midori-websettings.c:719 msgid "Enable embedded Netscape plugin objects" msgstr "Gömülü Netscape eklenti nesneleri açık" -#: ../midori/midori-websettings.c:777 +#: ../midori/midori-websettings.c:739 msgid "Enable Spell Checking" msgstr "Yazım Denetimi Açık" -#: ../midori/midori-websettings.c:778 +#: ../midori/midori-websettings.c:740 msgid "Enable spell checking while typing" msgstr "Yazarken yazım denetimi açık/kapalı" -#: ../midori/midori-websettings.c:784 +#: ../midori/midori-websettings.c:746 msgid "Enable HTML5 database support" msgstr "HTML5 veritabanı desteği açık" -#: ../midori/midori-websettings.c:785 +#: ../midori/midori-websettings.c:747 msgid "Whether to enable HTML5 database support" msgstr "HTML5 veritabanı desteği açık/kapalı" -#: ../midori/midori-websettings.c:791 +#: ../midori/midori-websettings.c:753 msgid "Enable HTML5 local storage support" msgstr "HTML5 yerel depolama desteği açık" -#: ../midori/midori-websettings.c:792 +#: ../midori/midori-websettings.c:754 msgid "Whether to enable HTML5 local storage support" msgstr "HTML5 yerel depolama desteği açık/kapalı" -#: ../midori/midori-websettings.c:798 +#: ../midori/midori-websettings.c:760 msgid "Enable offline web application cache" msgstr "Çevrim dışı web uygulama önbelleği açık" -#: ../midori/midori-websettings.c:799 +#: ../midori/midori-websettings.c:761 msgid "Whether to enable offline web application cache" msgstr "Çevrim dışı web uygulama önbelleği açık/kapalı" -#: ../midori/midori-websettings.c:815 +#: ../midori/midori-websettings.c:777 #, fuzzy msgid "Flash window on background tabs" msgstr "Flash penceresi arka plan sekmeler" -#: ../midori/midori-websettings.c:816 +#: ../midori/midori-websettings.c:778 #, 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 +#: ../midori/midori-websettings.c:793 msgid "Zoom Text and Images" msgstr "Metni ve Resimleri yakınlaştır" -#: ../midori/midori-websettings.c:852 +#: ../midori/midori-websettings.c:794 msgid "Whether to zoom text and images" msgstr "Metni ve Resimleri yakınlaştır açık/kapalı" -#: ../midori/midori-websettings.c:867 +#: ../midori/midori-websettings.c:809 msgid "Find inline while typing" msgstr "Yazarken satır içinde ara" -#: ../midori/midori-websettings.c:868 +#: ../midori/midori-websettings.c:810 msgid "Whether to automatically find inline while typing" msgstr "Yazarken otomatik satır içinde ara açık/kapalı" -#: ../midori/midori-websettings.c:883 +#: ../midori/midori-websettings.c:825 msgid "Kinetic scrolling" msgstr "Hareketli kaydırma" -#: ../midori/midori-websettings.c:884 +#: ../midori/midori-websettings.c:826 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:892 +#: ../midori/midori-websettings.c:834 msgid "Delete old Cookies after:" msgstr "Şu süreden eski Çerezleri sil:" -#: ../midori/midori-websettings.c:893 +#: ../midori/midori-websettings.c:835 msgid "The maximum number of days to save cookies for" msgstr "Çerezlerin saklanacağı en çok gün sayısı" -#: ../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 +#: ../midori/midori-websettings.c:844 msgid "Delete pages from history after:" msgstr "Şu süreden eski sayfaları geçmişten sil:" -#: ../midori/midori-websettings.c:925 +#: ../midori/midori-websettings.c:845 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:940 +#: ../midori/midori-websettings.c:860 msgid "Proxy server" msgstr "Vekil sunucu" -#: ../midori/midori-websettings.c:941 +#: ../midori/midori-websettings.c:861 msgid "The type of proxy server to use" msgstr "Kullanılacak vekil sunucunun türü" -#: ../midori/midori-websettings.c:950 +#: ../midori/midori-websettings.c:870 msgid "HTTP Proxy Server" msgstr "HTTP Vekil Sunucu" -#: ../midori/midori-websettings.c:951 +#: ../midori/midori-websettings.c:871 msgid "The proxy server used for HTTP connections" msgstr "HTTP bağlantıları için kullanılan vekil sunucu" -#: ../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 +#: ../midori/midori-websettings.c:888 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:1002 +#: ../midori/midori-websettings.c:905 msgid "Identify as" msgstr "Belirle" -#: ../midori/midori-websettings.c:1003 +#: ../midori/midori-websettings.c:906 msgid "What to identify as to web pages" msgstr "Web sayfasını belirle" -#: ../midori/midori-websettings.c:1019 +#: ../midori/midori-websettings.c:922 msgid "Identification string" msgstr "Tanımlama dizesi" -#: ../midori/midori-websettings.c:1020 +#: ../midori/midori-websettings.c:923 msgid "The application identification string" msgstr "Uygulama tanımlama dizesi" -#: ../midori/midori-websettings.c:1036 +#: ../midori/midori-websettings.c:939 msgid "Preferred languages" msgstr "Tercih diller" -#: ../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:940 +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:1052 +#: ../midori/midori-websettings.c:955 msgid "Clear private data" msgstr "Kişisel veri temizle" -#: ../midori/midori-websettings.c:1053 +#: ../midori/midori-websettings.c:956 msgid "The private data selected for deletion" msgstr "Silmek için kişisel veri seçildi" -#: ../midori/midori-websettings.c:1068 +#: ../midori/midori-websettings.c:971 msgid "Clear data" msgstr "Kişisel verileri temizle" -#: ../midori/midori-websettings.c:1069 +#: ../midori/midori-websettings.c:972 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 +#: ../midori/midori-websettings.c:1005 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 +#: ../midori/midori-websettings.c:1007 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 +#: ../midori/midori-view.c:1349 #, 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 +#: ../midori/midori-view.c:1353 ../midori/midori-view.c:1382 msgid "_Deny" msgstr "_Reddet" -#: ../midori/midori-view.c:1357 ../midori/midori-view.c:1389 +#: ../midori/midori-view.c:1353 ../midori/midori-view.c:1382 msgid "_Allow" msgstr "İzin ver" -#: ../midori/midori-view.c:1385 +#: ../midori/midori-view.c:1378 #, c-format msgid "%s wants to know your location." msgstr "%s Konumunuzu öğrenmek istiyor." -#: ../midori/midori-view.c:1476 +#: ../midori/midori-view.c:1467 #, c-format msgid "Error - %s" msgstr "Hata - %s" -#: ../midori/midori-view.c:1477 +#: ../midori/midori-view.c:1468 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "Sayfa '%s' yüklenemedi." -#: ../midori/midori-view.c:1479 +#: ../midori/midori-view.c:1470 msgid "Try again" msgstr "Tekrar deneyin" -#: ../midori/midori-view.c:1676 ../midori/midori-view.c:2589 +#: ../midori/midori-view.c:1629 ../midori/midori-view.c:2464 #, c-format msgid "Send a message to %s" msgstr "%s bir mesaj gönder" -#: ../midori/midori-view.c:2419 ../midori/midori-view.c:2738 +#: ../midori/midori-view.c:2303 ../midori/midori-view.c:2617 msgid "Inspect _Element" msgstr "Unsurları Kontrol _et" -#: ../midori/midori-view.c:2471 +#: ../midori/midori-view.c:2353 msgid "Open Link in New _Tab" msgstr "Bağlantıyı Yeni _Sekmede Aç" -#: ../midori/midori-view.c:2475 +#: ../midori/midori-view.c:2357 msgid "Open Link in _Foreground Tab" msgstr "Bağlantıyı _Önalan Sekmede Aç" -#: ../midori/midori-view.c:2476 +#: ../midori/midori-view.c:2358 msgid "Open Link in _Background Tab" msgstr "Bağlantıyı _Arka Alan Sekmede Aç" -#: ../midori/midori-view.c:2479 +#: ../midori/midori-view.c:2361 msgid "Open Link in New _Window" msgstr "Bağlantıyı Yeni _Pencerede aç" -#: ../midori/midori-view.c:2482 +#: ../midori/midori-view.c:2364 msgid "Open Link as Web A_pplication" msgstr "Bağlantıyı Web Uygulaması Olarak Aç" -#: ../midori/midori-view.c:2487 +#: ../midori/midori-view.c:2367 msgid "Copy Link de_stination" msgstr "Bağlantı konumunu _kopyala" -#: ../midori/midori-view.c:2503 +#: ../midori/midori-view.c:2379 msgid "Open _Image in New Tab" msgstr "Resm_i Yeni Sekmede Aç" -#: ../midori/midori-view.c:2506 +#: ../midori/midori-view.c:2382 msgid "Copy Image _Address" msgstr "Resim _Adresini Kopyala" -#: ../midori/midori-view.c:2509 +#: ../midori/midori-view.c:2385 msgid "Save I_mage" msgstr "Res_mi Kaydet" -#: ../midori/midori-view.c:2512 -#, fuzzy -msgid "Open in Image _Viewer" -msgstr "Resm_i Yeni Sekmede Aç" - -#: ../midori/midori-view.c:2519 +#: ../midori/midori-view.c:2392 msgid "Copy Video _Address" msgstr "Video _Adresini Kopyala" -#: ../midori/midori-view.c:2522 +#: ../midori/midori-view.c:2395 msgid "Save _Video" msgstr "_Video kaydet" -#: ../midori/midori-view.c:2522 +#: ../midori/midori-view.c:2395 msgid "Download _Video" msgstr "_Video İndir" -#: ../midori/midori-view.c:2548 +#: ../midori/midori-view.c:2421 msgid "Search _with" msgstr "_ile ara" -#: ../midori/midori-view.c:2580 +#: ../midori/midori-view.c:2455 msgid "_Search the Web" msgstr "Web ara" -#: ../midori/midori-view.c:2597 +#: ../midori/midori-view.c:2472 msgid "Open Address in New _Tab" msgstr "Adresi Yeni _Sekmede Aç" -#: ../midori/midori-view.c:2886 +#: ../midori/midori-view.c:2756 msgid "Open or download file" msgstr "Dosyayı aç veya indir" -#: ../midori/midori-view.c:2905 +#: ../midori/midori-view.c:2775 #, c-format msgid "File Type: '%s'" msgstr "Dosya Türü: '%s'" -#: ../midori/midori-view.c:2907 +#: ../midori/midori-view.c:2777 #, 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'" +#: ../midori/midori-view.c:2788 +msgid "MD5-Checksum:" +msgstr "MD5-Checksum:" + +#: ../midori/midori-view.c:2795 +msgid "SHA1-Checksum:" +msgstr "SHA1-Checksum:" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2930 +#: ../midori/midori-view.c:2805 #, c-format msgid "Open %s" msgstr "%s aç" -#: ../midori/midori-view.c:3575 +#: ../midori/midori-view.c:3386 #, c-format msgid "Inspect page - %s" msgstr "Sayfayı incele - %s" -#: ../midori/midori-view.c:3876 +#: ../midori/midori-view.c:3675 msgid "Speed Dial" msgstr "Hızlı arama" -#: ../midori/midori-view.c:3877 ../midori/midori-view.c:3973 +#: ../midori/midori-view.c:3676 msgid "Click to add a shortcut" msgstr "Bir kısayol eklemek için tıklayın" -#: ../midori/midori-view.c:3878 +#: ../midori/midori-view.c:3677 msgid "Enter shortcut address" msgstr "Kısayol adresi girin" -#: ../midori/midori-view.c:3879 +#: ../midori/midori-view.c:3678 msgid "Enter shortcut title" msgstr "Kısayol başlığını girin" -#: ../midori/midori-view.c:3880 +#: ../midori/midori-view.c:3679 msgid "Are you sure you want to delete this shortcut?" msgstr "Bu kısayolu silmek istediğinizden emin misiniz?" -#: ../midori/midori-view.c:4042 -#, c-format -msgid "No documentation installed" -msgstr "Kurulmuş belgelendirme yok" +#: ../midori/midori-view.c:3680 +msgid "Set number of columns and rows" +msgstr "Satır ve sütun sayısını ayarla" -#: ../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:3681 +msgid "Enter number of columns and rows:" +msgstr "Satır ve sütun sayısını gir" -#: ../midori/midori-view.c:4119 -msgid "No history or web cookies are being saved." -msgstr "" +#: ../midori/midori-view.c:3682 +msgid "Invalid input for the size of the speed dial" +msgstr "Hızlı arama boyutu için geçersiz girdi" -#: ../midori/midori-view.c:4120 -#, fuzzy -msgid "Extensions are disabled." -msgstr "Eklentiler etkisizleştirildi." +#: ../midori/midori-view.c:3683 +msgid "Thumb size:" +msgstr "Küçük resim boyutu:" -#: ../midori/midori-view.c:4121 -msgid "HTML5 storage, local database and application caches are disabled." -msgstr "" +#: ../midori/midori-view.c:3684 +msgid "Small" +msgstr "Küçük" -#: ../midori/midori-view.c:4122 -msgid "Midori prevents websites from tracking the user:" -msgstr "" +#: ../midori/midori-view.c:3685 +msgid "Medium" +msgstr "Orta" -#: ../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 "" +#: ../midori/midori-view.c:3686 +msgid "Big" +msgstr "Büyük" -#: ../midori/midori-view.c:4125 -msgid "The language and timezone are not revealed to websites." -msgstr "" - -#: ../midori/midori-view.c:4126 -msgid "Flash and other Netscape plugins cannot be listed by websites." -msgstr "" +#: ../midori/midori-view.c:3875 +#, c-format +msgid "No documentation installed" +msgstr "Kurulmuş belgelendirme yok" -#: ../midori/midori-view.c:4164 +#: ../midori/midori-view.c:3941 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." +msgstr "Parantez içerisindeki sürüm numaraları, çalışma zamanında kullanılan sürümü göstermektedir." -#: ../midori/midori-view.c:4220 +#: ../midori/midori-view.c:3990 msgid "Page loading delayed" msgstr "Sayfa yükleme gecikmesi" -#: ../midori/midori-view.c:4221 +#: ../midori/midori-view.c:3991 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "Yükleme yakın bir çökme veya başlangıç ayarları yüzünden gecikti." -#: ../midori/midori-view.c:4222 +#: ../midori/midori-view.c:3992 msgid "Load Page" msgstr "Sayfa Yükle" -#: ../midori/midori-view.c:4388 +#: ../midori/midori-view.c:4135 msgid "Blank page" msgstr "Boş sayfa" -#: ../midori/midori-view.c:4650 +#: ../midori/midori-view.c:4375 msgid "_Duplicate Tab" msgstr "Sekmeyi Çoğalt" -#: ../midori/midori-view.c:4655 +#: ../midori/midori-view.c:4380 msgid "Show Tab _Label" msgstr "Sekme etiketini göster" -#: ../midori/midori-view.c:4655 +#: ../midori/midori-view.c:4380 msgid "Show Tab _Icon Only" msgstr "Sadece sekme ikonunu göster" -#: ../midori/midori-view.c:4661 +#: ../midori/midori-view.c:4386 msgid "Close ot_her Tabs" msgstr "_Diğer Sekmeleri Kapat" -#. 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 +#: ../midori/midori-view.c:5006 msgid "Print background images" msgstr "Arkaplan resimlerini yazdır" -#: ../midori/midori-view.c:5507 +#: ../midori/midori-view.c:5007 msgid "Whether background images should be printed" msgstr "Arka fon resimlerini yaz açık/kapalı" -#: ../midori/midori-view.c:5539 +#: ../midori/midori-view.c:5039 msgid "Features" msgstr "Özellikler" -#: ../midori/midori-preferences.c:297 +#: ../midori/midori-preferences.c:301 msgid "Startup" msgstr "Açılış" -#: ../midori/midori-preferences.c:310 +#: ../midori/midori-preferences.c:314 msgid "Use _current page" msgstr "_Geçerli sayfayı kullan" -#: ../midori/midori-preferences.c:314 +#: ../midori/midori-preferences.c:318 msgid "Use current page as homepage" msgstr "Geçerli sayfayı ana sayfa olarak kullan " #. Page "Appearance" -#: ../midori/midori-preferences.c:323 +#: ../midori/midori-preferences.c:327 msgid "Fonts" msgstr "Yazıtipleri" -#: ../midori/midori-preferences.c:326 +#: ../midori/midori-preferences.c:330 msgid "Proportional Font Family" msgstr "Uygun Yazıtipi Ailesi" -#: ../midori/midori-preferences.c:330 +#: ../midori/midori-preferences.c:334 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:333 +#: ../midori/midori-preferences.c:337 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:335 +#: ../midori/midori-preferences.c:339 msgid "Fixed-width Font Family" msgstr "Sabit Yazıtipi Genişliği Ailesi" -#: ../midori/midori-preferences.c:339 +#: ../midori/midori-preferences.c:343 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:342 +#: ../midori/midori-preferences.c:346 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:344 +#: ../midori/midori-preferences.c:348 msgid "Minimum Font Size" msgstr "En Küçük Yazıtipi Boyutu" -#: ../midori/midori-preferences.c:348 +#: ../midori/midori-preferences.c:352 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:359 +#: ../midori/midori-preferences.c:361 msgid "Behavior" msgstr "Davranış" -#: ../midori/midori-preferences.c:385 +#: ../midori/midori-preferences.c:387 msgid "Allow scripts to open popups" msgstr "Açılır pencere açmak için scriptlere izin ver" -#: ../midori/midori-preferences.c:386 +#: ../midori/midori-preferences.c:388 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ı" +msgstr "Scriptlerin otomatik olarak açılır pencere açmasına izin verilmesi açık/kapalı" #. Page "Interface" -#: ../midori/midori-preferences.c:416 +#: ../midori/midori-preferences.c:411 msgid "Browsing" msgstr "Gözden Geçiriliyor" #. Page "Network" -#: ../midori/midori-preferences.c:456 +#: ../midori/midori-preferences.c:449 msgid "Network" msgstr "Ağ" -#: ../midori/midori-preferences.c:463 +#: ../midori/midori-preferences.c:456 msgid "Hostname" msgstr "Bilgisayar adı" -#: ../midori/midori-preferences.c:487 +#: ../midori/midori-preferences.c:472 msgid "MB" msgstr "MB" -#: ../midori/midori-searchaction.c:902 +#: ../midori/midori-searchaction.c:908 msgid "Add search engine" msgstr "Arama motoru ekle" -#: ../midori/midori-searchaction.c:902 +#: ../midori/midori-searchaction.c:908 msgid "Edit search engine" msgstr "Arama motoru düzenle" -#: ../midori/midori-searchaction.c:931 +#: ../midori/midori-searchaction.c:937 msgid "_Name:" msgstr "_İsim:" -#: ../midori/midori-searchaction.c:947 +#: ../midori/midori-searchaction.c:953 msgid "_Description:" msgstr "_Açıklama:" -#: ../midori/midori-searchaction.c:981 +#: ../midori/midori-searchaction.c:986 msgid "_Icon:" msgstr "Simgeler:" -#: ../midori/midori-searchaction.c:995 +#: ../midori/midori-searchaction.c:1000 msgid "_Token:" msgstr "İşare_t:" -#: ../midori/midori-searchaction.c:1295 +#: ../midori/midori-searchaction.c:1300 msgid "Manage Search Engines" msgstr "Arama Motorlarını Yönet" -#: ../midori/midori-searchaction.c:1395 +#: ../midori/midori-searchaction.c:1400 msgid "Use as _default" msgstr "Öntanımlı olarak kullan" -#: ../midori/sokoke.c:412 +#: ../midori/sokoke.c:452 msgid "Open with" msgstr "Birlikte aç" -#: ../midori/sokoke.c:420 +#: ../midori/sokoke.c:460 #, c-format msgid "Choose an application or command to open \"%s\":" msgstr "\"%s\" 'ı açmak için bir uygulama seçin." -#: ../midori/sokoke.c:461 ../midori/sokoke.c:471 ../midori/sokoke.c:499 -#: ../midori/sokoke.c:528 ../midori/sokoke.c:542 +#: ../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 "Harici uygulama çalıştırılamadı." -#: ../midori/sokoke.c:1653 +#: ../midori/sokoke.c:1515 +msgid "_Bookmark" +msgstr "_Yer imi" + +#: ../midori/sokoke.c:1517 +msgid "Add Boo_kmark" +msgstr "_Yerimi Ekle" + +#: ../midori/sokoke.c:1518 +msgid "_Console" +msgstr "_Uçbirim" + +#: ../midori/sokoke.c:1519 +msgid "_Extensions" +msgstr "_Ek Özellikler" + +#: ../midori/sokoke.c:1521 +msgid "_Homepage" +msgstr "_Anasayfa" + +#: ../midori/sokoke.c:1522 +msgid "_Userscripts" +msgstr "_Kullanıcı betikleri" + +#: ../midori/sokoke.c:1523 +msgid "New _Tab" +msgstr "Yeni _Sekme" + +#: ../midori/sokoke.c:1524 +msgid "_Transfers" +msgstr "_Aktarımlar" + +#: ../midori/sokoke.c:1525 +msgid "Netscape p_lugins" +msgstr "Netscape eklentileri" + +#: ../midori/sokoke.c:1528 +msgid "New _Folder" +msgstr "Yeni _Dizin" + +#: ../midori/sokoke.c:2214 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d saat" msgstr[1] "%d saat" -#: ../midori/sokoke.c:1654 +#: ../midori/sokoke.c:2215 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d dakika" msgstr[1] "%d dakika" -#: ../midori/sokoke.c:1655 +#: ../midori/sokoke.c:2216 #, c-format msgid "%d second" msgid_plural "%d seconds" @@ -2070,171 +2116,167 @@ msgstr[0] "%d saniye" msgstr[1] "%d saniye" #. i18n: Download tooltip (size): 4KB of 43MB -#: ../midori/sokoke.c:1663 ../panels/midori-transfers.c:267 +#: ../midori/sokoke.c:2224 ../panels/midori-transfers.c:268 #, c-format msgid "%s of %s" msgstr "%s nin %s" #. i18n: Unknown number of bytes, used for transfer rate like ?B/s -#: ../midori/sokoke.c:1672 +#: ../midori/sokoke.c:2233 msgid "?B" msgstr "?B" #. i18n: Download tooltip (transfer rate): (130KB/s) -#: ../midori/sokoke.c:1675 +#: ../midori/sokoke.c:2236 #, c-format msgid " (%s/s)" msgstr "(%s/s)" #. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning -#: ../midori/sokoke.c:1692 +#: ../midori/sokoke.c:2253 #, c-format msgid " - %s remaining" msgstr "-%s kalan" #. i18n: A panel at the bottom, to search text in pages -#: ../toolbars/midori-findbar.c:264 +#: ../toolbars/midori-findbar.c:246 msgid "_Inline Find:" msgstr "Sat_ıriçi Bul:" -#: ../toolbars/midori-findbar.c:290 +#: ../toolbars/midori-findbar.c:276 msgid "Previous" msgstr "Önceki Sekme" -#: ../toolbars/midori-findbar.c:296 +#: ../toolbars/midori-findbar.c:282 msgid "Next" msgstr "Sonraki" -#: ../toolbars/midori-findbar.c:300 +#: ../toolbars/midori-findbar.c:286 msgid "Match Case" msgstr "Büyük - Küçük Harf Duyarlı" -#: ../toolbars/midori-findbar.c:309 +#: ../toolbars/midori-findbar.c:295 msgid "Highlight Matches" msgstr "Eşleşenleri Vurgula" -#: ../toolbars/midori-findbar.c:320 +#: ../toolbars/midori-findbar.c:306 msgid "Close Findbar" msgstr "Arama Çubuğunu Kapat" -#: ../toolbars/midori-transferbar.c:122 +#: ../toolbars/midori-transferbar.c:129 #, c-format msgid "The file '%s' has been downloaded." msgstr "Dosya '%s' indirildi." -#: ../toolbars/midori-transferbar.c:125 +#: ../toolbars/midori-transferbar.c:132 msgid "Transfer completed" msgstr "Aktarım tamamlandı" -#: ../toolbars/midori-transferbar.c:193 +#: ../toolbars/midori-transferbar.c:214 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:215 +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 +#: ../toolbars/midori-transferbar.c:323 ../panels/midori-transfers.c:142 msgid "Clear All" msgstr "Hepsini Temizle" -#: ../toolbars/midori-transferbar.c:368 ../toolbars/midori-transferbar.c:370 +#: ../toolbars/midori-transferbar.c:360 ../toolbars/midori-transferbar.c:362 msgid "Some files are being downloaded" msgstr "Bazı dosyalar indiriliyor" -#: ../toolbars/midori-transferbar.c:374 +#: ../toolbars/midori-transferbar.c:366 msgid "_Quit Midori" msgstr "Midori'den _çık" -#: ../toolbars/midori-transferbar.c:376 +#: ../toolbars/midori-transferbar.c:368 msgid "The transfers will be cancelled if Midori quits." msgstr "Midori kapatılırsa aktarmalar iptal edilecek." -#: ../panels/midori-bookmarks.c:114 +#: ../panels/midori-bookmarks.c:116 msgid "Bookmarks" msgstr "Yer imleri" -#: ../panels/midori-bookmarks.c:257 +#: ../panels/midori-bookmarks.c:294 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "Yerimi ekleme hatası: %s\n" -#: ../panels/midori-bookmarks.c:435 +#: ../panels/midori-bookmarks.c:474 msgid "Edit the selected bookmark" msgstr "Seçili yer imini düzenle" -#: ../panels/midori-bookmarks.c:443 +#: ../panels/midori-bookmarks.c:482 msgid "Delete the selected bookmark" msgstr "Seçili yer imini sil" -#: ../panels/midori-bookmarks.c:458 +#: ../panels/midori-bookmarks.c:497 msgid "Add a new folder" msgstr "Yeni bir dizin ekle" -#: ../panels/midori-bookmarks.c:592 ../panels/midori-history.c:633 +#: ../panels/midori-bookmarks.c:631 ../panels/midori-history.c:583 msgid "Separator" msgstr "Ayraç" -#: ../panels/midori-history.c:111 +#: ../panels/midori-history.c:114 msgid "History" msgstr "Geçmiş" -#: ../panels/midori-history.c:158 ../panels/midori-history.c:189 -msgid "Today" -msgstr "Bugün" - -#: ../panels/midori-history.c:160 ../panels/midori-history.c:191 -msgid "Yesterday" -msgstr "Dün" +#: ../panels/midori-history.c:146 +msgid "A week ago" +msgstr "Bir hafta önce" -#: ../panels/midori-history.c:162 ../panels/midori-history.c:186 +#: ../panels/midori-history.c:148 #, 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:165 ../panels/midori-history.c:184 -msgid "A week ago" -msgstr "Bir hafta önce" +#: ../panels/midori-history.c:151 +msgid "Today" +msgstr "Bugün" + +#: ../panels/midori-history.c:153 +msgid "Yesterday" +msgstr "Dün" -#: ../panels/midori-history.c:360 +#: ../panels/midori-history.c:321 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:407 +#: ../panels/midori-history.c:367 msgid "Bookmark the selected history item" msgstr "Seçili geçmiş ögesini yer imlerine ekle" -#: ../panels/midori-history.c:416 +#: ../panels/midori-history.c:376 msgid "Delete the selected history item" msgstr "Seçili geçmiş öğesini sil" -#: ../panels/midori-history.c:424 +#: ../panels/midori-history.c:384 msgid "Clear the entire history" msgstr "Bütün geçmişi sil" -#: ../panels/midori-transfers.c:86 +#: ../panels/midori-transfers.c:87 msgid "Transfers" msgstr "Aktarımlar" -#: ../panels/midori-transfers.c:467 +#: ../panels/midori-transfers.c:468 msgid "Open Destination _Folder" msgstr "Hedef _Dizini Aç" -#: ../panels/midori-transfers.c:470 +#: ../panels/midori-transfers.c:471 msgid "Copy Link Loc_ation" msgstr "Konum Bağlantısını Kopyala" -#: ../katze/katze-http-auth.c:210 +#: ../katze/katze-http-auth.c:213 msgid "Authentication Required" msgstr "Yetki Doğrulaması" -#: ../katze/katze-http-auth.c:226 +#: ../katze/katze-http-auth.c:229 msgid "" "A username and a password are required\n" "to open this location:" @@ -2242,191 +2284,187 @@ msgstr "" "Bu konuma girmek için\n" "kullanıcı adı ve şifre gerekli:" -#: ../katze/katze-http-auth.c:240 +#: ../katze/katze-http-auth.c:243 msgid "Username" msgstr "Kullanıcı adı" -#: ../katze/katze-http-auth.c:253 +#: ../katze/katze-http-auth.c:256 msgid "Password" msgstr "Şifre" -#: ../katze/katze-http-auth.c:267 +#: ../katze/katze-http-auth.c:270 msgid "_Remember password" msgstr "Şifreyi _hatırla" -#: ../katze/katze-throbber.c:949 +#: ../katze/katze-throbber.c:879 #, c-format msgid "Named icon '%s' couldn't be loaded" msgstr "'%s' olarak isimlendirilmiş simge yüklenemiyor" -#: ../katze/katze-throbber.c:962 +#: ../katze/katze-throbber.c:892 #, c-format msgid "Stock icon '%s' couldn't be loaded" msgstr "'%s' stok simgesi yüklenemedi" -#: ../katze/katze-throbber.c:1042 +#: ../katze/katze-throbber.c:964 msgid "Animation frames are broken" msgstr "Animasyon kareleri kırık" -#: ../katze/katze-utils.c:439 ../katze/katze-utils.c:873 +#: ../katze/katze-utils.c:536 ../katze/katze-utils.c:971 #, c-format msgid "Property '%s' is invalid for %s" msgstr "'%s' özelliği %s için geçersiz" -#: ../katze/katze-utils.c:485 ../katze/katze-utils.c:514 -#: ../extensions/addons.c:308 +#: ../katze/katze-utils.c:582 ../katze/katze-utils.c:611 +#: ../extensions/addons.c:306 msgid "Choose file" msgstr "Dosya seç" -#: ../katze/katze-utils.c:500 +#: ../katze/katze-utils.c:597 msgid "Choose folder" msgstr "Dizin seç" -#: ../katze/katze-utils.c:604 +#: ../katze/katze-utils.c:701 msgid "None" msgstr "Yok" -#: ../katze/katze-utils.c:719 +#: ../katze/katze-utils.c:819 msgid "1 hour" msgstr "1 saat" -#: ../katze/katze-utils.c:720 +#: ../katze/katze-utils.c:820 msgid "1 day" msgstr "1 gün" -#: ../katze/katze-utils.c:721 +#: ../katze/katze-utils.c:821 msgid "1 week" msgstr "1 hafta" -#: ../katze/katze-utils.c:722 +#: ../katze/katze-utils.c:822 msgid "1 month" msgstr "1 ay" -#: ../katze/katze-utils.c:723 +#: ../katze/katze-utils.c:823 msgid "1 year" msgstr "1 yıl" -#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235 +#: ../katze/katze-preferences.c:95 ../extensions/history-list.vala:227 #, c-format msgid "Preferences for %s" msgstr "%s için tercihler" -#: ../extensions/adblock.c:467 +#: ../extensions/adblock.c:418 msgid "Configure Advertisement filters" msgstr "Reklam filtresini yapılandır" -#: ../extensions/adblock.c:498 +#: ../extensions/adblock.c:450 #, 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." +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:846 +#: ../extensions/adblock.c:813 msgid "Edit rule" msgstr "Kuralı düzenle" -#: ../extensions/adblock.c:860 +#: ../extensions/adblock.c:826 msgid "_Rule:" msgstr "_Kural:" -#: ../extensions/adblock.c:914 +#: ../extensions/adblock.c:880 msgid "Bl_ock image" msgstr "Resim _Engelle" -#: ../extensions/adblock.c:919 +#: ../extensions/adblock.c:885 msgid "Bl_ock link" msgstr "Bağlantıyı engelle" -#: ../extensions/adblock.c:1620 +#: ../extensions/adblock.c:1453 msgid "Advertisement blocker" msgstr "Reklam engelleyici" -#: ../extensions/adblock.c:1621 +#: ../extensions/adblock.c:1454 msgid "Block advertisements according to a filter list" msgstr "Filtre listesine göre reklamları engelle" #. i18n: An infobar shows up when viewing a script on userscripts.org -#: ../extensions/addons.c:221 +#: ../extensions/addons.c:218 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 +#: ../extensions/addons.c:219 msgid "_Install user script" msgstr "Betiklere izin ver" #. i18n: An infobar shows up when viewing a style on userstyles.org -#: ../extensions/addons.c:227 +#: ../extensions/addons.c:224 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 +#: ../extensions/addons.c:225 msgid "_Install user style" msgstr "Kullanıcı stillerini yükle" -#: ../extensions/addons.c:236 +#: ../extensions/addons.c:233 msgid "Don't install" msgstr "Yükleme" -#: ../extensions/addons.c:319 ../extensions/addons.c:681 +#: ../extensions/addons.c:317 ../extensions/addons.c:679 msgid "Userscripts" msgstr "Kullanıcı Betikleri" -#: ../extensions/addons.c:324 ../extensions/addons.c:683 +#: ../extensions/addons.c:322 ../extensions/addons.c:681 msgid "Userstyles" msgstr "Kullanıcı Biçimleri" -#: ../extensions/addons.c:380 ../extensions/addons.c:459 +#: ../extensions/addons.c:378 ../extensions/addons.c:457 #: ../extensions/feed-panel/main.c:129 msgid "Error" msgstr "Hata" -#: ../extensions/addons.c:421 +#: ../extensions/addons.c:419 #, c-format msgid "Do you want to delete '%s'?" msgstr "'%s' i silmek istediğinizden eminmisiniz." -#: ../extensions/addons.c:427 +#: ../extensions/addons.c:425 msgid "Delete user script" msgstr "Kullanıcı betiklerini sil" -#: ../extensions/addons.c:428 +#: ../extensions/addons.c:426 msgid "Delete user style" msgstr "Kullanıcı stillerini sil" -#: ../extensions/addons.c:431 +#: ../extensions/addons.c:429 #, 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 +#: ../extensions/addons.c:568 ../extensions/addons.c:645 msgid "Open in Text Editor" msgstr "Metin düzenleyici ile aç" -#: ../extensions/addons.c:572 ../extensions/addons.c:656 +#: ../extensions/addons.c:570 ../extensions/addons.c:654 msgid "Open Target Folder" msgstr "Hedef _Dizini Aç" -#: ../extensions/addons.c:638 +#: ../extensions/addons.c:636 msgid "Add new addon" msgstr "Yeni eklenti ekle" -#: ../extensions/addons.c:664 +#: ../extensions/addons.c:662 msgid "Remove selected addon" msgstr "Seçilmiş eklentiyi kaldır" -#: ../extensions/addons.c:1696 ../extensions/addons.c:1914 +#: ../extensions/addons.c:1641 ../extensions/addons.c:1803 msgid "User addons" msgstr "Kullanıcı eklentileri" -#: ../extensions/addons.c:1826 +#: ../extensions/addons.c:1762 #, c-format msgid "Can't monitor folder '%s': %s" msgstr "Dizin '%s' izlenemedi: %s" -#: ../extensions/addons.c:1915 +#: ../extensions/addons.c:1804 msgid "Support for userscripts and userstyles" msgstr "Kullanıcı scripts ve sitil desteği" @@ -2438,48 +2476,44 @@ msgstr "Renkli Sekmeler" msgid "Tint each tab distinctly" msgstr "Her sekmeyi farklı biçimde renklendir" -#: ../extensions/cookie-manager/cookie-manager-page.c:73 +#: ../extensions/cookie-manager/cookie-manager-page.c:82 #: ../extensions/cookie-manager/main.c:35 msgid "Cookie Manager" msgstr "Çerez Yöneticisi" -#: ../extensions/cookie-manager/cookie-manager-page.c:103 +#: ../extensions/cookie-manager/cookie-manager-page.c:112 msgid "Delete All" msgstr "Hepsini Sil" -#: ../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: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:120 +#: ../extensions/cookie-manager/cookie-manager-page.c:129 msgid "Expand All" msgstr "Hepsini Genişlet" -#: ../extensions/cookie-manager/cookie-manager-page.c:127 +#: ../extensions/cookie-manager/cookie-manager-page.c:136 msgid "Collapse All" msgstr "Hepsini Kapat" -#: ../extensions/cookie-manager/cookie-manager-page.c:572 +#: ../extensions/cookie-manager/cookie-manager-page.c:578 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:574 +#: ../extensions/cookie-manager/cookie-manager-page.c:580 msgid "Question" msgstr "Soru" -#: ../extensions/cookie-manager/cookie-manager-page.c:583 +#: ../extensions/cookie-manager/cookie-manager-page.c:589 msgid "Only cookies which match the filter will be deleted." msgstr "Sadece filtrelenen çerezler silinecek." -#: ../extensions/cookie-manager/cookie-manager-page.c:671 +#: ../extensions/cookie-manager/cookie-manager-page.c:677 msgid "At the end of the session" msgstr "Oturumun sonunda" -#: ../extensions/cookie-manager/cookie-manager-page.c:674 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 #, c-format msgid "" "Host: %s\n" @@ -2496,15 +2530,15 @@ msgstr "" "Güvenlik: %s\n" "Bitiş süresi: %s" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:686 msgid "Yes" msgstr "Evet" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:686 msgid "No" msgstr "Hayır" -#: ../extensions/cookie-manager/cookie-manager-page.c:694 +#: ../extensions/cookie-manager/cookie-manager-page.c:700 #, c-format msgid "" "Domain: %s\n" @@ -2513,43 +2547,39 @@ msgstr "" "Alan: %s\n" "Çerezler: %d" -#: ../extensions/cookie-manager/cookie-manager-page.c:1024 +#: ../extensions/cookie-manager/cookie-manager-page.c:1030 msgid "Name" msgstr "İsim" -#: ../extensions/cookie-manager/cookie-manager-page.c:1077 +#: ../extensions/cookie-manager/cookie-manager-page.c:1083 msgid "_Expand All" msgstr "Hepsini G_enişlet" -#: ../extensions/cookie-manager/cookie-manager-page.c:1085 +#: ../extensions/cookie-manager/cookie-manager-page.c:1091 msgid "_Collapse All" msgstr "Hepsini _Kapat" -#: ../extensions/cookie-manager/cookie-manager-page.c:1139 +#: ../extensions/cookie-manager/cookie-manager-page.c:1144 msgid "Filter:" msgstr "Filtre:" -#: ../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/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:36 msgid "List, view and delete cookies" msgstr "Çerezleri listele, görüntüle ve sil" -#: ../extensions/copy-tabs.c:38 +#: ../extensions/copy-tabs.c:39 msgid "Copy Tab _Addresses" msgstr "Sekme _Adresini Kopyala" -#: ../extensions/copy-tabs.c:95 +#: ../extensions/copy-tabs.c:96 msgid "Copy Addresses of Tabs" msgstr "Sekme _Adresini Kopyala" -#: ../extensions/copy-tabs.c:96 +#: ../extensions/copy-tabs.c:97 msgid "Copy the addresses of all tabs to the clipboard" msgstr "Tüm sekmelerde ki adresleri panoya kopyala" @@ -2562,25 +2592,25 @@ msgid "Failed to find required Atom \"feed\" elements in XML data." msgstr "XML verisindeki gerekli Atom \"kaynak\" elementi bulma hatası." #. i18n: The local date a feed was last updated -#: ../extensions/feed-panel/feed-panel.c:387 +#: ../extensions/feed-panel/feed-panel.c:392 #, c-format msgctxt "Feed" msgid "Last updated: %s." msgstr "Son güncelleme: %s." -#: ../extensions/feed-panel/feed-panel.c:653 +#: ../extensions/feed-panel/feed-panel.c:658 msgid "Feeds" msgstr "Kaynaklar" -#: ../extensions/feed-panel/feed-panel.c:706 +#: ../extensions/feed-panel/feed-panel.c:711 msgid "Add new feed" msgstr "Yeni kaynak ekle" -#: ../extensions/feed-panel/feed-panel.c:713 +#: ../extensions/feed-panel/feed-panel.c:718 msgid "Delete feed" msgstr "kaynak sil" -#: ../extensions/feed-panel/feed-panel.c:795 +#: ../extensions/feed-panel/feed-panel.c:800 msgid "_Feeds" msgstr "_Kaynak" @@ -2633,133 +2663,100 @@ msgstr "Kaynak Paneli" msgid "Read Atom/ RSS feeds" msgstr "Atom/RSS kaynaklarını oku" -#: ../extensions/formhistory/formhistory.c:39 +#: ../extensions/formhistory.c:151 #, c-format msgid "Failed to add form value: %s\n" msgstr "Biçim değeri ekleme hatası: %s\n" -#: ../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/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 +#: ../extensions/formhistory.c:303 #, fuzzy msgid "Toggle form history state" msgstr "Form geçmişi durumunu değiştir." -#: ../extensions/formhistory/formhistory.c:438 +#: ../extensions/formhistory.c:304 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 +#: ../extensions/formhistory.c:438 ../extensions/formhistory.c:442 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Veri tabanı ifadesi çalışma hatası: %s\n" -#: ../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/formhistory.c:668 -msgid "Form history filler" -msgstr "Tarih doldurucu biçimi" +#: ../extensions/formhistory.c:517 +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/formhistory.c:669 +#: ../extensions/formhistory.c:576 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/formhistory.c:580 +#, c-format +msgid "Not available: %s" +msgstr "Kullanılamaz: %s" + +#: ../extensions/formhistory.c:581 +msgid "Resource files not installed" +msgstr "Kaynak dosyalar yüklenmedi" -#: ../extensions/history-list.vala:197 +#: ../extensions/formhistory.c:587 +msgid "Form history filler" +msgstr "Tarih doldurucu biçimi" + +#: ../extensions/history-list.vala:189 msgid "There are no unvisited tabs" msgstr "Ziyaret edilmemiş sekme bulunmuyor" -#: ../extensions/history-list.vala:235 +#: ../extensions/history-list.vala:227 #, c-format msgid "History-List" msgstr "Geçmiş-Listesi" -#: ../extensions/history-list.vala:275 +#: ../extensions/history-list.vala:266 msgid "Tab closing behavior" msgstr "Sekme kapatma davranışı" -#: ../extensions/history-list.vala:283 +#: ../extensions/history-list.vala:274 msgid "Do nothing" msgstr "Hiçbirş ey yapma" -#: ../extensions/history-list.vala:289 +#: ../extensions/history-list.vala:280 msgid "Switch to last viewed tab" msgstr "Son bakılan sekmeye geç" -#: ../extensions/history-list.vala:295 +#: ../extensions/history-list.vala:286 msgid "Switch to newest tab" msgstr "En yeni sekmeye geç" -#: ../extensions/history-list.vala:423 +#: ../extensions/history-list.vala:410 msgid "Next new Tab (History List)" msgstr "Bir sonraki yeni Sekme (Geçmiş Listesi)" -#: ../extensions/history-list.vala:424 +#: ../extensions/history-list.vala:411 msgid "Next new tab from history" msgstr "Geçmişten bir sonraki yeni sekme" -#: ../extensions/history-list.vala:433 +#: ../extensions/history-list.vala:420 msgid "Previous new Tab (History List)" msgstr "Bir önceki yeni Sekme (Geçmiş Listesi)" -#: ../extensions/history-list.vala:434 +#: ../extensions/history-list.vala:421 msgid "Previous new tab from history" msgstr "Geçmişten bir önceki yeni sekme" -#: ../extensions/history-list.vala:443 +#: ../extensions/history-list.vala:430 msgid "Display tab in background (History List)" msgstr "Sekmeyi arkaplanda göster Geçmiş Listesi()" -#: ../extensions/history-list.vala:444 +#: ../extensions/history-list.vala:431 msgid "Display the current selected tab in background" msgstr "Yeni seçilen sekmeyi arkaplanda göster" -#: ../extensions/history-list.vala:569 +#: ../extensions/history-list.vala:556 msgid "History List" msgstr "Geçmiş Listesi" -#: ../extensions/history-list.vala:570 +#: ../extensions/history-list.vala:557 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şı" @@ -2771,7 +2768,7 @@ msgstr "Fare İşaretleri" msgid "Control Midori by moving the mouse" msgstr "Hareketli fare tarafından Midori kontrolü" -#: ../extensions/shortcuts.c:109 +#: ../extensions/shortcuts.c:110 msgid "Reload page or stop loading" msgstr "Sayfayı Yeniden yükle ya da yüklemeyi durdur" @@ -2779,15 +2776,15 @@ msgstr "Sayfayı Yeniden yükle ya da yüklemeyi durdur" msgid "Customize Keyboard shortcuts" msgstr "Klavye kısayolunu özelleştir" -#: ../extensions/shortcuts.c:283 -msgid "Customize Sh_ortcuts…" -msgstr "Kısayollar özelleştiriliyor…" +#: ../extensions/shortcuts.c:282 +msgid "Customize Sh_ortcuts..." +msgstr "Kısayollar özelleştiriliyor..." -#: ../extensions/shortcuts.c:320 +#: ../extensions/shortcuts.c:319 msgid "Shortcuts" msgstr "Kısayollar" -#: ../extensions/shortcuts.c:321 +#: ../extensions/shortcuts.c:320 msgid "View and edit keyboard shortcuts" msgstr "Klavye kısayollarını görüntüle ve düzenle" @@ -2799,276 +2796,82 @@ msgstr "_Durum Çubuğu Saati" msgid "Display date and time in the statusbar" msgstr "Durum çubuğunda tarihi ve saati göster" -#: ../extensions/statusbar-features.c:131 +#: ../extensions/statusbar-features.c:129 msgid "Images" msgstr "Resimler" -#: ../extensions/statusbar-features.c:140 +#: ../extensions/statusbar-features.c:138 msgid "Scripts" msgstr "Betikler" -#: ../extensions/statusbar-features.c:151 +#: ../extensions/statusbar-features.c:147 msgid "Netscape plugins" msgstr "Netscape eklentileri" -#: ../extensions/statusbar-features.c:199 +#: ../extensions/statusbar-features.c:193 msgid "Statusbar Features" msgstr "Durum Çubuğu Özellikleri" -#: ../extensions/statusbar-features.c:200 +#: ../extensions/statusbar-features.c:194 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:593 ../extensions/tab-panel.c:680 +#: ../extensions/tab-panel.c:597 ../extensions/tab-panel.c:684 msgid "Tab Panel" msgstr "Sekme Paneli" -#: ../extensions/tab-panel.c:663 +#: ../extensions/tab-panel.c:667 msgid "T_ab Panel" msgstr "Sekme P_aneli" -#: ../extensions/tab-panel.c:681 +#: ../extensions/tab-panel.c:685 msgid "Show tabs in a vertical panel" msgstr "Sekmeleri bir dikey panelde göster" -#: ../extensions/tabs-minimized.c:76 +#: ../extensions/tabs-minimized.c:77 msgid "Only Icons on Tabs by default" msgstr "Ön tanımlı olarak sadece sekme ikonlarını göster" -#: ../extensions/tabs-minimized.c:77 +#: ../extensions/tabs-minimized.c:78 msgid "New tabs have no label by default" msgstr "Yeni sekmelere etiket verme" -#: ../extensions/toolbar-editor.c:393 +#: ../extensions/toolbar-editor.c:391 msgid "Customize Toolbar" msgstr "Araç Çubuğunu Özelleştir" -#: ../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:407 +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:425 +#: ../extensions/toolbar-editor.c:423 msgid "Available Items" msgstr "Kullanılabilir ögeler" -#: ../extensions/toolbar-editor.c:446 +#: ../extensions/toolbar-editor.c:444 msgid "Displayed Items" msgstr "Görüntülenen Ögeler" -#: ../extensions/toolbar-editor.c:581 -msgid "Customize _Toolbar…" -msgstr "_Araç Çubuğu Özelleştiriliyor…" +#: ../extensions/toolbar-editor.c:579 +msgid "Customize _Toolbar..." +msgstr "_Araç Çubuğu Özelleştiriliyor..." -#: ../extensions/toolbar-editor.c:597 -msgid "_Customize…" -msgstr "_Düzenle…" +#: ../extensions/toolbar-editor.c:595 +msgid "_Customize..." +msgstr "_Düzenle..." -#: ../extensions/toolbar-editor.c:627 +#: ../extensions/toolbar-editor.c:625 msgid "Toolbar Editor" msgstr "Araç Çubuğu Düzenleyici" -#: ../extensions/toolbar-editor.c:628 +#: ../extensions/toolbar-editor.c:626 msgid "Easily edit the toolbar layout" msgstr "Araç çubuğunu kolayca düzenler" -#: ../extensions/web-cache.c:463 +#: ../extensions/web-cache.c:471 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" @@ -3234,12 +3037,15 @@ msgstr "Diskteki HTTP iletişimi önbelleği" #~ 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 "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 "_Form History" +#~ msgstr "_Form Geçmişi" + #~ msgid "Next Tab (History List)" #~ msgstr "Sonraki Sekme (Geçmiş Listesi)" @@ -3250,9 +3056,7 @@ msgstr "Diskteki HTTP iletişimi önbelleği" #~ 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" +#~ msgstr "Son kullanım tarafından seçilmiş bir listeden seçilerek sekmelerin değişmesine izin verir" #~ msgid "Pageholder" #~ msgstr "Sayfa Tutucu" @@ -3261,8 +3065,7 @@ msgstr "Diskteki HTTP iletişimi önbelleği" #~ 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" +#~ msgstr "Bir veya birden fazla sayfayı sekmelerinizde paralel olarak açık tutun" #~ msgid "_Recently visited pages" #~ msgstr "_Yeni ziyaret edilmiş sayfalar" @@ -3279,6 +3082,9 @@ msgstr "Diskteki HTTP iletişimi önbelleği" #~ msgid "Original cookies only" #~ msgstr "Sadece gerçek çerezler" +#~ msgid "Accept cookies from the original website only" +#~ msgstr "Sadece asıl internet sitelerinden gelen çerezleri kabul et" + #~ msgid "Remember last visited pages" #~ msgstr "Son ziyaret edilen sayfaları hatırla" @@ -3288,8 +3094,7 @@ msgstr "Diskteki HTTP iletişimi önbelleği" #~ msgid "Detect proxy server automatically" #~ msgstr "Vekil sunucuyu otomatik olarak belirle" -#~ msgid "" -#~ "Whether to detect the proxy server automatically from the environment" +#~ msgid "Whether to detect the proxy server automatically from the environment" #~ msgstr "Vekil sunucuyu ortamdan otomatik olarak belirle açık/kapalı" #~ msgid "_Restore Tab" @@ -3304,12 +3109,8 @@ msgstr "Diskteki HTTP iletişimi önbelleği" #~ 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 "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" @@ -3323,8 +3124,7 @@ msgstr "Diskteki HTTP iletişimi önbelleği" #~ msgid "Erroneous clock time" #~ msgstr "Saat zamanı hatalı" -#~ 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 "Saat geri kalmış. Lütfen mevcut saat ve tarihi kontrol edin" #~ msgid "Copy %s to the folder %s." diff --git a/po/ug.po b/po/ug.po index 87a70bcf..7b1d6cf1 100644 --- a/po/ug.po +++ b/po/ug.po @@ -1,2941 +1,2844 @@ -# Uyghur translation for midori. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# Gheyret Kenji , 2012. -# -msgid "" -msgstr "" -"Project-Id-Version: midori\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-24 04:27+0000\n" -"PO-Revision-Date: 2011-11-09 16:10+0900\n" -"Last-Translator: Gheyret Kenji \n" -"Language-Team: Uyghur Computer Science Association \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: \n" -"Plural-Forms: nplurals=1; plural=0;\n" - -#: ../data/midori.desktop.in.h:1 -msgid "Browse the Web" -msgstr "تور كۆرۈش" - -#: ../data/midori.desktop.in.h:2 -msgid "Internet;WWW;Explorer" -msgstr "ئىنتېرنېت؛WWW؛Explorer" - -#: ../data/midori.desktop.in.h:3 ../midori/main.c:2009 ../midori/main.c:2033 -#: ../midori/main.c:2047 ../midori/midori-websettings.c:316 -msgid "Midori" -msgstr "مىدورى(Midori)" - -#: ../data/midori.desktop.in.h:4 -msgid "Midori Web Browser" -msgstr "مىدورى(Midori) توركۆرگۈ" - -#: ../data/midori.desktop.in.h:5 -msgid "New Private Browsing Window" -msgstr "يېڭى شەخسىي كۆرۈش كۆزنىكى" - -#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1491 -msgid "New Tab" -msgstr "يېڭى بەتكۈچ" - -#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1488 -msgid "New Window" -msgstr "يېڭى كۆزنەك" - -#: ../data/midori.desktop.in.h:8 -msgid "Web Browser" -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 "يېڭى شەخسىي كۆرۈش كۆزنىكىدىن بىرنى ئاچىدۇ" - -#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4505 -msgid "Private Browsing" -msgstr "شەخسىي كۆرۈش" - -#: ../midori/main.c:91 ../midori/main.c:97 -#, c-format -msgid "The configuration couldn't be loaded: %s\n" -msgstr "تەڭشەكنى ئوقۇغىلى بولمىدى: %s\n" - -#: ../midori/main.c:145 -#, c-format -msgid "Value '%s' is invalid for %s" -msgstr "قىممەت ‹%s› ئىناۋەتسىز (%s نىڭ قىممىتى)" - -#: ../midori/main.c:150 ../midori/main.c:254 -#, c-format -msgid "Invalid configuration value '%s'" -msgstr "سەپلىمە قىممەت ‹%s› ئىناۋەتسىز" - -#: ../midori/main.c:375 -#, c-format -msgid "The search engines couldn't be loaded. %s\n" -msgstr "ئىزدەش ماتورىنى ئوقۇغىلى بولمىدى. %s\n" - -#: ../midori/main.c:429 -#, c-format -msgid "Failed to clear history: %s\n" -msgstr "ئىزنى تازىلاش مەغلۇپ بولدى: %s\n" - -#: ../midori/main.c:451 ../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:523 -#, c-format -msgid "Failed to remove old history items: %s\n" -msgstr "كونا ئىزلارنى ئۆچۈرۈش مەغلۇپ بولدى: %s\n" - -#: ../midori/main.c:545 -#, c-format -msgid "The configuration couldn't be saved. %s" -msgstr "تەڭشەكنى ساقلىغىلى بولمىدى. %s" - -#: ../midori/main.c:571 -#, c-format -msgid "The search engines couldn't be saved. %s" -msgstr "ئىزدەش ماتورىنى ساقلىغىنى بولمىدى. %s" - -#. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:608 -#, c-format -msgid "The trash couldn't be saved. %s" -msgstr "ئەخلەتنى ساقلىغىلى بولمىدى. %s" - -#: ../midori/main.c:681 ../panels/midori-extensions.c:90 -msgid "Extensions" -msgstr "كېڭەيتىلمىلەر" - -#: ../midori/main.c:695 -msgid "Privacy" -msgstr "شەخسىيەت" - -#: ../midori/main.c:707 -msgid "" -"Cookies store login data, saved games, or user profiles for advertisement " -"purposes." -msgstr "" - -#: ../midori/main.c:763 -#, c-format -msgid "The session couldn't be saved. %s" -msgstr "ئەڭگىمەنى ساقلىغىلى بولمىدى. %s" - -#: ../midori/main.c:985 -msgid "" -"No root certificate file is available. SSL certificates cannot be verified." -msgstr "" -"ئالىي ئىشلەتكۈچى ئىسپاتنامە ھۆججىتى يوق. SSL ئىسپاتنامىسىنى دەلىللىگىلى " -"بولمايدۇ." - -#: ../midori/main.c:1077 -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 "Modify _preferences" -msgstr "تەڭشەكنى ئۆزگەرت(_P)" - -#: ../midori/main.c:1100 -msgid "Disable all _extensions" -msgstr "بارلىق كېڭەيتمىنى چەكلە(_E)" - -#: ../midori/main.c:1113 -msgid "Discard old tabs" -msgstr "كونا بەتكۈچلەرنى تاشلىۋەت" - -#: ../midori/main.c:1114 ../midori/midori-websettings.c:224 -msgid "Show last tabs without loading" -msgstr "ئەڭ ئاخىرىدا ئېچىلغان بەتنى قايتا ئوقۇماي كۆرسەت" - -#: ../midori/main.c:1115 ../midori/midori-websettings.c:223 -msgid "Show last open tabs" -msgstr "ئەڭ ئاخىرىدا ئېچىلغان بەتكۈچنى كۆرسەت" - -#: ../midori/main.c:1363 ../midori/main.c:2417 -#, c-format -msgid "The session couldn't be loaded: %s\n" -msgstr "ئەڭگىمەنى ئوقۇغىلى بولمىدى: %s\n" - -#: ../midori/main.c:1501 -#, c-format -msgid "Snapshot saved to: %s\n" -msgstr "كۆرۈنۈش بۇ يەرگە ساقلاندى :%s\n" - -#: ../midori/main.c:1917 -msgid "Run ADDRESS as a web application" -msgstr "ADDRESS نى تور پروگراممىسى قاتارىدا ئىجرا قىلىدۇ" - -#: ../midori/main.c:1917 -msgid "ADDRESS" -msgstr "ADDRESS" - -#: ../midori/main.c:1920 -msgid "Use FOLDER as configuration folder" -msgstr "FOLDER نى تەڭشەك مۇندەرىجىسى قىلىپ ئىشلىتىدۇ" - -#: ../midori/main.c:1920 -msgid "FOLDER" -msgstr "FOLDER" - -#: ../midori/main.c:1923 -msgid "Private browsing, no changes are saved" -msgstr "شەخسىي كۆرۈش، ئۆزگىرىشلەر ساقلانمىدى" - -#: ../midori/main.c:1925 -msgid "Show a diagnostic dialog" -msgstr "دىئاگنوز سۆزلەشكۈسىنى كۆرسىتىدۇ" - -#: ../midori/main.c:1927 -msgid "Run the specified filename as javascript" -msgstr "كۆرسىتىلگەن ھۆججەت نامىنى javascript دەپ قاراپ ئىجرا قىلىدۇ" - -#: ../midori/main.c:1929 -msgid "Take a snapshot of the specified URI" -msgstr "كۆرسىتىلگەن URI نىڭ كۆرۈنۈشىنى ئالىدۇ" - -#: ../midori/main.c:1931 -msgid "Execute the specified command" -msgstr "كۆرسىتىلگەن بۇيرۇقنى ئىجرا قىلىدۇ" - -#: ../midori/main.c:1933 -msgid "List available commands to execute with -e/ --execute" -msgstr "" -"تاللانما -e/ --execute بىلەن بىرگە ئىجرا قىلغىلى بولىدىغان بۇيرۇقلارنى " -"كۆرسىتىدۇ" - -#: ../midori/main.c:1935 -msgid "Display program version" -msgstr "پروگرامما نەشرى كۆرسىتىدۇ" - -#: ../midori/main.c:1937 -msgid "Addresses" -msgstr "ئادرېسلار" - -#: ../midori/main.c:1939 -msgid "Block URIs according to regular expression PATTERN" -msgstr "ئۆلچەملىك ئىپادە PATTERN غا بويسۇنۇپ URI چەكلە" - -#: ../midori/main.c:1939 -msgid "PATTERN" -msgstr "PATTERN" - -#. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1943 -msgid "Reset Midori after SECONDS seconds of inactivity" -msgstr "" -"مىدورى(Midori) ئاكتىپ ئەمەس ھالەتتە SECONDS سېكۇنت تۇرسا، Midori نى ئەسلىگە " -"قايتىدۇ" - -#: ../midori/main.c:1943 -msgid "SECONDS" -msgstr "SECONDS" - -#: ../midori/main.c:1946 -msgid "Redirects console warnings to the specified FILENAME" -msgstr "ئېكراندىكى ئاگاھلاندۇرۇشلارنى FILENAME غا يوللايدۇ" - -#: ../midori/main.c:1946 -msgid "FILENAME" -msgstr "FILENAME" - -#: ../midori/main.c:2048 -msgid "Please report comments, suggestions and bugs to:" -msgstr "پىكىر، تەكلىپ، شۇنداقلا كەمتۈكلەرنى بۇ يەرگە مەلۇم قىلىڭ:" - -#: ../midori/main.c:2050 -msgid "Check for new versions at:" -msgstr "يېڭى نەشرىنى بۇ يەردىن تەكشۈر:" - -#. i18n: Logins and passwords in websites and web forms -#: ../midori/main.c:2145 -msgid "Saved logins and _passwords" -msgstr "ساقلانغان كىرىشلەر ۋە ئىملار(_P)" - -#: ../midori/main.c:2147 -msgid "Cookies and Website data" -msgstr "Cookies ۋە تورتۇرا سانلىق-مەلۇماتلىرى" - -#. TODO: Preserve page icons of search engines and merge privacy items -#: ../midori/main.c:2151 ../midori/midori-websettings.c:1021 -#: ../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:2258 -msgid "An unknown error occured" -msgstr "نامەلۇم خاتالىق كۆرۈلدى" - -#: ../midori/main.c:2365 -msgid "An instance of Midori is already running but not responding.\n" -msgstr "مىدورى(Midori)نىڭ ئۈلگىسى ئىجرا قىلىنىۋېتىپتۇ بىراق ئىنكاس يوق.\n" - -#: ../midori/main.c:2399 -#, c-format -msgid "Bookmarks couldn't be loaded: %s\n" -msgstr "خەتكۈشنى ئوقۇغىلى بولمىدى: %s\n" - -#: ../midori/main.c:2432 -#, c-format -msgid "The trash couldn't be loaded: %s\n" -msgstr "ئەخلەت ساندۇقىنى ئوقۇغىلى بولمىدى: %s\n" - -#: ../midori/main.c:2445 -#, c-format -msgid "The history couldn't be loaded: %s\n" -msgstr "ئىزلارنى ئوقۇغىلى بولمىدى: %s\n" - -#: ../midori/main.c:2460 -msgid "The following errors occured:" -msgstr "تۆۋەندىكىدەك خاتالىق كۆرۈلدى:" - -#: ../midori/main.c:2476 -msgid "_Ignore" -msgstr "پەرۋا قىلما(_I)" - -#: ../midori/midori-app.c:1155 ../midori/midori-browser.c:557 -#, c-format -msgid "Unexpected action '%s'." -msgstr "تاسادىپىي مەشغۇلات ‹%s›" - -#: ../midori/midori-app.c:1459 ../midori/midori-browser.c:6452 -msgid "_Bookmarks" -msgstr "خەتكۈش(_B)" - -#: ../midori/midori-app.c:1460 -msgid "Add Boo_kmark" -msgstr "خەتكۈش قوش(_K)" - -#: ../midori/midori-app.c:1461 -msgid "_Extensions" -msgstr "كېڭەيتمىلەر(_E)" - -#. i18n: Browsing history, visited web pages, closed tabs -#: ../midori/midori-app.c:1462 ../midori/midori-browser.c:4905 -msgid "_History" -msgstr "ئىز(_H)" - -#: ../midori/midori-app.c:1463 -msgid "_Userscripts" -msgstr "_Userscripts" - -#: ../midori/midori-app.c:1464 -msgid "User_styles" -msgstr "ئىشلەتكۈچى ئۇسلۇبى(_S)" - -#: ../midori/midori-app.c:1465 -msgid "New _Tab" -msgstr "يېڭى بەتكۈچ(_T)" - -#: ../midori/midori-app.c:1466 -msgid "_Transfers" -msgstr "ئۇزىتىش(_T)" - -#: ../midori/midori-app.c:1467 -msgid "Netscape p_lugins" -msgstr "Netscape قىستۇرمىلىرى(_L)" - -#: ../midori/midori-app.c:1468 -msgid "_Closed Tabs" -msgstr "تاقالغان بەتكۈچلەر(_C)" - -#: ../midori/midori-app.c:1469 ../midori/midori-browser.c:5588 -msgid "New _Window" -msgstr "يېڭى كۆزنەك(_W)" - -#: ../midori/midori-app.c:1470 -msgid "New _Folder" -msgstr "يېڭى مۇندەرىجە(_F)" - -#: ../midori/midori-app.c:1499 -msgid "[Addresses]" -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:359 ../midori/midori-browser.c:5676 -#: ../midori/midori-browser.c:5685 -msgid "Reload the current page" -msgstr "ھازىرقى بەتنى قايتا ئوقۇيدۇ" - -#: ../midori/midori-browser.c:368 ../midori/midori-browser.c:5682 -msgid "Stop loading the current page" -msgstr "ھازىرقى بېتىنى ئوقۇشنى توختىتىدۇ" - -#: ../midori/midori-browser.c:376 ../midori/midori-browser.c:5727 -msgid "Go forward to the next page" -msgstr "كېيىنكى بەتكە ماڭىدۇ" - -#. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:383 ../midori/midori-browser.c:5735 -#: ../midori/midori-browser.c:5738 -msgid "Go to the next sub-page" -msgstr "كېيىنكى بالا بەتكە يۆتكىلىدۇ" - -#: ../midori/midori-browser.c:542 -#, c-format -msgid "Failed to update title: %s\n" -msgstr "ماۋزۇنى يېڭىلاش مەغلۇپ بولدى: %s\n" - -#: ../midori/midori-browser.c:637 -#, c-format -msgid "%s (Private Browsing)" -msgstr "%s (شەخسىي كۆرۈش)" - -#: ../midori/midori-browser.c:747 ../midori/midori-browser.c:789 -#: ../panels/midori-bookmarks.c:114 -msgid "Bookmarks" -msgstr "خەتكۈش" - -#: ../midori/midori-browser.c:849 -msgid "New folder" -msgstr "يېڭى مۇندەرىجە" - -#: ../midori/midori-browser.c:849 -msgid "Edit folder" -msgstr "مۇندەرىجە تەھرىرلەيدۇ" - -#: ../midori/midori-browser.c:851 -msgid "New bookmark" -msgstr "يېڭى خەتكۈش" - -#: ../midori/midori-browser.c:851 -msgid "Edit bookmark" -msgstr "خەتكۈش تەھرىرلەش" - -#: ../midori/midori-browser.c:885 -msgid "Type a name for this bookmark and choose where to keep it." -msgstr "خەتكۈشنىڭ ئاتىنى كىرگۈزۈپ ساقلايدىغان ئورۇننى كۆرسىتىپ بېرىدۇ." - -#: ../midori/midori-browser.c:946 -msgid "Add to _Speed Dial" -msgstr "تەز تېلېفون قىلىشنى قوش(_S)" - -#: ../midori/midori-browser.c:952 -msgid "Show in the tool_bar" -msgstr "قورال بالدىقىدا كۆرسەت(_B)" - -#: ../midori/midori-browser.c:960 -msgid "Run as _web application" -msgstr "تور پروگراممىسى شەكلىدە ئىجرا قىل(_W)" - -#: ../midori/midori-browser.c:1031 -#, c-format -msgid "The file \"%s\" can't be saved in this folder." -msgstr "ھۆججەت «%s» نى بۇ مۇندەرىجىگە ساقلىغىلى بولمىدى." - -#: ../midori/midori-browser.c:1033 -#, c-format -msgid "You don't have permission to write in this location." -msgstr "بۇ ئورۇنغا يېزىش ئىمتىيازىڭىز يوق." - -#: ../midori/midori-browser.c:1040 -#, c-format -msgid "There is not enough free space to download \"%s\"." -msgstr "«%s» نى چۈشۈرۈشكە يېتەرلىك بوشلۇق يوق." - -#: ../midori/midori-browser.c:1043 -#, c-format -msgid "The file needs %s but only %s are left." -msgstr "ھۆججەتكە %s كېرەك ئىدى، بىراق %s لا بار ئىكەن." - -#: ../midori/midori-browser.c:1179 ../midori/midori-browser.c:4709 -msgid "Save file as" -msgstr "باشقا نامدا ساقلا" - -#: ../midori/midori-browser.c:1185 -msgid "Save associated _resources" -msgstr "مۇناسىۋەتلىك مەنبەلەرنى ساقلا(_R)" - -#: ../midori/midori-browser.c:1488 -msgid "A new window has been opened" -msgstr "يېڭى بىر كۆزنەك ئېچىلدى" - -#: ../midori/midori-browser.c:1491 -msgid "A new tab has been opened" -msgstr "يېڭى بەتكۈچ ئېچىلدى" - -#: ../midori/midori-browser.c:1508 -msgid "Error opening the image!" -msgstr "مەزكۇر سۈرەتنى ئېچىشتا خاتالىق كۆرۈلدى!" - -#: ../midori/midori-browser.c:1509 -msgid "Can not open selected image in a default viewer." -msgstr "تاللانغان سۈرەتنى كۆڭۈلدىكى كۆرگۈدە ئاچقىلى بولمىدى." - -#: ../midori/midori-browser.c:1515 -msgid "Error downloading the image!" -msgstr "مەزكۇر سۈرەتنى چۈشۈرۈشتە خاتالىق كۆرۈلدى!" - -#: ../midori/midori-browser.c:1516 -msgid "Can not download selected image." -msgstr "تاللانغان سۈرەتنى چۈشۈرگىلى بولمىدى." - -#: ../midori/midori-browser.c:1637 -msgid "Save file" -msgstr "ھۆججەت ساقلا" - -#: ../midori/midori-browser.c:2540 -msgid "Open file" -msgstr "ھۆججەتنى ئاچ" - -#: ../midori/midori-browser.c:2672 -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:2678 ../extensions/feed-panel/main.c:365 -msgid "New feed" -msgstr "يېڭى feed" - -#: ../midori/midori-browser.c:2721 ../midori/midori-browser.c:5751 -#: ../panels/midori-bookmarks.c:527 -msgid "Add a new bookmark" -msgstr "يېڭى خەتكۈش قوشىدۇ" - -#: ../midori/midori-browser.c:3265 ../midori/midori-searchaction.c:487 -msgid "Empty" -msgstr "قۇرۇق" - -#: ../midori/midori-browser.c:3711 ../midori/midori-browser.c:3712 -msgid "Toggle text cursor navigation" -msgstr "تېكىست نۇر بەلگىسى ئارقىلىق كۆرۈشكە ئۆزگەرت" - -#: ../midori/midori-browser.c:3714 -msgid "" -"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in " -"all websites." -msgstr "" -"كۇنۇپكا F7 بېسىلسا نۇربەلگە بىلەن كۆرۈشكە ئۆزگىرىدۇ. ئاكتىپ ھالەتتە بارلىق " -"تور بەتلىرىدە تېكىست نۇر بەلگىسى كۆرۈنىدۇ." - -#: ../midori/midori-browser.c:3717 -msgid "_Enable Caret Browsing" -msgstr "نۇربەلگە بىلەن كۆرۈش ئىناۋەتلىك قىل(_R)" - -#: ../midori/midori-browser.c:4109 ../midori/midori-browser.c:6145 -#, c-format -msgid "Failed to insert new history item: %s\n" -msgstr "يېڭى ئىز قىستۇرۇش مەغلۇپ بولدى: %s\n" - -#: ../midori/midori-browser.c:4435 ../panels/midori-bookmarks.c:850 -#: ../panels/midori-history.c:806 -msgid "Open all in _Tabs" -msgstr "ھەممىنى بەتكۈچتە ئاچ(_T)" - -#: ../midori/midori-browser.c:4442 ../panels/midori-bookmarks.c:856 -#: ../panels/midori-history.c:812 ../extensions/feed-panel/feed-panel.c:528 -msgid "Open in New _Tab" -msgstr "يېڭى بەتكۈچتە ئاچ(_T)" - -#: ../midori/midori-browser.c:4445 ../midori/midori-view.c:2944 -#: ../midori/midori-view.c:5082 ../panels/midori-bookmarks.c:858 -#: ../panels/midori-history.c:814 ../extensions/feed-panel/feed-panel.c:530 -msgid "Open in New _Window" -msgstr "يېڭى كۆزنەكتە ئاچ(_W)" - -#: ../midori/midori-browser.c:4534 -msgid "Arora" -msgstr "Arora" - -#: ../midori/midori-browser.c:4535 -msgid "Kazehakase" -msgstr "Kazehakase" - -#: ../midori/midori-browser.c:4536 -msgid "Opera" -msgstr "Opera" - -#: ../midori/midori-browser.c:4537 -msgid "Konqueror" -msgstr "Konqueror" - -#: ../midori/midori-browser.c:4538 -msgid "Epiphany" -msgstr "Epiphany" - -#: ../midori/midori-browser.c:4539 -#, c-format -msgid "Firefox (%s)" -msgstr "Firefox (%s)" - -#: ../midori/midori-browser.c:4540 -msgid "Midori 0.2.6" -msgstr "مىدورى(Midori 0.2.6)" - -#: ../midori/midori-browser.c:4561 -msgid "Import bookmarks…" -msgstr "خەتكۈش ئىمپورت قىل…" - -#: ../midori/midori-browser.c:4564 ../midori/midori-browser.c:5756 -msgid "_Import bookmarks" -msgstr "خەتكۈش ئىمپورت قىل(_I)" - -#: ../midori/midori-browser.c:4575 -msgid "_Application:" -msgstr "پروگرامما(_A):" - -#: ../midori/midori-browser.c:4640 -msgid "Import from XBEL or HTML file" -msgstr "XBEL ياكى HTML دىن ئىمپورت قىلىش" - -#: ../midori/midori-browser.c:4668 -msgid "Import from a file" -msgstr "ھۆججەتتىن ئىمپورت قىلىدۇ" - -#: ../midori/midori-browser.c:4680 -msgid "Failed to import bookmarks" -msgstr "خەتكۈش ئىمپورت قىلىش مەغلۇپ بولدى" - -#: ../midori/midori-browser.c:4714 -msgid "XBEL Bookmarks" -msgstr "XBEL خەتكۈش" - -#: ../midori/midori-browser.c:4719 -msgid "Netscape Bookmarks" -msgstr "Netscape خەتكۈش" - -#: ../midori/midori-browser.c:4733 -msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)" -msgstr "" -"مىدورى(Midori) پەقەتلا XBEL (*.xbel) ۋە Netscape (*.html) غا ئېكسپورت " -"قىلالايدۇ" - -#: ../midori/midori-browser.c:4748 -msgid "Failed to export bookmarks" -msgstr "خەتكۈش ئېكسپورت قىلىش مەغلۇپ بولدى" - -#. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4870 -msgid "Clear Private Data" -msgstr "شەخسىي سانلىق-مەلۇماتلارنى تازىلايدۇ" - -#: ../midori/midori-browser.c:4874 -msgid "_Clear private data" -msgstr "شەخسىي سانلىق-مەلۇماتلار تازىلا(_C)" - -#: ../midori/midori-browser.c:4889 -msgid "Clear the following data:" -msgstr "تۆۋەندىكى سانلىق-مەلۇماتلارنى تازىلا:" - -#: ../midori/midori-browser.c:4899 -msgid "Last open _tabs" -msgstr "ئەڭ ئاخىرىدا ئېچىلغان بەتكۈچلەر" - -#: ../midori/midori-browser.c:4925 -msgid "Clear private data when _quitting Midori" -msgstr "" -"مىدورى(Midori) نى ئاخىرلاشقاندا شەخسىي سانلىق-مەلۇماتلار تازىلانسۇن(_Q)" - -#: ../midori/midori-browser.c:5140 -msgid "A lightweight web browser." -msgstr "يېنىك ۋە ئەپچىل توركۆرگۈ." - -#: ../midori/midori-browser.c:5141 -msgid "See about:version for version info." -msgstr "نەشر ئۇچۇرىنى about:version دىن كۆرۈڭ." - -#: ../midori/midori-browser.c:5143 -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 ئادەتتىكى ئاممىۋى ئىجازەتنامە بويىچە ئۇنى قايتا تارقىتىپ ياكى " -"ئۆزگەرتەلەيسىز؛ سىز شۇ ئىجازەت كېلىشىمىنىڭ ئىككىنچى نەشرى ياكى يۇقىرى " -"نەشرىنى ئىشلەتسىڭىز بولىدۇ." - -#: ../midori/midori-browser.c:5173 -msgid "translator-credits" -msgstr "غەيرەت ت.كەنجى " - -#: ../midori/midori-browser.c:5586 -msgid "_File" -msgstr "ھۆججەت(_F)" - -#: ../midori/midori-browser.c:5589 -msgid "Open a new window" -msgstr "يېڭى كۆزنەكتىن بىرنى ئاچىدۇ" - -#: ../midori/midori-browser.c:5592 -msgid "Open a new tab" -msgstr "يېڭى بەتكۈچتىن بىرنى ئاچىدۇ" - -#: ../midori/midori-browser.c:5594 -msgid "New P_rivate Browsing Window" -msgstr "يېڭى شەخسىي كۆرۈش كۆزنىكى(_R)" - -#: ../midori/midori-browser.c:5598 -msgid "Open a file" -msgstr "ھۆججەت ئاچىدۇ" - -#: ../midori/midori-browser.c:5600 -msgid "_Save Page As…" -msgstr "بەتنى باشقا ئاتتا ساقلا(_S)…" - -#: ../midori/midori-browser.c:5601 -msgid "Save to a file" -msgstr "ھۆججەتكە ساقلايدۇ" - -#: ../midori/midori-browser.c:5603 -msgid "Add to Speed _dial" -msgstr "تەز تېلېفون قىلىشنى قوش(_D)" - -#: ../midori/midori-browser.c:5607 -msgid "Add Shortcut to the _desktop" -msgstr "ئۈستەلئۈستىگە تېزلەتمە قوش(_D)" - -#: ../midori/midori-browser.c:5609 -msgid "Create _Launcher" -msgstr "ئىجراچى قۇر(_L)" - -#: ../midori/midori-browser.c:5613 -msgid "Subscribe to News _feed" -msgstr "خەۋەر feed غا مۇشتەرى بول(_F)" - -#: ../midori/midori-browser.c:5619 -msgid "_Close Tab" -msgstr "بەتكۈچنى تاقا(_C)" - -#: ../midori/midori-browser.c:5620 -msgid "Close the current tab" -msgstr "ھازىرقى بەتكۈچنى تاقايدۇ" - -#: ../midori/midori-browser.c:5622 -msgid "C_lose Window" -msgstr "كۆزنەك تاقا(_L)" - -#: ../midori/midori-browser.c:5626 -msgid "_Share" -msgstr "ھەمبەھىرلە(_S)" - -#: ../midori/midori-browser.c:5631 -msgid "Print the current page" -msgstr "ھازىرقى بەتنى باسىدۇ" - -#: ../midori/midori-browser.c:5634 -msgid "Close a_ll Windows" -msgstr "بارلىق كۆزنەكلەر تاقا(_L)" - -#: ../midori/midori-browser.c:5637 -msgid "_Edit" -msgstr "تەھرىر(_E)" - -#: ../midori/midori-browser.c:5660 -msgid "_Find…" -msgstr "ئىزدە(_F)…" - -#: ../midori/midori-browser.c:5661 -msgid "Find a word or phrase in the page" -msgstr "بەت ئىچىدىن سوز ياكى سوز بىرىكمىسىنى ئىزدەيدۇ" - -#: ../midori/midori-browser.c:5663 -msgid "Find _Next" -msgstr "كېيىنكىسىنى ئىزدە(_N)" - -#: ../midori/midori-browser.c:5666 -msgid "Find _Previous" -msgstr "ئالدىنقىنى ئىزدە(_P)" - -#: ../midori/midori-browser.c:5670 -msgid "Configure the application preferences" -msgstr "مەزكۇر پروگراممىنىڭ تەڭشىكىنى تەڭشەيدۇ" - -#: ../midori/midori-browser.c:5672 -msgid "_View" -msgstr "كۆرۈنۈش(_V)" - -#: ../midori/midori-browser.c:5673 -msgid "_Toolbars" -msgstr "قورال بالدىقى(_T)" - -#: ../midori/midori-browser.c:5678 -msgid "Reload page without caching" -msgstr "غەملىمەيلا ھۆججەتنى قايتا ئوقۇسۇن" - -#: ../midori/midori-browser.c:5688 -msgid "Increase the zoom level" -msgstr "چوڭايتىش-كىچىكلىتىش دەرىجىسىنى چوڭايتىدۇ" - -#: ../midori/midori-browser.c:5691 -msgid "Decrease the zoom level" -msgstr "چوڭايتىش-كىچىكلىتىش دەرىجىسىنى كىچىكلىتىدۇ" - -#: ../midori/midori-browser.c:5695 -msgid "_Encoding" -msgstr "كودلىشى(_E)" - -#: ../midori/midori-browser.c:5697 -msgid "View So_urce" -msgstr "مەنبەنى كۆرسەت(_U)" - -#: ../midori/midori-browser.c:5700 -msgid "Ca_ret Browsing" -msgstr "نۇربەلگىسىدە كۆرۈش(_R)" - -#: ../midori/midori-browser.c:5704 -msgid "Toggle fullscreen view" -msgstr "تولۇق ئېكران كۆرسىتىش/كۆرسەتمەسلىكنى ئالماشتۇرىدۇ" - -#: ../midori/midori-browser.c:5706 -msgid "Scroll _Left" -msgstr "سولغا سىيرىل(_L)" - -#: ../midori/midori-browser.c:5709 -msgid "Scroll _Down" -msgstr "پەسكە سىيرىل(_D)" - -#: ../midori/midori-browser.c:5712 -msgid "Scroll _Up" -msgstr "ئۈستىگە سىيرىلىدۇ(_U)" - -#: ../midori/midori-browser.c:5715 -msgid "Scroll _Right" -msgstr "ئوڭغا سىيرىل(_R)" - -#: ../midori/midori-browser.c:5718 -msgid "_Readable" -msgstr "ئوقۇغىلى بولىدۇ(_R)" - -#: ../midori/midori-browser.c:5721 -msgid "_Go" -msgstr "يۆتكەل(_G)" - -#: ../midori/midori-browser.c:5724 -msgid "Go back to the previous page" -msgstr "ئالدىنقى بەتكە قايتىدۇ" - -#. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5731 -msgid "Go to the previous sub-page" -msgstr "ئالدىنقى بالا بەتكە قايتىدۇ" - -#: ../midori/midori-browser.c:5740 -msgid "_Homepage" -msgstr "ماكان بەت(_H)" - -#: ../midori/midori-browser.c:5741 -msgid "Go to your homepage" -msgstr "ئانا بەتكە يۆتكىلىدۇ" - -#: ../midori/midori-browser.c:5743 -msgid "Empty Trash" -msgstr "ئەخلەت ساندۇقىنى تازىلاش" - -#: ../midori/midori-browser.c:5746 -msgid "Undo _Close Tab" -msgstr "تاقالغان بەتكۈچنى ئەسلى كەلتۈر(_C)" - -#: ../midori/midori-browser.c:5753 -msgid "Add a new _folder" -msgstr "يېڭى مۇندەرىجە قوش(_F)" - -#: ../midori/midori-browser.c:5759 -msgid "_Export bookmarks" -msgstr "خەتكۈشنى ئېكسپورت قىل(_E)" - -#: ../midori/midori-browser.c:5762 ../midori/midori-searchaction.c:496 -msgid "_Manage Search Engines" -msgstr "ئىزدەش ماتورىنى باشقۇر(_M)" - -#: ../midori/midori-browser.c:5765 -msgid "_Clear Private Data" -msgstr "شەخسىي سانلىق-مەلۇماتلارنى تازىلا(_C)" - -#: ../midori/midori-browser.c:5768 -msgid "_Inspect Page" -msgstr "بەتنى تەكشۈر(_I)" - -#: ../midori/midori-browser.c:5772 -msgid "_Previous Tab" -msgstr "ئالدىنقى بەتكۈچ(_P)" - -#: ../midori/midori-browser.c:5775 -msgid "_Next Tab" -msgstr "كېيىنكى بەتكۈچ(_N)" - -#: ../midori/midori-browser.c:5777 -msgid "Move Tab _Backward" -msgstr "بەتكۈچنى كەينىگە يۆتكەش(_B)" - -#: ../midori/midori-browser.c:5779 -msgid "_Move Tab Forward" -msgstr "بەتكۈچنى ئالدىغا يۆتكەش(_B)" - -#: ../midori/midori-browser.c:5782 -msgid "Focus _Current Tab" -msgstr "ھازىرقى بەتكۈچكە فوكۇسلان(_C)" - -#: ../midori/midori-browser.c:5785 -msgid "Focus _Next view" -msgstr "كېيىنكى كۆرۈنۈشكە فوكۇسلان(_N)" - -#: ../midori/midori-browser.c:5788 -msgid "Only show the Icon of the _Current Tab" -msgstr "پەقەت نۆۋەتتىكى بەتكۈچتىلا سىنبەلگىنى كۆرسەتسۇن(_C)" - -#: ../midori/midori-browser.c:5791 -msgid "_Duplicate Current Tab" -msgstr "بەتكۈچنى تۇغدۇر(_D)" - -#: ../midori/midori-browser.c:5794 -msgid "Close Ot_her Tabs" -msgstr "باشقا بەتكۈچلەرنى تاقا(_H)" - -#: ../midori/midori-browser.c:5797 -msgid "Open last _session" -msgstr "ئەڭ ئاخىرقى ئەڭگىمەنى ئاچ(_S)" - -#: ../midori/midori-browser.c:5800 -msgid "_Help" -msgstr "ياردەم(_H)" - -#: ../midori/midori-browser.c:5802 -msgid "_Frequent Questions" -msgstr "كۆپ سورىلىدىغان سوئاللار(_F)" - -#: ../midori/midori-browser.c:5805 -msgid "_Report a Problem…" -msgstr "كەمتۈك مەلۇم قىل(_R)" - -#: ../midori/midori-browser.c:5810 ../midori/midori-browser.c:6471 -msgid "_Tools" -msgstr "قورال(_T)" - -#: ../midori/midori-browser.c:5817 -msgid "_Menubar" -msgstr "تىزىملىك بالدىقى(_M)" - -#: ../midori/midori-browser.c:5821 -msgid "_Navigationbar" -msgstr "يولچى بالدىقى(_N)" - -#: ../midori/midori-browser.c:5825 -msgid "Side_panel" -msgstr "يان كۆزنەك(_P)" - -#: ../midori/midori-browser.c:5826 -msgid "Sidepanel" -msgstr "يان كۆزنەك" - -#: ../midori/midori-browser.c:5829 -msgid "_Bookmarkbar" -msgstr "خەتكۈش بالدىقى(_B)" - -#: ../midori/midori-browser.c:5833 -msgid "_Statusbar" -msgstr "ھالەت بالدىقى(_S)" - -#: ../midori/midori-browser.c:5842 ../midori/midori-websettings.c:315 -msgid "_Automatic" -msgstr "ئۆزلۈكىدىن(_A)" - -#: ../midori/midori-browser.c:5845 ../midori/midori-websettings.c:239 -msgid "Chinese Traditional (BIG5)" -msgstr "مۇرەككەپ خەنزۇچە(BIG5)" - -#: ../midori/midori-browser.c:5848 ../midori/midori-websettings.c:240 -msgid "Chinese Simplified (GB18030)" -msgstr "ئاددىيلاشتۇرۇلغان خەنزۇچە (GB18030)" - -#. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5852 -msgid "Japanese (SHIFT__JIS)" -msgstr "ياپونچە (SHIFT__JIS)" - -#: ../midori/midori-browser.c:5855 ../midori/midori-websettings.c:242 -msgid "Korean (EUC-KR)" -msgstr "كورېيەچە(EUC-KR)" - -#: ../midori/midori-browser.c:5858 ../midori/midori-websettings.c:243 -msgid "Russian (KOI8-R)" -msgstr "رۇسچە(KOI8-R)" - -#: ../midori/midori-browser.c:5861 ../midori/midori-websettings.c:244 -msgid "Unicode (UTF-8)" -msgstr "يۇنىكود (UTF-8)" - -#: ../midori/midori-browser.c:5864 ../midori/midori-websettings.c:245 -msgid "Western (ISO-8859-1)" -msgstr "غەربچە (ISO-8859-1)" - -#: ../midori/midori-browser.c:5867 -msgid "Custom…" -msgstr "ئىختىيارىي…" - -#: ../midori/midori-browser.c:6377 -msgid "_Separator" -msgstr "ئايرىغۇ(_S)" - -#: ../midori/midori-browser.c:6384 -msgid "_Location…" -msgstr "ئورۇن(_L)…" - -#: ../midori/midori-browser.c:6386 -msgid "Open a particular location" -msgstr "بەلگىلەنگەن ئورۇننى ئاچىدۇ" - -#: ../midori/midori-browser.c:6408 -msgid "_Web Search…" -msgstr "توردىن ئىزدە(_W)…" - -#: ../midori/midori-browser.c:6410 -msgid "Run a web search" -msgstr "توردىن ئىزدەيدۇ" - -#: ../midori/midori-browser.c:6437 -msgid "Reopen a previously closed tab or window" -msgstr "بۇرۇن يېپىلغان بەتكۈچ ياكى كۆزنەكنى قايتا ئاچىدۇ" - -#: ../midori/midori-browser.c:6454 -msgid "Show the saved bookmarks" -msgstr "ساقلانغان خەتكۈچلەرنى كۆرسىتىدۇ" - -#: ../midori/midori-browser.c:6487 -msgid "_Window" -msgstr "كۆزنەك(_W)" - -#: ../midori/midori-browser.c:6489 -msgid "Show a list of all open tabs" -msgstr "ئوچۇق بارلىق بەتكۈچلەرنى كۆرسىتىدۇ" - -#: ../midori/midori-browser.c:6503 -msgid "_Menu" -msgstr "تىزىملىك(_M)" - -#: ../midori/midori-browser.c:6505 -msgid "Menu" -msgstr "تىزىملىك" - -#: ../midori/midori-browser.c:7330 -#, c-format -msgid "Unexpected setting '%s'" -msgstr "ئويلىمىغان تەڭشەك ‹%s›" - -#: ../midori/midori-extension.c:329 -#, c-format -msgid "The configuration of the extension '%s' couldn't be loaded: %s\n" -msgstr "كېڭەيتىلمە ‹%s› نىڭ سەپلىمىسىنى ساقلىغىلى بولمىدى: %s\n" - -#: ../midori/midori-extension.c:747 ../midori/midori-extension.c:844 -#: ../midori/midori-extension.c:941 ../midori/midori-extension.c:1053 -#: ../extensions/addons.c:1688 -#, c-format -msgid "The configuration of the extension '%s' couldn't be saved: %s\n" -msgstr "كېڭەيتىلمە ‹%s› نىڭ سەپلىمىسىنى ساقلىغىلى بولمىدى: %s\n" - -#: ../midori/midori-locationaction.c:398 -#, c-format -msgid "Search with %s" -msgstr "%s دا ئىزدە" - -#: ../midori/midori-locationaction.c:418 -msgid "Search with…" -msgstr "ئىزدە…" - -#: ../midori/midori-locationaction.c:545 -#, c-format -msgid "Failed to select from history\n" -msgstr "ئىزدىن تاللاش مەغلۇپ بولدى\n" - -#: ../midori/midori-locationaction.c:632 -#, c-format -msgid "Search for %s" -msgstr "%s نى ئىزدە" - -#: ../midori/midori-locationaction.c:1227 -msgid "Export certificate" -msgstr "گۇۋاھنامىنى ئېكسپورت قىلىش" - -#: ../midori/midori-locationaction.c:1259 -msgid "The signing certificate authority is not known." -msgstr "ئىمزالىق گۇۋاھنامە تارقاتقۇچى ئېنىق ئەمەس." - -#: ../midori/midori-locationaction.c:1261 -msgid "" -"The certificate does not match the expected identity of the site that it was " -"retrieved from." -msgstr "گۇۋاھنامە، ئۇنى قايتۇرۇپ ئالغان تورتۇرادىن كەلگىنى بىلەن بىردەك ئەمەس." - -#: ../midori/midori-locationaction.c:1263 -msgid "The certificate's activation time is still in the future." -msgstr "گۇۋاھنامىنىڭ ئاكتىپلاش ۋاقتى يەنىلا كەلگۈسى ھالەتتە." - -#: ../midori/midori-locationaction.c:1265 -msgid "The certificate has expired" -msgstr "مەزكۇر ئىسپاتنامىنىڭ ۋاقتى ئۆتۈپ كېتىپتۇ" - -#: ../midori/midori-locationaction.c:1267 -msgid "" -"The certificate has been revoked according to the GTlsConnection's " -"certificate revocation list." -msgstr "" -"گۇۋاھنامە GTlsConnection نىڭ يوق ئەمەلدىن قالدۇرۇش تىزىمىغا ئاساسەن ئەمەلدىن " -"قالدۇرۇلدى." - -#: ../midori/midori-locationaction.c:1269 -msgid "The certificate's algorithm is considered insecure." -msgstr "گۇۋاھنامىنىڭ ھېسابلاش ئۇسۇلى(algorithm) بىخەتەر ئەمەستەك قىلىدۇ." - -#: ../midori/midori-locationaction.c:1271 -msgid "Some other error occurred validating the certificate." -msgstr "ئىسپاتنامىنى دەلىللەۋاتقاندا بەزى خاتالىقلار كۆرۈلدى." - -#: ../midori/midori-locationaction.c:1318 -msgid "_Export certificate" -msgstr "گۇۋاھنامىنى ئېكسپورت قىل(_E)" - -#: ../midori/midori-locationaction.c:1333 -msgid "Self-signed" -msgstr "ئۆزىنىڭ ئىمزاسى" - -#: ../midori/midori-locationaction.c:1367 -msgid "Security details" -msgstr "بىخەتەرلىك تەپسىلاتلىرى" - -#. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1650 -msgid "Paste and p_roceed" -msgstr "چاپلا ۋە داۋاملاشتۇر(_R)" - -#: ../midori/midori-locationaction.c:1974 -msgid "Not verified" -msgstr "تەھقىقلەنمىگەن" - -#: ../midori/midori-locationaction.c:1982 -msgid "Verified and encrypted connection" -msgstr "تەھقىقلەنگەن ۋە شىفىرلانغان باغلىنىش" - -#: ../midori/midori-locationaction.c:1989 -msgid "Open, unencrypted connection" -msgstr "ئوچۇق، شىفىرلانمىغان باغلىنىش" - -#: ../midori/midori-panel.c:317 ../midori/midori-panel.c:319 -#: ../midori/midori-panel.c:483 ../midori/midori-panel.c:486 -msgid "Align sidepanel to the right" -msgstr "يان كۆزنەكنى ئوڭ تەرەپكە ئورۇنلاشتۇرىدۇ" - -#: ../midori/midori-panel.c:329 ../midori/midori-panel.c:330 -msgid "Close panel" -msgstr "كۆزنەكنى تاقا" - -#: ../midori/midori-panel.c:484 ../midori/midori-panel.c:487 -msgid "Align sidepanel to the left" -msgstr "يان كۆزنەكنى سول تەرەپكە ئورۇنلاشتۇرىدۇ" - -#: ../midori/midori-websettings.c:221 -msgid "Show Speed Dial" -msgstr "تېز تېلېفون قىلىشنى كۆرسەت" - -#: ../midori/midori-websettings.c:222 -msgid "Show Homepage" -msgstr "ماكان بەتنى كۆرسەت" - -#: ../midori/midori-websettings.c:241 -msgid "Japanese (SHIFT_JIS)" -msgstr "ياپونچە (SHIFT_JIS)" - -#: ../midori/midori-websettings.c:246 ../midori/midori-websettings.c:322 -#: ../katze/katze-utils.c:633 -msgid "Custom..." -msgstr "ئىختىيارىي…" - -#: ../midori/midori-websettings.c:261 -msgid "New tab" -msgstr "يېڭى بەتكۈچ" - -#: ../midori/midori-websettings.c:262 -msgid "New window" -msgstr "يېڭى كۆزنەك" - -#: ../midori/midori-websettings.c:263 -msgid "Current tab" -msgstr "ھازىرقى بەتكۈچ" - -#: ../midori/midori-websettings.c:278 -msgid "Default" -msgstr "كۆڭۈلدىكى" - -#: ../midori/midori-websettings.c:279 -msgid "Icons" -msgstr "سىنبەلگىلەر" - -#: ../midori/midori-websettings.c:280 -msgid "Small icons" -msgstr "كىچىك سىنبەلگە" - -#: ../midori/midori-websettings.c:281 -msgid "Text" -msgstr "تېكىست" - -#: ../midori/midori-websettings.c:282 -msgid "Icons and text" -msgstr "سىنبەلگە ۋە تېكىست" - -#: ../midori/midori-websettings.c:283 -msgid "Text beside icons" -msgstr "تېكىست سىنبەلگىنىڭ يېنىدا كۆرسىتىلسۇن" - -#: ../midori/midori-websettings.c:298 -msgid "Automatic (GNOME or environment)" -msgstr "ئۆزلۈكىدىن (GNOME ياكى مۇھىت)" - -#: ../midori/midori-websettings.c:299 -msgid "HTTP proxy server" -msgstr "HTTP ۋاكالەتچى مۇلازىمېتىر" - -#: ../midori/midori-websettings.c:300 -msgid "No proxy server" -msgstr "ۋاكالەتچى مۇلازىمېتىر يوق" - -#: ../midori/midori-websettings.c:317 -msgid "Chrome" -msgstr "خىروم(Chrome)" - -#: ../midori/midori-websettings.c:318 -msgid "Safari" -msgstr "Safari" - -#: ../midori/midori-websettings.c:319 -msgid "iPhone" -msgstr "iPhone" - -#: ../midori/midori-websettings.c:320 -msgid "Firefox" -msgstr "Firefox" - -#: ../midori/midori-websettings.c:321 -msgid "Internet Explorer" -msgstr "Internet Explorer" - -#: ../midori/midori-websettings.c:405 -msgid "Remember last window size" -msgstr "كۆزنەكنىڭ ئەڭ ئاخىرقى چوڭلۇقىنى ئەستە تۇتۇۋال" - -#: ../midori/midori-websettings.c:406 -msgid "Whether to save the last window size" -msgstr "كۆزنەكنىڭ ئەڭ ئاخىرقى چوڭلۇقىنى ئەستە تۇتۇۋالىدۇ" - -#: ../midori/midori-websettings.c:414 -msgid "Last window width" -msgstr "كۆزنەكنىڭ ئەڭ ئاخىرقى كەڭلىكى" - -#: ../midori/midori-websettings.c:415 -msgid "The last saved window width" -msgstr "كۆزنەكنىڭ ئەڭ ئاخىرقى كەڭلىكى" - -#: ../midori/midori-websettings.c:423 -msgid "Last window height" -msgstr "كۆزنەكنىڭ ئەڭ ئاخىرقى ئېگىزلىكى" - -#: ../midori/midori-websettings.c:424 -msgid "The last saved window height" -msgstr "كۆزنەكنىڭ ئەڭ ئاخىرقى ئېگىزلىكى" - -#: ../midori/midori-websettings.c:449 -msgid "Last panel position" -msgstr "كۆزنەكنىڭ ئەڭ ئاخىرقى ئورنى" - -#: ../midori/midori-websettings.c:450 -msgid "The last saved panel position" -msgstr "كۆزنەكنىڭ ئەڭ ئاخىرقى ئورنى" - -#. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:459 -msgid "Last panel page" -msgstr "كۆزنەكتىكى ئەڭ ئاخىرقى بەت" - -#: ../midori/midori-websettings.c:460 -msgid "The last saved panel page" -msgstr "ئەڭ ئاخىرى ساقلانغان كۆزنەك بېتى" - -#: ../midori/midori-websettings.c:468 -msgid "Last Web search" -msgstr "ئەڭ ئاخىرقى ئىزدەلگەنلىرى" - -#: ../midori/midori-websettings.c:469 -msgid "The last saved Web search" -msgstr "ساقلانغان ئەڭ ئاخىرقى ئىزدەلگەن" - -#: ../midori/midori-websettings.c:493 -msgid "Show Menubar" -msgstr "تىزىملىك بالدىقىنى كۆرسەت" - -#: ../midori/midori-websettings.c:494 -msgid "Whether to show the menubar" -msgstr "تىزىملىك بالدىقىنى كۆرسىتىدۇ" - -#: ../midori/midori-websettings.c:502 -msgid "Show Navigationbar" -msgstr "يولچى بالدىقىنى كۆرسەت" - -#: ../midori/midori-websettings.c:503 -msgid "Whether to show the navigationbar" -msgstr "يولچى بالدىقىنى كۆرسىتىدۇ" - -#: ../midori/midori-websettings.c:511 -msgid "Show Bookmarkbar" -msgstr "خەتكۈش بالدىقىنى كۆرسەت" - -#: ../midori/midori-websettings.c:512 -msgid "Whether to show the bookmarkbar" -msgstr "خەتكۈش بالدىقىنى كۆرسىتىدۇ" - -#: ../midori/midori-websettings.c:520 -msgid "Show Panel" -msgstr "كۆزنەكنى كۆرسەت" - -#: ../midori/midori-websettings.c:521 -msgid "Whether to show the panel" -msgstr "كۆزنەكنى كۆرسىتىدۇ" - -#: ../midori/midori-websettings.c:529 -msgid "Show Statusbar" -msgstr "ھالەت بالدىقىنى كۆرسەت" - -#: ../midori/midori-websettings.c:530 -msgid "Whether to show the statusbar" -msgstr "ھالەت بالدىقىنى كۆرسىتىدۇ" - -#: ../midori/midori-websettings.c:539 -msgid "Toolbar Style:" -msgstr "قورال بالدىقىنىڭ ئۇسلۇبى:" - -#: ../midori/midori-websettings.c:540 -msgid "The style of the toolbar" -msgstr "قورال بالدىقىنىڭ ئۇسلۇبىنى بەلگىلەيدۇ" - -#: ../midori/midori-websettings.c:549 -msgid "Toolbar Items" -msgstr "قورال بالدىقىدىكى تۈرلەر" - -#: ../midori/midori-websettings.c:550 -msgid "The items to show on the toolbar" -msgstr "قورال بالدىقىدا كۆرسىتىلىدىغان تۈرلەرنى بەلگىلەيدۇ" - -#: ../midori/midori-websettings.c:558 -msgid "Compact Sidepanel" -msgstr "يان كۆزنەكنى ئىخچام كۆرسەت" - -#: ../midori/midori-websettings.c:559 -msgid "Whether to make the sidepanel compact" -msgstr "يان كۆزنەكنى ئىخچام كۆرسىتىدۇ" - -#: ../midori/midori-websettings.c:574 -msgid "Align sidepanel on the right" -msgstr "يان كۆزنەكنى ئوڭ تەرەپكە ئورۇنلاشتۇر" - -#: ../midori/midori-websettings.c:575 -msgid "Whether to align the sidepanel on the right" -msgstr "يان كۆزنەكنى ئوڭ تەرەپكە ئورۇنلاشتۇرىدۇ" - -#: ../midori/midori-websettings.c:590 -msgid "Open panels in separate windows" -msgstr "كۆزنەكنى ئايرىم كۆزنەكتە ئاچ" - -#: ../midori/midori-websettings.c:591 -msgid "Whether to always open panels in separate windows" -msgstr "كۆزنەكنى ئايرىم كۆزنەكتە ئاچىدىغان قىلىدۇ" - -#: ../midori/midori-websettings.c:600 -msgid "When Midori starts:" -msgstr "مىدورى(Midori) قوزغالغاندا:" - -#: ../midori/midori-websettings.c:601 -msgid "What to do when Midori starts" -msgstr "مىدورى(Midori) قوزغالغاندا نېمە قىلىش كېرەك" - -#: ../midori/midori-websettings.c:610 -msgid "Homepage:" -msgstr "ماكان بەت:" - -#: ../midori/midori-websettings.c:611 -msgid "The homepage" -msgstr "ماكان بەتنى ئاچىدۇ" - -#: ../midori/midori-websettings.c:626 -msgid "Show crash dialog" -msgstr "غۇلاش كۆزنىكىنى كۆرسەت" - -#: ../midori/midori-websettings.c:627 -msgid "Show a dialog after Midori crashed" -msgstr "مىدورى(Midori) غۇلاپ كېتىپ، قايتا قوزغالغاندا كۆزنەك كۆرسىتىدۇ" - -#: ../midori/midori-websettings.c:635 -msgid "Save downloaded files to:" -msgstr "چۈشۈرگەن ھۆججەتنى ساقلايدىغان ئورۇن:" - -#: ../midori/midori-websettings.c:636 -msgid "The folder downloaded files are saved to" -msgstr "چۈشۈرگەن ھۆججەتنى ساقلايدىغان ئورۇننى بەلگىلەيدۇ" - -#: ../midori/midori-websettings.c:644 -msgid "Text Editor" -msgstr "تېكىست تەھرىرلىگۈ" - -#: ../midori/midori-websettings.c:645 -msgid "An external text editor" -msgstr "سىرتقى تېكىست تەھرىرلىگۈنى بېكىتىدۇ" - -#: ../midori/midori-websettings.c:660 -msgid "News Aggregator" -msgstr "خەۋەر يىغقۇچ" - -#: ../midori/midori-websettings.c:661 -msgid "An external news aggregator" -msgstr "سىرتتىكى خەۋەر يىغقۇچ" - -#: ../midori/midori-websettings.c:669 -msgid "Location entry Search" -msgstr "كىرگۈزگەن ئورۇندىن ئىزدە" - -#: ../midori/midori-websettings.c:670 -msgid "The search to perform inside the location entry" -msgstr "ئىزدەش پەقەت كىرگۈزگەن ئورۇندىلا ئېلىپ بېرىلىدۇ" - -#: ../midori/midori-websettings.c:678 -msgid "Preferred Encoding" -msgstr "ئامراق كودلاش" - -#: ../midori/midori-websettings.c:679 -msgid "The preferred character encoding" -msgstr "ھەرپلەرنىڭ ئامراق كودلاش شەكلى" - -#: ../midori/midori-websettings.c:689 -msgid "Always Show Tabbar" -msgstr "بەتكۈچ بالدىقىنى كۆرسەت" - -#: ../midori/midori-websettings.c:690 -msgid "Always show the tabbar" -msgstr "بەتكۈچ بالدىقىنى كۆرسىتىپلا تۇرىدۇ" - -#: ../midori/midori-websettings.c:703 -msgid "Close Buttons on Tabs" -msgstr "بەتكۈچتە تاقاش توپچىسىنى كۆرسەت" - -#: ../midori/midori-websettings.c:704 -msgid "Whether tabs have close buttons" -msgstr "بەتكۈچتە تاقاش توپچىسىنى كۆرسىتىدۇ" - -#: ../midori/midori-websettings.c:729 -msgid "Open new pages in:" -msgstr "يېڭى بەت ئاچقاندا:" - -#: ../midori/midori-websettings.c:730 -msgid "Where to open new pages" -msgstr "يېڭى بەتنى قەيەردە ئاچىدىغانلىقىنى بەلگىلەيدۇ" - -#: ../midori/midori-websettings.c:739 -msgid "Middle click opens Selection" -msgstr "چاشقىنەكنىڭ ئوتتۇرىسىنى چېكىپ تاللىغاننى ئاچ" - -#: ../midori/midori-websettings.c:740 -msgid "Load an address from the selection via middle click" -msgstr "" -"ئادرېسنى تاللاپ بولۇپ، چاشقىنەكنىڭ ئوتتۇرىسىنى چەكسە شۇ ئادرېس ئېچىلىدۇ" - -#: ../midori/midori-websettings.c:748 -msgid "Open tabs in the background" -msgstr "بەتكۈچنى ئارقىدا تۇرۇپ ئاچ" - -#: ../midori/midori-websettings.c:749 -msgid "Whether to open new tabs in the background" -msgstr "يېڭى بەتكۈچنى ئارقىدا تۇرۇپ ئاچىدۇ" - -#: ../midori/midori-websettings.c:757 -msgid "Open Tabs next to Current" -msgstr "يېڭى بەتكۈچنى ھازىرقى بەتكۈچنىڭ يېنىدا ئاچ" - -#: ../midori/midori-websettings.c:758 -msgid "Whether to open new tabs next to the current tab or after the last one" -msgstr "يېڭى بەتكۈچنى ھازىرقىنىڭ يېنىدا ياكى ئەڭ ئاخىرقىنىڭ يېنىدا ئاچىدۇ" - -#: ../midori/midori-websettings.c:766 -msgid "Open popups in tabs" -msgstr "بەتكۈچتە قاڭقىشى ئاچ" - -#: ../midori/midori-websettings.c:767 -msgid "Whether to open popup windows in tabs" -msgstr "بەتكۈچتە قاڭقىش تىزىملىكى ئاچىدىغان ئاچمايدىغانلىقنى بەلگىلەيدۇ" - -#: ../midori/midori-websettings.c:777 ../extensions/statusbar-features.c:155 -msgid "Load images automatically" -msgstr "سۈرەتنى ئۆزلۈكىدىن يۈكلە" - -#: ../midori/midori-websettings.c:778 -msgid "Load and display images automatically" -msgstr "سۈرەتنى ئۆزلۈكىدىن ئوقۇپ كۆرسىتىدۇ" - -#: ../midori/midori-websettings.c:785 ../extensions/statusbar-features.c:165 -msgid "Enable scripts" -msgstr "قوليازما(script) ئىناۋەتلىك" - -#: ../midori/midori-websettings.c:786 -msgid "Enable embedded scripting languages" -msgstr "سىڭدۈرمە قوليازما(script) تىلىنى ئىشلەتكىلى بولىدىغان قىلىدۇ" - -#: ../midori/midori-websettings.c:793 ../extensions/statusbar-features.c:177 -msgid "Enable Netscape plugins" -msgstr "Netscape قىستۇرمىلىرى ئېچىۋەت" - -#: ../midori/midori-websettings.c:794 -msgid "Enable embedded Netscape plugin objects" -msgstr "سىڭدۈرمە Netscape قىستۇرمىلىرىنى ئىشلەتكىلى بولىدىغان قىلىدۇ" - -#: ../midori/midori-websettings.c:809 -msgid "Enable Spell Checking" -msgstr "ئىملا تەكشۈرۈش ئىناۋەتلىك" - -#: ../midori/midori-websettings.c:810 -msgid "Enable spell checking while typing" -msgstr "كىرگۈزۈۋاتقاندا ئىملا تەكشۈرىدۇ" - -#: ../midori/midori-websettings.c:816 -msgid "Enable HTML5 database support" -msgstr "HTML5 ساندانىنى قوللا" - -#: ../midori/midori-websettings.c:817 -msgid "Whether to enable HTML5 database support" -msgstr "HTML5 ساندانىنى ئىشلەتكىلى بولىدىغان قىلىدۇ" - -#: ../midori/midori-websettings.c:823 -msgid "Enable HTML5 local storage support" -msgstr "HTML5 يەرلىك ساقلىغۇچنى قوللا" - -#: ../midori/midori-websettings.c:824 -msgid "Whether to enable HTML5 local storage support" -msgstr "HTML5 يەرلىك ساقلىغۇچنى ئىشلەتكىلى بولىدىغان قىلىدۇ" - -#: ../midori/midori-websettings.c:830 -msgid "Enable offline web application cache" -msgstr "تورسىز ھالەتتە تور پروگراممىلىرىنىڭ غەملىكىنى ئېچىۋەت" - -#: ../midori/midori-websettings.c:831 -msgid "Whether to enable offline web application cache" -msgstr "تورسىز ھالەتتە تور پروگراممىلىرىنىڭ غەملىكىنى ئېچىۋېتىدۇ" - -#: ../midori/midori-websettings.c:852 -msgid "Flash window on background tabs" -msgstr "ئارقا تەرەپتە بەتكۈچلەر ئېچىلسا كۆزنەك چاقنىسۇن" - -#: ../midori/midori-websettings.c:853 -msgid "Flash the browser window if a new tab was opened in the background" -msgstr "ئارقا تەرەپتە يېڭى بەتكۈچ ئېچىلسا توركۆرگۈ كۆزنىكى چاقنايدۇ" - -#: ../midori/midori-websettings.c:861 -msgid "Enable WebGL support" -msgstr "WebGL نى ئىناۋەتلىك قىل" - -#: ../midori/midori-websettings.c:862 -msgid "Allow websites to use OpenGL rendering" -msgstr "تورتۇرالارنى OpenGL ئارقىلىق سىزىشقا ئىجازەت" - -#: ../midori/midori-websettings.c:888 -msgid "Zoom Text and Images" -msgstr "تېكىست ۋە سۈرەتلەرنى چوڭايت تارايت" - -#: ../midori/midori-websettings.c:889 -msgid "Whether to zoom text and images" -msgstr "تېكىست ۋە سۈرەتلەرنى چوڭايتىدۇ ياكى تارايتىدۇ" - -#: ../midori/midori-websettings.c:904 -msgid "Find inline while typing" -msgstr "كىرگۈزگەن ھامان ئىزدە" - -#: ../midori/midori-websettings.c:905 -msgid "Whether to automatically find inline while typing" -msgstr "كۇنۇپكا بېسىلغان ھامان ئىزدەش ئېلىپ بارىدۇ" - -#: ../midori/midori-websettings.c:920 -msgid "Kinetic scrolling" -msgstr "Kinetic سىيرىلىش" - -#: ../midori/midori-websettings.c:921 -msgid "Whether scrolling should kinetically move according to speed" -msgstr "تېزلىكىگە ئاساسەن Kinetic سىيرىلىپ يۆتكىلىدۇ" - -#: ../midori/midori-websettings.c:929 -msgid "Delete old Cookies after:" -msgstr "بۇ ۋاقىتتىن كېيىن كونا Cookies ئۆچۈرسۇن:" - -#: ../midori/midori-websettings.c:930 -msgid "The maximum number of days to save cookies for" -msgstr "Cookie نىڭ ئەڭ ئۇزۇن ساقلىنىش ۋاقتى" - -#: ../midori/midori-websettings.c:946 -msgid "Only accept Cookies from sites you visit" -msgstr "سىز زىيارەت قىلغان تورتۇرادىن كەلگەن cookie لارنىلا قوبۇل قىلىدۇ" - -#: ../midori/midori-websettings.c:947 -msgid "Block cookies sent by third-party websites" -msgstr "ئۈچىنچى تەرەپ تورتۇراسىغا Cookies لارنى ئەۋەتىشنى توسۇن" - -#: ../midori/midori-websettings.c:961 -msgid "Delete pages from history after:" -msgstr "ئىزدىن بەتلەرنى بۇ ۋاقىتتىن كېيىن ئۆچۈرسۇن:" - -#: ../midori/midori-websettings.c:962 -msgid "The maximum number of days to save the history for" -msgstr "ئىزنىڭ ئەڭ ئۇزۇن ساقلىنىش ۋاقتى" - -#: ../midori/midori-websettings.c:977 -msgid "Proxy server" -msgstr "ۋاكالەتچى مۇلازىمېتىر" - -#: ../midori/midori-websettings.c:978 -msgid "The type of proxy server to use" -msgstr "ئىشلىتىدىغان ۋاكالەتچى مۇلازىمېتىرنىڭ تىپى" - -#: ../midori/midori-websettings.c:987 -msgid "HTTP Proxy Server" -msgstr "HTTP ۋاكالەتچى مۇلازىمېتىر" - -#: ../midori/midori-websettings.c:988 -msgid "The proxy server used for HTTP connections" -msgstr "HTTP باغلىنىشىدا ئىشلىتىدىغان ۋاكالەتچى مۇلازىمېتىرنى كۆرسىتىدۇ" - -#: ../midori/midori-websettings.c:1003 -msgid "Port" -msgstr "ئېغىز" - -#: ../midori/midori-websettings.c:1004 -msgid "The proxy server port used for HTTP connections" -msgstr "HTTP باغلىنىشىدا ئىشلىتىدىغان ۋاكالەتچى مۇلازىمېتىرنىڭ ئېغىزى" - -#: ../midori/midori-websettings.c:1022 -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 -msgid "Identify as" -msgstr "تونۇتۇلىدۇ" - -#: ../midori/midori-websettings.c:1040 -msgid "What to identify as to web pages" -msgstr "قانداقلىرىنى تور بېتى دەپ تونۇتىدىغانلىقىنى بېكىتىدۇ" - -#: ../midori/midori-websettings.c:1056 -msgid "Identification string" -msgstr "تونۇش ھەرپ تىزمىسى" - -#: ../midori/midori-websettings.c:1057 -msgid "The application identification string" -msgstr "پروگراممىنىڭ كىملىك تېكىستى" - -#: ../midori/midori-websettings.c:1073 -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,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" - -#: ../midori/midori-websettings.c:1089 -msgid "Clear private data" -msgstr "شەخسىي سانلىق-مەلۇماتلارنى تازىلا" - -#: ../midori/midori-websettings.c:1090 -msgid "The private data selected for deletion" -msgstr "تالانغان شەخسىي سانلىق-مەلۇماتلارنى ئۆچۈرىدۇ" - -#: ../midori/midori-websettings.c:1105 -msgid "Clear data" -msgstr "شەخسىي سانلىق-مەلۇماتلارنى تازىلا" - -#: ../midori/midori-websettings.c:1106 -msgid "The data selected for deletion" -msgstr "ئۆچۈرۈش ئۈچۈن تاللانغان سانلىق-مەلۇماتلار" - -#. i18n: Reworded: Shorten details propagated when going to another page -#: ../midori/midori-websettings.c:1155 -msgid "Strip referrer details sent to websites" -msgstr "تورتۇرالارغا ئەۋەتىلىدىغان پايدىلىنىشنىڭ تەپسىلاتلىرى چىقىرىۋېتىلسۇن" - -#. i18n: Referer here is not a typo but a technical term -#: ../midori/midori-websettings.c:1157 -msgid "Whether the \"Referer\" header should be shortened to the hostname" -msgstr "بۇنىڭدا «Referer» قېشى قىسقارتىلىۋېتىلىدۇ." - -#: ../midori/midori-websettings.c:1171 -msgid "Always use my font choices" -msgstr "ھەمىشە مەن تاللىغان خەت نۇسخىسىنى ئىشلەت" - -#: ../midori/midori-websettings.c:1172 -msgid "Override fonts picked by websites with user preferences" -msgstr "" -"تور بەتلىرىدىكى خەت نۇسخىلىرىدىنمۇ بەكرەك ئىشلەتكۈچى تەڭشىكى ئابرۇيلۇق بولسۇن" - -#: ../midori/midori-view.c:1002 ../midori/midori-view.c:1140 -msgid "Trust this website" -msgstr "بۇ تورتۇراغا ئىشەن" - -#: ../midori/midori-view.c:1138 -msgid "Security unknown" -msgstr "بىخەتەرلىكى نامەلۇم" - -#: ../midori/midori-view.c:1436 -#, c-format -msgid "%s wants to save an HTML5 database." -msgstr "%s نىڭ بىر HTML ساندىنىغا ساقلىغۇسى بار ئىكەن." - -#: ../midori/midori-view.c:1440 ../midori/midori-view.c:1474 -msgid "_Deny" -msgstr "رەت قىل(_D)" - -#: ../midori/midori-view.c:1440 ../midori/midori-view.c:1474 -msgid "_Allow" -msgstr "ئىجازەت(_A)" - -#: ../midori/midori-view.c:1469 -#, c-format -msgid "%s wants to know your location." -msgstr "%s نىڭ ئورنىڭىزنى بىلگۈسى بار ئىكەن." - -#: ../midori/midori-view.c:1565 -#, c-format -msgid "Error - %s" -msgstr "خاتالىق - %s" - -#: ../midori/midori-view.c:1566 -#, c-format -msgid "The page '%s' couldn't be loaded." -msgstr "بەت ‹%s› نى ئوقۇغىلى بولمىدى." - -#: ../midori/midori-view.c:1568 -msgid "Try again" -msgstr "قايتا سىناپ كۆر" - -#: ../midori/midori-view.c:1766 ../midori/midori-view.c:2879 -#, c-format -msgid "Send a message to %s" -msgstr "%s غا ئۇچۇر ئەۋەتىدۇ" - -#: ../midori/midori-view.c:2665 -msgid "Add _search engine..." -msgstr "ئىزدەش ماتورى قوش(_S)…" - -#: ../midori/midori-view.c:2709 ../midori/midori-view.c:3035 -msgid "Inspect _Element" -msgstr "ئېلېمېنتلارنى تەكشۈر(_E)" - -#: ../midori/midori-view.c:2761 -msgid "Open Link in New _Tab" -msgstr "ئۇلانمىنى يېڭى بەتكۈچتە ئاچ(_T)" - -#: ../midori/midori-view.c:2765 -msgid "Open Link in _Foreground Tab" -msgstr "ئۇلانمىنى ئەڭ ئالدىدىكى بەتكۈچتە ئاچ(_T)" - -#: ../midori/midori-view.c:2766 -msgid "Open Link in _Background Tab" -msgstr "ئۇلانمىنى ئەڭ ئاخىرقى بەتكۈچتە ئاچ(_T)" - -#: ../midori/midori-view.c:2769 -msgid "Open Link in New _Window" -msgstr "ئۇلانمىنى يېڭى كۆزنەكتە ئاچ(_W)" - -#: ../midori/midori-view.c:2772 -msgid "Open Link as Web A_pplication" -msgstr "ئۇلانمىنى تور پروگراممىسى دەپ قاراپ ئاچ(_P)" - -#: ../midori/midori-view.c:2777 -msgid "Copy Link de_stination" -msgstr "ئۇلانما نىشانىنى كۆچۈر(_S)" - -#: ../midori/midori-view.c:2793 -msgid "Open _Image in New Tab" -msgstr "سۈرەتنى يېڭى بەتكۈچتە ئاچ(_I)" - -#: ../midori/midori-view.c:2796 -msgid "Copy Image _Address" -msgstr "سۈرەت ئادرېسىنى كۆچۈر(_A)" - -#: ../midori/midori-view.c:2799 -msgid "Save I_mage" -msgstr "سۈرەتنى ساقلا(_M)" - -#: ../midori/midori-view.c:2802 -msgid "Open in Image _Viewer" -msgstr "سۈرەت كۆرگۈدە ئاچ(_V)" - -#: ../midori/midori-view.c:2809 -msgid "Copy Video _Address" -msgstr "سىن ئادرېسىنى كۆچۈر(_A)" - -#: ../midori/midori-view.c:2812 -msgid "Save _Video" -msgstr "سىننى ساقلا(_V)" - -#: ../midori/midori-view.c:2812 -msgid "Download _Video" -msgstr "سىننى چۈشۈر(_V)" - -#: ../midori/midori-view.c:2838 -msgid "Search _with" -msgstr "ئىزدە(_W)" - -#: ../midori/midori-view.c:2870 -msgid "_Search the Web" -msgstr "توردا ئىزدە(_S)" - -#: ../midori/midori-view.c:2887 -msgid "Open Address in New _Tab" -msgstr "ئادرېسنى يېڭى بەتكۈچتە ئاچ(_T)" - -#: ../midori/midori-view.c:2940 -msgid "Open _Frame in New Tab" -msgstr "كاندۇكنى يېڭى بەتكۈچتە ئاچ(_F)" - -#: ../midori/midori-view.c:3201 -#, c-format -msgid "Open or download file from %s" -msgstr "ھۆججەتنى %s دىن ئېچىش ياكى چۈشۈرۈش" - -#: ../midori/midori-view.c:3225 -#, c-format -msgid "File Name: %s" -msgstr "ھۆججەت ئاتى: ‹%s›" - -#: ../midori/midori-view.c:3230 -#, c-format -msgid "File Type: '%s'" -msgstr "ھۆججەت تىپى: ‹%s›" - -#: ../midori/midori-view.c:3232 -#, c-format -msgid "File Type: %s ('%s')" -msgstr "ھۆججەت تىپى: %s (‹%s›)" - -#: ../midori/midori-view.c:3267 -#, c-format -msgid "Size: %s" -msgstr "چوڭلۇقى: %s" - -#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:3278 -#, c-format -msgid "Open %s" -msgstr "%s نى ئاچ" - -#: ../midori/midori-view.c:3897 -#, c-format -msgid "Inspect page - %s" -msgstr "بەتنى تەكشۈر - %s" - -#: ../midori/midori-view.c:4252 -msgid "Speed Dial" -msgstr "تېز تېلېفون قىلىش" - -#: ../midori/midori-view.c:4253 ../midori/midori-view.c:4359 -msgid "Click to add a shortcut" -msgstr "چەكسە تېزلەتمىگە قوشۇلىدۇ" - -#: ../midori/midori-view.c:4254 -msgid "Enter shortcut address" -msgstr "تېزلەتمە ئادرېسىنى كىرگۈز" - -#: ../midori/midori-view.c:4255 -msgid "Enter shortcut title" -msgstr "تېزلەتمە ماۋزۇسىنى كىرگۈز" - -#: ../midori/midori-view.c:4256 -msgid "Are you sure you want to delete this shortcut?" -msgstr "بۇ تېزلەتمىنى راستلا ئۆچۈرەمسىز؟" - -#: ../midori/midori-view.c:4429 -#, c-format -msgid "No documentation installed" -msgstr "پۈتۈك ئورنىتىلمىغان" - -#: ../midori/midori-view.c:4506 -msgid "Midori doesn't store any personal data:" -msgstr "مىدورى(Midori) ھېچقانداق شەخسىي ئۇچۇرلارنى ساقلىمايدۇ:" - -#: ../midori/midori-view.c:4507 -msgid "No history or web cookies are being saved." -msgstr "ھېچقانداق ئىز ۋە cookies لار ساقلانمىغان." - -#: ../midori/midori-view.c:4508 -msgid "Extensions are disabled." -msgstr "كېڭەيتىلمىلەر چەكلەنگەن." - -#: ../midori/midori-view.c:4509 -msgid "HTML5 storage, local database and application caches are disabled." -msgstr "يەرلىك ساندان، HTML5 ساقلىغۇچى ۋە پروگرامما غەملىكى چەكلەنگەن." - -#: ../midori/midori-view.c:4510 -msgid "Midori prevents websites from tracking the user:" -msgstr "مىدورى(Midori) تورتۇرالارنىڭ ئىشلەتكۈچىنى ئىزلىشىنى توسىدۇ:" - -#: ../midori/midori-view.c:4511 -msgid "Referrer URLs are stripped down to the hostname." -msgstr "" - -#: ../midori/midori-view.c:4512 -msgid "DNS prefetching is disabled." -msgstr "" - -#: ../midori/midori-view.c:4513 -msgid "The language and timezone are not revealed to websites." -msgstr "تىل ۋە ۋاقىت رايونى تورتۇراغا ئاشكارىلانمايدۇ." - -#: ../midori/midori-view.c:4514 -msgid "Flash and other Netscape plugins cannot be listed by websites." -msgstr "بۇنىڭدا Flash ياكى Netscape قىستۇرمىلىرى تورتۇراغا خاتىرىلەنمەيدۇ." - -#: ../midori/midori-view.c:4603 -msgid "Version numbers in brackets show the version used at runtime." -msgstr "" - -#: ../midori/midori-view.c:4653 -msgid "Page loading delayed" -msgstr "بەتنى ئوقۇش كېچىكتۈرۈلدى" - -#: ../midori/midori-view.c:4654 -msgid "Loading delayed either due to a recent crash or startup preferences." -msgstr "غۇلاش ياكى قوزغىلىش مايىللىقى سەۋەبىدىن ئوقۇش كېچىكتۈرۈلدى." - -#: ../midori/midori-view.c:4655 -msgid "Load Page" -msgstr "بەتنى ئوقۇش" - -#: ../midori/midori-view.c:4822 -msgid "Blank page" -msgstr "بوش بەت" - -#: ../midori/midori-view.c:5086 -msgid "_Duplicate Tab" -msgstr "بەتكۈچنى تۇغدۇر(_D)" - -#: ../midori/midori-view.c:5091 -msgid "Show Tab _Label" -msgstr "بەتكۈچ ئەنىنى كۆرسەت(_L)" - -#: ../midori/midori-view.c:5091 -msgid "Show Tab _Icon Only" -msgstr "پەقەت بەتكۈچ سىنبەلگىسىنىلا كۆرسەت(_I)" - -#: ../midori/midori-view.c:5098 -msgid "Close Ot_her Tab" -msgid_plural "Close Ot_her Tabs" -msgstr[0] "باشقا بەتكۈچلەرنى تاقا(_H)" - -#. i18n: word stem of "previous page" type links, case is not important -#: ../midori/midori-view.c:5934 -msgid "previous" -msgstr "ئالدىنقى" - -#. i18n: word stem of "next page" type links, case is not important -#: ../midori/midori-view.c:5953 -msgid "next" -msgstr "كېيىنكى" - -#: ../midori/midori-view.c:5966 -msgid "Print background images" -msgstr "تەگ سۈرىتىنى بېسىپ چىقار" - -#: ../midori/midori-view.c:5967 -msgid "Whether background images should be printed" -msgstr "تەگ سۈرىتىنى بېسىپ چىقىرىدۇ" - -#: ../midori/midori-view.c:5999 -msgid "Features" -msgstr "ئىقتىدار" - -#: ../midori/midori-preferences.c:298 -msgid "Startup" -msgstr "قوزغات" - -#: ../midori/midori-preferences.c:311 -msgid "Use _current page" -msgstr "ھازىرقى بەتنى ئىشلىتىدۇ(_C)" - -#: ../midori/midori-preferences.c:315 -msgid "Use current page as homepage" -msgstr "ھازىرقى بەتنى ماكان بەت قىلىدۇ" - -#. Page "Appearance" -#: ../midori/midori-preferences.c:324 -msgid "Fonts" -msgstr "خەت نۇسخىسى" - -#: ../midori/midori-preferences.c:327 -msgid "Proportional Font Family" -msgstr "كەڭلىكى تەڭ بولمىغان خەت نۇسخىلىرى" - -#: ../midori/midori-preferences.c:331 -msgid "The default font family used to display text" -msgstr "تېكىستلەرنى كۆرسىتىدىغان كۆڭۈلدىكى فونت" - -#: ../midori/midori-preferences.c:334 -msgid "The default font size used to display text" -msgstr "تېكىستلەرنى كۆرسىتىدىغان كۆڭۈلدىكى فونتنىڭ چوڭلۇقى" - -#: ../midori/midori-preferences.c:336 -msgid "Fixed-width Font Family" -msgstr "تەڭ كەڭلىكتىكى فونت" - -#: ../midori/midori-preferences.c:340 -msgid "The font family used to display fixed-width text" -msgstr "تېكىستلەرنى تەڭ كەڭلىكتە كۆرسىتىدىغان فونت" - -#: ../midori/midori-preferences.c:343 -msgid "The font size used to display fixed-width text" -msgstr "تېكىستلەرنى تەڭ كەڭلىكتە كۆرسىتىدىغان فونتنىڭ چوڭلۇقى" - -#: ../midori/midori-preferences.c:345 -msgid "Minimum Font Size" -msgstr "فونتنىڭ ئەڭ كىچىك چوڭلۇقى" - -#: ../midori/midori-preferences.c:349 -msgid "The minimum font size used to display text" -msgstr "تېكىستلەرنى كۆرسىتىدىغان فونتنىڭ ئەڭ كىچىك چوڭلۇقى" - -#. Page "Behavior" -#: ../midori/midori-preferences.c:360 -msgid "Behavior" -msgstr "ھەرىكىتى" - -#: ../midori/midori-preferences.c:386 -msgid "Allow scripts to open popups" -msgstr "قوليازما ئىشلىتىپ سەكرىمىلەرنى چىقىرىشقا رۇخسەت قىل" - -#: ../midori/midori-preferences.c:387 -msgid "Whether scripts are allowed to open popup windows automatically" -msgstr "قوليازما ئىشلىتىپ سەكرىمىلەرنى چىقىرىشقا رۇخسەت قىلىدۇ" - -#. Page "Interface" -#: ../midori/midori-preferences.c:418 -msgid "Browsing" -msgstr "كۆز يۈگۈرت" - -#. Page "Network" -#: ../midori/midori-preferences.c:458 -msgid "Network" -msgstr "تور" - -#: ../midori/midori-preferences.c:465 -msgid "Hostname" -msgstr "مۇلازىمېتىر نامى" - -#: ../midori/midori-preferences.c:489 -msgid "MB" -msgstr "م ب" - -#: ../midori/midori-searchaction.c:957 -msgid "Add search engine" -msgstr "ئىزدەش ماتورى قوش" - -#: ../midori/midori-searchaction.c:957 -msgid "Edit search engine" -msgstr "ئىزدەش ماتورى تەھرىرلە" - -#: ../midori/midori-searchaction.c:985 -msgid "_Name:" -msgstr "ئاتى(_N):" - -#: ../midori/midori-searchaction.c:1000 -msgid "_Description:" -msgstr "چۈشەندۈرۈش(_D):" - -#: ../midori/midori-searchaction.c:1013 ../extensions/feed-panel/main.c:377 -msgid "_Address:" -msgstr "ئادرېس(_A):" - -#: ../midori/midori-searchaction.c:1032 -msgid "_Token:" -msgstr "ماياق(_T):" - -#: ../midori/midori-searchaction.c:1330 -msgid "Manage Search Engines" -msgstr "ئىزدەش ماتورىنى باشقۇرۇش" - -#: ../midori/midori-searchaction.c:1432 -msgid "Use as _default" -msgstr "كۆڭۈلدىكى قىلىپ ئىشلەت(_D)" - -#: ../midori/sokoke.c:346 -msgid "Open with" -msgstr "بۇنىڭدا ئاچ" - -#: ../midori/sokoke.c:354 -#, c-format -msgid "Choose an application or command to open \"%s\":" -msgstr "«%s» نى ئاچىدىغان پروگرامما ياكى بۇيرۇقنى تاللاڭ." - -#: ../midori/sokoke.c:468 ../midori/sokoke.c:482 -msgid "Could not run external program." -msgstr "سىرتقى پروگراممىنى ئىجرا قىلغىلى بولمىدى" - -#: ../midori/sokoke.c:1443 -#, c-format -msgid "%d hour" -msgid_plural "%d hours" -msgstr[0] "%d سائەت" - -#: ../midori/sokoke.c:1444 -#, c-format -msgid "%d minute" -msgid_plural "%d minutes" -msgstr[0] "%d مىنۇت" - -#: ../midori/sokoke.c:1445 -#, c-format -msgid "%d second" -msgid_plural "%d seconds" -msgstr[0] "%d سېكۇنت" - -#. i18n: Download tooltip (size): 4KB of 43MB -#: ../midori/sokoke.c:1453 ../panels/midori-transfers.c:268 -#, c-format -msgid "%s of %s" -msgstr "%s / %s" - -#. i18n: Unknown number of bytes, used for transfer rate like ?B/s -#: ../midori/sokoke.c:1462 -msgid "?B" -msgstr "؟ب" - -#. i18n: Download tooltip (transfer rate): (130KB/s) -#: ../midori/sokoke.c:1465 -#, c-format -msgid " (%s/s)" -msgstr " (%s/s)" - -#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning -#: ../midori/sokoke.c:1482 -#, c-format -msgid " - %s remaining" -msgstr " - %s قالدى" - -#. i18n: A panel at the bottom, to search text in pages -#: ../toolbars/midori-findbar.c:265 -msgid "_Inline Find:" -msgstr "" - -#: ../toolbars/midori-findbar.c:287 -msgid "Previous" -msgstr "ئالدىنقى" - -#: ../toolbars/midori-findbar.c:293 -msgid "Next" -msgstr "كېيىنكى" - -#: ../toolbars/midori-findbar.c:297 -msgid "Match Case" -msgstr "چوڭ كىچىكلىكىگە قارىسۇن" - -#: ../toolbars/midori-findbar.c:306 -msgid "Highlight Matches" -msgstr "ماس كەلگەنلىرىنى يورۇتسۇن" - -#: ../toolbars/midori-findbar.c:317 -msgid "Close Findbar" -msgstr "تېپىش بالدىقىنى تاقاش" - -#: ../toolbars/midori-transferbar.c:124 -#, c-format -msgid "The file '%s' has been downloaded." -msgstr "ھۆججەت '%s' چۈشۈرۈلدى." - -#: ../toolbars/midori-transferbar.c:129 -msgid "Transfer completed" -msgstr "ئۇزىتىش تاماملاندى" - -#: ../toolbars/midori-transferbar.c:201 -msgid "The downloaded file is erroneous." -msgstr "چۈشۈرگەن ھۆججەتتە خاتالىقلار بار." - -#: ../toolbars/midori-transferbar.c:202 -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:345 ../panels/midori-transfers.c:142 -msgid "Clear All" -msgstr "ھەممىنى تازىلا" - -#: ../toolbars/midori-transferbar.c:382 ../toolbars/midori-transferbar.c:384 -msgid "Some files are being downloaded" -msgstr "بەزى ھۆججەتلەر چۈشۈرۈلىدۇ" - -#: ../toolbars/midori-transferbar.c:388 -msgid "_Quit Midori" -msgstr "مىدورى(Midori) نى ئاخىرلاشتۇر(_Q)" - -#: ../toolbars/midori-transferbar.c:390 -msgid "The transfers will be cancelled if Midori quits." -msgstr "مىدورى(Midori) ئاخىرلاشتۇرۇلسا ئۇزىتىشلار ئۈزۈلىدۇ." - -#: ../panels/midori-bookmarks.c:308 -#, c-format -msgid "Failed to add bookmark item: %s\n" -msgstr "خەتكۈش تۇرىنى ئېچىش مەغلۇپ بولدى: %s\n" - -#: ../panels/midori-bookmarks.c:475 -#, c-format -msgid "Failed to update bookmark : %s\n" -msgstr "خەتكۈش يېڭىلاش مەغلۇپ بولدى: %s\n" - -#: ../panels/midori-bookmarks.c:535 -msgid "Edit the selected bookmark" -msgstr "تاللانغان خەتكۈشنى تەھرىرلەيدۇ" - -#: ../panels/midori-bookmarks.c:543 -msgid "Delete the selected bookmark" -msgstr "تاللانغان خەتكۈشنى ئۆچۈرىدۇ" - -#: ../panels/midori-bookmarks.c:558 -msgid "Add a new folder" -msgstr "يېڭى مۇندەرىجە قوش" - -#: ../panels/midori-bookmarks.c:697 ../panels/midori-history.c:638 -msgid "Separator" -msgstr "ئايرىغۇچ" - -#. Create the filter entry -#: ../panels/midori-bookmarks.c:1027 -msgid "Search Bookmarks" -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] "%d كۈن بۇرۇن" - -#: ../panels/midori-history.c:165 ../panels/midori-history.c:184 -msgid "A week ago" -msgstr "بىر ھەپتە بۇرۇن" - -#: ../panels/midori-history.c:232 -#, c-format -msgid "Failed to remove history item: %s\n" -msgstr "ئىز ئۆچۈرۈش مەغلۇپ بولدى: %s\n" - -#: ../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 "بارلىق ئىزنى تازىلايدۇ" - -#. Create the filter entry -#: ../panels/midori-history.c:997 -msgid "Search History" -msgstr "ئىزدەش ئىزلىرى" - -#: ../panels/midori-transfers.c:87 -msgid "Transfers" -msgstr "ئۇزاتقانلىرى" - -#: ../panels/midori-transfers.c:470 -msgid "Open Destination _Folder" -msgstr "نىشان مۇندەرىجىنى ئاچ(_F)" - -#: ../panels/midori-transfers.c:473 -msgid "Copy Link Loc_ation" -msgstr "ئۇلانما ئورنىنى كۆچۈر(_A)" - -#: ../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 "ئىمنى ئەستە تۇتۇۋال(_R)" - -#: ../katze/katze-throbber.c:949 -#, c-format -msgid "Named icon '%s' couldn't be loaded" -msgstr "ئات قويۇلغان سىنبەلگە ‹%s› نى ئوقۇغىلى بولمىدى" - -#: ../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:443 ../katze/katze-utils.c:867 -#, c-format -msgid "Property '%s' is invalid for %s" -msgstr "خاسلىق ‹%s› ئىناۋەتسىز (%s نىڭ خاسلىقى)" - -#: ../katze/katze-utils.c:489 ../katze/katze-utils.c:518 -#: ../extensions/addons.c:308 -msgid "Choose file" -msgstr "ھۆججەت تاللا" - -#: ../katze/katze-utils.c:504 -msgid "Choose folder" -msgstr "مۇندەرىجە تاللا" - -#: ../katze/katze-utils.c:602 -msgid "None" -msgstr "يوق" - -#: ../katze/katze-utils.c:717 -msgid "1 hour" -msgstr "بىر سائەت" - -#: ../katze/katze-utils.c:718 -msgid "1 day" -msgstr "بىر كۈن" - -#: ../katze/katze-utils.c:719 -msgid "1 week" -msgstr "بىر ھەپتە" - -#: ../katze/katze-utils.c:720 -msgid "1 month" -msgstr "بىر ئاي" - -#: ../katze/katze-utils.c:721 -msgid "1 year" -msgstr "بىر يىل" - -#: ../katze/katze-preferences.c:98 ../extensions/history-list.vala:235 -#, c-format -msgid "Preferences for %s" -msgstr "%s نى تەڭشىكى" - -#: ../extensions/adblock.c:470 -msgid "Configure Advertisement filters" -msgstr "ئېلان سۈزگۈچىنى تەڭشەش" - -#: ../extensions/adblock.c:503 -#, 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:917 -msgid "Edit rule" -msgstr "تۇزۇم تەھرىرلە" - -#: ../extensions/adblock.c:931 -msgid "_Rule:" -msgstr "تۇزۇم(_R):" - -#: ../extensions/adblock.c:985 -msgid "Bl_ock image" -msgstr "سۈرەتنى چەكلە(_O)" - -#: ../extensions/adblock.c:990 -msgid "Bl_ock link" -msgstr "ئۇلانمىنى چەكلە(_O)" - -#: ../extensions/adblock.c:1689 -msgid "Advertisement blocker" -msgstr "ئېلان چەكلىگۈ" - -#: ../extensions/adblock.c:1690 -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 "ئىشلەتكۈچى قوليازما(script)سىنى ئورنات(_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:677 -msgid "Userscripts" -msgstr "Userscripts" - -#: ../extensions/addons.c:324 ../extensions/addons.c:679 -msgid "Userstyles" -msgstr "ئىشلەتكۈچى ئۇسلۇبى" - -#: ../extensions/addons.c:370 ../extensions/addons.c:449 -#: ../extensions/feed-panel/main.c:129 -msgid "Error" -msgstr "خاتالىق" - -#: ../extensions/addons.c:411 -#, c-format -msgid "Do you want to delete '%s'?" -msgstr "سىزنىڭ ‹%s› نى ئۆچۈرگۈڭىز بارمۇ؟" - -#: ../extensions/addons.c:417 -msgid "Delete user script" -msgstr "ئىشلەتكۈچى قوليازما پروگراممىسىنى ئۆچۈر" - -#: ../extensions/addons.c:418 -msgid "Delete user style" -msgstr "ئىشلەتكۈچى ئۇسلۇبىنى ئۆچۈر" - -#: ../extensions/addons.c:421 -#, c-format -msgid "The file %s will be permanently deleted." -msgstr "ھۆججەت %s مەڭگۈلۈككە ئۆچۈرۈلىدۇ." - -#: ../extensions/addons.c:566 ../extensions/addons.c:643 -msgid "Open in Text Editor" -msgstr "تېكىست تەھرىرلىگۈدە ئېچىش" - -#: ../extensions/addons.c:568 ../extensions/addons.c:652 -msgid "Open Target Folder" -msgstr "نىشان مۇندەرىجىنى ئېچىش" - -#: ../extensions/addons.c:634 -msgid "Add new addon" -msgstr "يېڭى قوشۇلما قوش" - -#: ../extensions/addons.c:660 -msgid "Remove selected addon" -msgstr "تاللانغان قوشۇلمىنى ئۆچۈر" - -#: ../extensions/addons.c:1689 ../extensions/addons.c:1907 -msgid "User addons" -msgstr "ئىشلەتكۈچى قوشۇلمىسى" - -#: ../extensions/addons.c:1819 -#, c-format -msgid "Can't monitor folder '%s': %s" -msgstr "قىسقۇچ ‹%s› نى كۆزەتكىلى بولمىدى: %s" - -#: ../extensions/addons.c:1908 -msgid "Support for userscripts and userstyles" -msgstr "" -"ئىشلەتكۈچى قوليازمىسى(userscripts ۋە) ئىشلەتكۈچى ئۇسلۇبىنى ئىشلەتكىلى بولىدۇ" - -#: ../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 "كۇكى(Cookie) باشقۇرغۇ" - -#: ../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 "" -"كۆرۈنگەن ھەممە كۇكى(Cookie) نى ئۆچۈرىدۇ. ئەگەر سۈزگۈچ بار بولسا، " -"سۈزۈلگەننىلا ئۆچۈرىدۇ." - -#: ../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 "ھەممە كۇكى(Cookie)نى راستلا ئۆچۈرەمسىز؟" - -#: ../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 "سۈزۈلگەن كۇكى(Cookie) نىلا ئۆچۈرىدۇ." - -#: ../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 "" -"Host: %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" -"كۇكى(Cookie) سانى: %d" - -#: ../extensions/cookie-manager/cookie-manager-page.c:1017 -msgid "Name" -msgstr "ئاتى" - -#: ../extensions/cookie-manager/cookie-manager-page.c:1069 -msgid "_Expand All" -msgstr "ھەممىنى ياي(_E)" - -#: ../extensions/cookie-manager/cookie-manager-page.c:1077 -msgid "_Collapse All" -msgstr "ھەممىنى قاتلا(_C)" - -#: ../extensions/cookie-manager/cookie-manager-page.c:1129 -msgid "Search Cookies by Name or Domain" -msgstr "ئاتى ياكى دائىرە بويىچە كۇكى(Cookie)لارنى ئىزدەش" - -#: ../extensions/cookie-manager/main.c:36 -msgid "List, view and delete cookies" -msgstr "كۇكى(Cookie) نى تىزىپ كۆرسىتىدۇ، كۆرىدۇ، ئۆچۈرىدۇ" - -#: ../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 غا زۆرۈر بولغان Atom \"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 "فىدلار(Feeds)" - -#: ../extensions/feed-panel/feed-panel.c:706 -msgid "Add new feed" -msgstr "يېڭى فىد(feed) قوش" - -#: ../extensions/feed-panel/feed-panel.c:713 -msgid "Delete feed" -msgstr "فىد(feed) ئۆچۈر" - -#: ../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 "فىد(feed) XML ئىچىدىن root ئېلېمېنتىنى تېپىش مەغلۇپ بولدى" - -#: ../extensions/feed-panel/feed-parse.c:235 -#, c-format -msgid "Unsupported feed format." -msgstr "بۇ خىل فىد(feed) فورماتىنى تېخى ئىشلەتكىلى بولمايدۇ" - -#: ../extensions/feed-panel/feed-parse.c:265 -#, c-format -msgid "Failed to parse XML feed: %s" -msgstr "XML فىد(feed) نى تەھلىل قىلىش مەغلۇپ بولدى: %s" - -#: ../extensions/feed-panel/feed-rss.c:46 -msgid "Failed to find \"channel\" element in RSS XML data." -msgstr "RSS XML ئىچىدىن \"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 "فىد(feed) ‹%s› مەۋجۇت" - -#: ../extensions/feed-panel/main.c:208 -#, c-format -msgid "Error loading feed '%s'" -msgstr "فىد(feed) ‹%s› نى ئوقۇشتا خاتالىق كۆرۈلدى" - -#: ../extensions/feed-panel/main.c:518 -msgid "Feed Panel" -msgstr "فىد(feed) كۆزنىكى" - -#: ../extensions/feed-panel/main.c:519 -msgid "Read Atom/ RSS feeds" -msgstr "Atom/RSS فىد(feed) نى ئوقۇۋاتىدۇ" - -#: ../extensions/formhistory/formhistory.c:39 -#, c-format -msgid "Failed to add form value: %s\n" -msgstr "جەدۋەل(form) قىممىتىنى قوشۇش مەغلۇپ بولدى: %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 "بۇ بەتنىڭ ئىمنى ئەستە تۇتۇۋالسۇنمۇ(_R)" - -#: ../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 "جەدۋەل(form) ئىزىنىڭ ھالىتىنى ئالماشتۇرۇش" - -#: ../extensions/formhistory/formhistory.c:438 -msgid "Activate or deactivate form history for the current tab." -msgstr "" -"نۆۋەتتىكى بەتكۈچنىڭ جەدۋەل(form) ئىزىنىڭ ھالىتىنى ئاكتىپلايدۇ/ئاكتىپسىزلايدۇ" - -#: ../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 "" -"ھەر بىر بەتكۈچنىڭ جەدۋەل(form) ئىزىنى پەقەت (Ctrl+Shift+F) ئارقىلىق " -"ئاكتىپلىسۇن" - -#: ../extensions/formhistory/formhistory.c:668 -msgid "Form history filler" -msgstr "جەدۋەل(form) ئىزى تولدۇرغۇ" - -#: ../extensions/formhistory/formhistory.c:669 -msgid "Stores history of entered form data" -msgstr "جەدۋەل(form) كىرگۈزۈلگەن ئۇچۇرلارنى ئەستە ساقلىۋالىدۇ" - -#: ../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:302 -msgid "Control Midori by moving the mouse" -msgstr "چاشقىنەك ھەرىكىتىدە مىدورى(Midori) نى باشقۇرىدۇ" - -#: ../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:152 -msgid "Images" -msgstr "سۈرەتلەر" - -#: ../extensions/statusbar-features.c:162 -msgid "Scripts" -msgstr "قوليازمىلار" - -#: ../extensions/statusbar-features.c:174 -msgid "Netscape plugins" -msgstr "Netscape قىستۇرمىلىرى" - -#: ../extensions/statusbar-features.c:259 -msgid "Statusbar Features" -msgstr "ھالەت بالدىقى ئالاھىدىلىكلىرى" - -#: ../extensions/statusbar-features.c:260 -msgid "Easily toggle features on web pages on and off" -msgstr "تور بەتنىڭ ئىقتىدارىنى ئاسانلا ئىناۋەتلىك/ئىناۋەتسىز قىلىدۇ" - -#: ../extensions/tab-panel.c:589 ../extensions/tab-panel.c:676 -msgid "Tab Panel" -msgstr "بەتكۈچ كۆزنەك" - -#: ../extensions/tab-panel.c:659 -msgid "T_ab Panel" -msgstr "بەتكۈچ كۆزنەك(_A)" - -#: ../extensions/tab-panel.c:677 -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:395 -msgid "Customize Toolbar" -msgstr "قورال ئىستونىنى ئۆزلەشتۈرۈش" - -#: ../extensions/toolbar-editor.c:411 -msgid "" -"Select items to be displayed on the toolbar. Items can be reordered by drag " -"and drop." -msgstr "" -"قورال بالدىقىدا كۆرسىتىلىدىغان تۈرلەرنى تاللا. ئۇلارنى ئۇنىڭ تەرتىپىنى تۇتۇپ " -"تاشلاپ ئۆزگەرتىشكە بولىدۇ" - -#: ../extensions/toolbar-editor.c:427 -msgid "Available Items" -msgstr "بار تۈرلەر" - -#: ../extensions/toolbar-editor.c:448 -msgid "Displayed Items" -msgstr "كۆرسىتىدىغان تۈرلەر" - -#: ../extensions/toolbar-editor.c:588 -msgid "_Customize Toolbar…" -msgstr "قورال بالدىقىنى ئۆزلەشتۈر(_C)…" - -#: ../extensions/toolbar-editor.c:617 -msgid "Toolbar Editor" -msgstr "قورال بالدىقى تەھرىرلىگۈ" - -#: ../extensions/toolbar-editor.c:618 -msgid "Easily edit the toolbar layout" -msgstr "قورال بالدىقىنىڭ ئورۇنلاشتۇرۇلۇشىنى ئاسانلا تەھرىرلىگىلى بولىدۇ" - -#: ../extensions/web-cache.c:463 -msgid "Cache HTTP communication on disk" -msgstr "HTTP ئالاقىسىنى دىسكىغا غەملەيدۇ" +# Uyghur translations for midori package. +# Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER +# This file is distributed under the same license as the midori package. +# Gheyret T.Kenji , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: Midori 0.1.9\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-06-21 04:08+0000\n" +"PO-Revision-Date: 2010-05-04 16:34+0900\n" +"Last-Translator: Gheyret T.Kenji \n" +"Language-Team: Uyghur Computer Science Association \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 "يېنىك توركۆرگۈ" + +#: ../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 +msgid "Midori" +msgstr "Midori" + +#: ../data/midori.desktop.in.h:3 +msgid "Web Browser" +msgstr "توركۆرگۈ" + +#: ../midori/main.c:102 +#, c-format +msgid "The configuration couldn't be loaded: %s\n" +msgstr "تەڭشەكنى ئوقۇغىلى بولمىدى: %s\n" + +#: ../midori/main.c:151 +#, c-format +msgid "Value '%s' is invalid for %s" +msgstr "'%s' نى %s نىڭ قىممىتى قىلىپ ئىشلەتكىلى بولمايدۇ" + +#: ../midori/main.c:158 ../midori/main.c:244 +#, c-format +msgid "Invalid configuration value '%s'" +msgstr "تەڭشەك قىممىتى '%s' خاتا" + +#: ../midori/main.c:370 ../midori/main.c:442 ../extensions/formhistory.c:446 +#, 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:425 +#, c-format +msgid "Failed to remove old history items: %s\n" +msgstr "كونا ئىزلارنى ئېچىش مەغلۇپ بولدى: %s\n" + +#: ../midori/main.c:468 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "خەتكۈچنى ساقلىغىلى بولمىدى. %s" + +#: ../midori/main.c:500 +#, c-format +msgid "The configuration couldn't be saved. %s" +msgstr "تەڭشەكنى ساقلىغىلى بولمىدى. %s" + +#: ../midori/main.c:538 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "ئىزدەش ماتورىنى ساقلىغىنى بولمىدى. %s " + +#. i18n: Trash, or wastebin, containing closed tabs +#: ../midori/main.c:558 ../midori/main.c:581 +#, c-format +msgid "The trash couldn't be saved. %s" +msgstr "ئەخلەتنى ساقلىغىلى بولمىدى. %s" + +#: ../midori/main.c:640 ../midori/main.c:880 +#, c-format +msgid "The session couldn't be saved. %s" +msgstr "ئەڭگىمەنى ساقلىغىلى بولمىدى. %s" + +#: ../midori/main.c:824 +msgid "" +"No root certificate file is available. SSL certificates cannot be verified." +msgstr " " + +#: ../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:929 +msgid "Modify _preferences" +msgstr "تەڭشەكنى ئۆزگەرت(_P)" + +#: ../midori/main.c:933 +msgid "Reset the last _session" +msgstr "ئەڭ ئاخىرقى ئەڭگىمەنى ئەسلىگە قايتۇر(_S)" + +#: ../midori/main.c:938 +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:1298 +msgid "No filename specified" +msgstr "ھۆججەت ئاتى بەلگىلەنمىگەن" + +#: ../midori/main.c:1317 +msgid "An unknown error occured." +msgstr "نامەلۇم خاتالىق كۆرۈلدى." + +#: ../midori/main.c:1348 +#, c-format +msgid "Snapshot saved to: %s\n" +msgstr "Snapshot بۇ يەرگە ساقلاندى :%s\n" + +# CLI --help +#: ../midori/main.c:1520 +msgid "Run ADDRESS as a web application" +msgstr "ADDRESS نى تور پروگراممىسى قاتارىدا ئىجرا قىل" + +#: ../midori/main.c:1520 +msgid "ADDRESS" +msgstr "ADDRESS" + +# CLI --help +#: ../midori/main.c:1523 +msgid "Use FOLDER as configuration folder" +msgstr "FOLDER نى تەڭشەك مۇندەرىجىسى قىلىپ ئىشلەت" + +#: ../midori/main.c:1523 +msgid "FOLDER" +msgstr "FOLDER" + +#: ../midori/main.c:1526 +msgid "Show a diagnostic dialog" +msgstr "دىئاگنوز كۆزنىكىنى كۆرسىتىدۇ" + +# CLI --help +#: ../midori/main.c:1528 +msgid "Run the specified filename as javascript" +msgstr "كۆرسىتىلگەن ھۆججەت نامىنى javascript دەپ قاراپ ئىجرا قىل" + +# CLI --help +#: ../midori/main.c:1531 +msgid "Take a snapshot of the specified URI" +msgstr "كۆرسىتىلگەن URI نىڭ snapshot نى ئال" + +# CLI --help +#: ../midori/main.c:1534 +msgid "Execute the specified command" +msgstr "كۆرسىتىلگەن بۇيرۇقنى ئىجرا قىل" + +# CLI --help +#: ../midori/main.c:1536 +msgid "Display program version" +msgstr "پروگرامما نەشرى كۆرسەت" + +#: ../midori/main.c:1538 +msgid "Addresses" +msgstr "ئادرېس" + +#: ../midori/main.c:1540 +msgid "Block URIs according to regular expression PATTERN" +msgstr "ئۆلچەملىك ئىپادە PATTERN غا بويسۇنۇپ URI چەكلە" + +#: ../midori/main.c:1540 +msgid "PATTERN" +msgstr "PATTERN" + +# CLI --help +#. i18n: CLI: Close tabs, clear private data, open starting page +#: ../midori/main.c:1544 +msgid "Reset Midori after SECONDS seconds of inactivity" +msgstr "Midori ئاكتىپ ئەمەس ھالەتتە SECONDS سېكۇنت تۇرسا، Midori نى ئەسلىگە قايتۇر" + +#: ../midori/main.c:1544 +msgid "SECONDS" +msgstr "SECONDS" + +#: ../midori/main.c:1625 +msgid "[Addresses]" +msgstr "[ئادرېس]" + +#: ../midori/main.c:1653 +msgid "Please report comments, suggestions and bugs to:" +msgstr "پىكىر، تەكلىپ، شۇنداقلا كەمتۈكلەرنى بۇ يەرگە مەلۇم قىلىڭ:" + +#: ../midori/main.c:1655 +msgid "Check for new versions at:" +msgstr "يېڭى نەشرىنى بۇ يەردىن تەكشۈر:" + +#: ../midori/main.c:1752 +msgid "The specified configuration folder is invalid." +msgstr "كۆرسىتىلگەن تەڭشەك مۇندەرىجىسى توغرا ئەمەس." + +#: ../midori/main.c:1800 +msgid "An instance of Midori is already running but not responding.\n" +msgstr "Midori نىڭ instance ئىجرا قىلىنىۋېتىپتۇ بىراق ئىنكاس يوق.\n" + +#: ../midori/main.c:1855 +#, c-format +msgid "The search engines couldn't be loaded. %s\n" +msgstr "ئىزدەش ماتورىنى ئوقۇغىلى بولمىدى. %s\n" + +#: ../midori/main.c:1877 +#, c-format +msgid "Bookmarks couldn't be loaded: %s\n" +msgstr "خەتكۈچنى ئوقۇغىلى بولمىدى: %s\n" + +#: ../midori/main.c:1920 +#, c-format +msgid "The trash couldn't be loaded: %s\n" +msgstr "ئەخلەت ساندۇقىنى ئوقۇغىلى بولمىدى: %s\n" + +#: ../midori/main.c:1934 +#, c-format +msgid "The history couldn't be loaded: %s\n" +msgstr "ئىزلارنى ئوقۇغىلى بولمىدى: %s\n" + +#: ../midori/main.c:1948 +msgid "The following errors occured:" +msgstr "تۆۋەندىكىدەك خاتالىق كۆرۈلدى:" + +#: ../midori/main.c:1964 +msgid "_Ignore" +msgstr "پەرۋا قىلما(_I)" + +#: ../midori/midori-array.c:428 +msgid "File not found." +msgstr "ھۆججەت تېپىلمىدى." + +#: ../midori/midori-array.c:462 ../midori/midori-array.c:485 +#: ../midori/midori-array.c:495 +msgid "Malformed document." +msgstr "فورماتى خاتا بولغان پۈتۈك." + +#: ../midori/midori-array.c:504 +msgid "Unrecognized bookmark format." +msgstr "فورماتى خاتا بولغان خەتكۈش." + +#: ../midori/midori-array.c:718 +msgid "Writing failed." +msgstr "يېزىش مەغلۇپ بولدى." + +#: ../midori/midori-browser.c:332 ../midori/midori-browser.c:5244 +#: ../midori/midori-browser.c:5250 +msgid "Reload the current page" +msgstr "ھازىرقى بەتنى قايتا ئوقۇيدۇ" + +#: ../midori/midori-browser.c:342 ../midori/midori-browser.c:5247 +msgid "Stop loading the current page" +msgstr "ھازىرقى بېتىنى ئوقۇشنى توختىتىدۇ" + +#: ../midori/midori-browser.c:456 +#, c-format +msgid "%d%% loaded" +msgstr "%d%% ئوقۇلدى" + +#: ../midori/midori-browser.c:494 +#, c-format +msgid "Failed to update title: %s\n" +msgstr "ماۋزۇنى يېڭىلاش مەغلۇپ بولدى: %s\n" + +#: ../midori/midori-browser.c:508 +#, c-format +msgid "Unexpected action '%s'." +msgstr "'%s' بولسا كۈتۈلمىگەن مەشغۇلات." + +#: ../midori/midori-browser.c:731 +msgid "New folder" +msgstr "يېڭى مۇندەرىجە" + +#: ../midori/midori-browser.c:731 +msgid "Edit folder" +msgstr "مۇندەرىجە تەھرىرلەيدۇ" + +#: ../midori/midori-browser.c:733 +msgid "New bookmark" +msgstr "يېڭى خەتكۈش" + +#: ../midori/midori-browser.c:733 +msgid "Edit bookmark" +msgstr "خەتكۈش تەھرىرلەش" + +#: ../midori/midori-browser.c:764 +msgid "_Title:" +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 +msgid "_Address:" +msgstr "ئادرېس(_A):" + +#: ../midori/midori-browser.c:830 ../midori/midori-browser.c:4400 +msgid "_Folder:" +msgstr "مۇندەرىجە(_F)" + +#: ../midori/midori-browser.c:840 ../midori/midori-browser.c:940 +#: ../midori/midori-browser.c:4405 ../midori/midori-browser.c:4437 +msgid "Toplevel folder" +msgstr "ئۈستىقەۋەت مۇندەرىجە" + +#: ../midori/midori-browser.c:874 +msgid "Add to _Speed Dial" +msgstr "" + +#: ../midori/midori-browser.c:887 +msgid "Show in the tool_bar" +msgstr "قورال بالدىقىدا كۆرسەت(_B)" + +#: ../midori/midori-browser.c:902 +msgid "Run as _web application" +msgstr "تور پروگراممىسى شەكلىدە ئىجرا قىل(_W)" + +#: ../midori/midori-browser.c:994 +#, 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:1055 ../midori/midori-browser.c:4455 +#: ../midori/midori-browser.c:4487 +msgid "Save file as" +msgstr "باشقا نامدا ساقلا" + +#: ../midori/midori-browser.c:1448 +msgid "Save file" +msgstr "ھۆججەت ساقلا" + +#: ../midori/midori-browser.c:2152 +msgid "Open file" +msgstr "ھۆججەتنى ئاچ" + +#: ../midori/midori-browser.c:2230 +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 " \n" +" " + +#: ../midori/midori-browser.c:2236 ../extensions/feed-panel/main.c:361 +msgid "New feed" +msgstr "يېڭى feed" + +# tooltip +#: ../midori/midori-browser.c:2279 ../midori/midori-browser.c:5309 +#: ../panels/midori-bookmarks.c:422 +msgid "Add a new bookmark" +msgstr "يېڭى خەتكۈش قوش" + +#: ../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 "ساندان جۈملىسىنى ئىجرا قىلىش مەغلۇپ بولدى: %s\n" + +#: ../midori/midori-browser.c:2828 ../midori/midori-searchaction.c:484 +msgid "Empty" +msgstr "قۇرۇق" + +#: ../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 "سىرتقى پروگراممىنى ئىجرا قىلغىلى بولمىدى" + +#: ../midori/midori-browser.c:3760 ../midori/midori-browser.c:5693 +#, c-format +msgid "Failed to insert new history item: %s\n" +msgstr "يېڭى ئىز قىستۇرۇش مەغلۇپ بولدى: %s\n" + +#: ../midori/midori-browser.c:4093 ../panels/midori-bookmarks.c:780 +#: ../panels/midori-history.c:750 +msgid "Open all in _Tabs" +msgstr "ھەممىنى بەتكۈچتە ئاچ(_T)" + +#: ../midori/midori-browser.c:4100 ../panels/midori-bookmarks.c:786 +#: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:544 +msgid "Open in New _Tab" +msgstr "يېڭى بەتكۈچتە ئاچ(_T)" + +#: ../midori/midori-browser.c:4103 ../panels/midori-bookmarks.c:788 +#: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:546 +msgid "Open in New _Window" +msgstr "يېڭى كۆزنەكتە ئاچ(_W)" + +#: ../midori/midori-browser.c:4326 +msgid "Arora" +msgstr "Arora" + +#: ../midori/midori-browser.c:4327 +msgid "Kazehakase" +msgstr "Kazehakase" + +#: ../midori/midori-browser.c:4328 +msgid "Opera" +msgstr "Opera" + +#: ../midori/midori-browser.c:4329 +msgid "Konqueror" +msgstr "Konqueror" + +#: ../midori/midori-browser.c:4330 +msgid "Epiphany" +msgstr "Epiphany" + +#: ../midori/midori-browser.c:4351 +msgid "Import bookmarks..." +msgstr "خەتكۈش ئىمپورت قىل..." + +#: ../midori/midori-browser.c:4354 ../midori/midori-browser.c:5314 +msgid "_Import bookmarks" +msgstr "خەتكۈش ئىمپورت قىل(_I)" + +#: ../midori/midori-browser.c:4365 +msgid "_Application:" +msgstr "پروگرامما(_A):" + +#: ../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 "ئۆزى بەلگىلەش…" + +#: ../midori/midori-browser.c:4466 +msgid "Failed to import bookmarks" +msgstr "خەتكۈش ئىمپورت قىلىش مەغلۇپ بولدى" + +#: ../midori/midori-browser.c:4502 +msgid "Failed to export bookmarks" +msgstr "خەتكۈش ئېكسپورت قىلىش مەغلۇپ بولدى" + +#: ../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 "ئىز ئۆچۈرۈش مەغلۇپ بولدى: %s\n" + +# Dialog title +#. i18n: Dialog: Clear Private Data, in the Tools menu +#: ../midori/midori-browser.c:4663 +msgid "Clear Private Data" +msgstr "شەخسىي سانلىق ئاساسلارنى تازىلايدۇ" + +# Button label +#: ../midori/midori-browser.c:4667 +msgid "_Clear private data" +msgstr "شەخسىي سانلىق مەلۇماتلار تازىلا(_C)" + +#: ../midori/midori-browser.c:4681 +msgid "Clear the following data:" +msgstr "تۆۋەندىكى سانلىق ئاساسلارنى تازىلا:" + +#: ../midori/midori-browser.c:4692 ../midori/midori-preferences.c:530 +#: ../panels/midori-history.c:119 +msgid "History" +msgstr "ئىز" + +#: ../midori/midori-browser.c:4698 +msgid "Cookies" +msgstr "Cookies" + +#: ../midori/midori-browser.c:4703 +msgid "'Flash' Cookies" +msgstr "'Flash' Cookie" + +#: ../midori/midori-browser.c:4708 +msgid "Website icons" +msgstr "تورتۇرا سىنبەلگىسى" + +#: ../midori/midori-browser.c:4713 ../midori/sokoke.c:1298 +msgid "_Closed Tabs" +msgstr "تاقالغان بەتكۈچلەر(_C)" + +#: ../midori/midori-browser.c:4718 ../extensions/web-cache.c:464 +msgid "Web Cache" +msgstr "تور غەملىكى" + +#: ../midori/midori-browser.c:4726 +msgid "Clear private data when _quitting Midori" +msgstr "Midori نى ئاخىرلاشتۇرغاندا شەخسىي سانلىق ئاساسلارنى تازىلا(_Q)" + +#: ../midori/midori-browser.c:4827 +msgid "A lightweight web browser." +msgstr "ئەپچىل توركۆرگۈ" + +#: ../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 "" + +#: ../midori/midori-browser.c:4848 +msgid "translator-credits" +msgstr "Gheyret T.Kenji 2010" + +#: ../midori/midori-browser.c:5157 +msgid "_File" +msgstr "ھۆججەت(_F)" + +#: ../midori/midori-browser.c:5159 ../midori/sokoke.c:1299 +msgid "New _Window" +msgstr "يېڭى كۆزنەك(_W)" + +# tooltip +#: ../midori/midori-browser.c:5160 +msgid "Open a new window" +msgstr "يېڭى كۆزنەكتىن بىرنى ئاچ" + +# tooltip +#: ../midori/midori-browser.c:5163 +msgid "Open a new tab" +msgstr "يېڭى بەتكۈچتىن بىرنى ئاچ" + +#: ../midori/midori-browser.c:5165 +msgid "P_rivate Browsing" +msgstr "شەخسىي كۆرۈش(_R)" + +# tooltip +#: ../midori/midori-browser.c:5166 +msgid "Don't save any private data while browsing" +msgstr "كۆرۈۋاتقاندا شەخسىي سانلىق مەلۇماتلارنى ساقلىمىسۇن" + +# tooltip +#: ../midori/midori-browser.c:5170 +msgid "Open a file" +msgstr "ھۆججەت ئاچ" + +# tooltip +#: ../midori/midori-browser.c:5173 +msgid "Save to a file" +msgstr "ھۆججەتكە ساقلا" + +#: ../midori/midori-browser.c:5175 +msgid "Add to Speed _dial" +msgstr "Speed dial قوش(_D)" + +# tooltip +#: ../midori/midori-browser.c:5176 +msgid "Add shortcut to speed dial" +msgstr "Speed dial نىڭ تېزلەتمىسىنى قوش" + +#: ../midori/midori-browser.c:5178 +msgid "Add Shortcut to the _desktop" +msgstr "ئۈستەليۈزىگە تېزلەتمە قوش(_D)" + +# tooltip +#: ../midori/midori-browser.c:5179 +msgid "Add shortcut to the desktop" +msgstr "ئۈستەليۈزىگە تېزلەتمە قوش" + +#: ../midori/midori-browser.c:5181 +msgid "Subscribe to News _feed" +msgstr "خەۋەر feed غا مۇشتەرى بول(_F)" + +#: ../midori/midori-browser.c:5182 +msgid "Subscribe to this news feed" +msgstr "خەۋەر feed غا مۇشتەرى بولىدۇ" + +#: ../midori/midori-browser.c:5187 +msgid "_Close Tab" +msgstr "بەتكۈچنى تاقا(_C)" + +# tooltip +#: ../midori/midori-browser.c:5188 +msgid "Close the current tab" +msgstr "ھازىرقى بەتكۈچنى تاقايدۇ" + +#: ../midori/midori-browser.c:5190 +msgid "C_lose Window" +msgstr "كۆزنەك تاقا(_L)" + +# tooltip +#: ../midori/midori-browser.c:5191 +msgid "Close this window" +msgstr "مەزكۇر كۆزنەكنى تاقايدۇ" + +# tooltip +#: ../midori/midori-browser.c:5194 +msgid "Print the current page" +msgstr "ھازىرقى بەتنى باسىدۇ" + +# tooltip +#: ../midori/midori-browser.c:5197 +msgid "Quit the application" +msgstr "مەزكۇر پروگراممىنى ئاخىرلاشتۇرىدۇ" + +#: ../midori/midori-browser.c:5199 +msgid "_Edit" +msgstr "تەھرىر(_E)" + +#: ../midori/midori-browser.c:5203 +msgid "Undo the last modification" +msgstr "ئەڭ ئاخىرقى قېتىم تۈزەتكەندىن يېنىۋالىدۇ" + +#: ../midori/midori-browser.c:5206 +msgid "Redo the last modification" +msgstr "ئەڭ ئاخىرقى قېتىم يانغانغا پۇشايمان قىلىدۇ" + +# tooltip +#: ../midori/midori-browser.c:5210 +msgid "Cut the selected text" +msgstr "تاللانغان تېكىستنى كېسىدۇ" + +# tooltip +#: ../midori/midori-browser.c:5213 ../midori/midori-browser.c:5216 +msgid "Copy the selected text" +msgstr "تاللانغان تېكىستنى كۆچۈرىدۇ" + +# tooltip +#: ../midori/midori-browser.c:5219 +msgid "Paste text from the clipboard" +msgstr "clipboard دىكىنى چاپلايدۇ" + +# tooltip +#: ../midori/midori-browser.c:5222 +msgid "Delete the selected text" +msgstr "تاللانغان تېكىستنى ئۆچۈرىدۇ" + +# tooltip +#: ../midori/midori-browser.c:5225 +msgid "Select all text" +msgstr "ھەممە تېكىستنى تاللايدۇ" + +# tooltip +#: ../midori/midori-browser.c:5228 +msgid "Find a word or phrase in the page" +msgstr "بەت ئىچىدىن سوز ياكى سوز بىرىكمىسىنى ئىزدەيدۇ" + +#: ../midori/midori-browser.c:5230 +msgid "Find _Next" +msgstr "كېيىنكىسىنى ئىزدە(_N)" + +# tooltip +#: ../midori/midori-browser.c:5231 +msgid "Find the next occurrence of a word or phrase" +msgstr "كېيىنكى سوز ياكى سوز بىرىكمىسىنى ئىزدەيدۇ" + +#: ../midori/midori-browser.c:5233 +msgid "Find _Previous" +msgstr "ئالدىنقىنى ئىزدە(_P)" + +# tooltip +#: ../midori/midori-browser.c:5234 +msgid "Find the previous occurrence of a word or phrase" +msgstr "ئالدىنقى سوز ياكى سوز بىرىكمىسىنى ئىزدەيدۇ" + +# tooltip +#: ../midori/midori-browser.c:5238 +msgid "Configure the application preferences" +msgstr "مەزكۇر پروگراممىنىڭ تەڭشىكىنى تەڭشەيدۇ" + +#: ../midori/midori-browser.c:5240 +msgid "_View" +msgstr "كۆرۈنۈش(_V)" + +#: ../midori/midori-browser.c:5241 +msgid "_Toolbars" +msgstr "قورال بالدىقى(_T)" + +# tooltip +#: ../midori/midori-browser.c:5253 +msgid "Increase the zoom level" +msgstr "zoom دەرىجىسىنى چوڭايتىدۇ" + +# tooltip +#: ../midori/midori-browser.c:5256 +msgid "Decrease the zoom level" +msgstr "zoom دەرىجىسىنى كىچىكلىتىدۇ" + +# tooltip +#: ../midori/midori-browser.c:5259 +msgid "Reset the zoom level" +msgstr "zoom دەرىجىسىنى ئەسلىگە قايتۇرىدۇ" + +#: ../midori/midori-browser.c:5260 +msgid "_Encoding" +msgstr "كودلىشى(_E)" + +#: ../midori/midori-browser.c:5262 +msgid "View So_urce" +msgstr "مەنبەنى كۆرسەت(_U)" + +# tooltip +#: ../midori/midori-browser.c:5263 +msgid "View the source code of the page" +msgstr "مەزكۇر بەتنىڭ مەنبە كودىنى كۆرسىتىدۇ" + +# tooltip +#: ../midori/midori-browser.c:5266 +msgid "Toggle fullscreen view" +msgstr "تولۇق ئېكران كۆرسەت/كۆرسەتمە نى ئالماشتۇرۇش" + +#: ../midori/midori-browser.c:5269 +msgid "Scroll _Left" +msgstr "سولغا سىيرىل(_L)" + +#: ../midori/midori-browser.c:5270 +msgid "Scroll to the left" +msgstr "سولغا سىيرىلىدۇ" + +#: ../midori/midori-browser.c:5272 +msgid "Scroll _Down" +msgstr "پەسكە سىيرىل(_D)" + +#: ../midori/midori-browser.c:5273 +msgid "Scroll down" +msgstr "پەسكە سىيرىلىدۇ" + +#: ../midori/midori-browser.c:5275 +msgid "Scroll _Up" +msgstr "ئۈستىگە سىيرىلىدۇ(_U)" + +#: ../midori/midori-browser.c:5276 +msgid "Scroll up" +msgstr "ئۈستىگە سىيرىلىدۇ" + +#: ../midori/midori-browser.c:5278 +msgid "Scroll _Right" +msgstr "ئوڭغا سىيرىل(_R)" + +#: ../midori/midori-browser.c:5279 +msgid "Scroll to the right" +msgstr "ئونغا سىيرىلىدۇ" + +#: ../midori/midori-browser.c:5282 +msgid "_Go" +msgstr "يۆتكەل(_G)" + +# tooltip +#: ../midori/midori-browser.c:5285 +msgid "Go back to the previous page" +msgstr "ئالدىنقى بەتكە قايتىدۇ" + +# tooltip +#: ../midori/midori-browser.c:5288 +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:5292 +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:5296 +msgid "Go to the next sub-page" +msgstr "كېيىنكى بالا بەتكە ماڭىدۇ" + +# tooltip +#: ../midori/midori-browser.c:5299 +msgid "Go to your homepage" +msgstr "ئانا بەتكە ماڭىدۇ" + +#: ../midori/midori-browser.c:5301 +msgid "Empty Trash" +msgstr "ئەخلەت ساندۇقىنى تازىلاش" + +# tooltip +#: ../midori/midori-browser.c:5302 +msgid "Delete the contents of the trash" +msgstr "ئەخلەت ساندۇقىنىڭ ئىچىدىكى مەزمۇنلارنى ئۆچۈرىدۇ" + +#: ../midori/midori-browser.c:5304 +msgid "Undo _Close Tab" +msgstr "تاقالغان بەتكۈچنى ئەسلى كەلتۈر(_C)" + +# tooltip +#: ../midori/midori-browser.c:5305 +msgid "Open the last closed tab" +msgstr "ئەڭ ئاخىرقى قېتىم تاقالغان بەتنى ئاچىدۇ" + +#: ../midori/midori-browser.c:5311 +msgid "Add a new _folder" +msgstr "يېڭى مۇندەرىجە قوش(_F)" + +# tooltip +#: ../midori/midori-browser.c:5312 +msgid "Add a new bookmark folder" +msgstr "يېڭى خەتكۈش مۇندەرىجىسى قوشىدۇ" + +#: ../midori/midori-browser.c:5317 +msgid "_Export bookmarks" +msgstr "خەتكۈچنى ئېكسپورت قىل(_E)" + +#: ../midori/midori-browser.c:5320 ../midori/midori-searchaction.c:493 +msgid "_Manage Search Engines" +msgstr "ئىزدەش ماتورىنى باشقۇر(_M)" + +# tooltip +#: ../midori/midori-browser.c:5321 +msgid "Add, edit and remove search engines..." +msgstr "ئىزدەش ماتورىنى قوشىدۇ، تەھرىرلەيدۇ، ئۆچۈرىدۇ..." + +#: ../midori/midori-browser.c:5324 +msgid "_Clear Private Data" +msgstr "شەخسىي سانلىق ئاساسلارنى تازىلا(_C)" + +# tooltip +#: ../midori/midori-browser.c:5325 +msgid "Clear private data..." +msgstr "شەخسىي سانلىق ئاساسلارنى تازىلايدۇ..." + +#: ../midori/midori-browser.c:5329 +msgid "_Inspect Page" +msgstr "بەتنى تەكشۈر(_I)" + +#: ../midori/midori-browser.c:5330 +msgid "Inspect page details and access developer tools..." +msgstr "بەت تەپسىلاتىنى تەكشۈرىدۇ ۋە ئىجادىيەت قوراللىرىنى زىيارەت قىلىدۇ..." + +#: ../midori/midori-browser.c:5335 +msgid "_Previous Tab" +msgstr "ئالدىنقى بەتكۈچ(_P)" + +# tooltip +#: ../midori/midori-browser.c:5336 +msgid "Switch to the previous tab" +msgstr "ئالدىنقى بەتكۈچكە ئالمىشىدۇ" + +#: ../midori/midori-browser.c:5338 +msgid "_Next Tab" +msgstr "كېيىنكى بەتكۈچ(_N)" + +# tooltip +#: ../midori/midori-browser.c:5339 +msgid "Switch to the next tab" +msgstr "كېيىنكى بەتكۈچكە ئالمىشىدۇ" + +#: ../midori/midori-browser.c:5341 +msgid "Focus _Current Tab" +msgstr "ھازىرقى بەتكۈچكە فوكۇسلان(_C)" + +# tooltip +#: ../midori/midori-browser.c:5342 +msgid "Focus the current tab" +msgstr "فوكۇسنى ھازىرقى بەتكە يۆتكەيدۇ" + +#: ../midori/midori-browser.c:5344 +msgid "Open last _session" +msgstr "ئەڭ ئاخىرقى ئەڭگىمەنى ئاچ(_S)" + +#: ../midori/midori-browser.c:5345 +msgid "Open the tabs saved in the last session" +msgstr "ئەڭ ئاخىرقى ئەڭگىمەدە ساقلانغان بەتنى ئاچىدۇ" + +#: ../midori/midori-browser.c:5347 +msgid "_Help" +msgstr "ياردەم(_H)" + +#: ../midori/midori-browser.c:5349 +msgid "_Contents" +msgstr "مەزمۇن(_C)" + +# tooltip +#: ../midori/midori-browser.c:5350 +msgid "Show the documentation" +msgstr "پۈتۈكلەرنى كۆرسىتىدۇ" + +#: ../midori/midori-browser.c:5352 +msgid "_Frequent Questions" +msgstr "كوپ سورىلىدىغان سوئاللار(_F)" + +# tooltip +#: ../midori/midori-browser.c:5353 +msgid "Show the Frequently Asked Questions" +msgstr "كوپ سورىلىدىغان سوئاللارنى كۆرسىتىدۇ" + +#: ../midori/midori-browser.c:5355 +msgid "_Report a Bug" +msgstr "كەمتۈك مەلۇم قىل(_R)" + +# tooltip +#: ../midori/midori-browser.c:5356 +msgid "Open Midori's bug tracker" +msgstr "Midori نىڭ كەمتۈك tracker سىنى ئاچىدۇ" + +# tooltip +#: ../midori/midori-browser.c:5359 +msgid "Show information about the program" +msgstr "مەزكۇر پروگرامما ھەققىدىكى ئۇچۇرنى كۆرسىتىدۇ" + +#: ../midori/midori-browser.c:5367 +msgid "_Menubar" +msgstr "Menu بالدىقى(_M)" + +# tooltip +#: ../midori/midori-browser.c:5368 +msgid "Show menubar" +msgstr "Menu بالدىقىنى كۆرسىتىدۇ" + +#: ../midori/midori-browser.c:5371 +msgid "_Navigationbar" +msgstr "يولچى بالدىقى(_N)" + +# tooltip +#: ../midori/midori-browser.c:5372 +msgid "Show navigationbar" +msgstr "يولچى بالدىقىنى كۆرسىتىدۇ" + +#: ../midori/midori-browser.c:5375 +msgid "Side_panel" +msgstr "يان panel(_P)" + +# tooltip +#: ../midori/midori-browser.c:5376 +msgid "Show sidepanel" +msgstr "يان panel نى كۆرسىتىدۇ" + +#: ../midori/midori-browser.c:5379 +msgid "_Bookmarkbar" +msgstr "خەتكۈش بالدىقى(_B)" + +# tooltip +#: ../midori/midori-browser.c:5380 +msgid "Show bookmarkbar" +msgstr "خەتكۈش بالدىقىنى كۆرسىتىدۇ" + +#: ../midori/midori-browser.c:5383 +msgid "_Transferbar" +msgstr "ئۇزىتىش بالدىقى(_T)" + +# tooltip +#: ../midori/midori-browser.c:5384 +msgid "Show transferbar" +msgstr "ئۇزىتىش بالدىقىنى كۆرسىتىدۇ" + +#: ../midori/midori-browser.c:5387 +msgid "_Statusbar" +msgstr "ھالەت بالدىقى(_S)" + +# tooltip +#: ../midori/midori-browser.c:5388 +msgid "Show statusbar" +msgstr "ھالەت بالدىقىنى كۆرسىتىدۇ" + +#: ../midori/midori-browser.c:5396 +msgid "_Automatic" +msgstr "ئۆزلۈكىدىن(_A)" + +#: ../midori/midori-browser.c:5399 ../midori/midori-websettings.c:222 +msgid "Chinese (BIG5)" +msgstr "خەنزۇچە (BIG5)" + +#. i18n: A double underscore "__" is used to prevent the mnemonic +#: ../midori/midori-browser.c:5403 +msgid "Japanese (SHIFT__JIS)" +msgstr "ياپونچە (SHIFT__JIS)" + +#: ../midori/midori-browser.c:5406 ../midori/midori-websettings.c:224 +msgid "Korean (EUC-KR)" +msgstr "كورىيەچە(EUC-KR)" + +#: ../midori/midori-browser.c:5409 ../midori/midori-websettings.c:225 +msgid "Russian (KOI8-R)" +msgstr "رۇسچە(KOI8-R)" + +#: ../midori/midori-browser.c:5412 ../midori/midori-websettings.c:226 +msgid "Unicode (UTF-8)" +msgstr "يۇنىكود (UTF-8)" + +#: ../midori/midori-browser.c:5415 ../midori/midori-websettings.c:227 +msgid "Western (ISO-8859-1)" +msgstr "غەربچە (ISO-8859-1)" + +#: ../midori/midori-browser.c:5949 +msgid "_Separator" +msgstr "ئايرىغۇ(_S)" + +#: ../midori/midori-browser.c:5956 +msgid "_Location..." +msgstr "ئورۇن(_L)..." + +# tooltip +#: ../midori/midori-browser.c:5958 +msgid "Open a particular location" +msgstr "بەلگىلەنگەن ئورۇننى ئاچىدۇ" + +#: ../midori/midori-browser.c:5982 +msgid "_Web Search..." +msgstr "توردىن ئىزدە(_W)..." + +# tooltip +#: ../midori/midori-browser.c:5984 +msgid "Run a web search" +msgstr "توردىن ئىزدەيدۇ" + +# tooltip +#: ../midori/midori-browser.c:6005 +msgid "Reopen a previously closed tab or window" +msgstr "بۇرۇن يېپىلغان بەتكۈچ ياكى كۆزنەكنى قايتا ئاچىدۇ" + +#: ../midori/midori-browser.c:6020 +msgid "_Recently visited pages" +msgstr "يېقىندا كۆرگەن بەتلەر" + +# tooltip +#: ../midori/midori-browser.c:6022 +msgid "Reopen pages that you visited earlier" +msgstr "يېقىندا كۆرگەن بەتلەرنى ئاچىدۇ" + +#: ../midori/midori-browser.c:6037 ../midori/sokoke.c:1288 +msgid "_Bookmarks" +msgstr "خەتكۈش(_B)" + +# tooltip +#: ../midori/midori-browser.c:6039 +msgid "Show the saved bookmarks" +msgstr "ساقلانغان خەتكۈچلەرنى كۆرسىتىدۇ" + +#: ../midori/midori-browser.c:6054 +msgid "_Tools" +msgstr "قورال(_T)" + +#: ../midori/midori-browser.c:6067 +msgid "_Window" +msgstr "كۆزنەك(_W)" + +# tooltip +#: ../midori/midori-browser.c:6069 +msgid "Show a list of all open tabs" +msgstr "ئوچۇق بارلىق بەتكۈچلەرنى كۆرسىتىدۇ" + +#: ../midori/midori-browser.c:6083 +msgid "_Menu" +msgstr "Menu(_M)" + +#: ../midori/midori-browser.c:6085 +msgid "Menu" +msgstr "Menu" + +#: ../midori/midori-browser.c:6670 +#, c-format +msgid "Unexpected setting '%s'" +msgstr "'%s' ئويلاپ باقمىغان تەڭشەكتۇر" + +#: ../midori/midori-locationaction.c:377 +#, c-format +msgid "Failed to select from history\n" +msgstr "ئىزدىن تاللاش مەغلۇپ بولدى\n" + +#: ../midori/midori-locationaction.c:459 +#, c-format +msgid "Search for %s" +msgstr "%s نى ئىزدە" + +#: ../midori/midori-locationaction.c:482 +#, c-format +msgid "Search with %s" +msgstr "%s دا ئىزدە" + +#: ../midori/midori-locationaction.c:1197 +#, c-format +msgid "Failed to execute database statement\n" +msgstr "ساندان جۈملىسىنى ئىجرا قىلىش مەغلۇپ بولدى\n" + +#. i18n: Right-click on Location, Open an URL from the clipboard +#: ../midori/midori-locationaction.c:1254 +msgid "Paste and p_roceed" +msgstr "چاپلا ۋە داۋاملاشتۇر(_R)" + +#: ../midori/midori-panel.c:432 ../midori/midori-panel.c:434 +msgid "Detach chosen panel from the window" +msgstr "تاللانغان panel نى كۆزنەكتىن ئايرىۋېتىدۇ" + +#: ../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 "يان panel نى ئوڭ تەرەپكە ئورۇنلاشتۇرىدۇ" + +#: ../midori/midori-panel.c:456 ../midori/midori-panel.c:457 +msgid "Close panel" +msgstr "panel نى تاقا" + +#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643 +msgid "Align sidepanel to the left" +msgstr "يان panel نى سول تەرەپكە ئورۇنلاشتۇرىدۇ" + +#: ../midori/midori-panel.c:797 +msgid "Hide operating controls" +msgstr "مەشغۇلات تىزگىنەكلىرىنى يوشۇر" + +#: ../midori/midori-websettings.c:204 +msgid "Show Blank page" +msgstr "قۇرۇق بەتنى كۆرسەت" + +#: ../midori/midori-websettings.c:205 +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 +msgid "Japanese (SHIFT_JIS)" +msgstr "ياپونچە (SHIFT_JIS)" + +#: ../midori/midori-websettings.c:243 +msgid "New tab" +msgstr "يېڭى بەتكۈچ" + +#: ../midori/midori-websettings.c:244 +msgid "New window" +msgstr "يېڭى كۆزنەك" + +#: ../midori/midori-websettings.c:245 +msgid "Current tab" +msgstr "ھازىرقى بەتكۈچ" + +#: ../midori/midori-websettings.c:260 +msgid "Default" +msgstr "كۆڭۈلدىكى" + +#: ../midori/midori-websettings.c:261 +msgid "Icons" +msgstr "سىنبەلگىلەر" + +#: ../midori/midori-websettings.c:262 +msgid "Small icons" +msgstr "كىچىك سىنبەلگە" + +#: ../midori/midori-websettings.c:263 +msgid "Text" +msgstr "تېكىست" + +#: ../midori/midori-websettings.c:264 +msgid "Icons and text" +msgstr "سىنبەلگە ۋە تېكىست" + +#: ../midori/midori-websettings.c:265 +msgid "Text beside icons" +msgstr "تېكىست سىنبەلگىنىڭ يېنىدا كۆرسىتىلسۇن" + +#: ../midori/midori-websettings.c:280 +msgid "Automatic (GNOME or environment)" +msgstr "ئۆزلۈكىدىن (GNOME ياكى مۇھىت)" + +#: ../midori/midori-websettings.c:281 +msgid "HTTP proxy server" +msgstr "HTTP ۋاكالەتچى مۇلازىمېتىر" + +#: ../midori/midori-websettings.c:282 +msgid "No proxy server" +msgstr "ۋاكالەتچى مۇلازىمېتىر يوق" + +#: ../midori/midori-websettings.c:297 +msgid "All cookies" +msgstr "بارلىق Cookie" + +#: ../midori/midori-websettings.c:298 +msgid "Session cookies" +msgstr "ئەڭگىمە Cookie سى" + +#: ../midori/midori-websettings.c:299 ../katze/katze-utils.c:667 +msgid "None" +msgstr "يوق" + +#: ../midori/midori-websettings.c:315 +msgid "Safari" +msgstr "Safari" + +#: ../midori/midori-websettings.c:316 +msgid "iPhone" +msgstr "iPhone" + +#: ../midori/midori-websettings.c:317 +msgid "Firefox" +msgstr "Firefox" + +#: ../midori/midori-websettings.c:318 +msgid "Internet Explorer" +msgstr "Internet Explorer" + +#: ../midori/midori-websettings.c:371 +msgid "Remember last window size" +msgstr "كۆزنەكنىڭ ئەڭ ئاخىرقى چوڭلۇقىنى ئەستە تۇتۇۋال" + +# tooltip +#: ../midori/midori-websettings.c:372 +msgid "Whether to save the last window size" +msgstr "كۆزنەكنىڭ ئەڭ ئاخىرقى چوڭلۇقىنى ئەستە تۇتۇۋالىدۇ" + +#: ../midori/midori-websettings.c:380 +msgid "Last window width" +msgstr "كۆزنەكنىڭ ئەڭ ئاخىرقى كەڭلىكى" + +#: ../midori/midori-websettings.c:381 +msgid "The last saved window width" +msgstr "كۆزنەكنىڭ ئەڭ ئاخىرقى كەڭلىكى" + +#: ../midori/midori-websettings.c:389 +msgid "Last window height" +msgstr "كۆزنەكنىڭ ئەڭ ئاخىرقى ئېگىزلىكى" + +# tooltip +#: ../midori/midori-websettings.c:390 +msgid "The last saved window height" +msgstr "كۆزنەكنىڭ ئەڭ ئاخىرقى ئېگىزلىكى" + +#: ../midori/midori-websettings.c:415 +msgid "Last panel position" +msgstr "panel نىڭ ئەڭ ئاخىرقى ئورنى" + +# tooltip +#: ../midori/midori-websettings.c:416 +msgid "The last saved panel position" +msgstr "panel نىڭ ئەڭ ئاخىرقى ئورنى" + +#. i18n: The internal index of the last opened panel +#: ../midori/midori-websettings.c:425 +msgid "Last panel page" +msgstr "panel دىكى ئەڭ ئاخىرقى بەت" + +# tooltip +#: ../midori/midori-websettings.c:426 +msgid "The last saved panel page" +msgstr "panel نىڭ ئەڭ ئاخىرى ساقلانغان بەت" + +#: ../midori/midori-websettings.c:434 +msgid "Last Web search" +msgstr "ئەڭ ئاخىرقى ئىزدەلگەنلەر" + +#: ../midori/midori-websettings.c:435 +msgid "The last saved Web search" +msgstr "ساقلانغان ئەڭ ئاخىرقى ئىزدەلگەن" + +#: ../midori/midori-websettings.c:444 +msgid "Show Menubar" +msgstr "Menu بالدىقىنى كۆرسەت" + +# tooltip +#: ../midori/midori-websettings.c:445 +msgid "Whether to show the menubar" +msgstr "Menu بالدىقىنى كۆرسىتىدۇ" + +#: ../midori/midori-websettings.c:453 +msgid "Show Navigationbar" +msgstr "يولچى بالدىقىنى كۆرسەت" + +# tooltip +#: ../midori/midori-websettings.c:454 +msgid "Whether to show the navigationbar" +msgstr "يولچى بالدىقىنى كۆرسىتىدۇ" + +#: ../midori/midori-websettings.c:462 +msgid "Show Bookmarkbar" +msgstr "خەتكۈش بالدىقىنى كۆرسەت" + +# tooltip +#: ../midori/midori-websettings.c:463 +msgid "Whether to show the bookmarkbar" +msgstr "خەتكۈش بالدىقىنى كۆرسىتىدۇ" + +#: ../midori/midori-websettings.c:471 +msgid "Show Panel" +msgstr "Panel نى كۆرسەت" + +# tooltip +#: ../midori/midori-websettings.c:472 +msgid "Whether to show the panel" +msgstr "Panel نى كۆرسىتىدۇ" + +#: ../midori/midori-websettings.c:487 +msgid "Show Transferbar" +msgstr "ئۇزىتىش بالدىقىنى كۆرسەت" + +# tooltip +#: ../midori/midori-websettings.c:488 +msgid "Whether to show the transferbar" +msgstr "ئۇزىتىش بالدىقىنى كۆرسىتىدۇ" + +#: ../midori/midori-websettings.c:496 +msgid "Show Statusbar" +msgstr "ھالەت بالدىقىنى كۆرسەت" + +# tooltip +#: ../midori/midori-websettings.c:497 +msgid "Whether to show the statusbar" +msgstr "ھالەت بالدىقىنى كۆرسىتىدۇ" + +#: ../midori/midori-websettings.c:506 +msgid "Toolbar Style:" +msgstr "قورال بالدىقى ئۇسلۇبى:" + +# tooltip +#: ../midori/midori-websettings.c:507 +msgid "The style of the toolbar" +msgstr "قورال بالدىقىنىڭ ئۇسلۇبىنى بەلگىلەيدۇ" + +#: ../midori/midori-websettings.c:523 +msgid "Show progress in location entry" +msgstr "ئورۇن كىرگۈزىدىغان يەردە progress نى كۆرسەت" + +# tooltip +#: ../midori/midori-websettings.c:524 +msgid "Whether to show loading progress in the location entry" +msgstr "ئورۇن كىرگۈزىدىغان يەردە progress نى كۆرسىتىدۇ" + +#: ../midori/midori-websettings.c:539 +msgid "Search engines in location completion" +msgstr "" + +# tooltip +#: ../midori/midori-websettings.c:540 +msgid "Whether to show search engines in the location completion" +msgstr "" + +#: ../midori/midori-websettings.c:548 +msgid "Toolbar Items" +msgstr "قورال بالدىقىدىكى تۈرلەر" + +# tooltip +#: ../midori/midori-websettings.c:549 +msgid "The items to show on the toolbar" +msgstr "قورال بالدىقىدا كۆرسىتىلىدىغان تۈرلەرنى بەلگىلەيدۇ" + +#: ../midori/midori-websettings.c:557 +msgid "Compact Sidepanel" +msgstr "يان panel نى ئىخچام كۆرسەت" + +# tooltip +#: ../midori/midori-websettings.c:558 +msgid "Whether to make the sidepanel compact" +msgstr "يان panel نى ئىخچام كۆرسىتىدۇ" + +#: ../midori/midori-websettings.c:573 +msgid "Show operating controls of the panel" +msgstr "panel نىڭ مەشغۇلات تىزگىنەكلىرىنى كۆرسەت" + +# tooltip +#: ../midori/midori-websettings.c:574 +msgid "Whether to show the operating controls of the panel" +msgstr "panel نىڭ مەشغۇلات تىزگىنەكلىرىنى كۆرسىتىدۇ" + +#: ../midori/midori-websettings.c:589 +msgid "Align sidepanel on the right" +msgstr "يان panelنى ئوڭ تەرەپكە ئورۇنلاشتۇر" + +# tooltip +#: ../midori/midori-websettings.c:590 +msgid "Whether to align the sidepanel on the right" +msgstr "يان panelنى ئوڭ تەرەپكە ئورۇنلاشتۇرىدۇ" + +#: ../midori/midori-websettings.c:605 +msgid "Open panels in separate windows" +msgstr "panel نى ئايرىم كۆزنەكتە ئاچ" + +# tooltip +#: ../midori/midori-websettings.c:606 +msgid "Whether to always open panels in separate windows" +msgstr "panel نى ئايرىم كۆزنەكتە ئاچىدىغان قىلىدۇ" + +#: ../midori/midori-websettings.c:615 +msgid "When Midori starts:" +msgstr "Midori قوزغالغاندا:" + +# tooltip +#: ../midori/midori-websettings.c:616 +msgid "What to do when Midori starts" +msgstr "Midori قوزغالغاندا نېمە قىلىش كېرەك" + +#: ../midori/midori-websettings.c:625 +msgid "Homepage:" +msgstr "ماكان بەت:" + +# tooltip +#: ../midori/midori-websettings.c:626 +msgid "The homepage" +msgstr "ماكان بەتنى بېكىتىدۇ" + +#: ../midori/midori-websettings.c:641 +msgid "Show crash dialog" +msgstr "غۇلاش كۆزنىكىنى كۆرسەت" + +# tooltip +#: ../midori/midori-websettings.c:642 +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 "يېڭى بەتكۈچتە speed dial نى كۆرسەت" + +# tooltip +#: ../midori/midori-websettings.c:659 +msgid "Show speed dial in newly opened tabs" +msgstr "يېڭى ئېچىلغان بەتكۈچتە speed dial نى كۆرسىتىدۇ" + +#: ../midori/midori-websettings.c:667 +msgid "Save downloaded files to:" +msgstr "چۈشۈرگەن ھۆججەتنى ساقلايدىغان ئورۇن:" + +# tooltip +#: ../midori/midori-websettings.c:668 +msgid "The folder downloaded files are saved to" +msgstr "چۈشۈرگەن ھۆججەتنى ساقلايدىغان ئورۇننى بەلگىلەيدۇ" + +#: ../midori/midori-websettings.c:689 +msgid "Ask for the destination folder" +msgstr "ساقلايدىغان چاغدا سورا" + +# tooltip +#: ../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 "ئۇزىتىش تاماملانغاندا ئۇقتۇرۇش قىل" + +# tooltip +#: ../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 "چۈشۈرۈش باشقۇرغۇسى" + +# tooltip +#: ../midori/midori-websettings.c:723 +msgid "An external download manager" +msgstr "سىرتتىكى چۈشۈرۈش باشقۇرغۇسىنى بېكىتىدۇ" + +#: ../midori/midori-websettings.c:731 +msgid "Text Editor" +msgstr "تېكىست تەھرىرلىگۈ" + +# tooltip +#: ../midori/midori-websettings.c:732 +msgid "An external text editor" +msgstr "سىرتقى تېكىست تەھرىرلىگۈنى بېكىتىدۇ" + +#: ../midori/midori-websettings.c:747 +msgid "News Aggregator" +msgstr "" + +# tooltip +#: ../midori/midori-websettings.c:748 +msgid "An external news aggregator" +msgstr "" + +#: ../midori/midori-websettings.c:756 +msgid "Location entry Search" +msgstr "" + +# tooltip +#: ../midori/midori-websettings.c:757 +msgid "The search to perform inside the location entry" +msgstr "" + +#: ../midori/midori-websettings.c:765 +msgid "Preferred Encoding" +msgstr "ئامراق كودلاش" + +# tooltip +#: ../midori/midori-websettings.c:766 +msgid "The preferred character encoding" +msgstr "ھەرپلەرنىڭ ئامراق كودلاش شەكلى" + +#: ../midori/midori-websettings.c:776 +msgid "Always Show Tabbar" +msgstr "بەتكۈچ بالدىقىنى كۆرسەت" + +# tooltip +#: ../midori/midori-websettings.c:777 +msgid "Always show the tabbar" +msgstr "بەتكۈچ بالدىقىنى كۆرسىتىپلا تۇرىدۇ" + +#: ../midori/midori-websettings.c:785 +msgid "Close Buttons on Tabs" +msgstr "بەتكۈچتە تاقاش توپچىسىنى كۆرسەت" + +# tooltip +#: ../midori/midori-websettings.c:786 +msgid "Whether tabs have close buttons" +msgstr "بەتكۈچتە تاقاش توپچىسىنى كۆرسىتىدۇ" + +#: ../midori/midori-websettings.c:794 +msgid "Open new pages in:" +msgstr "يېڭى بەت ئاچقاندا:" + +# tooltip +#: ../midori/midori-websettings.c:795 +msgid "Where to open new pages" +msgstr "يېڭى بەتنى قەيەردە ئاچىدىغانلىقىنى بەلگىلەيدۇ" + +#: ../midori/midori-websettings.c:804 +msgid "Open external pages in:" +msgstr "سىرتقى بەتنى ئاچقاندا:" + +# tooltip +#: ../midori/midori-websettings.c:805 +msgid "Where to open externally opened pages" +msgstr "سىرتقى بەتنى قەيەردە ئاچىدىغانلىقىنى بەلگىلەيدۇ" + +#: ../midori/midori-websettings.c:814 +msgid "Middle click opens Selection" +msgstr "چاشقىنەكنىڭ ئوتتۇرىسىنى چېكىپ تاللىغاننى ئاچ" + +# tooltip +#: ../midori/midori-websettings.c:815 +msgid "Load an address from the selection via middle click" +msgstr "ئادرېسنى تاللاپ بولۇپ، چاشقىنەكنىڭ ئوتتۇرىسىنى چەكسە شۇ ئادرېس ئېچىلىدۇ" + +#: ../midori/midori-websettings.c:823 +msgid "Open tabs in the background" +msgstr "بەتكۈچنى background دا ئاچ" + +# tooltip +#: ../midori/midori-websettings.c:824 +msgid "Whether to open new tabs in the background" +msgstr "يېڭى بەتكۈچنى background ئاچىدۇ" + +#: ../midori/midori-websettings.c:832 +msgid "Open Tabs next to Current" +msgstr "يېڭى بەتكۈچنى ھازىرقى بەتكۈچنىڭ يېنىدا ئاچ" + +# tooltip +#: ../midori/midori-websettings.c:833 +msgid "Whether to open new tabs next to the current tab or after the last one" +msgstr "يېڭى بەتكۈچنى ھازىرقىنىڭ يېنىدا ياكى ئەڭ ئاخىرقىنىڭ يېنىدا ئاچىدۇ" + +#: ../midori/midori-websettings.c:841 +msgid "Open popups in tabs" +msgstr "بەتكۈچتە قاڭقىشى ئاچ" + +# tooltip +#: ../midori/midori-websettings.c:842 +msgid "Whether to open popup windows in tabs" +msgstr "بەتكۈچتە قاڭقىش menusini ئاچىدۇ" + +#: ../midori/midori-websettings.c:852 ../extensions/statusbar-features.c:88 +msgid "Load images automatically" +msgstr "سۈرەتنى ئۆزلۈكىدىن يۈكلە" + +# tooltip +#: ../midori/midori-websettings.c:853 +msgid "Load and display images automatically" +msgstr "سۈرەتنى ئۆزلۈكىدىن ئوقۇپ كۆرسىتىدۇ" + +#: ../midori/midori-websettings.c:860 ../extensions/statusbar-features.c:100 +msgid "Enable scripts" +msgstr "script ئېچىۋەت" + +# tooltip +#: ../midori/midori-websettings.c:861 +msgid "Enable embedded scripting languages" +msgstr "سىڭدۈرمە script تىلىنى ئىشلەتكىلى بولىدىغان قىلىدۇ" + +#: ../midori/midori-websettings.c:868 ../extensions/statusbar-features.c:112 +msgid "Enable Netscape plugins" +msgstr "Netscape قىستۇرمىلىرى ئېچىۋەت" + +# tooltip +#: ../midori/midori-websettings.c:869 +msgid "Enable embedded Netscape plugin objects" +msgstr "سىڭدۈرمە Netscape قىستۇرمىلىرىنى ئىشلەتكىلى بولىدىغان قىلىدۇ" + +#: ../midori/midori-websettings.c:885 +msgid "Enable HTML5 database support" +msgstr "HTML5 ساندانىنى قوللا" + +#: ../midori/midori-websettings.c:886 +msgid "Whether to enable HTML5 database support" +msgstr "HTML5 ساندانىنى ئىشلەتكىلى بولىدىغان قىلىدۇ" + +#: ../midori/midori-websettings.c:892 +msgid "Enable HTML5 local storage support" +msgstr "HTML5 يەرلىك storage نى قوللا" + +#: ../midori/midori-websettings.c:893 +msgid "Whether to enable HTML5 local storage support" +msgstr "HTML5 يەرلىك storage نى ئىشلەتكىلى بولىدىغان قىلىدۇ" + +#: ../midori/midori-websettings.c:901 +msgid "Enable offline web application cache" +msgstr "تورسىز ھالەتتە تور پروگراممىلىرىنىڭ غەملىكىنى ئېچىۋەت" + +#: ../midori/midori-websettings.c:902 +msgid "Whether to enable offline web application cache" +msgstr "تورسىز ھالەتتە تور پروگراممىلىرىنىڭ غەملىكىنى ئېچىۋېتىدۇ" + +#: ../midori/midori-websettings.c:927 +msgid "Zoom Text and Images" +msgstr "تېكىست ۋە سۈرەتلەرنى چوڭايت تارايت" + +# tooltip +#: ../midori/midori-websettings.c:928 +msgid "Whether to zoom text and images" +msgstr "تېكىست ۋە سۈرەتلەرنى چوڭايتىدۇ ياكى تارايتىدۇ" + +#: ../midori/midori-websettings.c:943 +msgid "Find inline while typing" +msgstr "كىرگۈزگەن ھامان ئىزدە" + +# tooltip +#: ../midori/midori-websettings.c:944 +msgid "Whether to automatically find inline while typing" +msgstr "كۇنۇپكا بېسىلغان ھامان ئىزدەش ئېلىپ بارىدۇ" + +#: ../midori/midori-websettings.c:959 +msgid "Kinetic scrolling" +msgstr "Kinetic سىيرىل" + +#: ../midori/midori-websettings.c:960 +msgid "Whether scrolling should kinetically move according to speed" +msgstr "تېزلىكىگە ئاساسەن Kinetic سىيرىلىپ يۆتكىلىدۇ" + +#: ../midori/midori-websettings.c:968 +msgid "Accept cookies" +msgstr "cookie لارنى قوبۇل قىل" + +# tooltip +#: ../midori/midori-websettings.c:969 +msgid "What type of cookies to accept" +msgstr "قوبۇل قىلىدىغان cookie نىڭ تىپى" + +#: ../midori/midori-websettings.c:985 +msgid "Original cookies only" +msgstr "پەقەتلا ئەسلى cookie" + +# tooltip +#: ../midori/midori-websettings.c:986 +msgid "Accept cookies from the original website only" +msgstr "ئەسلى تورتۇرادىن كەلگەن cookie لارنىلا قوبۇل قىلىدۇ" + +#: ../midori/midori-websettings.c:994 +msgid "Maximum cookie age" +msgstr "Cookie نىڭ ئۆمرى" + +# tooltip +#: ../midori/midori-websettings.c:995 +msgid "The maximum number of days to save cookies for" +msgstr "Cookie نىڭ ئەڭ ئۇزۇن ساقلىنىش ۋاقتى" + +#: ../midori/midori-websettings.c:1012 +msgid "Remember last visited pages" +msgstr "ئەڭ ئاخىرقى قېتىم كۆرگەن بەتنى ئەستە تۇت" + +# tooltip +#: ../midori/midori-websettings.c:1013 +msgid "Whether the last visited pages are saved" +msgstr "ئەڭ ئاخىرقى قېتىم كۆرگەن بەتنى ساقلىۋالىدۇ" + +#: ../midori/midori-websettings.c:1021 +msgid "Maximum history age" +msgstr "ئىزنىڭ ئەڭ ئۇزۇن ۋاقتى" + +# tooltip +#: ../midori/midori-websettings.c:1022 +msgid "The maximum number of days to save the history for" +msgstr "ئىزنىڭ ئەڭ ئۇزۇن ساقلىنىش ۋاقتى" + +#: ../midori/midori-websettings.c:1030 +msgid "Remember last downloaded files" +msgstr "ئەڭ ئاخىرقى قېتىم چۈشۈرگەن ھۆججەتنى ئەستە تۇت" + +# tooltip +#: ../midori/midori-websettings.c:1031 +msgid "Whether the last downloaded files are saved" +msgstr "ئەڭ ئاخىرقى قېتىم چۈشۈرگەن ھۆججەتنى ئەستە تۇتۇۋالىدۇ" + +#: ../midori/midori-websettings.c:1048 +msgid "Proxy server" +msgstr "ۋاكالەتچى مۇلازىمېتىر" + +#: ../midori/midori-websettings.c:1049 +msgid "The type of proxy server to use" +msgstr "ئىشلىتىدىغان ۋاكالەتچى مۇلازىمېتىرنىڭ تىپى" + +#: ../midori/midori-websettings.c:1058 +msgid "HTTP Proxy Server" +msgstr "HTTP ۋاكالەتچى مۇلازىمېتىر" + +# tooltip +#: ../midori/midori-websettings.c:1059 +msgid "The proxy server used for HTTP connections" +msgstr "HTTP باغلىنىشىدا ئىشلىتىدىغان ۋاكالەتچى مۇلازىمېتىرنى كۆرسىتىدۇ" + +#: ../midori/midori-websettings.c:1074 +msgid "Detect proxy server automatically" +msgstr "ۋاكالەتچى مۇلازىمېتىرنى ئۆزلۈكىدىن ئۆچۈر" + +# tooltip +#: ../midori/midori-websettings.c:1075 +msgid "Whether to detect the proxy server automatically from the environment" +msgstr "ۋاكالەتچى مۇلازىمېتىرنى ئۆزلۈكىدىن ئۆچۈرىدۇ" + +#. i18n: This refers to an application, not the 'user agent' string +#: ../midori/midori-websettings.c:1091 +msgid "Identify as" +msgstr "تونۇتۇلىدۇ" + +# tooltip +#: ../midori/midori-websettings.c:1092 +msgid "What to identify as to web pages" +msgstr "قانداقلىرىنى تور بېتى دەپ تونۇتىدىغانلىقىنى بېكىتىدۇ" + +#: ../midori/midori-websettings.c:1108 +msgid "Identification string" +msgstr "تونۇش ھەرپ تىزمىسى" + +# tooltip +#: ../midori/midori-websettings.c:1109 +msgid "The application identification string" +msgstr "پروگراممىنىڭ تونۇش ھەرپ تىزمىسى" + +#: ../midori/midori-websettings.c:1124 +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\" or \"en-us;q=1.0, fr-fr;q=0.667\"" + +# Button title +#: ../midori/midori-websettings.c:1140 +msgid "Clear private data" +msgstr "شەخسىي سانلىق-ئاساسلارنى تازىلا" + +# FIXME: +#: ../midori/midori-websettings.c:1141 +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:1261 ../midori/midori-view.c:4560 +#: ../midori/midori-view.c:4564 +#, c-format +msgid "Error - %s" +msgstr "خاتالىق - %s" + +#: ../midori/midori-view.c:1262 +#, c-format +msgid "The page '%s' couldn't be loaded." +msgstr "بەت '%s' نى ئوقۇغىلى بولمىدى." + +#: ../midori/midori-view.c:1264 +msgid "Try again" +msgstr "قايتا سىناپ كور" + +#. i18n: The title of the 404 - Not found error page +#: ../midori/midori-view.c:1283 +#, c-format +msgid "Not found - %s" +msgstr "بەت تېپىلمىدى - %s" + +#: ../midori/midori-view.c:1520 ../midori/midori-view.c:2357 +#, c-format +msgid "Send a message to %s" +msgstr "%s غا ئۇچۇر ئەۋەتىدۇ" + +#: ../midori/midori-view.c:2139 ../midori/midori-view.c:2519 +msgid "Inspect _Element" +msgstr "ئېلېمېنتلارنى تەكشۈر(_E)" + +#: ../midori/midori-view.c:2191 ../midori/midori-view.c:2261 +msgid "Open Link in New _Tab" +msgstr "ئۇلانمىنى يېڭى بەتكۈچتە ئاچ(_T)" + +#: ../midori/midori-view.c:2195 +msgid "Open Link in _Foreground Tab" +msgstr "ئۇلانمىنى ئەڭ ئالدىدىكى بەتكۈچتە ئاچ(_T)" + +#: ../midori/midori-view.c:2196 +msgid "Open Link in _Background Tab" +msgstr "ئۇلانمىنى ئەڭ ئاخىرقى بەتكۈچتە ئاچ(_T)" + +#: ../midori/midori-view.c:2199 ../midori/midori-view.c:2268 +msgid "Open Link in New _Window" +msgstr "ئۇلانمىنى يېڭى كۆزنەكتە ئاچ(_W)" + +#: ../midori/midori-view.c:2202 +msgid "Open Link as Web A_pplication" +msgstr "ئۇلانمىنى تور پروگراممىسى دەپ قاراپ ئاچ(_P)" + +#: ../midori/midori-view.c:2205 +msgid "Copy Link de_stination" +msgstr "ئۇلانما نىشانىنى كۆچۈر(_S)" + +#: ../midori/midori-view.c:2208 ../midori/midori-view.c:2280 +msgid "_Save Link destination" +msgstr "ئۇلانما نىشانىنى ساقلا(_S)" + +#: ../midori/midori-view.c:2209 ../midori/midori-view.c:2274 +msgid "_Download Link destination" +msgstr "ئۇلانما نىشانىنى چۈشۈر(_D)" + +#: ../midori/midori-view.c:2213 ../midori/midori-view.c:2243 +#: ../midori/midori-view.c:2285 +msgid "Download with Download _Manager" +msgstr "چۈشۈرۈش باشقۇرغۇسىدا چۈشۈر(_M)" + +#: ../midori/midori-view.c:2222 +msgid "Open _Image in New Tab" +msgstr "سۈرەتنى يېڭى بەتكۈچتە ئاچ(_I)" + +#: ../midori/midori-view.c:2225 +msgid "Copy Image _Address" +msgstr "سۈرەت ئادرېسىنى كۆچۈر(_A)" + +#: ../midori/midori-view.c:2228 +msgid "Save I_mage" +msgstr "سۈرەتنى ساقلا(_M)" + +#: ../midori/midori-view.c:2229 +msgid "Download I_mage" +msgstr "سۈرەتنى چۈشۈر(_M)" + +#: ../midori/midori-view.c:2236 +msgid "Copy Video _Address" +msgstr "سىن ئادرېسىنى كۆچۈر(_A)" + +#: ../midori/midori-view.c:2239 +msgid "Save _Video" +msgstr "سىننى ساقلا(_V)" + +#: ../midori/midori-view.c:2239 +msgid "Download _Video" +msgstr "سىننى چۈشۈر(_V)" + +#: ../midori/midori-view.c:2302 +msgid "Search _with" +msgstr "ئىزدە(_W)" + +#: ../midori/midori-view.c:2337 ../midori/midori-view.c:2344 +msgid "_Search the Web" +msgstr "توردا ئىزدە(_S)" + +#: ../midori/midori-view.c:2365 +msgid "Open Address in New _Tab" +msgstr "ئادرېسنى يېڭى بەتكۈچتە ئاچ(_T)" + +#: ../midori/midori-view.c:2661 +msgid "Open or download file" +msgstr "ھۆججەتنى ئاچامسىز، چۈشۈرەمسىز؟" + +#: ../midori/midori-view.c:2680 +#, c-format +msgid "File Type: '%s'" +msgstr "ھۆججەت تىپى: '%s'" + +#: ../midori/midori-view.c:2683 +#, 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:2687 +#, c-format +msgid "Open %s" +msgstr "%s نى ئاچ" + +#: ../midori/midori-view.c:3231 +#, c-format +msgid "Inspect page - %s" +msgstr "بەتنى تەكشۈر - %s" + +#: ../midori/midori-view.c:3513 +msgid "Speed Dial" +msgstr "" + +#: ../midori/midori-view.c:3514 +msgid "Click to add a shortcut" +msgstr "چەكسە تېزلەتمىگە قوشۇلىدۇ" + +#: ../midori/midori-view.c:3515 +msgid "Enter shortcut address" +msgstr "تېزلەتمە ئادرېسىنى كىرگۈز" + +#: ../midori/midori-view.c:3516 +msgid "Enter shortcut title" +msgstr "تېزلەتمە ماۋزۇسىنى كىرگۈز" + +#: ../midori/midori-view.c:3517 +msgid "Are you sure you want to delete this shortcut?" +msgstr "بۇ تېزلەتمىنى راستلا ئۆچۈرەمسىز؟" + +#: ../midori/midori-view.c:3518 +msgid "Set number of columns and rows" +msgstr "قۇر ۋە ئىستون نومۇرى" + +#: ../midori/midori-view.c:3519 +msgid "Enter number of columns and rows:" +msgstr "قۇر ۋە ئىستون نومۇرىنى كىرگۈزۈڭ:" + +#: ../midori/midori-view.c:3520 +msgid "Invalid input for the size of the speed dial" +msgstr "كىرگۈزۈلگەن speed dial نىڭ چوڭلۇقى ئىناۋەتسىز" + +#: ../midori/midori-view.c:3521 +msgid "Thumb size:" +msgstr "Thumb چوڭلۇقى:" + +#: ../midori/midori-view.c:3522 +msgid "Small" +msgstr "كىچىك" + +#: ../midori/midori-view.c:3523 +msgid "Medium" +msgstr "ئوتتۇرا" + +#: ../midori/midori-view.c:3524 +msgid "Big" +msgstr "چوڭ" + +#: ../midori/midori-view.c:3550 +#, c-format +msgid "Document cannot be displayed" +msgstr "پۈتۈكنى كۆرسەتكىلى بولمىدى" + +#: ../midori/midori-view.c:3573 +#, c-format +msgid "No documentation installed" +msgstr "پۈتۈك ئورنىتىلمىغان" + +#: ../midori/midori-view.c:3694 +msgid "Page loading delayed" +msgstr "بەتنى ئوقۇش كېچىكتۈرۈلدى" + +#: ../midori/midori-view.c:3695 +msgid "Loading delayed either due to a recent crash or startup preferences." +msgstr "غۇلاش ياكى قوزغىلىش مايىللىقى سەۋەبىدىن ئوقۇش كېچىكتۈرۈلدى." + +#: ../midori/midori-view.c:3696 +msgid "Load Page" +msgstr "بەتنى ئوقۇش" + +#: ../midori/midori-view.c:3840 +msgid "Blank page" +msgstr "بوش بەت" + +#: ../midori/midori-view.c:4100 +msgid "_Duplicate Tab" +msgstr "بەتكۈچنى تۇغدۇر(_D)" + +#: ../midori/midori-view.c:4105 +msgid "_Restore Tab" +msgstr "بەتكۈچنى ئەسلىگە كەلتۈر(_R)" + +#: ../midori/midori-view.c:4105 +msgid "_Minimize Tab" +msgstr "بەتكۈچنى كىچىكلەت(_M)" + +#: ../midori/midori-view.c:4111 +msgid "Close ot_her Tabs" +msgstr "باشقا بەتكۈچلەرنى تاقا(_H)" + +#: ../midori/midori-view.c:4797 +msgid "Print background images" +msgstr "تەگ سۈرىتىنى بېسىپ چىقار" + +# tooltip +#: ../midori/midori-view.c:4798 +msgid "Whether background images should be printed" +msgstr "تەگ سۈرىتىنى بېسىپ چىقىرىدۇ" + +#: ../midori/midori-view.c:4850 ../midori/midori-preferences.c:381 +msgid "Features" +msgstr "ئىقتىدار" + +#. Page "General" +#: ../midori/midori-preferences.c:298 +msgid "General" +msgstr "ئادەتتىكى" + +#: ../midori/midori-preferences.c:299 +msgid "Startup" +msgstr "قوزغات" + +# tooltip +#: ../midori/midori-preferences.c:314 ../midori/midori-preferences.c:321 +msgid "Use current page as homepage" +msgstr "ھازىرقى بەتنى ماكان بەت قىل" + +#: ../midori/midori-preferences.c:331 ../panels/midori-transfers.c:87 +msgid "Transfers" +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 "كۆڭۈلدىكى فونت" + +# tooltip +#: ../midori/midori-preferences.c:355 +msgid "The default font family used to display text" +msgstr "تېكىستلەرنى كۆرسىتىدىغان كۆڭۈلدىكى فونت" + +# tooltip +#: ../midori/midori-preferences.c:358 +msgid "The default font size used to display text" +msgstr "تېكىستلەرنى كۆرسىتىدىغان كۆڭۈلدىكى فونتنىڭ چوڭلۇقى" + +#: ../midori/midori-preferences.c:360 +msgid "Fixed-width Font Family" +msgstr "تەڭ كەڭلىكتىكى فونت" + +# tooltip +#: ../midori/midori-preferences.c:363 +msgid "The font family used to display fixed-width text" +msgstr "تېكىستلەرنى تەڭ كەڭلىكتە كۆرسىتىدىغان فونت" + +# tooltip +#: ../midori/midori-preferences.c:366 +msgid "The font size used to display fixed-width text" +msgstr "تېكىستلەرنى تەڭ كەڭلىكتە كۆرسىتىدىغان فونتنىڭ چوڭلۇقى" + +#: ../midori/midori-preferences.c:368 +msgid "Minimum Font Size" +msgstr "فونتنىڭ ئەڭ كىچىك چوڭلۇقى" + +# tooltip +#: ../midori/midori-preferences.c:371 +msgid "The minimum font size used to display text" +msgstr "تېكىستلەرنى كۆرسىتىدىغان فونتنىڭ ئەڭ كىچىك چوڭلۇقى" + +#. Page "Behavior" +#: ../midori/midori-preferences.c:380 +msgid "Behavior" +msgstr "ھەرىكىتى" + +#: ../midori/midori-preferences.c:393 +msgid "Enforce 96 dots per inch" +msgstr "مەجبۇرىي 96DPI دا كۆرسەت" + +# tooltip +#: ../midori/midori-preferences.c:394 +msgid "Enforce a video dot density of 96 DPI" +msgstr "سىن زىچلىقىنى 96DPI غا توغرىلايدۇ" + +#: ../midori/midori-preferences.c:414 +msgid "Allow scripts to open popups" +msgstr "script ئىشلىتىپ popup چىقىرىشقا رۇخسەت قىل" + +# tooltip +#: ../midori/midori-preferences.c:415 +msgid "Whether scripts are allowed to open popup windows automatically" +msgstr "script ئىشلىتىپ popup چىقىرىشقا رۇخسەت قىلىدۇ" + +#: ../midori/midori-preferences.c:419 +msgid "Spell Checking" +msgstr "ئىملا تەكشۈرۈش" + +#: ../midori/midori-preferences.c:422 +msgid "Enable Spell Checking" +msgstr "ئىملا تەكشۈرۈش ئىناۋەتلىك" + +# tooltip +#: ../midori/midori-preferences.c:423 +msgid "Enable spell checking while typing" +msgstr "كىرگۈزۈۋاتقاندا ئىملا تەكشۈرىدۇ" + +#: ../midori/midori-preferences.c:425 +msgid "Spelling dictionaries:" +msgstr "ئىملا ئامبىرى:" + +# tooltip +#. 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 "ئىملاسى تەكشۈرۈلىدىغان تىللار(پەش بىلەن ئايرىلىدۇ مەسىلەن: \"en,de_DE\")" + +#. Page "Interface" +#: ../midori/midori-preferences.c:435 +msgid "Interface" +msgstr "كۆرۈنمە يۈز" + +#: ../midori/midori-preferences.c:436 +msgid "Navigationbar" +msgstr "يولچى بالداق" + +#: ../midori/midori-preferences.c:446 +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 +msgid "Network" +msgstr "تور" + +#: ../midori/midori-preferences.c:492 +msgid "Hostname" +msgstr "مۇلازىمېتىر نامى" + +#. Page "Privacy" +#: ../midori/midori-preferences.c:511 +msgid "Privacy" +msgstr "شەخسىيەت" + +#: ../midori/midori-preferences.c:512 +msgid "Web Cookies" +msgstr "تور Cookie" + +#: ../midori/midori-preferences.c:521 ../midori/midori-preferences.c:535 +msgid "days" +msgstr "كۈن" + +#: ../midori/midori-searchaction.c:917 +msgid "Add search engine" +msgstr "ئىزدەش ماتورى قوش" + +#: ../midori/midori-searchaction.c:917 +msgid "Edit search engine" +msgstr "ئىزدەش ماتورى تەھرىرلە" + +#: ../midori/midori-searchaction.c:945 +msgid "_Name:" +msgstr "ئاتى(_N):" + +#: ../midori/midori-searchaction.c:989 +msgid "_Icon:" +msgstr "سىنبەلگە(_I):" + +#: ../midori/midori-searchaction.c:1003 +msgid "_Token:" +msgstr "ماياق(_T):" + +#: ../midori/midori-searchaction.c:1234 +msgid "Manage Search Engines" +msgstr "ئىزدەش ماتورىنى باشقۇرۇش" + +#: ../midori/midori-searchaction.c:1335 +msgid "Use as _default" +msgstr "كۆڭۈلدىكى قىلىپ ئىشلەت(_D)" + +#: ../midori/sokoke.c:1287 +msgid "_Bookmark" +msgstr "خەتكۈش(_B)" + +#: ../midori/sokoke.c:1289 +msgid "Add Boo_kmark" +msgstr "خەتكۈش قوش(_K)" + +#: ../midori/sokoke.c:1290 +msgid "_Console" +msgstr "كۆزنەك(_C)" + +#: ../midori/sokoke.c:1291 +msgid "_Extensions" +msgstr "كېڭەيتمىلەر(_E)" + +#: ../midori/sokoke.c:1292 +msgid "_History" +msgstr "ئىز(_H)" + +#: ../midori/sokoke.c:1293 +msgid "_Homepage" +msgstr "ماكان بەت(_H)" + +#: ../midori/sokoke.c:1294 +msgid "_Userscripts" +msgstr "_Userscripts" + +#: ../midori/sokoke.c:1295 +msgid "New _Tab" +msgstr "يېڭى بەتكۈچ(_T)" + +#: ../midori/sokoke.c:1296 +msgid "_Transfers" +msgstr "ئۇزىتىش(_T)" + +#: ../midori/sokoke.c:1297 +msgid "Netscape p_lugins" +msgstr "Netscape قىستۇرمىلىرى(_L)" + +#: ../midori/sokoke.c:1300 +msgid "New _Folder" +msgstr "يېڭى مۇندەرىجە(_F)" + +#: ../toolbars/midori-transferbar.c:88 ../panels/midori-transfers.c:270 +#, c-format +msgid "%s of %s" +msgstr "%s / %s" + +#: ../toolbars/midori-transferbar.c:123 +#, c-format +msgid "The file '%s' has been downloaded." +msgstr "ھۆججەت '%s' چۈشۈرۈلدى." + +#: ../toolbars/midori-transferbar.c:126 +msgid "Transfer completed" +msgstr "ئۇزىتىش تاماملاندى" + +#: ../toolbars/midori-transferbar.c:257 ../panels/midori-transfers.c:141 +msgid "Clear All" +msgstr "ھەممىنى تازىلا" + +#: ../toolbars/midori-transferbar.c:278 ../toolbars/midori-transferbar.c:280 +msgid "Some files are being downloaded" +msgstr "بەزى ھۆججەتلەر چۈشۈرۈلىدۇ" + +#: ../toolbars/midori-transferbar.c:284 +msgid "_Quit Midori" +msgstr "Midori نى ئاخىرلاشتۇر(_Q)" + +#: ../toolbars/midori-transferbar.c:286 +msgid "The transfers will be cancelled if Midori quits." +msgstr "Midori ئاخىرلاشتۇرۇلسا ئۇزىتىشلار ئۈزۈلىدۇ." + +#: ../panels/midori-bookmarks.c:109 +msgid "Bookmarks" +msgstr "خەتكۈش" + +#: ../panels/midori-bookmarks.c:244 +#, c-format +msgid "Failed to add bookmark item: %s\n" +msgstr "خەتكۈش تۇرىنى ئېچىش مەغلۇپ بولدى: %s\n" + +# tooltip +#: ../panels/midori-bookmarks.c:430 +msgid "Edit the selected bookmark" +msgstr "تاللانغان خەتكۈچنى تەھرىرلەيدۇ" + +# tooltip +#: ../panels/midori-bookmarks.c:438 +msgid "Delete the selected bookmark" +msgstr "تاللانغان خەتكۈچنى ئۆچۈرىدۇ" + +#: ../panels/midori-bookmarks.c:451 +msgid "Add a new folder" +msgstr "يېڭى مۇندەرىجە قوش" + +#: ../panels/midori-bookmarks.c:585 +msgid "Separator" +msgstr "ئايرىغۇچ" + +#: ../panels/midori-console.c:87 +msgid "Console" +msgstr "كۆزنەك" + +# tooltip +#: ../panels/midori-console.c:361 +msgid "Copy _All" +msgstr "ھەممىنى كۆچۈر(_A)" + +# tooltip +#: ../panels/midori-console.c:362 +msgid "Copy All" +msgstr "ھەممىنى كۆچۈر" + +#: ../panels/midori-extensions.c:91 +msgid "Extensions" +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:286 +msgid "A week ago" +msgstr "بىر ھەپتە بۇرۇن" + +#: ../panels/midori-history.c:288 +#, c-format +msgid "%d day ago" +msgid_plural "%d days ago" +msgstr[0] "%d كۈن بۇرۇن" + +#: ../panels/midori-history.c:291 +msgid "Today" +msgstr "بۈگۈن" + +#: ../panels/midori-history.c:293 +msgid "Yesterday" +msgstr "تۈنۈگۈن" + +#: ../panels/midori-history.c:378 +msgid "Are you sure you want to remove all history items?" +msgstr "بارلىق ئىزلارنى ئۆچۈرەمسىز؟" + +# tooltip +#: ../panels/midori-history.c:437 +msgid "Bookmark the selected history item" +msgstr "تاللانغان ئىزنى خەتكۈچكە قوشىدۇ" + +# tooltip +#: ../panels/midori-history.c:446 +msgid "Delete the selected history item" +msgstr "تاللانغان ئىزنى ئۆچۈرىدۇ" + +# tooltip +#: ../panels/midori-history.c:454 +msgid "Clear the entire history" +msgstr "بارلىق ئىزنى تازىلايدۇ" + +#: ../panels/midori-history.c:952 +#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +msgid "Filter:" +msgstr "سۈزگۈچ:" + +#: ../panels/midori-transfers.c:478 +msgid "Open Destination _Folder" +msgstr "نىشان مۇندەرىجىنى ئاچ(_F)" + +#: ../panels/midori-transfers.c:481 +msgid "Copy Link Loc_ation" +msgstr "ئۇلانما ئورنىنى كۆچۈر(_A)" + +#: ../katze/katze-http-auth.c:214 +msgid "Authentication Required" +msgstr "دەلىللەش زۆرۈر" + +#: ../katze/katze-http-auth.c:230 +msgid "" +"A username and a password are required\n" +"to open this location:" +msgstr "بۇ ئورۇننى ئېچىش ئۈچۈن ئىشلەتكۈچى ئاتى ۋە ئىم\n" +"زۆرۈردۇر:" + +#: ../katze/katze-http-auth.c:244 +msgid "Username" +msgstr "ئىشلەتكۈچى ئاتى" + +#: ../katze/katze-http-auth.c:257 +msgid "Password" +msgstr "ئىم" + +#: ../katze/katze-http-auth.c:272 +msgid "_Remember password" +msgstr "ئىمنى ئەستە تۇتۇۋال(_R)" + +#: ../katze/katze-throbber.c:882 +#, c-format +msgid "Named icon '%s' couldn't be loaded" +msgstr "'%s' ئاتلىق سىنبەلگىنى ئوقۇيالمىدى" + +#: ../katze/katze-throbber.c:895 +#, c-format +msgid "Stock icon '%s' couldn't be loaded" +msgstr "Stock سىنبەلگە '%s' نى ئوقۇيالمىدى" + +#: ../katze/katze-throbber.c:963 +msgid "Animation frames are broken" +msgstr "" + +#: ../katze/katze-utils.c:498 ../katze/katze-utils.c:893 +#, c-format +msgid "Property '%s' is invalid for %s" +msgstr "'%s' بولسا %s نىڭ خاسلىقى ئەمەس" + +#: ../katze/katze-utils.c:544 ../katze/katze-utils.c:573 +msgid "Choose file" +msgstr "ھۆججەت تاللا" + +#: ../katze/katze-utils.c:559 +msgid "Choose folder" +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 "ئېلان سۈزگۈچىنى تەڭشە(_A)..." + +#: ../extensions/adblock.c:841 +msgid "Edit rule" +msgstr "تۇزۇم تەھرىرلە" + +#: ../extensions/adblock.c:854 +msgid "_Rule:" +msgstr "تۇزۇم(_R):" + +#: ../extensions/adblock.c:908 +msgid "Bl_ock image" +msgstr "سۈرەتنى چەكلە(_O)" + +#: ../extensions/adblock.c:913 +msgid "Bl_ock link" +msgstr "ئۇلانمىنى چەكلە(_O)" + +#: ../extensions/adblock.c:1489 +msgid "Advertisement blocker" +msgstr "ئېلان چەكلىگۈ" + +# description +#: ../extensions/adblock.c:1490 +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 غا كۆچۈرىدۇ." + +#: ../extensions/addons.c:177 +msgid "Userscripts" +msgstr "Userscripts" + +#: ../extensions/addons.c:179 +msgid "Userstyles" +msgstr "ئىشلەتكۈچى ئۇسلۇبى" + +#: ../extensions/addons.c:1085 +#, c-format +msgid "The configuration of the extension '%s' couldn't be saved: %s\n" +msgstr "كېڭەيتىلمە '%s' نىڭ تەڭشىكىنى ساقلىغىلى بولمىدى: %s\n" + +#: ../extensions/addons.c:1086 ../extensions/addons.c:1253 +msgid "User addons" +msgstr "ئىشلەتكۈچى قوشۇلمىسى" + +#: ../extensions/addons.c:1210 +#, c-format +msgid "Can't monitor folder '%s': %s" +msgstr "مۇندەرىجە '%s' نى كۆزەتكىلى بولمىدى: %s" + +#: ../extensions/addons.c:1254 +msgid "Support for userscripts and userstyles" +msgstr "userscripts ۋە ئىشلەتكۈچى ئۇسلۇبىنى ئىشلەتكىلى بولىدۇ" + +#: ../extensions/colorful-tabs.c:204 +msgid "Colorful Tabs" +msgstr "رەڭلىك بەتكۈچلەر" + +# description +#: ../extensions/colorful-tabs.c:205 +msgid "Tint each tab distinctly" +msgstr "ھەر بىر بەتكۈچنى ئوخشىمىغان رەڭدە كۆرسەت" + +#: ../extensions/cookie-manager/cookie-manager-page.c:82 +#: ../extensions/cookie-manager/main.c:56 +msgid "Cookie Manager" +msgstr "Cookie باشقۇرغۇ" + +#: ../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 "كۆرۈنگەن ھەممە cookie نى ئۆچۈرىدۇ. ئەگەر سۈزگۈچ بار بولسا، سۈزۈلگەننىلا ئۆچۈرىدۇ." + +# tooltip +#: ../extensions/cookie-manager/cookie-manager-page.c:129 +msgid "Expand All" +msgstr "ھەممىنى ياي" + +# tooltip +#: ../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 "ھەممە cookie راستلا ئۆچۈرەمسىز؟" + +# Dialog title +#: ../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 "سۈزۈلگەن cookie نىلا ئۆچۈرىدۇ." + +#: ../extensions/cookie-manager/cookie-manager-page.c:677 +msgid "At the end of the session" +msgstr "ئەڭگىمەنىڭ ئاخىرىغىچە" + +#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#, c-format +msgid "" +"Host: %s\n" +"Name: %s\n" +"Value: %s\n" +"Path: %s\n" +"Secure: %s\n" +"Expires: %s" +msgstr "Host: %s\n" +"ئاتى: %s\n" +"قىممىتى: %s\n" +"يولى: %s\n" +"بىخەتەر: %s\n" +"مۇددىتى: %s" + +# cookie: Secure flag is set. +#: ../extensions/cookie-manager/cookie-manager-page.c:686 +msgid "Yes" +msgstr "ھەئە" + +# cookie: Secure flag isn't set. +#: ../extensions/cookie-manager/cookie-manager-page.c:686 +msgid "No" +msgstr "ياق" + +#: ../extensions/cookie-manager/cookie-manager-page.c:700 +#, c-format +msgid "" +"Domain: %s\n" +"Cookies: %d" +msgstr "Domain: %s\n" +"Cookie سانى: %d" + +# Column name of cookie browser +#: ../extensions/cookie-manager/cookie-manager-page.c:1030 +msgid "Name" +msgstr "ئاتى" + +#: ../extensions/cookie-manager/cookie-manager-page.c:1083 +msgid "_Expand All" +msgstr "ھەممىنى ياي(_E)" + +#: ../extensions/cookie-manager/cookie-manager-page.c:1091 +msgid "_Collapse All" +msgstr "ھەممىنى قاتلا(_C)" + +# tooltip +#: ../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 "Cookie باشقۇرغۇ(_C)" + +# description +#: ../extensions/cookie-manager/main.c:57 +msgid "List, view and delete cookies" +msgstr "Cookie نى تىزىپ كۆرسىتىدۇ، كۆرىدۇ، ئۆچۈرىدۇ" + +#: ../extensions/copy-tabs.c:39 +msgid "Copy Tab _Addresses" +msgstr "بەتكۈچ ئادرېسىنى كۆچۈرىدۇ(_A)" + +#: ../extensions/copy-tabs.c:98 +msgid "Copy Addresses of Tabs" +msgstr "بەتكۈچ ئادرېسىنى كۆچۈرىدۇ" + +#: ../extensions/copy-tabs.c:99 +msgid "Copy the addresses of all tabs to the clipboard" +msgstr "بارلىق بەتكۈچنىڭ ئادرېسىنى clipboard قا كۆچۈرىدۇ" + +#: ../extensions/feed-panel/feed-atom.c:209 +msgid "Failed to find required Atom \"entry\" elements in XML data." +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\" ئېلېمېنتى تېپىلمىدى." + +#. i18n: The local date a feed was last updated +#: ../extensions/feed-panel/feed-panel.c:398 +#, c-format +msgctxt "Feed" +msgid "Last updated: %s." +msgstr "يېڭىلانغان ۋاقتى: %s" + +#: ../extensions/feed-panel/feed-panel.c:670 +msgid "Feeds" +msgstr "Feeds" + +#: ../extensions/feed-panel/feed-panel.c:723 +msgid "Add new feed" +msgstr "يېڭى feed قوش" + +#: ../extensions/feed-panel/feed-panel.c:730 +msgid "Delete feed" +msgstr "feed ئۆچۈر" + +#: ../extensions/feed-panel/feed-panel.c:812 +msgid "_Feeds" +msgstr "feed(_F)" + +#: ../extensions/feed-panel/feed-parse.c:192 +#, c-format +msgid "Failed to find root element in feed XML data." +msgstr "feed XML ئىچىدىن root ئېلېمېنتىنى تېپىش مەغلۇپ بولدى" + +#: ../extensions/feed-panel/feed-parse.c:232 +#, c-format +msgid "Unsupported feed format." +msgstr "بۇ خىل feed فورماتىنى تېخى ئىشلەتكىلى بولمايدۇ" + +#: ../extensions/feed-panel/feed-parse.c:262 +#, c-format +msgid "Failed to parse XML feed: %s" +msgstr "XML feed نى تەھلىل قىلىش مەغلۇپ بولدى: %s" + +#: ../extensions/feed-panel/feed-rss.c:46 +msgid "Failed to find \"channel\" element in RSS XML data." +msgstr "RSS XML ئىچىدىن \"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:129 +msgid "Error" +msgstr "خاتالىق" + +#: ../extensions/feed-panel/main.c:131 +#, c-format +msgid "Feed '%s' already exists" +msgstr "Feed '%s' ئاللىقاچان بار" + +#: ../extensions/feed-panel/main.c:208 +#, c-format +msgid "Error loading feed '%s'" +msgstr "Feed '%s' ئوقۇشتا خاتالىق كۆرۈلدى" + +#: ../extensions/feed-panel/main.c:516 +msgid "Feed Panel" +msgstr "Feed Panel" + +# description +#: ../extensions/feed-panel/main.c:517 +msgid "Read Atom/ RSS feeds" +msgstr "Atom/RSS Feedنى ئوقۇۋاتىدۇ" + +#: ../extensions/formhistory.c:144 +#, c-format +msgid "Failed to add form value: %s\n" +msgstr "form قىممىتىنى قوشۇش مەغلۇپ بولدى: %s\n" + +#: ../extensions/formhistory.c:510 +msgid "Stores history of entered form data" +msgstr "form كىرگۈزۈلگەن ئۇچۇرلارنى ئەستە ساقلىۋالىدۇ" + +#: ../extensions/formhistory.c:514 +#, c-format +msgid "Not available: %s" +msgstr "ئىشلەتكىلى بولمايدۇ: %s" + +#: ../extensions/formhistory.c:515 +msgid "Resource files not installed" +msgstr "Resource ھۆججىتى ئورنىتىلمىغان" + +#: ../extensions/formhistory.c:521 +msgid "Form history filler" +msgstr "ئىز تولدۇرغۇدىن" + +#: ../extensions/mouse-gestures.c:303 +msgid "Mouse Gestures" +msgstr "چاشقىنەك ئىشارىتى" + +# description +#: ../extensions/mouse-gestures.c:304 +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 "Pageholder" + +#: ../extensions/page-holder.c:161 +msgid "_Pageholder" +msgstr "Pageholder(P)" + +#: ../extensions/page-holder.c:178 +msgid "Keep one or multiple pages open in parallel to your tabs" +msgstr "بەتكۈچلەردە بىر ياكى كوپ بەتلەرنى پاراللېل ئاچسۇن" + +#: ../extensions/shortcuts.c:170 +msgid "Customize Keyboard shortcuts" +msgstr "كۇنۇپكا تېزلەتمىسىنى ئۆزلەشتۈر" + +#: ../extensions/shortcuts.c:276 +msgid "Customize Sh_ortcuts..." +msgstr "تېزلەتمىنى ئۆزلەشتۈر(_O)..." + +#: ../extensions/shortcuts.c:315 +msgid "Shortcuts" +msgstr "تېزلەتمە" + +# description +#: ../extensions/shortcuts.c:316 +msgid "View and edit keyboard shortcuts" +msgstr "كۇنۇپكا تېزلەتمىسىنى كۆرىدۇ ۋە تەھرىرلەيدۇ" + +#: ../extensions/statusbar-features.c:84 +msgid "Images" +msgstr "سۈرەتلەر" + +#: ../extensions/statusbar-features.c:96 +msgid "Scripts" +msgstr "Scripts" + +#: ../extensions/statusbar-features.c:108 +msgid "Netscape plugins" +msgstr "Netscape قىستۇرمىلىرى" + +#: ../extensions/statusbar-features.c:149 +msgid "Statusbar Features" +msgstr "ھالەت بالدىقى ئالاھىدىلىكلىرى" + +# description +#: ../extensions/statusbar-features.c:150 +msgid "Easily toggle features on web pages on and off" +msgstr "" + +#: ../extensions/tab-panel.c:568 ../extensions/tab-panel.c:625 +msgid "Tab Panel" +msgstr "بەتكۈچ Panel" + +#: ../extensions/tab-panel.c:609 +msgid "T_ab Panel" +msgstr "بەتكۈچ Panel(_A)" + +# description +#: ../extensions/tab-panel.c:626 +msgid "Show tabs in a vertical panel" +msgstr "بەتكۈچلەرنى تىك panel دا كۆرسىتىدۇ" + +#: ../extensions/tab-switcher.c:402 +msgid "Tab History List" +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:79 +msgid "Minimize new Tabs" +msgstr "يېڭى بەتكۈچنى ئەڭ كىچىك قىل" + +#: ../extensions/tabs-minimized.c:80 +msgid "New tabs open minimized" +msgstr "يېڭى بەتكۈچنى ئەڭ كىچىك ھالەتتە ئاچىدۇ" + +#: ../extensions/toolbar-editor.c:389 +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:421 +msgid "Available Items" +msgstr "بار تۈرلەر" + +#: ../extensions/toolbar-editor.c:442 +msgid "Displayed Items" +msgstr "كۆرسىتىدىغان تۈرلەر" + +#: ../extensions/toolbar-editor.c:577 +msgid "Customize _Toolbar..." +msgstr "قورال بالدىقىنى ئۆزلەشتۈر(_T)..." + +#: ../extensions/toolbar-editor.c:608 +msgid "Toolbar Editor" +msgstr "قورال بالدىقى تەھرىرلىگۈ" + +# description +#: ../extensions/toolbar-editor.c:609 +msgid "Easily edit the toolbar layout" +msgstr "قورال بالدىقىنىڭ ئورۇنلاشتۇرۇلۇشىنى ئاسانلا تەھرىرلىگىلى بولىدۇ" + +#: ../extensions/web-cache.c:465 +msgid "Cache HTTP communication on disk" +msgstr "HTTP ئالاقىسىنى دىسكىغا غەملەيدۇ" diff --git a/po/uk.po b/po/uk.po index 196a35ae..afa7db22 100644 --- a/po/uk.po +++ b/po/uk.po @@ -8,46 +8,30 @@ msgid "" msgstr "" "Project-Id-Version: midori svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-11 05:48+0000\n" +"POT-Creation-Date: 2011-11-29 19:42+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-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 "Browse the Web" -msgstr "Переглянути Веб" - -#: ../data/midori.desktop.in.h:2 msgid "Internet;WWW;Explorer" msgstr "Internet;WWW;Explorer" -#: ../data/midori.desktop.in.h:3 ../midori/main.c:1926 ../midori/main.c:1950 -#: ../midori/main.c:1964 ../midori/midori-websettings.c:199 +#: ../data/midori.desktop.in.h:2 +msgid "Lightweight web browser" +msgstr "Легкий переглядач Веб" + +#: ../data/midori.desktop.in.h:3 ../midori/main.c:2005 ../midori/main.c:2025 +#: ../midori/main.c:2036 ../midori/midori-websettings.c:303 msgid "Midori" msgstr "Мідорі" #: ../data/midori.desktop.in.h:4 -msgid "Midori Web Browser" -msgstr "Midori - переглядач Веб-сторінок" - -#: ../data/midori.desktop.in.h:5 -msgid "New Private Browsing Window" -msgstr "Нове вікно в режимі приватності" - -#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1314 -msgid "New Tab" -msgstr "Нова вкладка" - -#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1311 -msgid "New Window" -msgstr "Нове вікно" - -#: ../data/midori.desktop.in.h:8 msgid "Web Browser" msgstr "Переглядач Веб" @@ -59,87 +43,81 @@ msgstr "Мідорі перегляд в режимі приватності" msgid "Open a new private browsing window" msgstr "Відкрити нове вікно перегляду в режимі приватності" -#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4351 +#: ../data/midori-private.desktop.in.h:3 msgid "Private Browsing" msgstr "Режим приватності" -#: ../midori/main.c:91 ../midori/main.c:97 +#: ../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:145 +#: ../midori/main.c:150 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Значення '%s' є неправильним для %s" -#: ../midori/main.c:150 ../midori/main.c:254 +#: ../midori/main.c:155 ../midori/main.c:261 #, c-format msgid "Invalid configuration value '%s'" msgstr "Неправильне значення конфігурації '%s'" -#: ../midori/main.c:365 +#: ../midori/main.c:366 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Неможливо завантажити пошукову машину. %s\n" -#: ../midori/main.c:419 +#: ../midori/main.c:420 #, c-format msgid "Failed to clear history: %s\n" msgstr "Невдача при очищенні історії: %s\n" -#: ../midori/main.c:441 ../extensions/formhistory/formhistory.c:531 +#: ../midori/main.c:440 ../midori/main.c:561 ../extensions/formhistory.c:417 #, 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:513 +#: ../midori/main.c:504 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Невдача видалення старих об'єктів історії: %s\n" -#: ../midori/main.c:535 +#: ../midori/main.c:544 ../panels/midori-history.c:189 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "Невдача при видаленні об'єкту історії: %s\n" + +#: ../midori/main.c:591 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "Неможливо зберегти закладки. %s" + +#: ../midori/main.c:624 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Неможливо зберегти конфігурацію. %s" -#: ../midori/main.c:561 +#: ../midori/main.c:659 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Неможливо зберегти пошукові машини. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:598 +#: ../midori/main.c:685 ../midori/main.c:705 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Неможливо зберегти смітник. %s" -#: ../midori/main.c:671 ../panels/midori-extensions.c:90 +#: ../midori/main.c:739 ../panels/midori-extensions.c:91 msgid "Extensions" msgstr "Розширення" -#: ../midori/main.c:685 +#: ../midori/main.c:753 msgid "Privacy" msgstr "Приватність" -#: ../midori/main.c:687 -msgid "Delete old Cookies after:" -msgstr "Вилучити старі тістечка через:" - -#: ../midori/main.c:689 ../midori/main.c:692 -msgid "The maximum number of days to save cookies for" -msgstr "Максимальне число днів зберігання тістечок для" - -#: ../midori/main.c:696 -msgid "Only accept Cookies from sites you visit" -msgstr "Приймати тістечка тільки з сторінок які ви відвідуєте" - -#: ../midori/main.c:697 -msgid "Block cookies sent by third-party websites" -msgstr "Блокувати тістечка що посилаються сторонніми сторінками" - -#: ../midori/main.c:702 +#: ../midori/main.c:765 msgid "" "Cookies store login data, saved games, or user profiles for advertisement " "purposes." @@ -147,44 +125,19 @@ msgstr "" "Тістечка зберігають дані входу, зберігають ігри або профілі користувачів для " "рекламних цілей." -#: ../midori/main.c:709 -msgid "Enable offline web application cache" -msgstr "Ввімкнути кеш веб переглядача при роботі поза мережею" - -#: ../midori/main.c:712 -msgid "Enable HTML5 local storage support" -msgstr "Ввімкнути підтримку локального сховища HTML5" - -#. i18n: Reworded: Shorten details propagated when going to another page -#: ../midori/main.c:716 -msgid "Strip referrer details sent to websites" -msgstr "Пропустити деталі referer'а, що вислані до зовнішніх сторінок" - -#. i18n: Referer here is not a typo but a technical term -#: ../midori/main.c:718 -msgid "Whether the \"Referer\" header should be shortened to the hostname" -msgstr "Чи заголовок \"Referer'а\" повинен бути скорочений до назви сервера" - -#: ../midori/main.c:721 -msgid "Delete pages from history after:" -msgstr "Видалити сторінку з історії через:" - -#: ../midori/main.c:723 ../midori/main.c:726 -msgid "The maximum number of days to save the history for" -msgstr "Максимальне число днів зберігання історії для" - -#: ../midori/main.c:767 +#: ../midori/main.c:821 #, c-format msgid "The session couldn't be saved. %s" msgstr "Сесія не може бути збережена. %s" -#: ../midori/main.c:993 +#: ../midori/main.c:1031 msgid "" "No root certificate file is available. SSL certificates cannot be verified." msgstr "" -"Немає доступних кореневих сертифікатів. Сертифікати SSL неможливо перевірити." +"Немає доступних кореневих сертифікатів. Сертифікати SSL неможливо " +"перевірити. " -#: ../midori/main.c:1088 +#: ../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." @@ -192,239 +145,245 @@ msgstr "" "Схоже, що Мідорі зазнало краху останнього разу. Якщо це трапилося не вперше, " "то можливо якась з наступних опцій зможе посприяти вирішенню цієї проблеми." -#: ../midori/main.c:1107 +#: ../midori/main.c:1118 msgid "Modify _preferences" msgstr "Змінити _налаштування" -#: ../midori/main.c:1111 +#: ../midori/main.c:1122 msgid "Disable all _extensions" msgstr "Заборонити всі розширення" -#: ../midori/main.c:1120 -msgid "Show a dialog after Midori crashed" -msgstr "Показати діалог, коли Мідорі зазнає краху" - -#: ../midori/main.c:1125 +#: ../midori/main.c:1135 msgid "Discard old tabs" msgstr "Видалити старі вкладки" -#: ../midori/main.c:1126 ../midori/midori-websettings.c:107 +#: ../midori/main.c:1136 ../midori/midori-websettings.c:212 msgid "Show last tabs without loading" msgstr "Показати останні вкладки без завантаження" -#: ../midori/main.c:1127 ../midori/midori-websettings.c:106 +#: ../midori/main.c:1137 ../midori/midori-websettings.c:211 msgid "Show last open tabs" msgstr "Показати останні відкриті вкладки" -#: ../midori/main.c:1374 ../midori/main.c:2378 +#: ../midori/main.c:1345 ../midori/main.c:2408 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Неможливо завантажити сесію: %s\n" -#: ../midori/main.c:1512 +#: ../midori/main.c:1484 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Знімок екрану збережено до: %s\n" -#: ../midori/main.c:1841 +#: ../midori/main.c:1908 msgid "Run ADDRESS as a web application" msgstr "Запустити АДРЕСУ як веб-додаток" -#: ../midori/main.c:1841 +#: ../midori/main.c:1908 msgid "ADDRESS" msgstr "АДРЕСА" -#: ../midori/main.c:1844 +#: ../midori/main.c:1911 msgid "Use FOLDER as configuration folder" msgstr "Використайте ТЕКУ як теку конфігурації" -#: ../midori/main.c:1844 +#: ../midori/main.c:1911 msgid "FOLDER" msgstr "ТЕКА" -#: ../midori/main.c:1847 +#: ../midori/main.c:1914 msgid "Private browsing, no changes are saved" msgstr "Захищений перегляд, жодні зміни не записуються" -#: ../midori/main.c:1850 -msgid "Portable mode, all runtime files are stored in one place" -msgstr "Портативний режим, всі файли запуску збережено в одному місці" - -#: ../midori/main.c:1853 -msgid "Plain GTK+ window with WebKit, akin to GtkLauncher" -msgstr "Звичайне GTK+ вікно з WebKit, аналогічно до GtkLauncher" - -#: ../midori/main.c:1855 +#: ../midori/main.c:1916 msgid "Show a diagnostic dialog" msgstr "Показати діалог діагностики" -#: ../midori/main.c:1857 +#: ../midori/main.c:1918 msgid "Run the specified filename as javascript" msgstr "Виконати визначений файл як джава-скрипт" -#: ../midori/main.c:1859 +#: ../midori/main.c:1920 msgid "Take a snapshot of the specified URI" msgstr "Зробити знімок вибраної сторінки/адреси" -#: ../midori/main.c:1861 +#: ../midori/main.c:1922 msgid "Execute the specified command" msgstr "Виконати вибрану команду" -#: ../midori/main.c:1863 +#: ../midori/main.c:1924 msgid "List available commands to execute with -e/ --execute" msgstr "Список можливих команд для запуску з -e/ --execute" -#: ../midori/main.c:1865 +#: ../midori/main.c:1926 msgid "Display program version" msgstr "Відобразити версію програми" -#: ../midori/main.c:1867 +#: ../midori/main.c:1928 msgid "Addresses" msgstr "Адреси" -#: ../midori/main.c:1869 +#: ../midori/main.c:1930 msgid "Block URIs according to regular expression PATTERN" msgstr "Блокувати URI згідно з регулярним виразом PATTERN" -#: ../midori/main.c:1869 +#: ../midori/main.c:1930 msgid "PATTERN" msgstr "PATTERN" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1873 +#: ../midori/main.c:1934 msgid "Reset Midori after SECONDS seconds of inactivity" -msgstr "Зареєструвати Midori після СЕКУНД неактивності" +msgstr "Зресетувати Midori після СЕКУНД неактивності" -#: ../midori/main.c:1873 +#: ../midori/main.c:1934 msgid "SECONDS" msgstr "СЕКУНД" -#: ../midori/main.c:1876 +#: ../midori/main.c:1937 msgid "Redirects console warnings to the specified FILENAME" -msgstr "Перенаправити попередження консолі до вказаного ФАЙЛ" +msgstr "Перенаправити попередження консолі до вказаного ФАЙЛ " -#: ../midori/main.c:1876 +#: ../midori/main.c:1937 msgid "FILENAME" msgstr "ФАЙЛ" -#: ../midori/main.c:1965 +#: ../midori/main.c:2002 +msgid "[Addresses]" +msgstr "[Адреси]" + +#: ../midori/main.c:2012 +msgid "The specified configuration folder is invalid." +msgstr "Це невластива тека конфігурації." + +#: ../midori/main.c:2037 msgid "Please report comments, suggestions and bugs to:" msgstr "Будь ласка надсилайте звіти, коментарі, пропозиції і помилки до:" -#: ../midori/main.c:1967 +#: ../midori/main.c:2039 msgid "Check for new versions at:" msgstr "Перевірити на наявність нової версії на:" +#: ../midori/main.c:2122 +msgid "Website icons" +msgstr "Значки веб-сторінок" + #. i18n: Logins and passwords in websites and web forms -#: ../midori/main.c:2098 +#: ../midori/main.c:2125 msgid "Saved logins and _passwords" msgstr "Збережені логіни і _паролі" -#: ../midori/main.c:2100 -msgid "Cookies and Website data" -msgstr "Дані коржиків і веб-сторінки" +#: ../midori/main.c:2127 +msgid "Cookies" +msgstr "Тістечка" + +#: ../midori/main.c:2130 +msgid "'Flash' Cookies" +msgstr "'Очистити' тістечка" + +#: ../midori/main.c:2133 +msgid "HTML5 _Databases" +msgstr "_Бази даних HTML5" -#. TODO: Preserve page icons of search engines and merge privacy items -#: ../midori/main.c:2104 ../midori/midori-preferences.c:505 -#: ../extensions/web-cache.c:461 ../extensions/web-cache.c:470 +#: ../midori/main.c:2136 ../midori/midori-websettings.c:936 +#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471 msgid "Web Cache" msgstr "Веб-кеш" -#: ../midori/main.c:2107 -msgid "Website icons" -msgstr "Значки веб-сторінок" +#: ../midori/main.c:2138 +msgid "Offline Application Cache" +msgstr "Кеш програми при праці без мережі" -#: ../midori/main.c:2211 +#: ../midori/main.c:2241 msgid "An unknown error occured" -msgstr "Сталася невідома помилка" +msgstr "Сталася невідома помилка." -#: ../midori/main.c:2326 +#: ../midori/main.c:2339 msgid "An instance of Midori is already running but not responding.\n" msgstr "" "Один із екземплярів програми Midori вже працює, але не відповідає на " "запити.\n" -#: ../midori/main.c:2360 +#: ../midori/main.c:2375 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Неможливо завантажити закладки: %s\n" -#: ../midori/main.c:2393 +#: ../midori/main.c:2423 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Неможливо завантажити смітник: %s\n" -#: ../midori/main.c:2406 +#: ../midori/main.c:2436 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Неможливо завантажити історію: %s\n" -#: ../midori/main.c:2421 +#: ../midori/main.c:2452 msgid "The following errors occured:" msgstr "Отримано наступні помилки:" -#: ../midori/main.c:2437 +#: ../midori/main.c:2468 msgid "_Ignore" msgstr "_Ігнорувати" -#: ../midori/midori-app.c:1156 ../midori/midori-browser.c:533 -#, c-format -msgid "Unexpected action '%s'." -msgstr "Несподівана дія '%s'." +#: ../midori/midori-app.c:1335 +msgid "_Bookmark" +msgstr "_Закладка" -#: ../midori/midori-app.c:1372 ../midori/midori-browser.c:6212 +#: ../midori/midori-app.c:1336 ../midori/midori-browser.c:5982 msgid "_Bookmarks" msgstr "_Закладки" -#: ../midori/midori-app.c:1373 +#: ../midori/midori-app.c:1337 msgid "Add Boo_kmark" msgstr "_Додати закладку" -#: ../midori/midori-app.c:1374 +#: ../midori/midori-app.c:1338 +msgid "_Console" +msgstr "_Консоль" + +#: ../midori/midori-app.c:1339 msgid "_Extensions" msgstr "_Розширення" #. i18n: Browsing history, visited web pages, closed tabs -#: ../midori/midori-app.c:1375 ../midori/midori-browser.c:4665 +#: ../midori/midori-app.c:1340 ../midori/midori-browser.c:4577 msgid "_History" msgstr "_Історія" -#: ../midori/midori-app.c:1376 +#: ../midori/midori-app.c:1341 +msgid "_Homepage" +msgstr "Д_омашня сторінка" + +#: ../midori/midori-app.c:1342 msgid "_Userscripts" msgstr "_Скрипти користувача" -#: ../midori/midori-app.c:1377 -msgid "User_styles" -msgstr "Стилі користувача" - -#: ../midori/midori-app.c:1378 +#: ../midori/midori-app.c:1343 msgid "New _Tab" msgstr "Нова _вкладка" -#: ../midori/midori-app.c:1379 +#: ../midori/midori-app.c:1344 msgid "_Transfers" msgstr "_Завантаження" -#: ../midori/midori-app.c:1380 +#: ../midori/midori-app.c:1345 msgid "Netscape p_lugins" msgstr "Роз_ширення Netscape" -#: ../midori/midori-app.c:1381 +#: ../midori/midori-app.c:1346 msgid "_Closed Tabs" msgstr "_Закриті вкладки" -#: ../midori/midori-app.c:1382 ../midori/midori-browser.c:5348 +#: ../midori/midori-app.c:1347 ../midori/midori-browser.c:5165 msgid "New _Window" msgstr "_Нове вікно" -#: ../midori/midori-app.c:1383 +#: ../midori/midori-app.c:1348 msgid "New _Folder" msgstr "Нова _тека" -#: ../midori/midori-app.c:1437 -msgid "[Addresses]" -msgstr "[Адреси]" - #: ../midori/midori-array.c:522 msgid "File not found." msgstr "Файл не знайдений." @@ -442,113 +401,124 @@ msgstr "Нерозпізнаний формат закладки." msgid "Writing failed." msgstr "Невдача запису." -#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:5487 -msgid "Go forward to the next page" -msgstr "Перейти до наступної сторінки" - -#. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:353 ../midori/midori-browser.c:5495 -#: ../midori/midori-browser.c:5498 -msgid "Go to the next sub-page" -msgstr "Перейти до наступної сторінки" - -#: ../midori/midori-browser.c:440 ../midori/midori-browser.c:5436 -#: ../midori/midori-browser.c:5445 +#: ../midori/midori-browser.c:329 ../midori/midori-browser.c:5247 +#: ../midori/midori-browser.c:5256 msgid "Reload the current page" msgstr "Оновити поточну сторінку" -#: ../midori/midori-browser.c:448 ../midori/midori-browser.c:5442 +#: ../midori/midori-browser.c:337 ../midori/midori-browser.c:5253 msgid "Stop loading the current page" msgstr "Зупинити завантаження поточної сторінки" -#: ../midori/midori-browser.c:518 +#: ../midori/midori-browser.c:462 #, c-format msgid "Failed to update title: %s\n" msgstr "Невдача при оновленні назви: %s\n" -#: ../midori/midori-browser.c:613 +#: ../midori/midori-browser.c:475 +#, c-format +msgid "Unexpected action '%s'." +msgstr "Несподівана дія '%s'." + +#: ../midori/midori-browser.c:576 #, c-format msgid "%s (Private Browsing)" msgstr "%s (Режим приватності)" -#: ../midori/midori-browser.c:723 ../midori/midori-browser.c:765 -#: ../panels/midori-bookmarks.c:114 -msgid "Bookmarks" -msgstr "Закладки" +#: ../midori/midori-browser.c:687 ../midori/midori-browser.c:720 +msgid "Toplevel folder" +msgstr "Тека рівнем вище" -#: ../midori/midori-browser.c:825 +#: ../midori/midori-browser.c:777 msgid "New folder" msgstr "Нова тека" -#: ../midori/midori-browser.c:825 +#: ../midori/midori-browser.c:777 msgid "Edit folder" msgstr "Редагувати теку" -#: ../midori/midori-browser.c:827 +#: ../midori/midori-browser.c:779 msgid "New bookmark" msgstr "Нова закладка" -#: ../midori/midori-browser.c:827 +#: ../midori/midori-browser.c:779 msgid "Edit bookmark" msgstr "Редагувати закладку" -#: ../midori/midori-browser.c:861 -msgid "Type a name for this bookmark and choose where to keep it." -msgstr "Напишіть назву для цієї закладки і виберіть де її зберегти." +#: ../midori/midori-browser.c:810 +msgid "_Title:" +msgstr "_Назва:" + +#: ../midori/midori-browser.c:830 ../midori/midori-searchaction.c:966 +#: ../extensions/feed-panel/main.c:377 +msgid "_Address:" +msgstr "_Адреса:" + +#: ../midori/midori-browser.c:853 ../midori/midori-browser.c:4312 +msgid "_Folder:" +msgstr "_Тека:" -#: ../midori/midori-browser.c:922 +#: ../midori/midori-browser.c:869 msgid "Add to _Speed Dial" msgstr "Додати до шви_дкого виклику" -#: ../midori/midori-browser.c:928 +#: ../midori/midori-browser.c:882 msgid "Show in the tool_bar" msgstr "Показати в панелі інструментів" -#: ../midori/midori-browser.c:936 +#: ../midori/midori-browser.c:897 msgid "Run as _web application" msgstr "Запустити як веб-додаток" -#: ../midori/midori-browser.c:1054 ../midori/midori-browser.c:4469 +#: ../midori/midori-browser.c:968 +#, c-format +msgid "The file \"%s\" can't be saved in this folder." +msgstr "Файл \"%s\" неможливо зберегти в цій теці." + +#: ../midori/midori-browser.c:970 +#, c-format +msgid "You don't have permission to write in this location." +msgstr "Ви не маєте прав доступу для запису." + +#: ../midori/midori-browser.c:977 +#, c-format +msgid "There is not enough free space to download \"%s\"." +msgstr "Немає достатньо вільного місця для завантаження \"%s\"." + +#: ../midori/midori-browser.c:980 +#, c-format +msgid "The file needs %s but only %s are left." +msgstr "Файл потребує %s, але тільки %s залишилося. " + +#: ../midori/midori-browser.c:1024 ../midori/midori-browser.c:4382 msgid "Save file as" msgstr "Зберегти файл як" -#: ../midori/midori-browser.c:1064 -msgid "Save associated _resources" -msgstr "Показати пов’язані _ресурси" +#: ../midori/midori-browser.c:1333 +msgid "New Window" +msgstr "Нове вікно" -#: ../midori/midori-browser.c:1311 +#: ../midori/midori-browser.c:1333 msgid "A new window has been opened" msgstr "Відкрито нове вікно" -#: ../midori/midori-browser.c:1314 +#: ../midori/midori-browser.c:1336 +msgid "New Tab" +msgstr "Нова вкладка" + +#: ../midori/midori-browser.c:1336 msgid "A new tab has been opened" msgstr "Відкрито нову вкладку" -#: ../midori/midori-browser.c:1331 -msgid "Error opening the image!" -msgstr "Помилка відкривання малюнка!" - -#: ../midori/midori-browser.c:1332 -msgid "Can not open selected image in a default viewer." -msgstr "Неможливо відкрити вибраний малюнок в типовому переглядачі." - -#: ../midori/midori-browser.c:1338 -msgid "Error downloading the image!" -msgstr "Помилка звантаження малюнка!" - -#: ../midori/midori-browser.c:1339 -msgid "Can not download selected image." -msgstr "Неможливо звантажити вибраний малюнок." - -#: ../midori/midori-browser.c:1396 +#: ../midori/midori-browser.c:1373 msgid "Save file" msgstr "Зберегти файл" -#: ../midori/midori-browser.c:2300 +#: ../midori/midori-browser.c:2265 msgid "Open file" msgstr "Відкрити файл" -#: ../midori/midori-browser.c:2432 +#: ../midori/midori-browser.c:2396 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" @@ -556,162 +526,146 @@ msgid "" "Aggregator. Next time you click the news feed icon, it will be added " "automatically." msgstr "" -"Для використання посилання вище, відкрийте переглядач новин. Зазвичай він є " +"Для використання посилання вище, відкрийте переглядач новин. Звичайно віе є " "в меню або під кнопкою \"Нова підписка\", \"Новий виток новин\" або щось " "подібне.\n" "Або Ви можете перейти до Налаштування, Програми в Мідорі, і виберіть " "Переглядач новин. Якщо наступного Ви натиснете на іконку витка новин, то " "вони будуть додані автоматично." -#: ../midori/midori-browser.c:2438 ../extensions/feed-panel/main.c:365 +#: ../midori/midori-browser.c:2402 ../extensions/feed-panel/main.c:365 msgid "New feed" msgstr "Нова стрічка новин" -#: ../midori/midori-browser.c:2481 ../midori/midori-browser.c:5511 -#: ../panels/midori-bookmarks.c:527 +#: ../midori/midori-browser.c:2445 ../midori/midori-browser.c:5316 +#: ../panels/midori-bookmarks.c:432 msgid "Add a new bookmark" msgstr "Додати нову закладку" -#: ../midori/midori-browser.c:3025 ../midori/midori-searchaction.c:487 +#: ../midori/midori-browser.c:2971 ../midori/midori-searchaction.c:487 msgid "Empty" msgstr "Пусто" -#: ../midori/midori-browser.c:3471 ../midori/midori-browser.c:3472 +#: ../midori/midori-browser.c:3461 msgid "Toggle text cursor navigation" msgstr "Переключити текстовий курсор навігації" -#: ../midori/midori-browser.c:3474 -msgid "" -"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in " -"all websites." -msgstr "" -"Натискання F7 включає курсорний перегляд. Після включення на всіх веб-" -"сторінках появляється текстовий курсор." - -#: ../midori/midori-browser.c:3477 -msgid "_Enable Caret Browsing" -msgstr "_Включення курсорного перегляду" - -#: ../midori/midori-browser.c:3869 ../midori/midori-browser.c:5905 +#: ../midori/midori-browser.c:3773 ../midori/midori-browser.c:5723 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Неможливо вставити новий об'єкт історії: %s\n" -#: ../midori/midori-browser.c:4195 ../panels/midori-bookmarks.c:850 -#: ../panels/midori-history.c:806 +#: ../midori/midori-browser.c:4109 ../panels/midori-bookmarks.c:748 +#: ../panels/midori-history.c:747 msgid "Open all in _Tabs" msgstr "Відкрити все у в_кладках" -#: ../midori/midori-browser.c:4202 ../panels/midori-bookmarks.c:856 -#: ../panels/midori-history.c:812 ../extensions/feed-panel/feed-panel.c:528 +#: ../midori/midori-browser.c:4116 ../panels/midori-bookmarks.c:754 +#: ../panels/midori-history.c:753 ../extensions/feed-panel/feed-panel.c:528 msgid "Open in New _Tab" msgstr "Відкрити у новій _вкладці" -#: ../midori/midori-browser.c:4205 ../midori/midori-view.c:2952 -#: ../midori/midori-view.c:4924 ../panels/midori-bookmarks.c:858 -#: ../panels/midori-history.c:814 ../extensions/feed-panel/feed-panel.c:530 +#: ../midori/midori-browser.c:4119 ../midori/midori-view.c:2530 +#: ../midori/midori-view.c:4357 ../panels/midori-bookmarks.c:756 +#: ../panels/midori-history.c:755 ../extensions/feed-panel/feed-panel.c:530 msgid "Open in New _Window" msgstr "Відкрити у новому _вікні" -#: ../midori/midori-browser.c:4294 +#: ../midori/midori-browser.c:4199 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4295 +#: ../midori/midori-browser.c:4200 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4296 +#: ../midori/midori-browser.c:4201 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4297 +#: ../midori/midori-browser.c:4202 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4298 +#: ../midori/midori-browser.c:4203 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4299 +#: ../midori/midori-browser.c:4204 #, c-format msgid "Firefox (%s)" msgstr "Firefox (%s)" -#: ../midori/midori-browser.c:4300 -msgid "Midori 0.2.6" -msgstr "Мідорі 0.2.6" +#: ../midori/midori-browser.c:4225 +msgid "Import bookmarks..." +msgstr "Імпорт закладок..." -#: ../midori/midori-browser.c:4321 -msgid "Import bookmarks…" -msgstr "Імпорт закладок…" - -#: ../midori/midori-browser.c:4324 ../midori/midori-browser.c:5516 +#: ../midori/midori-browser.c:4228 ../midori/midori-browser.c:5321 msgid "_Import bookmarks" msgstr "_Імпорт закладок" -#: ../midori/midori-browser.c:4335 +#: ../midori/midori-browser.c:4239 msgid "_Application:" msgstr "_Програма:" -#: ../midori/midori-browser.c:4400 +#: ../midori/midori-browser.c:4304 msgid "Import from XBEL or HTML file" msgstr "Імпорт з XBEL або HTML файлу" -#: ../midori/midori-browser.c:4428 +#: ../midori/midori-browser.c:4339 msgid "Import from a file" msgstr "Імпорт з файлу" -#: ../midori/midori-browser.c:4440 +#: ../midori/midori-browser.c:4351 msgid "Failed to import bookmarks" msgstr "Не вдалося імпортувати закладки" -#: ../midori/midori-browser.c:4474 +#: ../midori/midori-browser.c:4387 msgid "XBEL Bookmarks" msgstr "XBEL Закладки" -#: ../midori/midori-browser.c:4479 +#: ../midori/midori-browser.c:4392 msgid "Netscape Bookmarks" msgstr "Закладки Netscape" -#: ../midori/midori-browser.c:4493 +#: ../midori/midori-browser.c:4406 msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)" msgstr "Мідорі може експортувати тільки до XBEL (*.xbel) і Netscape (*.html)" -#: ../midori/midori-browser.c:4508 +#: ../midori/midori-browser.c:4422 msgid "Failed to export bookmarks" msgstr "Не вдалося експортувати закладки" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4630 +#: ../midori/midori-browser.c:4544 msgid "Clear Private Data" msgstr "Очистити приватні дані" -#: ../midori/midori-browser.c:4634 +#: ../midori/midori-browser.c:4548 msgid "_Clear private data" msgstr "_Очистити приватні дані" -#: ../midori/midori-browser.c:4649 +#: ../midori/midori-browser.c:4561 msgid "Clear the following data:" msgstr "Очистити наступні дані:" -#: ../midori/midori-browser.c:4659 +#: ../midori/midori-browser.c:4571 msgid "Last open _tabs" msgstr "Останні відкриті _вкладки" -#: ../midori/midori-browser.c:4685 +#: ../midori/midori-browser.c:4597 msgid "Clear private data when _quitting Midori" msgstr "Очистити приватні дані при _виході з Мідорі" -#: ../midori/midori-browser.c:4900 +#: ../midori/midori-browser.c:4773 msgid "A lightweight web browser." -msgstr "Легкий переглядач Веб." +msgstr "Легкий переглядач Веб" -#: ../midori/midori-browser.c:4901 +#: ../midori/midori-browser.c:4774 msgid "See about:version for version info." msgstr "Дивіться about:version для отримання інформації про версію." -#: ../midori/midori-browser.c:4903 +#: ../midori/midori-browser.c:4776 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 " @@ -724,1293 +678,1434 @@ msgstr "" "Foundation), з версією 2.1 ліцензії, або (на Ваше побажання) будь-якою вищою " "версією." -#: ../midori/midori-browser.c:4933 +#: ../midori/midori-browser.c:4797 msgid "translator-credits" msgstr "Yarema aka Knedlyk " -#: ../midori/midori-browser.c:5346 +#: ../midori/midori-browser.c:5163 msgid "_File" msgstr "_Файл" -#: ../midori/midori-browser.c:5349 +#: ../midori/midori-browser.c:5166 msgid "Open a new window" msgstr "Відкрити нове вікно" -#: ../midori/midori-browser.c:5352 +#: ../midori/midori-browser.c:5169 msgid "Open a new tab" msgstr "Відкрити нову вкладку" -#: ../midori/midori-browser.c:5354 +#: ../midori/midori-browser.c:5171 msgid "New P_rivate Browsing Window" msgstr "Нове _вікно в режимі приватності" -#: ../midori/midori-browser.c:5358 +#: ../midori/midori-browser.c:5175 msgid "Open a file" msgstr "Відкрити файл" -#: ../midori/midori-browser.c:5360 -msgid "_Save Page As…" -msgstr "_Зберегти сторінку як…" +#: ../midori/midori-browser.c:5177 +msgid "_Save Page As..." +msgstr "_Зберегти сторінку як..." -#: ../midori/midori-browser.c:5361 +#: ../midori/midori-browser.c:5178 msgid "Save to a file" msgstr "Зберегти в файл" -#: ../midori/midori-browser.c:5363 +#: ../midori/midori-browser.c:5180 msgid "Add to Speed _dial" msgstr "Додати до шви_дкого виклику" -#: ../midori/midori-browser.c:5367 +#: ../midori/midori-browser.c:5184 msgid "Add Shortcut to the _desktop" msgstr "Додати скорочення до _стільниці" -#: ../midori/midori-browser.c:5369 +#: ../midori/midori-browser.c:5186 msgid "Create _Launcher" msgstr "Створити _Запускач" -#: ../midori/midori-browser.c:5373 +#: ../midori/midori-browser.c:5190 msgid "Subscribe to News _feed" msgstr "Підписатися на _стрічки новин" -#: ../midori/midori-browser.c:5379 +#: ../midori/midori-browser.c:5196 msgid "_Close Tab" msgstr "_Закрити вкладку" -#: ../midori/midori-browser.c:5380 +#: ../midori/midori-browser.c:5197 msgid "Close the current tab" msgstr "Закрити поточну вкладку" -#: ../midori/midori-browser.c:5382 +#: ../midori/midori-browser.c:5199 msgid "C_lose Window" msgstr "З_акрити вікно" -#: ../midori/midori-browser.c:5386 -msgid "_Share" -msgstr "_Поділитися" - -#: ../midori/midori-browser.c:5391 +#: ../midori/midori-browser.c:5203 msgid "Print the current page" msgstr "Надрукувати поточну сторінку" -#: ../midori/midori-browser.c:5394 +#: ../midori/midori-browser.c:5205 msgid "Close a_ll Windows" msgstr "З_акрити всі вікна" -#: ../midori/midori-browser.c:5397 +#: ../midori/midori-browser.c:5208 msgid "_Edit" msgstr "_Редагувати" -#: ../midori/midori-browser.c:5420 -msgid "_Find…" -msgstr "_Знайти…" +#: ../midori/midori-browser.c:5231 +msgid "_Find..." +msgstr "_Знайти..." -#: ../midori/midori-browser.c:5421 +#: ../midori/midori-browser.c:5232 msgid "Find a word or phrase in the page" msgstr "Шукати слово чи фразу на сторінці" -#: ../midori/midori-browser.c:5423 +#: ../midori/midori-browser.c:5234 msgid "Find _Next" msgstr "Шукати _наступне" -#: ../midori/midori-browser.c:5426 +#: ../midori/midori-browser.c:5237 msgid "Find _Previous" msgstr "Шукати _попереднє" -#: ../midori/midori-browser.c:5430 +#: ../midori/midori-browser.c:5241 msgid "Configure the application preferences" msgstr "Налаштувати властивості програми" -#: ../midori/midori-browser.c:5432 +#: ../midori/midori-browser.c:5243 msgid "_View" msgstr "_Вигляд" -#: ../midori/midori-browser.c:5433 +#: ../midori/midori-browser.c:5244 msgid "_Toolbars" msgstr "Панелі _Інструментів" -#: ../midori/midori-browser.c:5438 +#: ../midori/midori-browser.c:5249 msgid "Reload page without caching" msgstr "Перезавантажити сторінку без кешування" -#: ../midori/midori-browser.c:5448 +#: ../midori/midori-browser.c:5259 msgid "Increase the zoom level" msgstr "Збільшити розмір перегляду" -#: ../midori/midori-browser.c:5451 +#: ../midori/midori-browser.c:5262 msgid "Decrease the zoom level" msgstr "Зменшити розмір перегляду" -#: ../midori/midori-browser.c:5455 +#: ../midori/midori-browser.c:5266 msgid "_Encoding" msgstr "_Кодування" -#: ../midori/midori-browser.c:5457 +#: ../midori/midori-browser.c:5268 msgid "View So_urce" msgstr "Перегляд _коду" -#: ../midori/midori-browser.c:5460 +#: ../midori/midori-browser.c:5271 msgid "Ca_ret Browsing" msgstr "_Перегляд вставками" -#: ../midori/midori-browser.c:5464 +#: ../midori/midori-browser.c:5275 msgid "Toggle fullscreen view" msgstr "Перемкнути в повноекранний режим" -#: ../midori/midori-browser.c:5466 +#: ../midori/midori-browser.c:5277 msgid "Scroll _Left" msgstr "Прокрутити _ліворуч" -#: ../midori/midori-browser.c:5469 +#: ../midori/midori-browser.c:5280 msgid "Scroll _Down" msgstr "Прокрутити в_низ" -#: ../midori/midori-browser.c:5472 +#: ../midori/midori-browser.c:5283 msgid "Scroll _Up" msgstr "Прокрутити в_верх" -#: ../midori/midori-browser.c:5475 +#: ../midori/midori-browser.c:5286 msgid "Scroll _Right" msgstr "Прокрутити _праворуч" -#: ../midori/midori-browser.c:5478 -msgid "_Readable" -msgstr "_Можна читати" - -#: ../midori/midori-browser.c:5481 +#: ../midori/midori-browser.c:5289 msgid "_Go" msgstr "_Перейти" -#: ../midori/midori-browser.c:5484 +#: ../midori/midori-browser.c:5292 msgid "Go back to the previous page" msgstr "Повернутись на попередню сторінку" +#: ../midori/midori-browser.c:5295 +msgid "Go forward to the next page" +msgstr "Перейти до наступної сторінки" + #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5491 +#: ../midori/midori-browser.c:5299 msgid "Go to the previous sub-page" msgstr "Повернутись на попередню суб-сторінку" -#: ../midori/midori-browser.c:5500 -msgid "_Homepage" -msgstr "Д_омашня сторінка" +#. i18n: Visit the following logical page, ie. in a forum or blog +#: ../midori/midori-browser.c:5303 +msgid "Go to the next sub-page" +msgstr "Перейти до наступної сторінки" -#: ../midori/midori-browser.c:5501 +#: ../midori/midori-browser.c:5306 msgid "Go to your homepage" msgstr "Перейти на домашню сторінку" -#: ../midori/midori-browser.c:5503 +#: ../midori/midori-browser.c:5308 msgid "Empty Trash" msgstr "Спорожнити смітник" -#: ../midori/midori-browser.c:5506 +#: ../midori/midori-browser.c:5311 msgid "Undo _Close Tab" msgstr "Повернути закриту вкладку" -#: ../midori/midori-browser.c:5513 +#: ../midori/midori-browser.c:5318 msgid "Add a new _folder" msgstr "Додати нову _теку" -#: ../midori/midori-browser.c:5519 +#: ../midori/midori-browser.c:5324 msgid "_Export bookmarks" msgstr "_Експорт закладок" -#: ../midori/midori-browser.c:5522 ../midori/midori-searchaction.c:496 +#: ../midori/midori-browser.c:5327 ../midori/midori-searchaction.c:496 msgid "_Manage Search Engines" msgstr "_Налаштувати пошукові машини" -#: ../midori/midori-browser.c:5525 +#: ../midori/midori-browser.c:5330 msgid "_Clear Private Data" msgstr "_Очистити приватні дані" -#: ../midori/midori-browser.c:5528 +#: ../midori/midori-browser.c:5333 msgid "_Inspect Page" msgstr "Перевірити сторінку" -#: ../midori/midori-browser.c:5532 +#: ../midori/midori-browser.c:5337 msgid "_Previous Tab" msgstr "_Попередня вкладка" -#: ../midori/midori-browser.c:5535 +#: ../midori/midori-browser.c:5340 msgid "_Next Tab" msgstr "_Наступна вкладка" -#: ../midori/midori-browser.c:5537 +#: ../midori/midori-browser.c:5342 msgid "Move Tab _Backward" msgstr "_Перенести вкладку назад" -#: ../midori/midori-browser.c:5539 +#: ../midori/midori-browser.c:5344 msgid "_Move Tab Forward" msgstr "_Перенести вкладку вперед" -#: ../midori/midori-browser.c:5542 +#: ../midori/midori-browser.c:5347 msgid "Focus _Current Tab" msgstr "Фокусувати поточну вкладку" -#: ../midori/midori-browser.c:5545 +#: ../midori/midori-browser.c:5350 msgid "Focus _Next view" msgstr "Фокусувати перегляд _наступного" -#: ../midori/midori-browser.c:5548 +#: ../midori/midori-browser.c:5353 msgid "Only show the Icon of the _Current Tab" msgstr "Показувати тільки іконку _поточної вкладки" -#: ../midori/midori-browser.c:5551 +#: ../midori/midori-browser.c:5356 msgid "_Duplicate Current Tab" msgstr "_Дублювати поточну вкладку" -#: ../midori/midori-browser.c:5554 +#: ../midori/midori-browser.c:5359 msgid "Close Ot_her Tabs" msgstr "_Закрити інші вкладки" -#: ../midori/midori-browser.c:5557 +#: ../midori/midori-browser.c:5362 msgid "Open last _session" msgstr "Відкрити останню _сесію" -#: ../midori/midori-browser.c:5560 +#: ../midori/midori-browser.c:5365 msgid "_Help" msgstr "_Допомога" -#: ../midori/midori-browser.c:5562 +#: ../midori/midori-browser.c:5367 msgid "_Frequent Questions" msgstr "_Часті запитання" -#: ../midori/midori-browser.c:5565 -msgid "_Report a Problem…" -msgstr "П_овідомити про проблему…" - -#: ../midori/midori-browser.c:5570 ../midori/midori-browser.c:6231 -msgid "_Tools" -msgstr "_Інструменти" +#: ../midori/midori-browser.c:5370 +msgid "_Report a Problem..." +msgstr "П_овідомити про проблему..." -#: ../midori/midori-browser.c:5577 +#: ../midori/midori-browser.c:5382 msgid "_Menubar" msgstr "Панель _меню" -#: ../midori/midori-browser.c:5581 +#: ../midori/midori-browser.c:5386 msgid "_Navigationbar" msgstr "Панель _навігації" -#: ../midori/midori-browser.c:5585 +#: ../midori/midori-browser.c:5390 msgid "Side_panel" msgstr "_Бічна панель" -#: ../midori/midori-browser.c:5586 +#: ../midori/midori-browser.c:5391 msgid "Sidepanel" msgstr "Бічна панель" -#: ../midori/midori-browser.c:5589 +#: ../midori/midori-browser.c:5394 msgid "_Bookmarkbar" msgstr "Панель _закладок" -#: ../midori/midori-browser.c:5593 +#: ../midori/midori-browser.c:5398 msgid "_Statusbar" msgstr "Панель _стану" -#: ../midori/midori-browser.c:5602 ../midori/midori-websettings.c:198 +#: ../midori/midori-browser.c:5407 ../midori/midori-websettings.c:302 msgid "_Automatic" msgstr "_Автоматично" -#: ../midori/midori-browser.c:5605 ../midori/midori-websettings.c:122 -msgid "Chinese Traditional (BIG5)" -msgstr "Китайська Традиційна (BIG5)" - -#: ../midori/midori-browser.c:5608 ../midori/midori-websettings.c:123 -msgid "Chinese Simplified (GB18030)" -msgstr "Китайська Спрощена (GB18030)" +#: ../midori/midori-browser.c:5410 ../midori/midori-websettings.c:227 +msgid "Chinese (BIG5)" +msgstr "Китайська (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5612 +#: ../midori/midori-browser.c:5414 msgid "Japanese (SHIFT__JIS)" msgstr "Японська (SHIFT_JIS)" -#: ../midori/midori-browser.c:5615 ../midori/midori-websettings.c:125 +#: ../midori/midori-browser.c:5417 ../midori/midori-websettings.c:229 msgid "Korean (EUC-KR)" msgstr "Корейська (EUC-KR)" -#: ../midori/midori-browser.c:5618 ../midori/midori-websettings.c:126 +#: ../midori/midori-browser.c:5420 ../midori/midori-websettings.c:230 msgid "Russian (KOI8-R)" msgstr "Російська (KOI8-R)" -#: ../midori/midori-browser.c:5621 ../midori/midori-websettings.c:127 +#: ../midori/midori-browser.c:5423 ../midori/midori-websettings.c:231 msgid "Unicode (UTF-8)" msgstr "Юнікод (UTF-8)" -#: ../midori/midori-browser.c:5624 ../midori/midori-websettings.c:128 +#: ../midori/midori-browser.c:5426 ../midori/midori-websettings.c:232 msgid "Western (ISO-8859-1)" msgstr "Західний (ISO-8859-1)" -#: ../midori/midori-browser.c:5627 -msgid "Custom…" -msgstr "Інша…" +#: ../midori/midori-browser.c:5429 ../midori/midori-websettings.c:233 +#: ../midori/midori-websettings.c:308 ../katze/katze-utils.c:635 +msgid "Custom..." +msgstr "Інша..." -#: ../midori/midori-browser.c:6137 +#: ../midori/midori-browser.c:5909 msgid "_Separator" msgstr "_Роздільник" -#: ../midori/midori-browser.c:6144 -msgid "_Location…" -msgstr "_Адреса…" +#: ../midori/midori-browser.c:5916 +msgid "_Location..." +msgstr "_Адреса..." -#: ../midori/midori-browser.c:6146 +#: ../midori/midori-browser.c:5918 msgid "Open a particular location" msgstr "Відкрити певну адресу" -#: ../midori/midori-browser.c:6168 -msgid "_Web Search…" -msgstr "_Пошук у Веб…" +#: ../midori/midori-browser.c:5940 +msgid "_Web Search..." +msgstr "_Пошук у Веб..." -#: ../midori/midori-browser.c:6170 +#: ../midori/midori-browser.c:5942 msgid "Run a web search" msgstr "Запустити пошук у Веб" -#: ../midori/midori-browser.c:6197 +#: ../midori/midori-browser.c:5969 msgid "Reopen a previously closed tab or window" msgstr "Знову відкрити закриту вкладку чи вікно" -#: ../midori/midori-browser.c:6214 +#: ../midori/midori-browser.c:5984 msgid "Show the saved bookmarks" msgstr "Показати збережені закладки" -#: ../midori/midori-browser.c:6247 +#: ../midori/midori-browser.c:5998 +msgid "_Tools" +msgstr "_Інструменти" + +#: ../midori/midori-browser.c:6013 msgid "_Window" msgstr "_Вікно" -#: ../midori/midori-browser.c:6249 +#: ../midori/midori-browser.c:6015 msgid "Show a list of all open tabs" msgstr "Показати список відкритих вкладок" -#: ../midori/midori-browser.c:6263 +#: ../midori/midori-browser.c:6029 msgid "_Menu" msgstr "_Меню" -#: ../midori/midori-browser.c:6265 +#: ../midori/midori-browser.c:6031 msgid "Menu" msgstr "Меню" -#: ../midori/midori-browser.c:7090 +#: ../midori/midori-browser.c:6679 #, c-format msgid "Unexpected setting '%s'" msgstr "Несподівані властивості '%s'" -#: ../midori/midori-extension.c:330 +#: ../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:752 ../midori/midori-extension.c:849 -#: ../midori/midori-extension.c:946 ../midori/midori-extension.c:1058 -#: ../extensions/addons.c:1686 +#: ../midori/midori-extension.c:721 ../midori/midori-extension.c:818 +#: ../midori/midori-extension.c:915 ../midori/midori-extension.c:1027 +#: ../extensions/addons.c:1690 #, c-format msgid "The configuration of the extension '%s' couldn't be saved: %s\n" -msgstr "Неможливо зберегти конфігурацію розширення '%s': %s\n" - -#: ../midori/midori-locationaction.c:398 -#, c-format -msgid "Search with %s" -msgstr "Шукати з %s" - -#: ../midori/midori-locationaction.c:418 -msgid "Search with…" -msgstr "Шукати з…" +msgstr "" +"Неможливо зберегти конфігурацію розширення '%s':\r\n" +"%s\n" -#: ../midori/midori-locationaction.c:545 +#: ../midori/midori-locationaction.c:425 #, c-format msgid "Failed to select from history\n" msgstr "Невдача при виборі з історії\n" -#: ../midori/midori-locationaction.c:632 +#: ../midori/midori-locationaction.c:509 #, c-format msgid "Search for %s" msgstr "Шукати %s" -#: ../midori/midori-locationaction.c:1227 -msgid "Export certificate" -msgstr "Експортувати сертифікат" - -#: ../midori/midori-locationaction.c:1259 -msgid "The signing certificate authority is not known." -msgstr "Підпис сертифікату невідомий." - -#: ../midori/midori-locationaction.c:1261 -msgid "" -"The certificate does not match the expected identity of the site that it was " -"retrieved from." -msgstr "" -"Сертифікат не відповідає очікуваному сертифікату, який отриманий з сторінки." - -#: ../midori/midori-locationaction.c:1263 -msgid "The certificate's activation time is still in the future." -msgstr "Час активації сертифікату все ще у майбутньому." - -#: ../midori/midori-locationaction.c:1265 -msgid "The certificate has expired" -msgstr "Термін дії сертифіката закінчився" - -#: ../midori/midori-locationaction.c:1267 -msgid "" -"The certificate has been revoked according to the GTlsConnection's " -"certificate revocation list." -msgstr "" -"Сертифікат був анульований згідно зі списком відкликаних сертифікатів " -"GTlsConnection" - -#: ../midori/midori-locationaction.c:1269 -msgid "The certificate's algorithm is considered insecure." -msgstr "Алгоритм сертифікату вважається небезпечним." - -#: ../midori/midori-locationaction.c:1271 -msgid "Some other error occurred validating the certificate." -msgstr "Інші помилки появилися під час перевірки сертифікату." - -#: ../midori/midori-locationaction.c:1318 -msgid "_Export certificate" -msgstr "_Експортувати сертифікат" - -#: ../midori/midori-locationaction.c:1333 -msgid "Self-signed" -msgstr "Самопідписаний" - -#: ../midori/midori-locationaction.c:1367 -msgid "Security details" -msgstr "Відомості про захист" +#: ../midori/midori-locationaction.c:535 +#, c-format +msgid "Search with %s" +msgstr "Шукати з %s" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1650 +#: ../midori/midori-locationaction.c:1287 msgid "Paste and p_roceed" msgstr "Вставити і про_довжити" -#: ../midori/midori-locationaction.c:1974 +#: ../midori/midori-locationaction.c:1656 msgid "Not verified" msgstr "Не перевірено" -#: ../midori/midori-locationaction.c:1982 +#: ../midori/midori-locationaction.c:1671 msgid "Verified and encrypted connection" msgstr "Перевірене і захищене з'єднання" -#: ../midori/midori-locationaction.c:1989 -msgid "Open, unencrypted connection" -msgstr "Відкрите, незахищене з'єднання" - -#: ../midori/midori-panel.c:317 ../midori/midori-panel.c:319 -#: ../midori/midori-panel.c:483 ../midori/midori-panel.c:486 +#: ../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:329 ../midori/midori-panel.c:330 +#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410 msgid "Close panel" msgstr "Закрити панель" -#: ../midori/midori-panel.c:484 ../midori/midori-panel.c:487 +#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566 msgid "Align sidepanel to the left" msgstr "Рівняти бічну панель по лівому краю" -#: ../midori/midori-websettings.c:104 +#: ../midori/midori-websettings.c:209 msgid "Show Speed Dial" msgstr "Показати швидкий виклик" -#: ../midori/midori-websettings.c:105 +#: ../midori/midori-websettings.c:210 msgid "Show Homepage" msgstr "Показати домашню сторінку" -#: ../midori/midori-websettings.c:124 +#: ../midori/midori-websettings.c:228 msgid "Japanese (SHIFT_JIS)" msgstr "Японська (SHIFT_JIS)" -#: ../midori/midori-websettings.c:129 ../midori/midori-websettings.c:205 -#: ../katze/katze-utils.c:633 -msgid "Custom..." -msgstr "Інше…" - -#: ../midori/midori-websettings.c:144 +#: ../midori/midori-websettings.c:248 msgid "New tab" msgstr "Нова вкладка" -#: ../midori/midori-websettings.c:145 +#: ../midori/midori-websettings.c:249 msgid "New window" msgstr "Нове вікно" -#: ../midori/midori-websettings.c:146 +#: ../midori/midori-websettings.c:250 msgid "Current tab" msgstr "Поточна вкладка" -#: ../midori/midori-websettings.c:161 +#: ../midori/midori-websettings.c:265 msgid "Default" msgstr "Типово" -#: ../midori/midori-websettings.c:162 +#: ../midori/midori-websettings.c:266 msgid "Icons" msgstr "Значки" -#: ../midori/midori-websettings.c:163 +#: ../midori/midori-websettings.c:267 msgid "Small icons" msgstr "Маленькі значки" -#: ../midori/midori-websettings.c:164 +#: ../midori/midori-websettings.c:268 msgid "Text" msgstr "Текст" -#: ../midori/midori-websettings.c:165 +#: ../midori/midori-websettings.c:269 msgid "Icons and text" msgstr "Значки і текст" -#: ../midori/midori-websettings.c:166 +#: ../midori/midori-websettings.c:270 msgid "Text beside icons" msgstr "Текст за значками" -#: ../midori/midori-websettings.c:181 +#: ../midori/midori-websettings.c:285 msgid "Automatic (GNOME or environment)" msgstr "Автоматично (GNOME або змінні оточення)" -#: ../midori/midori-websettings.c:182 +#: ../midori/midori-websettings.c:286 msgid "HTTP proxy server" msgstr "Сервер HTTP проксі" -#: ../midori/midori-websettings.c:183 +#: ../midori/midori-websettings.c:287 msgid "No proxy server" msgstr "Немає сервера проксі" -#: ../midori/midori-websettings.c:200 -msgid "Chrome" -msgstr "Chrome" - -#: ../midori/midori-websettings.c:201 +#: ../midori/midori-websettings.c:304 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:202 +#: ../midori/midori-websettings.c:305 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:203 +#: ../midori/midori-websettings.c:306 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:307 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:277 -msgid "Toolbar Style:" -msgstr "Стиль панелі:" - -#: ../midori/midori-websettings.c:278 -msgid "The style of the toolbar" -msgstr "Стиль панелі" +#: ../midori/midori-websettings.c:360 +msgid "Remember last window size" +msgstr "Запам'ятати останній розмір вікна" -#: ../midori/midori-websettings.c:287 -msgid "When Midori starts:" -msgstr "Коли Мідорі стартує:" +#: ../midori/midori-websettings.c:361 +msgid "Whether to save the last window size" +msgstr "Чи зберігати останній розмір вікна" -#: ../midori/midori-websettings.c:297 -msgid "Preferred Encoding" -msgstr "Типове кодування" +#: ../midori/midori-websettings.c:369 +msgid "Last window width" +msgstr "Ширина останнього вікна" -#: ../midori/midori-websettings.c:324 -msgid "Open new pages in:" -msgstr "Відкривати нові сторінки в:" +#: ../midori/midori-websettings.c:370 +msgid "The last saved window width" +msgstr "Остання збережена ширина вікна" -#. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:387 -msgid "Identify as" -msgstr "Ідентифікувати як" +#: ../midori/midori-websettings.c:378 +msgid "Last window height" +msgstr "Висота останнього вікна" -#: ../midori/midori-websettings.c:388 -msgid "What to identify as to web pages" -msgstr "Що ідентифікувати для веб-сторінок" +#: ../midori/midori-websettings.c:379 +msgid "The last saved window height" +msgstr "Остання збережена висота вікна" -#: ../midori/midori-websettings.c:421 -msgid "Preferred languages" -msgstr "Типові мови" +#: ../midori/midori-websettings.c:404 +msgid "Last panel position" +msgstr "Остання позиція панелі" -#: ../midori/midori-websettings.c:422 -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:405 +msgid "The last saved panel position" +msgstr "Остання збережена позиція панелі" -#: ../midori/midori-websettings.c:471 -msgid "Always use my font choices" -msgstr "Завжди використовувати мій вибір шрифтів" +#. i18n: The internal index of the last opened panel +#: ../midori/midori-websettings.c:414 +msgid "Last panel page" +msgstr "Остання сторінка панелі" -#: ../midori/midori-websettings.c:472 -msgid "Override fonts picked by websites with user preferences" -msgstr "Перезаписати шрифти для веб-сторінок шрифтами вибраними користувачем" +#: ../midori/midori-websettings.c:415 +msgid "The last saved panel page" +msgstr "Остання збережена сторінка панелі" -#: ../midori/midori-view.c:1012 ../midori/midori-view.c:1151 -msgid "Trust this website" -msgstr "Довіряти цій веб-сторінці" +#: ../midori/midori-websettings.c:423 +msgid "Last Web search" +msgstr "Останній пошук у Веб" -#: ../midori/midori-view.c:1149 -msgid "Security unknown" -msgstr "Захист невідомий" +#: ../midori/midori-websettings.c:424 +msgid "The last saved Web search" +msgstr "Останній збережений пошук у Веб" -#: ../midori/midori-view.c:1447 -#, c-format -msgid "%s wants to save an HTML5 database." -msgstr "%s бажає зберегти базу даних HTML5." +#: ../midori/midori-websettings.c:433 +msgid "Show Menubar" +msgstr "Показати панель меню" -#: ../midori/midori-view.c:1451 ../midori/midori-view.c:1485 -msgid "_Deny" -msgstr "_Заборонити" +#: ../midori/midori-websettings.c:434 +msgid "Whether to show the menubar" +msgstr "Чи показувати панель меню" -#: ../midori/midori-view.c:1451 ../midori/midori-view.c:1485 -msgid "_Allow" -msgstr "_Дозволити" +#: ../midori/midori-websettings.c:442 +msgid "Show Navigationbar" +msgstr "Показати панель навігації" -#: ../midori/midori-view.c:1480 -#, c-format -msgid "%s wants to know your location." -msgstr "%s бажає знати Ваше знаходження." +#: ../midori/midori-websettings.c:443 +msgid "Whether to show the navigationbar" +msgstr "Чи показувати панель навігації" -#: ../midori/midori-view.c:1576 -#, c-format -msgid "Error - %s" -msgstr "Помилка - %s" +#: ../midori/midori-websettings.c:451 +msgid "Show Bookmarkbar" +msgstr "Показати панель закладок" -#: ../midori/midori-view.c:1577 -#, c-format -msgid "The page '%s' couldn't be loaded." -msgstr "Сторінку '%s' неможливо завантажити." +#: ../midori/midori-websettings.c:452 +msgid "Whether to show the bookmarkbar" +msgstr "Чи показувати панель закладок" -#: ../midori/midori-view.c:1579 -msgid "Try again" -msgstr "Спробуйте знову" +#: ../midori/midori-websettings.c:460 +msgid "Show Panel" +msgstr "Показати панель" -#: ../midori/midori-view.c:1775 ../midori/midori-view.c:2887 -#, c-format -msgid "Send a message to %s" -msgstr "Послати повідомлення до %s" +#: ../midori/midori-websettings.c:461 +msgid "Whether to show the panel" +msgstr "Чи показувати панель" -#: ../midori/midori-view.c:2673 -msgid "Add _search engine..." -msgstr "Додати _пошукову машину" +#: ../midori/midori-websettings.c:469 +msgid "Show Statusbar" +msgstr "Показати панель стану" -#: ../midori/midori-view.c:2717 ../midori/midori-view.c:3043 -msgid "Inspect _Element" -msgstr "Перевірити _елемент" +#: ../midori/midori-websettings.c:470 +msgid "Whether to show the statusbar" +msgstr "Чи показувати панель стану" -#: ../midori/midori-view.c:2769 -msgid "Open Link in New _Tab" -msgstr "Відкрити посилання у новій в_кладці" +#: ../midori/midori-websettings.c:479 +msgid "Toolbar Style:" +msgstr "Стиль панелі:" -#: ../midori/midori-view.c:2773 -msgid "Open Link in _Foreground Tab" -msgstr "Відкривати посилання у в_кладці переднього плану" +#: ../midori/midori-websettings.c:480 +msgid "The style of the toolbar" +msgstr "Стиль панелі" -#: ../midori/midori-view.c:2774 -msgid "Open Link in _Background Tab" -msgstr "Відкрити посилання у фоновій в_кладці" +#: ../midori/midori-websettings.c:489 +msgid "Toolbar Items" +msgstr "Об'єкти панелі інструментів" -#: ../midori/midori-view.c:2777 -msgid "Open Link in New _Window" -msgstr "Відкрити посилання у новому _вікні" +#: ../midori/midori-websettings.c:490 +msgid "The items to show on the toolbar" +msgstr "Об'єкти, що відображаються у панелі інструментів" -#: ../midori/midori-view.c:2780 -msgid "Open Link as Web A_pplication" -msgstr "Відкрити посилання як веб-_додаток" +#: ../midori/midori-websettings.c:498 +msgid "Compact Sidepanel" +msgstr "Компактна бічна панель" -#: ../midori/midori-view.c:2785 -msgid "Copy Link de_stination" -msgstr "Копіювати поси_лання" +#: ../midori/midori-websettings.c:499 +msgid "Whether to make the sidepanel compact" +msgstr "Налаштування відображення компактної бічної панелі" -#: ../midori/midori-view.c:2801 -msgid "Open _Image in New Tab" -msgstr "Відкрити зображення у новій _вкладці" +#: ../midori/midori-websettings.c:514 +msgid "Align sidepanel on the right" +msgstr "Рівняти бічну панель по правому краю" -#: ../midori/midori-view.c:2804 -msgid "Copy Image _Address" -msgstr "Копіювати адрес _зображення" +#: ../midori/midori-websettings.c:515 +msgid "Whether to align the sidepanel on the right" +msgstr "Чи вирівнювати бічну панель по правому краю" -#: ../midori/midori-view.c:2807 -msgid "Save I_mage" -msgstr "Зберегти з_ображення" +#: ../midori/midori-websettings.c:530 +msgid "Open panels in separate windows" +msgstr "Відкривати панелі в нових вікнах" -#: ../midori/midori-view.c:2810 -msgid "Open in Image _Viewer" -msgstr "Відкрити малюнок в _Переглядачі зображень" +#: ../midori/midori-websettings.c:531 +msgid "Whether to always open panels in separate windows" +msgstr "Чи відкривати панелі в окремих вікнах" -#: ../midori/midori-view.c:2817 +#: ../midori/midori-websettings.c:540 +msgid "When Midori starts:" +msgstr "Коли Мідорі стартує:" + +#: ../midori/midori-websettings.c:541 +msgid "What to do when Midori starts" +msgstr "Що завантажувати при старті" + +#: ../midori/midori-websettings.c:550 +msgid "Homepage:" +msgstr "Домашня сторінка:" + +#: ../midori/midori-websettings.c:551 +msgid "The homepage" +msgstr "Домашня сторінка" + +#: ../midori/midori-websettings.c:566 +msgid "Show crash dialog" +msgstr "Показати діалог краху" + +#: ../midori/midori-websettings.c:567 +msgid "Show a dialog after Midori crashed" +msgstr "Показати діалог, коли Мідорі зазнає краху" + +#: ../midori/midori-websettings.c:575 +msgid "Save downloaded files to:" +msgstr "Зберігати завантажені файли до:" + +#: ../midori/midori-websettings.c:576 +msgid "The folder downloaded files are saved to" +msgstr "Завантажені файли зберігати в теку" + +#: ../midori/midori-websettings.c:584 +msgid "Text Editor" +msgstr "Текстовий редактор" + +#: ../midori/midori-websettings.c:585 +msgid "An external text editor" +msgstr "Зовнішній текстовий редактор" + +#: ../midori/midori-websettings.c:600 +msgid "News Aggregator" +msgstr "Читалка новин" + +#: ../midori/midori-websettings.c:601 +msgid "An external news aggregator" +msgstr "Зовнішня читалка стрічок новин" + +#: ../midori/midori-websettings.c:609 +msgid "Location entry Search" +msgstr "Місце початку пошуку" + +#: ../midori/midori-websettings.c:610 +msgid "The search to perform inside the location entry" +msgstr "Здійснювати пошук всередині місця входження" + +#: ../midori/midori-websettings.c:618 +msgid "Preferred Encoding" +msgstr "Типове кодування" + +#: ../midori/midori-websettings.c:619 +msgid "The preferred character encoding" +msgstr "Типове кодування символів" + +#: ../midori/midori-websettings.c:629 +msgid "Always Show Tabbar" +msgstr "Завжди відображати панель вкладок" + +#: ../midori/midori-websettings.c:630 +msgid "Always show the tabbar" +msgstr "Завжди відображати панель вкладок" + +#: ../midori/midori-websettings.c:638 +msgid "Close Buttons on Tabs" +msgstr "Кнопки закриття на вкладках" + +#: ../midori/midori-websettings.c:639 +msgid "Whether tabs have close buttons" +msgstr "Чи матимуть вкладки кнопки закриття" + +#: ../midori/midori-websettings.c:664 +msgid "Open new pages in:" +msgstr "Відкривати нові сторінки в:" + +#: ../midori/midori-websettings.c:665 +msgid "Where to open new pages" +msgstr "Де відкривати нові сторінки" + +#: ../midori/midori-websettings.c:674 +msgid "Middle click opens Selection" +msgstr "Середня кнопка відкриває виділене" + +#: ../midori/midori-websettings.c:675 +msgid "Load an address from the selection via middle click" +msgstr "" +"Завантажувати посилання URL з виділеного через клацання середньої кнопки" + +#: ../midori/midori-websettings.c:683 +msgid "Open tabs in the background" +msgstr "Відкривати вкладки в фоні" + +#: ../midori/midori-websettings.c:684 +msgid "Whether to open new tabs in the background" +msgstr "Чи відкривати нові вкладки в фоновому режимі" + +#: ../midori/midori-websettings.c:692 +msgid "Open Tabs next to Current" +msgstr "Відкривати вкладки у наступних після поточної" + +#: ../midori/midori-websettings.c:693 +msgid "Whether to open new tabs next to the current tab or after the last one" +msgstr "" +"Чи відкривати нові вкладки у наступній за нею чи після останньої вкладки" + +#: ../midori/midori-websettings.c:701 +msgid "Open popups in tabs" +msgstr "Відкривати спливаючі вікна у вкладках" + +#: ../midori/midori-websettings.c:702 +msgid "Whether to open popup windows in tabs" +msgstr "Чи відкривати спливаючі вікна у вкладках" + +#: ../midori/midori-websettings.c:712 ../extensions/statusbar-features.c:131 +msgid "Load images automatically" +msgstr "Автоматично завантажити зображення" + +#: ../midori/midori-websettings.c:713 +msgid "Load and display images automatically" +msgstr "Автоматично завантажити і показати зображення" + +#: ../midori/midori-websettings.c:720 ../extensions/statusbar-features.c:140 +msgid "Enable scripts" +msgstr "Ввімкнути скрипти" + +#: ../midori/midori-websettings.c:721 +msgid "Enable embedded scripting languages" +msgstr "Ввімкнути вбудовані мови скриптів" + +#: ../midori/midori-websettings.c:728 ../extensions/statusbar-features.c:149 +msgid "Enable Netscape plugins" +msgstr "Ввімкнути розширення Netscape" + +#: ../midori/midori-websettings.c:729 +msgid "Enable embedded Netscape plugin objects" +msgstr "Ввімкнути вбудовані об'єкти розширень Netscape" + +#: ../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 "Ввімкнути підтримку баз даних HTML5" + +#: ../midori/midori-websettings.c:757 +msgid "Whether to enable HTML5 database support" +msgstr "Чи дозволити підтримку баз даних HTML5" + +#: ../midori/midori-websettings.c:763 +msgid "Enable HTML5 local storage support" +msgstr "Ввімкнути підтримку локального сховища HTML5" + +#: ../midori/midori-websettings.c:764 +msgid "Whether to enable HTML5 local storage support" +msgstr "Чи дозволити підтримку локального сховища HTML5" + +#: ../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:803 +msgid "Zoom Text and Images" +msgstr "Збільшувати/зменшувати текст і зображення" + +#: ../midori/midori-websettings.c:804 +msgid "Whether to zoom text and images" +msgstr "Чи збільшувати/зменшувати текст і зображення" + +#: ../midori/midori-websettings.c:819 +msgid "Find inline while typing" +msgstr "Шукати під час вписування" + +#: ../midori/midori-websettings.c:820 +msgid "Whether to automatically find inline while typing" +msgstr "Чи автоматично шукати при вписуванні" + +#: ../midori/midori-websettings.c:835 +msgid "Kinetic scrolling" +msgstr "Кінетичне прокручування" + +#: ../midori/midori-websettings.c:836 +msgid "Whether scrolling should kinetically move according to speed" +msgstr "Чи прокручування повинно кінетично рухатися відповідно до швидкості" + +#: ../midori/midori-websettings.c:844 +msgid "Delete old Cookies after:" +msgstr "Вилучити старі тістечка через:" + +#: ../midori/midori-websettings.c:845 +msgid "The maximum number of days to save cookies for" +msgstr "Максимальне число днів зберігання тістечок для" + +#: ../midori/midori-websettings.c:861 +msgid "Only accept Cookies from sites you visit" +msgstr "Приймати тістечка тільки з сторінок які ви відвідуєте" + +#: ../midori/midori-websettings.c:862 +msgid "Block cookies sent by third-party websites" +msgstr "Блокувати тістечка що посилаються сторонніми сторінками" + +#: ../midori/midori-websettings.c:876 +msgid "Delete pages from history after:" +msgstr "Видалити сторінку з історії через:" + +#: ../midori/midori-websettings.c:877 +msgid "The maximum number of days to save the history for" +msgstr "Максимальне число днів зберігання історії для" + +#: ../midori/midori-websettings.c:892 +msgid "Proxy server" +msgstr "Сервер проксі" + +#: ../midori/midori-websettings.c:893 +msgid "The type of proxy server to use" +msgstr "Тип проксі-сервера для використання" + +#: ../midori/midori-websettings.c:902 +msgid "HTTP Proxy Server" +msgstr "HTTP сервер проксі" + +#: ../midori/midori-websettings.c:903 +msgid "The proxy server used for HTTP connections" +msgstr "Проксі, що використовується для HTTP з'єднань" + +#: ../midori/midori-websettings.c:918 +msgid "Port" +msgstr "Порт" + +#: ../midori/midori-websettings.c:919 +msgid "The proxy server port used for HTTP connections" +msgstr "Проксі, що використовується для HTTP з'єднань" + +#: ../midori/midori-websettings.c:937 +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:954 +msgid "Identify as" +msgstr "Ідентифікувати як" + +#: ../midori/midori-websettings.c:955 +msgid "What to identify as to web pages" +msgstr "Що ідентифікувати для веб-сторінок" + +#: ../midori/midori-websettings.c:971 +msgid "Identification string" +msgstr "Стрічка ідентифікації" + +#: ../midori/midori-websettings.c:972 +msgid "The application identification string" +msgstr "Стрічка ідентифікації програми" + +#: ../midori/midori-websettings.c:988 +msgid "Preferred languages" +msgstr "Типові мови" + +#: ../midori/midori-websettings.c:989 +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:1004 +msgid "Clear private data" +msgstr "Очистити приватні дані" + +#: ../midori/midori-websettings.c:1005 +msgid "The private data selected for deletion" +msgstr "Приватні дані, що вибрані для очищення" + +#: ../midori/midori-websettings.c:1020 +msgid "Clear data" +msgstr "Очистити дані" + +#: ../midori/midori-websettings.c:1021 +msgid "The data selected for deletion" +msgstr "Дані, що вибрані для вилучення" + +#. i18n: Reworded: Shorten details propagated when going to another page +#: ../midori/midori-websettings.c:1054 +msgid "Strip referrer details sent to websites" +msgstr "Пропустити деталі referer'а, що вислані до зовнішніх сторінок" + +#. i18n: Referer here is not a typo but a technical term +#: ../midori/midori-websettings.c:1056 +msgid "Whether the \"Referer\" header should be shortened to the hostname" +msgstr "Чи заголовок \"Referer'а\" повинен бути скорочений до назви сервера" + +#: ../midori/midori-websettings.c:1070 +msgid "Always use my font choices" +msgstr "Завжди використовувати мій вибір шрифтів" + +#: ../midori/midori-websettings.c:1071 +msgid "Override fonts picked by websites with user preferences" +msgstr "Перезаписати шрифти для веб-сторінок шрифтами вибраними користувачем" + +#: ../midori/midori-view.c:1343 +#, c-format +msgid "%s wants to save an HTML5 database." +msgstr "%s бажає зберегти базу даних HTML5." + +#: ../midori/midori-view.c:1347 ../midori/midori-view.c:1377 +msgid "_Deny" +msgstr "_Заборонити" + +#: ../midori/midori-view.c:1347 ../midori/midori-view.c:1377 +msgid "_Allow" +msgstr "_Дозволити" + +#: ../midori/midori-view.c:1373 +#, c-format +msgid "%s wants to know your location." +msgstr "%s бажає знати Ваше знаходження." + +#: ../midori/midori-view.c:1461 +#, c-format +msgid "Error - %s" +msgstr "Помилка - %s" + +#: ../midori/midori-view.c:1462 +#, c-format +msgid "The page '%s' couldn't be loaded." +msgstr "Сторінку '%s' неможливо завантажити." + +#: ../midori/midori-view.c:1464 +msgid "Try again" +msgstr "Спробуйте знову" + +#: ../midori/midori-view.c:1626 ../midori/midori-view.c:2471 +#, c-format +msgid "Send a message to %s" +msgstr "Послати повідомлення до %s" + +#: ../midori/midori-view.c:2313 ../midori/midori-view.c:2624 +msgid "Inspect _Element" +msgstr "Перевірити _елемент" + +#: ../midori/midori-view.c:2363 +msgid "Open Link in New _Tab" +msgstr "Відкрити посилання у новій в_кладці" + +#: ../midori/midori-view.c:2367 +msgid "Open Link in _Foreground Tab" +msgstr "Відкривати посилання у в_кладці переднього плану" + +#: ../midori/midori-view.c:2368 +msgid "Open Link in _Background Tab" +msgstr "Відкрити посилання у фоновій в_кладці" + +#: ../midori/midori-view.c:2371 +msgid "Open Link in New _Window" +msgstr "Відкрити посилання у новому _вікні" + +#: ../midori/midori-view.c:2374 +msgid "Open Link as Web A_pplication" +msgstr "Відкрити посилання як веб-_додаток" + +#: ../midori/midori-view.c:2377 +msgid "Copy Link de_stination" +msgstr "Копіювати поси_лання" + +#: ../midori/midori-view.c:2389 +msgid "Open _Image in New Tab" +msgstr "Відкрити зображення у новій _вкладці" + +#: ../midori/midori-view.c:2392 +msgid "Copy Image _Address" +msgstr "Копіювати адрес _зображення" + +#: ../midori/midori-view.c:2395 +msgid "Save I_mage" +msgstr "Зберегти з_ображення" + +#: ../midori/midori-view.c:2402 msgid "Copy Video _Address" msgstr "Скопіювати адресу _відео" -#: ../midori/midori-view.c:2820 +#: ../midori/midori-view.c:2405 msgid "Save _Video" msgstr "Зберегти _відео" -#: ../midori/midori-view.c:2820 +#: ../midori/midori-view.c:2405 msgid "Download _Video" msgstr "Завантажити _відео" -#: ../midori/midori-view.c:2846 +#: ../midori/midori-view.c:2431 msgid "Search _with" msgstr "Шукати _з" -#: ../midori/midori-view.c:2878 +#: ../midori/midori-view.c:2463 msgid "_Search the Web" msgstr "_Шукати Веб" -#: ../midori/midori-view.c:2895 +#: ../midori/midori-view.c:2479 msgid "Open Address in New _Tab" msgstr "Відкрити адресу у новій _вкладці" -#: ../midori/midori-view.c:2948 -msgid "Open _Frame in New Tab" -msgstr "Відкрити _фрейм у новій _вкладці" - -#: ../midori/midori-view.c:3203 -#, c-format -msgid "Open or download file from %s" -msgstr "Відкрити або завантажити файл з %s" +#: ../midori/midori-view.c:2775 +msgid "Open or download file" +msgstr "Відкрити або завантажити файл" -#: ../midori/midori-view.c:3216 -#, c-format -msgid "File Name: %s" -msgstr "Ім'я файлу: %s" - -#: ../midori/midori-view.c:3221 +#: ../midori/midori-view.c:2794 #, c-format msgid "File Type: '%s'" msgstr "Тип файлу: '%s'" -#: ../midori/midori-view.c:3223 +#: ../midori/midori-view.c:2796 #, c-format msgid "File Type: %s ('%s')" msgstr "Тип файлу: %s ('%s')" -#: ../midori/midori-view.c:3260 -#, c-format -msgid "Size: %s" -msgstr "Розмір: %s" - #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:3271 +#: ../midori/midori-view.c:2813 #, c-format msgid "Open %s" msgstr "Відкрити %s" -#: ../midori/midori-view.c:3876 +#: ../midori/midori-view.c:3405 #, c-format msgid "Inspect page - %s" msgstr "Перевірка сторінки - %s" -#: ../midori/midori-view.c:4275 -#, c-format -msgid "No documentation installed" -msgstr "Документація не встановлена" - -#: ../midori/midori-view.c:4352 -msgid "Midori doesn't store any personal data:" -msgstr "Мідорі не зберігає жодні персональні дані:" - -#: ../midori/midori-view.c:4353 -msgid "No history or web cookies are being saved." -msgstr "Історія і тістечка зберігаються." - -#: ../midori/midori-view.c:4354 -msgid "Extensions are disabled." -msgstr "Додатки виключено." - -#: ../midori/midori-view.c:4355 -msgid "HTML5 storage, local database and application caches are disabled." -msgstr "Сховище HTML5, локальна база даних і кеш програм виключено." +#: ../midori/midori-view.c:3692 +msgid "Speed Dial" +msgstr "Швидкий виклик" -#: ../midori/midori-view.c:4356 -msgid "Midori prevents websites from tracking the user:" -msgstr "Мідорі забороняє веб-сторінкам відслідковувати користувача:" +#: ../midori/midori-view.c:3693 ../midori/midori-view.c:3789 +msgid "Click to add a shortcut" +msgstr "Клікніть щоб додати скорочення" -#: ../midori/midori-view.c:4357 -msgid "Referrer URLs are stripped down to the hostname." -msgstr "URL реферера обмежується до назви вузла." +#: ../midori/midori-view.c:3694 +msgid "Enter shortcut address" +msgstr "Введіть адресу скорочення" -#: ../midori/midori-view.c:4358 -msgid "DNS prefetching is disabled." -msgstr "Попереднє отримання DNS виключено." +#: ../midori/midori-view.c:3695 +msgid "Enter shortcut title" +msgstr "Введіть назву скорочення" -#: ../midori/midori-view.c:4359 -msgid "The language and timezone are not revealed to websites." -msgstr "Мова і часовий пояс не показуються веб-сторінкам." +#: ../midori/midori-view.c:3696 +msgid "Are you sure you want to delete this shortcut?" +msgstr "Ви впевнені, що бажаєте видалити це скорочення?" -#: ../midori/midori-view.c:4360 -msgid "Flash and other Netscape plugins cannot be listed by websites." -msgstr "Flash та інші додатки Netscape не можуть бути показані веб-сторінкам." +#: ../midori/midori-view.c:3860 +#, c-format +msgid "No documentation installed" +msgstr "Документація не встановлена" -#: ../midori/midori-view.c:4446 +#: ../midori/midori-view.c:3910 msgid "Version numbers in brackets show the version used at runtime." msgstr "" "Номери версії в дужках показують версію, що використовується в робочому " "процесі." -#: ../midori/midori-view.c:4495 +#: ../midori/midori-view.c:3955 msgid "Page loading delayed" msgstr "Завантаження сторінки затримане" -#: ../midori/midori-view.c:4496 +#: ../midori/midori-view.c:3956 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "" -"Завантаження затримане або в зв'язку з останнім крахом або з налаштуваннями " +"Завантаження затримане або в зв’язку з останнім крахом або з налаштуваннями " "завантаження." -#: ../midori/midori-view.c:4497 +#: ../midori/midori-view.c:3957 msgid "Load Page" msgstr "Завантажити сторінку" -#: ../midori/midori-view.c:4664 +#: ../midori/midori-view.c:4097 msgid "Blank page" msgstr "Пуста сторінка" -#: ../midori/midori-view.c:4928 +#: ../midori/midori-view.c:4361 msgid "_Duplicate Tab" msgstr "_Дублювати вкладку" -#: ../midori/midori-view.c:4933 +#: ../midori/midori-view.c:4366 msgid "Show Tab _Label" msgstr "Показати мітку _вкладки" -#: ../midori/midori-view.c:4933 +#: ../midori/midori-view.c:4366 msgid "Show Tab _Icon Only" msgstr "Показати тільки _іконки вкладки" -#: ../midori/midori-view.c:4940 -msgid "Close Ot_her Tab" -msgid_plural "Close Ot_her Tabs" -msgstr[0] "Закрити _іншу вкладку" -msgstr[1] "Закрити _інші вкладки" -msgstr[2] "Закрити _інші вкладки" +#: ../midori/midori-view.c:4372 +msgid "Close ot_her Tabs" +msgstr "_Закрити інші вкладки" #. i18n: word stem of "previous page" type links, case is not important -#: ../midori/midori-view.c:5697 +#: ../midori/midori-view.c:4989 msgid "previous" msgstr "попереднє" #. i18n: word stem of "next page" type links, case is not important -#: ../midori/midori-view.c:5716 +#: ../midori/midori-view.c:5008 msgid "next" msgstr "наступне" -#: ../midori/midori-view.c:5729 +#: ../midori/midori-view.c:5021 msgid "Print background images" msgstr "Відобразити зображення тла" -#: ../midori/midori-view.c:5730 +#: ../midori/midori-view.c:5022 msgid "Whether background images should be printed" msgstr "Чи відобразити зображення тла" -#: ../midori/midori-view.c:5762 +#: ../midori/midori-view.c:5054 msgid "Features" msgstr "Опції" -#. i18n: Download tooltip (size): 4KB of 43MB -#: ../midori/midori-download.vala:48 -#, c-format -msgid "%s of %s" -msgstr "%s з %s" - -#: ../midori/midori-download.vala:64 -#, c-format -msgid "%d hour" -msgid_plural "%d hours" -msgstr[0] "%d година" -msgstr[1] "%d години" -msgstr[2] "%d годин" - -#: ../midori/midori-download.vala:65 -#, c-format -msgid "%d minute" -msgid_plural "%d minutes" -msgstr[0] "%d хвилина" -msgstr[1] "%d хвилини" -msgstr[2] "%d хвилин" - -#: ../midori/midori-download.vala:66 -#, c-format -msgid "%d second" -msgid_plural "%d seconds" -msgstr[0] "%d секунда" -msgstr[1] "%d секунди" -msgstr[2] "%d секунд" - -#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning -#: ../midori/midori-download.vala:82 -#, c-format -msgid " - %s remaining" -msgstr " - %s залишилось" - -#. i18n: Unknown number of bytes, used for transfer rate like ?B/s -#: ../midori/midori-download.vala:92 -msgid "?B" -msgstr "?Б" - -#. i18n: Download tooltip (transfer rate): (130KB/s) -#: ../midori/midori-download.vala:94 -#, c-format -msgid " (%s/s)" -msgstr " (%s/c)" - -#: ../midori/midori-download.vala:188 -msgid "The downloaded file is erroneous." -msgstr "Завантажений файл містить помилки." - -#: ../midori/midori-download.vala:189 -msgid "" -"The checksum provided with the link did not match. This means the file is " -"probably incomplete or was modified afterwards." -msgstr "" -"Контрольна сума надана з посиланням не збігається. Це означає, що файл може " -"бути неповним або був зміненим пізніше." - -#: ../midori/midori-download.vala:298 -#, c-format -msgid "The file \"%s\" can't be saved in this folder." -msgstr "Файл \"%s\" неможливо зберегти в цій теці." - -#: ../midori/midori-download.vala:300 -msgid "You don't have permission to write in this location." -msgstr "Ви не маєте прав доступу для запису." - -#: ../midori/midori-download.vala:303 -#, c-format -msgid "There is not enough free space to download \"%s\"." -msgstr "Немає достатньо вільного місця для завантаження \"%s\"." - -#: ../midori/midori-download.vala:305 -#, c-format -msgid "The file needs %s but only %s are left." -msgstr "Файл потребує %s, але тільки %s залишилося." - -#: ../midori/midori-speeddial.vala:164 -msgid "Speed Dial" -msgstr "Швидкий виклик" - -#: ../midori/midori-speeddial.vala:165 ../midori/midori-speeddial.vala:250 -msgid "Click to add a shortcut" -msgstr "Клікніть щоб додати скорочення" - -#: ../midori/midori-speeddial.vala:166 -msgid "Enter shortcut address" -msgstr "Введіть адресу скорочення" - -#: ../midori/midori-speeddial.vala:167 -msgid "Enter shortcut title" -msgstr "Введіть назву скорочення" - -#: ../midori/midori-speeddial.vala:168 -msgid "Are you sure you want to delete this shortcut?" -msgstr "Ви впевнені, що бажаєте видалити це скорочення?" - -#: ../midori/midori-preferences.c:299 +#: ../midori/midori-preferences.c:297 msgid "Startup" msgstr "Початкові" -#: ../midori/midori-preferences.c:305 -msgid "Homepage:" -msgstr "Домашня сторінка:" - -#: ../midori/midori-preferences.c:313 +#: ../midori/midori-preferences.c:310 msgid "Use _current page" msgstr "Використати _поточну сторінку" -#: ../midori/midori-preferences.c:317 +#: ../midori/midori-preferences.c:314 msgid "Use current page as homepage" msgstr "Використати поточну сторінку як домашню" #. Page "Appearance" -#: ../midori/midori-preferences.c:326 +#: ../midori/midori-preferences.c:323 msgid "Fonts" msgstr "Шрифти" -#: ../midori/midori-preferences.c:329 +#: ../midori/midori-preferences.c:326 msgid "Proportional Font Family" -msgstr "Пропорційне сімейство шрифтів" +msgstr "Пропорціональне сімейство шрифтів" -#: ../midori/midori-preferences.c:333 +#: ../midori/midori-preferences.c:330 msgid "The default font family used to display text" msgstr "Шрифт по замовчуванню для відображення тексту" -#: ../midori/midori-preferences.c:336 +#: ../midori/midori-preferences.c:333 msgid "The default font size used to display text" -msgstr "Розмір шрифту по замовчуванню для відображення тексту" +msgstr "Розмір шрифта по замовчуванню для відображення тексту" -#: ../midori/midori-preferences.c:338 +#: ../midori/midori-preferences.c:335 msgid "Fixed-width Font Family" -msgstr "Шрифти фіксованої ширини" - -#: ../midori/midori-preferences.c:342 -msgid "The font family used to display fixed-width text" -msgstr "Шрифт для відображення тексту фіксованої ширини" - -#: ../midori/midori-preferences.c:345 -msgid "The font size used to display fixed-width text" -msgstr "Розмір шрифту для відображення тексту фіксованої ширини" - -#: ../midori/midori-preferences.c:347 -msgid "Minimum Font Size" -msgstr "Мінімальний розмір шрифту" - -#: ../midori/midori-preferences.c:351 -msgid "The minimum font size used to display text" -msgstr "Мінімальний розмір шрифту для відображення тексту" - -#. Page "Behavior" -#: ../midori/midori-preferences.c:362 -msgid "Behavior" -msgstr "Поведінка" - -#: ../midori/midori-preferences.c:366 ../extensions/statusbar-features.c:155 -msgid "Load images automatically" -msgstr "Автоматично завантажити зображення" - -#: ../midori/midori-preferences.c:369 -msgid "Enable Spell Checking" -msgstr "Ввімкнути перевірку правопису" - -#: ../midori/midori-preferences.c:383 ../extensions/statusbar-features.c:165 -msgid "Enable scripts" -msgstr "Ввімкнути скрипти" - -#: ../midori/midori-preferences.c:386 ../extensions/statusbar-features.c:177 -msgid "Enable Netscape plugins" -msgstr "Ввімкнути розширення Netscape" - -#: ../midori/midori-preferences.c:391 -msgid "Zoom Text and Images" -msgstr "Збільшувати/зменшувати текст і зображення" - -#: ../midori/midori-preferences.c:394 -msgid "Allow scripts to open popups" -msgstr "Дозволити скриптам відкривати спливаючі вікна" - -#: ../midori/midori-preferences.c:395 -msgid "Whether scripts are allowed to open popup windows automatically" -msgstr "Чи дозволяти скриптам автоматично відкривати спливаючі вікна" - -#: ../midori/midori-preferences.c:401 -msgid "Kinetic scrolling" -msgstr "Кінетичне прокручування" - -#: ../midori/midori-preferences.c:402 -msgid "Whether scrolling should kinetically move according to speed" -msgstr "Чи прокручування повинно кінетично рухатися відповідно до швидкості" - -#: ../midori/midori-preferences.c:407 -msgid "Middle click opens Selection" -msgstr "Середня кнопка відкриває виділене" - -#: ../midori/midori-preferences.c:408 -msgid "Load an address from the selection via middle click" -msgstr "" -"Завантажувати посилання URL з виділеного через клацання середньої кнопки" - -#: ../midori/midori-preferences.c:414 -msgid "Enable WebGL support" -msgstr "Ввімкнути підтримку WebGL" - -#: ../midori/midori-preferences.c:419 -msgid "Flash window on background tabs" -msgstr "Відкрити вікно у фонових вкладках" - -#: ../midori/midori-preferences.c:428 -msgid "Save downloaded files to:" -msgstr "Зберігати завантажені файли до:" - -#. Page "Interface" -#: ../midori/midori-preferences.c:435 -msgid "Browsing" -msgstr "Перегляд сторінок" +msgstr "Шрифти фіксованої ширини" -#: ../midori/midori-preferences.c:451 -msgid "Close Buttons on Tabs" -msgstr "Кнопки закриття на вкладках" +#: ../midori/midori-preferences.c:339 +msgid "The font family used to display fixed-width text" +msgstr "Шрифт для відображення тексту фіксованої ширини" -#: ../midori/midori-preferences.c:455 -msgid "Always Show Tabbar" -msgstr "Завжди відображати панель вкладок" +#: ../midori/midori-preferences.c:342 +msgid "The font size used to display fixed-width text" +msgstr "Розмір шрифта для відображення тексту фіксованої ширини" -#: ../midori/midori-preferences.c:459 -msgid "Open Tabs next to Current" -msgstr "Відкривати вкладки у наступних після поточної" +#: ../midori/midori-preferences.c:344 +msgid "Minimum Font Size" +msgstr "Мінімальний розмір шрифту" -#: ../midori/midori-preferences.c:460 -msgid "Whether to open new tabs next to the current tab or after the last one" -msgstr "" -"Чи відкривати нові вкладки у наступній за нею чи після останньої вкладки" +#: ../midori/midori-preferences.c:348 +msgid "The minimum font size used to display text" +msgstr "Мінімальний розмір шрифта для відображення тексту" -#: ../midori/midori-preferences.c:463 -msgid "Open tabs in the background" -msgstr "Відкривати вкладки в фоні" +#. Page "Behavior" +#: ../midori/midori-preferences.c:359 +msgid "Behavior" +msgstr "Поведінка" -#: ../midori/midori-preferences.c:467 -msgid "Text Editor" -msgstr "Текстовий редактор" +#: ../midori/midori-preferences.c:385 +msgid "Allow scripts to open popups" +msgstr "Дозволити скриптам відкривати спливаючі вікна" -#: ../midori/midori-preferences.c:472 -msgid "News Aggregator" -msgstr "Читалка новин" +#: ../midori/midori-preferences.c:386 +msgid "Whether scripts are allowed to open popup windows automatically" +msgstr "Чи дозволяти скриптам автоматично відкривати спливаючі вікна" + +#. Page "Interface" +#: ../midori/midori-preferences.c:409 +msgid "Browsing" +msgstr "Перегляд сторінок" #. Page "Network" -#: ../midori/midori-preferences.c:479 +#: ../midori/midori-preferences.c:447 msgid "Network" msgstr "Мережа" -#: ../midori/midori-preferences.c:481 -msgid "Proxy server" -msgstr "Сервер проксі" - -#: ../midori/midori-preferences.c:486 +#: ../midori/midori-preferences.c:454 msgid "Hostname" msgstr "Назва сервера" -#: ../midori/midori-preferences.c:494 -msgid "Port" -msgstr "Порт" - -#: ../midori/midori-preferences.c:506 ../midori/midori-preferences.c:509 -msgid "The maximum size of cached pages on disk" -msgstr "Максимальний розмір кешованих сторінок на диску" - -#: ../midori/midori-preferences.c:511 +#: ../midori/midori-preferences.c:478 msgid "MB" -msgstr "МБ" +msgstr "MB" -#: ../midori/midori-searchaction.c:957 +#: ../midori/midori-searchaction.c:907 msgid "Add search engine" msgstr "Додати пошукову машину" -#: ../midori/midori-searchaction.c:957 +#: ../midori/midori-searchaction.c:907 msgid "Edit search engine" msgstr "Редагувати пошукову машину" -#: ../midori/midori-searchaction.c:985 +#: ../midori/midori-searchaction.c:936 msgid "_Name:" msgstr "_Назва:" -#: ../midori/midori-searchaction.c:1000 +#: ../midori/midori-searchaction.c:952 msgid "_Description:" msgstr "_Опис:" -#: ../midori/midori-searchaction.c:1013 ../extensions/feed-panel/main.c:377 -msgid "_Address:" -msgstr "_Адреса:" +#: ../midori/midori-searchaction.c:985 +msgid "_Icon:" +msgstr "З_начок:" -#: ../midori/midori-searchaction.c:1032 +#: ../midori/midori-searchaction.c:999 msgid "_Token:" msgstr "_Ознака:" -#: ../midori/midori-searchaction.c:1330 +#: ../midori/midori-searchaction.c:1299 msgid "Manage Search Engines" msgstr "Налаштувати пошукові машини" -#: ../midori/midori-searchaction.c:1432 +#: ../midori/midori-searchaction.c:1399 msgid "Use as _default" msgstr "Використовувати по _замовчуванню" -#: ../midori/sokoke.c:353 +#: ../midori/sokoke.c:410 msgid "Open with" msgstr "Відкрити з" -#: ../midori/sokoke.c:361 +#: ../midori/sokoke.c:418 #, c-format msgid "Choose an application or command to open \"%s\":" msgstr "Виберіть програму або команду для відкриття \"%s\":" -#: ../midori/sokoke.c:476 ../midori/sokoke.c:490 +#: ../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 годин" + +#: ../midori/sokoke.c:1678 +#, c-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "%d хвилина" +msgstr[1] "%d хвилини" +msgstr[2] "%d хвилин" + +#: ../midori/sokoke.c:1679 +#, c-format +msgid "%d second" +msgid_plural "%d seconds" +msgstr[0] "%d секунда" +msgstr[1] "%d секунди" +msgstr[2] "%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:265 +#: ../toolbars/midori-findbar.c:264 msgid "_Inline Find:" msgstr "Знайти _входження:" -#: ../toolbars/midori-findbar.c:287 +#: ../toolbars/midori-findbar.c:291 msgid "Previous" msgstr "Попереднє" -#: ../toolbars/midori-findbar.c:293 +#: ../toolbars/midori-findbar.c:297 msgid "Next" msgstr "Наступне" -#: ../toolbars/midori-findbar.c:297 +#: ../toolbars/midori-findbar.c:301 msgid "Match Case" msgstr "Врахувати регістр" -#: ../toolbars/midori-findbar.c:306 +#: ../toolbars/midori-findbar.c:310 msgid "Highlight Matches" msgstr "Підсвітити збіги" -#: ../toolbars/midori-findbar.c:317 +#: ../toolbars/midori-findbar.c:321 msgid "Close Findbar" msgstr "Закрити панель пошуку" -#: ../toolbars/midori-transferbar.c:109 +#: ../toolbars/midori-transferbar.c:122 #, c-format msgid "The file '%s' has been downloaded." msgstr "Файл '%s' завантажено." -#: ../toolbars/midori-transferbar.c:114 +#: ../toolbars/midori-transferbar.c:125 msgid "Transfer completed" msgstr "Передачу завершено" -#: ../toolbars/midori-transferbar.c:239 ../panels/midori-transfers.c:139 +#: ../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:272 ../toolbars/midori-transferbar.c:274 +#: ../toolbars/midori-transferbar.c:368 ../toolbars/midori-transferbar.c:370 msgid "Some files are being downloaded" -msgstr "Деякі файли завантажено" +msgstr "Деякі файли завантажено." -#: ../toolbars/midori-transferbar.c:278 +#: ../toolbars/midori-transferbar.c:374 msgid "_Quit Midori" msgstr "_Вийти з Мідорі" -#: ../toolbars/midori-transferbar.c:280 +#: ../toolbars/midori-transferbar.c:376 msgid "The transfers will be cancelled if Midori quits." -msgstr "Всі завантаження буде скасовано, якщо вийти з Мідорі." +msgstr "Всі завантаження буде скасовано, якщо вийти з Мідорі" -#: ../panels/midori-bookmarks.c:308 +#: ../panels/midori-bookmarks.c:113 +msgid "Bookmarks" +msgstr "Закладки" + +#: ../panels/midori-bookmarks.c:260 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "Не вдалося додати закладку: %s\n" -#: ../panels/midori-bookmarks.c:475 -#, c-format -msgid "Failed to update bookmark : %s\n" -msgstr "Не вдалося оновити закладку : %s\n" - -#: ../panels/midori-bookmarks.c:535 +#: ../panels/midori-bookmarks.c:440 msgid "Edit the selected bookmark" msgstr "Редагувати вибрану закладку" -#: ../panels/midori-bookmarks.c:543 +#: ../panels/midori-bookmarks.c:448 msgid "Delete the selected bookmark" msgstr "Видалити вибрану закладку" -#: ../panels/midori-bookmarks.c:558 +#: ../panels/midori-bookmarks.c:463 msgid "Add a new folder" msgstr "Додати нову теку" -#: ../panels/midori-bookmarks.c:697 ../panels/midori-history.c:638 +#: ../panels/midori-bookmarks.c:597 ../panels/midori-history.c:579 msgid "Separator" msgstr "Роздільник" -#. Create the filter entry -#: ../panels/midori-bookmarks.c:1027 -msgid "Search Bookmarks" -msgstr "Шукати закладки" - -#: ../panels/midori-history.c:111 +#: ../panels/midori-history.c:110 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:142 +msgid "A week ago" +msgstr "Тижневої давності" -#: ../panels/midori-history.c:162 ../panels/midori-history.c:186 +#: ../panels/midori-history.c:144 #, c-format msgid "%d day ago" msgid_plural "%d days ago" @@ -2018,45 +2113,39 @@ msgstr[0] "%d день тому" msgstr[1] "%d дні тому" msgstr[2] "%d днів тому" -#: ../panels/midori-history.c:165 ../panels/midori-history.c:184 -msgid "A week ago" -msgstr "Тижневої давності" +#: ../panels/midori-history.c:147 +msgid "Today" +msgstr "Сьогодні" -#: ../panels/midori-history.c:232 -#, c-format -msgid "Failed to remove history item: %s\n" -msgstr "Невдача при видаленні об'єкту історії: %s\n" +#: ../panels/midori-history.c:149 +msgid "Yesterday" +msgstr "Вчора" -#: ../panels/midori-history.c:360 +#: ../panels/midori-history.c:317 msgid "Are you sure you want to remove all history items?" msgstr "Ви впевнені, що бажаєте видалити всі об'єкти з історії?" -#: ../panels/midori-history.c:407 +#: ../panels/midori-history.c:363 msgid "Bookmark the selected history item" msgstr "Додати в закладки вибраний об'єкт історії" -#: ../panels/midori-history.c:416 +#: ../panels/midori-history.c:372 msgid "Delete the selected history item" msgstr "Видалити вибраний об'єкт історії" -#: ../panels/midori-history.c:424 +#: ../panels/midori-history.c:380 msgid "Clear the entire history" msgstr "Очистити історію" -#. Create the filter entry -#: ../panels/midori-history.c:997 -msgid "Search History" -msgstr "Шукати в історії" - -#: ../panels/midori-transfers.c:87 +#: ../panels/midori-transfers.c:86 msgid "Transfers" msgstr "Завантаження" -#: ../panels/midori-transfers.c:435 +#: ../panels/midori-transfers.c:467 msgid "Open Destination _Folder" msgstr "Відкрити теку при_значення" -#: ../panels/midori-transfers.c:438 +#: ../panels/midori-transfers.c:470 msgid "Copy Link Loc_ation" msgstr "Копіювати поси_лання" @@ -2069,7 +2158,7 @@ msgid "" "A username and a password are required\n" "to open this location:" msgstr "" -"Вимагається ім'я користувача і пароль\n" +"Вимагається назва користувача і пароль\n" "для відкриття цієї адреси:" #: ../katze/katze-http-auth.c:240 @@ -2084,76 +2173,68 @@ msgstr "Пароль" msgid "_Remember password" msgstr "За_пам'ятати пароль" -#: ../katze/katze-throbber.c:949 +#: ../katze/katze-throbber.c:942 #, c-format msgid "Named icon '%s' couldn't be loaded" msgstr "Названий значок '%s' не може бути завантажений" -#: ../katze/katze-throbber.c:962 +#: ../katze/katze-throbber.c:955 #, c-format msgid "Stock icon '%s' couldn't be loaded" msgstr "Значок '%s' не вдається завантажити" -#: ../katze/katze-throbber.c:1042 +#: ../katze/katze-throbber.c:1035 msgid "Animation frames are broken" msgstr "Кадри анімації пошкоджені" -#: ../katze/katze-utils.c:443 ../katze/katze-utils.c:866 +#: ../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:489 ../katze/katze-utils.c:518 -#: ../extensions/addons.c:309 +#: ../katze/katze-utils.c:485 ../katze/katze-utils.c:514 +#: ../extensions/addons.c:308 msgid "Choose file" msgstr "Вибрати файл" -#: ../katze/katze-utils.c:504 +#: ../katze/katze-utils.c:500 msgid "Choose folder" msgstr "Вибрати теку" -#: ../katze/katze-utils.c:602 +#: ../katze/katze-utils.c:604 msgid "None" msgstr "Нічого" -#: ../katze/katze-utils.c:717 +#: ../katze/katze-utils.c:719 msgid "1 hour" msgstr "1 година" -#: ../katze/katze-utils.c:718 +#: ../katze/katze-utils.c:720 msgid "1 day" msgstr "1 день" -#: ../katze/katze-utils.c:719 +#: ../katze/katze-utils.c:721 msgid "1 week" msgstr "1 тиждень" -#: ../katze/katze-utils.c:720 +#: ../katze/katze-utils.c:722 msgid "1 month" msgstr "1 місяць" -#: ../katze/katze-utils.c:721 +#: ../katze/katze-utils.c:723 msgid "1 year" msgstr "1 рік" -#: ../katze/katze-preferences.c:98 ../extensions/history-list.vala:235 +#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235 #, c-format msgid "Preferences for %s" msgstr "Налаштування для %s" -#: ../katze/midori-uri.vala:173 -msgid "MD5-Checksum:" -msgstr "Контрольна сума MD5:" - -#: ../katze/midori-uri.vala:180 -msgid "SHA1-Checksum:" -msgstr "Контрольна сума SHA1:" - -#: ../extensions/adblock.c:495 +#: ../extensions/adblock.c:434 msgid "Configure Advertisement filters" -msgstr "Конфігурувати фільтр реклам" +msgstr "Кофігурувати фільтр реклам" -#: ../extensions/adblock.c:528 +#: ../extensions/adblock.c:465 #, c-format msgid "" "Type the address of a preconfigured filter list in the text entry and click " @@ -2161,136 +2242,136 @@ msgid "" msgstr "" "Введіть адресу сконфігурованого списку фільтрів в поле для вводу тексту та " "натисніть кнопку \"Додати\", щоб додати його до списку. Ви можете знайти " -"більше списків на %s." +"більше списків на % s." -#: ../extensions/adblock.c:942 +#: ../extensions/adblock.c:816 msgid "Edit rule" msgstr "Додати правило" -#: ../extensions/adblock.c:956 +#: ../extensions/adblock.c:830 msgid "_Rule:" msgstr "_Правило:" -#: ../extensions/adblock.c:1010 +#: ../extensions/adblock.c:884 msgid "Bl_ock image" msgstr "Блокувати зображення" -#: ../extensions/adblock.c:1015 +#: ../extensions/adblock.c:889 msgid "Bl_ock link" msgstr "Блокувати посилання" -#: ../extensions/adblock.c:1913 +#: ../extensions/adblock.c:1483 msgid "Advertisement blocker" msgstr "Блокіратор реклами" -#: ../extensions/adblock.c:1914 +#: ../extensions/adblock.c:1484 msgid "Block advertisements according to a filter list" msgstr "Блокувати рекламу використовуючи список фільтрів" #. i18n: An infobar shows up when viewing a script on userscripts.org -#: ../extensions/addons.c:222 +#: ../extensions/addons.c:221 msgid "This page appears to contain a user script. Do you wish to install it?" msgstr "" "Здається, що ця сторінка містить користувацький скрипт. Ви бажаєте " "встановити його?" -#: ../extensions/addons.c:223 +#: ../extensions/addons.c:222 msgid "_Install user script" msgstr "_Встановити скрипт користувача" #. i18n: An infobar shows up when viewing a style on userstyles.org -#: ../extensions/addons.c:228 +#: ../extensions/addons.c:227 msgid "This page appears to contain a user style. Do you wish to install it?" msgstr "" "Здається, що ця сторінка містить користувацький стиль. Ви бажаєте встановити " "його?" -#: ../extensions/addons.c:229 +#: ../extensions/addons.c:228 msgid "_Install user style" msgstr "_Встановити стиль користувача" -#: ../extensions/addons.c:237 +#: ../extensions/addons.c:236 msgid "Don't install" msgstr "Не встановлювати" -#: ../extensions/addons.c:320 ../extensions/addons.c:675 +#: ../extensions/addons.c:319 ../extensions/addons.c:681 msgid "Userscripts" msgstr "Скрипти користувача" -#: ../extensions/addons.c:325 ../extensions/addons.c:677 +#: ../extensions/addons.c:324 ../extensions/addons.c:683 msgid "Userstyles" msgstr "Стилі користувача" -#: ../extensions/addons.c:371 ../extensions/addons.c:450 +#: ../extensions/addons.c:380 ../extensions/addons.c:459 #: ../extensions/feed-panel/main.c:129 msgid "Error" msgstr "Помилка" -#: ../extensions/addons.c:412 +#: ../extensions/addons.c:421 #, c-format msgid "Do you want to delete '%s'?" msgstr "Ви впевнені, що бажаєте видалити '%s'?" -#: ../extensions/addons.c:418 +#: ../extensions/addons.c:427 msgid "Delete user script" msgstr "Видалити скрипт користувача" -#: ../extensions/addons.c:419 +#: ../extensions/addons.c:428 msgid "Delete user style" msgstr "Видалити стиль користувача" -#: ../extensions/addons.c:422 +#: ../extensions/addons.c:431 #, c-format msgid "The file %s will be permanently deleted." -msgstr "Файл %s буде безповоротно вилучено." +msgstr "Файл '%s' буде безповоротно вилучено." -#: ../extensions/addons.c:564 ../extensions/addons.c:641 +#: ../extensions/addons.c:570 ../extensions/addons.c:647 msgid "Open in Text Editor" msgstr "Відкрити в текстовому редакторі" -#: ../extensions/addons.c:566 ../extensions/addons.c:650 +#: ../extensions/addons.c:572 ../extensions/addons.c:656 msgid "Open Target Folder" msgstr "Відкрити теку призначення" -#: ../extensions/addons.c:632 +#: ../extensions/addons.c:638 msgid "Add new addon" msgstr "Додати новий додаток" -#: ../extensions/addons.c:658 +#: ../extensions/addons.c:664 msgid "Remove selected addon" msgstr "Видалити вибраний додаток" -#: ../extensions/addons.c:1687 ../extensions/addons.c:1905 +#: ../extensions/addons.c:1691 ../extensions/addons.c:1909 msgid "User addons" msgstr "Додатки користувача" -#: ../extensions/addons.c:1817 +#: ../extensions/addons.c:1821 #, c-format msgid "Can't monitor folder '%s': %s" msgstr "Не можу моніторувати теку '%s': %s" -#: ../extensions/addons.c:1906 +#: ../extensions/addons.c:1910 msgid "Support for userscripts and userstyles" msgstr "Підтримка користувацьких скриптів і стилів" -#: ../extensions/colorful-tabs.c:201 +#: ../extensions/colorful-tabs.c:202 msgid "Colorful Tabs" msgstr "Кольорові вкладки" -#: ../extensions/colorful-tabs.c:202 +#: ../extensions/colorful-tabs.c:203 msgid "Tint each tab distinctly" msgstr "Забарвити кожну вкладку окремо" -#: ../extensions/cookie-manager/cookie-manager-page.c:73 +#: ../extensions/cookie-manager/cookie-manager-page.c:80 #: ../extensions/cookie-manager/main.c:35 msgid "Cookie Manager" msgstr "Менеджер тістечок" -#: ../extensions/cookie-manager/cookie-manager-page.c:103 +#: ../extensions/cookie-manager/cookie-manager-page.c:110 msgid "Delete All" msgstr "Видалити все" -#: ../extensions/cookie-manager/cookie-manager-page.c:105 +#: ../extensions/cookie-manager/cookie-manager-page.c:112 msgid "" "Deletes all shown cookies. If a filter is set, only those cookies are " "deleted which match the filter." @@ -2298,31 +2379,31 @@ msgstr "" "Видаляє всі відображені тістечка. Якщо налаштований фільтр, то будуть " "видалені тільки ті тістечка, які відповідають фільтрові." -#: ../extensions/cookie-manager/cookie-manager-page.c:120 +#: ../extensions/cookie-manager/cookie-manager-page.c:127 msgid "Expand All" msgstr "Розкрити все" -#: ../extensions/cookie-manager/cookie-manager-page.c:127 +#: ../extensions/cookie-manager/cookie-manager-page.c:134 msgid "Collapse All" msgstr "Згорнути все" -#: ../extensions/cookie-manager/cookie-manager-page.c:572 +#: ../extensions/cookie-manager/cookie-manager-page.c:576 msgid "Do you really want to delete all cookies?" msgstr "Ви впевнені, що бажаєте видалити всі тістечка?" -#: ../extensions/cookie-manager/cookie-manager-page.c:574 +#: ../extensions/cookie-manager/cookie-manager-page.c:578 msgid "Question" msgstr "Питання" -#: ../extensions/cookie-manager/cookie-manager-page.c:583 +#: ../extensions/cookie-manager/cookie-manager-page.c:587 msgid "Only cookies which match the filter will be deleted." -msgstr "Будуть видалені тільки ті тістечка, які відповідають фільтрові." +msgstr "Будуть видалені тільки ті тістечка, які відповідають фільтрові" -#: ../extensions/cookie-manager/cookie-manager-page.c:671 +#: ../extensions/cookie-manager/cookie-manager-page.c:675 msgid "At the end of the session" msgstr "Наприкінці сесії" -#: ../extensions/cookie-manager/cookie-manager-page.c:674 +#: ../extensions/cookie-manager/cookie-manager-page.c:678 #, c-format msgid "" "Host: %s\n" @@ -2339,38 +2420,46 @@ msgstr "" "Безпека: %s\n" "Дата закінчення: %s" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:684 msgid "Yes" msgstr "Так" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:684 msgid "No" msgstr "Ні" -#: ../extensions/cookie-manager/cookie-manager-page.c:694 +#: ../extensions/cookie-manager/cookie-manager-page.c:698 #, c-format msgid "" "Domain: %s\n" "Cookies: %d" msgstr "" -"Домен: %s\n" +"Домейн: %s\n" "Тістечка: %d" -#: ../extensions/cookie-manager/cookie-manager-page.c:1017 +#: ../extensions/cookie-manager/cookie-manager-page.c:1028 msgid "Name" msgstr "Назва" -#: ../extensions/cookie-manager/cookie-manager-page.c:1069 +#: ../extensions/cookie-manager/cookie-manager-page.c:1081 msgid "_Expand All" msgstr "Роз_крити все" -#: ../extensions/cookie-manager/cookie-manager-page.c:1077 +#: ../extensions/cookie-manager/cookie-manager-page.c:1089 msgid "_Collapse All" msgstr "З_горнути все" -#: ../extensions/cookie-manager/cookie-manager-page.c:1129 -msgid "Search Cookies by Name or Domain" -msgstr "Шукати коржики за назвою або доменом" +#: ../extensions/cookie-manager/cookie-manager-page.c:1142 +msgid "Filter:" +msgstr "Фільтр:" + +#: ../extensions/cookie-manager/cookie-manager-page.c:1147 +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" @@ -2390,18 +2479,18 @@ msgstr "Копіювати адреси усіх вкладок до буфер #: ../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:387 #, c-format msgctxt "Feed" msgid "Last updated: %s." -msgstr "Востаннє оновлювалося: %s." +msgstr "Останньо оновлювалося: %s." #: ../extensions/feed-panel/feed-panel.c:653 msgid "Feeds" @@ -2436,7 +2525,7 @@ msgstr "Не вдалось відкрити стрічку новин XML : %s" #: ../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." @@ -2444,11 +2533,11 @@ msgstr "Ця версія RSS не підтримується." #: ../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 @@ -2468,72 +2557,46 @@ msgstr "Панель стрічок новин" msgid "Read Atom/ RSS feeds" msgstr "Читати Atom/ RSS стрічки новин" -#: ../extensions/formhistory/formhistory.c:39 +#: ../extensions/formhistory.c:143 #, 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 +#: ../extensions/formhistory.c:295 msgid "Toggle form history state" msgstr "Переключити стан форми історії" -#: ../extensions/formhistory/formhistory.c:438 +#: ../extensions/formhistory.c:296 msgid "Activate or deactivate form history for the current tab." -msgstr "Активувати чи деактивувати форму історії для поточної вкладки." +msgstr "Активувати чи деактивувати форму історії для поточної вкладки" -#: ../extensions/formhistory/formhistory.c:549 -#: ../extensions/formhistory/formhistory.c:553 +#: ../extensions/formhistory.c:432 ../extensions/formhistory.c:436 #, 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" +#: ../extensions/formhistory.c:511 +msgid "only activate form history via hotkey (Ctrl+Shift+F) per tab" msgstr "" -"Тільки активувати форму історії за допомогою гарячих клавіш (Ctrl+Shift+F) " +"тільки активувати форму історії за допомогою гарячих клавіш (Ctrl+Shift+F) " "для вкладки" -#: ../extensions/formhistory/formhistory.c:668 -msgid "Form history filler" -msgstr "Заповнювач історії форм" - -#: ../extensions/formhistory/formhistory.c:669 +#: ../extensions/formhistory.c:570 msgid "Stores history of entered form data" msgstr "Зберігає історію введених даних форм" -#: ../extensions/formhistory/formhistory-gdom-frontend.c:225 -#: ../extensions/formhistory/formhistory-js-frontend.c:106 +#: ../extensions/formhistory.c:574 #, c-format -msgid "Failed to select suggestions\n" -msgstr "Невдача при виборі пропозиції\n" +msgid "Not available: %s" +msgstr "Недоступно: %s" + +#: ../extensions/formhistory.c:575 +msgid "Resource files not installed" +msgstr "Файли ресурсів не встановлені" + +#: ../extensions/formhistory.c:581 +msgid "Form history filler" +msgstr "Заповнювач історії форм" #: ../extensions/history-list.vala:197 msgid "There are no unvisited tabs" @@ -2610,15 +2673,15 @@ msgstr "Перезавантажити сторінку або зупинити msgid "Customize Keyboard shortcuts" msgstr "Редагувати скорочення клавіатури" -#: ../extensions/shortcuts.c:283 +#: ../extensions/shortcuts.c:285 msgid "Customize Sh_ortcuts..." -msgstr "Змінити скоро_чення…" +msgstr "Редагувати скоро_чення..." -#: ../extensions/shortcuts.c:320 +#: ../extensions/shortcuts.c:322 msgid "Shortcuts" msgstr "Скорочення" -#: ../extensions/shortcuts.c:321 +#: ../extensions/shortcuts.c:323 msgid "View and edit keyboard shortcuts" msgstr "Переглянути і редагувати скорочення клавіатури" @@ -2630,348 +2693,86 @@ msgstr "Годинник панелі статусу" msgid "Display date and time in the statusbar" msgstr "Показувати дату і час на панелі статусу" -#: ../extensions/statusbar-features.c:152 +#: ../extensions/statusbar-features.c:128 msgid "Images" msgstr "Зображення" -#: ../extensions/statusbar-features.c:162 +#: ../extensions/statusbar-features.c:137 msgid "Scripts" msgstr "Скрипти" -#: ../extensions/statusbar-features.c:174 +#: ../extensions/statusbar-features.c:146 msgid "Netscape plugins" msgstr "Розширення Netscape" -#: ../extensions/statusbar-features.c:259 +#: ../extensions/statusbar-features.c:192 msgid "Statusbar Features" msgstr "Властивості панелі _стану" -#: ../extensions/statusbar-features.c:260 +#: ../extensions/statusbar-features.c:193 msgid "Easily toggle features on web pages on and off" msgstr "Просте включання і виключання перемикання функцій на веб-сторінках" -#: ../extensions/tab-panel.c:589 ../extensions/tab-panel.c:676 +#: ../extensions/tab-panel.c:596 ../extensions/tab-panel.c:683 msgid "Tab Panel" msgstr "Панель вкладок" -#: ../extensions/tab-panel.c:659 +#: ../extensions/tab-panel.c:666 msgid "T_ab Panel" msgstr "Панель в_кладок" -#: ../extensions/tab-panel.c:677 +#: ../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 "По замовчуванню тільки іконки на вкладках" +msgstr "По замовчуванню тільки іконки на вкладках " #: ../extensions/tabs-minimized.c:77 msgid "New tabs have no label by default" msgstr "Нові вкладки по замовчуванню не будуть мати міток" -#: ../extensions/toolbar-editor.c:395 +#: ../extensions/toolbar-editor.c:393 msgid "Customize Toolbar" msgstr "Змінити панель інструментів" -#: ../extensions/toolbar-editor.c:411 +#: ../extensions/toolbar-editor.c:413 msgid "" -"Select items to be displayed on the toolbar. Items can be reordered by drag " +"Select items to be displayed on the toolbar. Items can be reodered by drag " "and drop." msgstr "" "Вибрати елементи, які будуть показані на панелі інструментів. Елементи можна " -"перевпорядкувати, пересуваючи їх мишою (drag'n'drop)." +"перевпорядкувати, пересуваючи їх мишою (drag'n'drop)" -#: ../extensions/toolbar-editor.c:427 +#: ../extensions/toolbar-editor.c:429 msgid "Available Items" msgstr "Доступні елементи" -#: ../extensions/toolbar-editor.c:448 +#: ../extensions/toolbar-editor.c:450 msgid "Displayed Items" msgstr "Елементи для показу" -#: ../extensions/toolbar-editor.c:588 -msgid "_Customize Toolbar…" -msgstr "Змінити панель _інструментів…" +#: ../extensions/toolbar-editor.c:585 +msgid "Customize _Toolbar..." +msgstr "Змінити пане_ль інструментів..." + +#: ../extensions/toolbar-editor.c:601 +msgid "_Customize..." +msgstr "_Налаштувати..." -#: ../extensions/toolbar-editor.c:617 +#: ../extensions/toolbar-editor.c:631 msgid "Toolbar Editor" msgstr "Редактор панелі інструментів" -#: ../extensions/toolbar-editor.c:618 +#: ../extensions/toolbar-editor.c:632 msgid "Easily edit the toolbar layout" msgstr "Легко редагувати формат панелі інструментів" -#: ../extensions/web-cache.c:462 +#: ../extensions/web-cache.c:463 msgid "Cache HTTP communication on disk" msgstr "Кешувати комунікацію HTTP на диск" -#~ msgid "Remember last window size" -#~ msgstr "Запам'ятати останній розмір вікна" - -#~ msgid "Whether to save the last window size" -#~ msgstr "Чи зберігати останній розмір вікна" - -#~ msgid "Last window width" -#~ msgstr "Ширина останнього вікна" - -#~ msgid "The last saved window width" -#~ msgstr "Остання збережена ширина вікна" - -#~ msgid "Last window height" -#~ msgstr "Висота останнього вікна" - -#~ msgid "The last saved window height" -#~ msgstr "Остання збережена висота вікна" - -#~ msgid "Last panel position" -#~ msgstr "Остання позиція панелі" - -#~ msgid "The last saved panel position" -#~ msgstr "Остання збережена позиція панелі" - -#~ msgid "Last panel page" -#~ msgstr "Остання сторінка панелі" - -#~ msgid "The last saved panel page" -#~ msgstr "Остання збережена сторінка панелі" - -#~ msgid "Last Web search" -#~ msgstr "Останній пошук у Веб" - -#~ msgid "The last saved Web search" -#~ msgstr "Останній збережений пошук у Веб" - -#~ msgid "Show Menubar" -#~ msgstr "Показати панель меню" - -#~ msgid "Whether to show the menubar" -#~ msgstr "Чи показувати панель меню" - -#~ msgid "Show Navigationbar" -#~ msgstr "Показати панель навігації" - -#~ msgid "Whether to show the navigationbar" -#~ msgstr "Чи показувати панель навігації" - -#~ msgid "Show Bookmarkbar" -#~ msgstr "Показати панель закладок" - -#~ msgid "Whether to show the bookmarkbar" -#~ msgstr "Чи показувати панель закладок" - -#~ msgid "Show Panel" -#~ msgstr "Показати панель" - -#~ msgid "Whether to show the panel" -#~ msgstr "Чи показувати панель" - -#~ msgid "Show Statusbar" -#~ msgstr "Показати панель стану" - -#~ msgid "Whether to show the statusbar" -#~ msgstr "Чи показувати панель стану" - -#~ msgid "Toolbar Items" -#~ msgstr "Об'єкти панелі інструментів" - -#~ msgid "The items to show on the toolbar" -#~ msgstr "Об'єкти, що відображаються у панелі інструментів" - -#~ msgid "Compact Sidepanel" -#~ msgstr "Компактна бічна панель" - -#~ msgid "Whether to make the sidepanel compact" -#~ msgstr "Налаштування відображення компактної бічної панелі" - -#~ msgid "Align sidepanel on the right" -#~ msgstr "Рівняти бічну панель по правому краю" - -#~ msgid "Whether to align the sidepanel on the right" -#~ msgstr "Чи вирівнювати бічну панель по правому краю" - -#~ msgid "Open panels in separate windows" -#~ msgstr "Відкривати панелі в нових вікнах" - -#~ msgid "Whether to always open panels in separate windows" -#~ msgstr "Чи відкривати панелі в окремих вікнах" - -#~ msgid "What to do when Midori starts" -#~ msgstr "Що завантажувати при старті" - -#~ msgid "The homepage" -#~ msgstr "Домашня сторінка" - -#~ msgid "Show crash dialog" -#~ msgstr "Показати діалог краху" - -#~ msgid "The folder downloaded files are saved to" -#~ msgstr "Завантажені файли зберігати в теку" - -#~ msgid "An external text editor" -#~ msgstr "Зовнішній текстовий редактор" - -#~ msgid "An external news aggregator" -#~ msgstr "Зовнішня читалка стрічок новин" - -#~ msgid "Location entry Search" -#~ msgstr "Місце початку пошуку" - -#~ msgid "The search to perform inside the location entry" -#~ msgstr "Здійснювати пошук всередині місця входження" - -#~ msgid "The preferred character encoding" -#~ msgstr "Типове кодування символів" - -#~ msgid "Always show the tabbar" -#~ msgstr "Завжди відображати панель вкладок" - -#~ msgid "Whether tabs have close buttons" -#~ msgstr "Чи матимуть вкладки кнопки закриття" - -#~ msgid "Where to open new pages" -#~ msgstr "Де відкривати нові сторінки" - -#~ msgid "Whether to open new tabs in the background" -#~ msgstr "Чи відкривати нові вкладки в фоновому режимі" - -#~ msgid "Open popups in tabs" -#~ msgstr "Відкривати спливаючі вікна у вкладках" - -#~ msgid "Whether to open popup windows in tabs" -#~ msgstr "Чи відкривати спливаючі вікна у вкладках" - -#~ msgid "Load and display images automatically" -#~ msgstr "Автоматично завантажити і показати зображення" - -#~ msgid "Enable embedded scripting languages" -#~ msgstr "Ввімкнути вбудовані мови скриптів" - -#~ msgid "Enable embedded Netscape plugin objects" -#~ msgstr "Ввімкнути вбудовані об'єкти розширень Netscape" - -#~ msgid "Enable spell checking while typing" -#~ msgstr "Ввімкнути перевірку правопису під час введення тексту" - -#~ msgid "Enable HTML5 database support" -#~ msgstr "Ввімкнути підтримку баз даних HTML5" - -#~ msgid "Whether to enable HTML5 database support" -#~ msgstr "Чи дозволити підтримку баз даних HTML5" - -#~ msgid "Whether to enable HTML5 local storage support" -#~ msgstr "Чи дозволити підтримку локального сховища HTML5" - -#~ msgid "Whether to enable offline web application cache" -#~ msgstr "Чи дозволити кеш веб переглядача при роботі поза мережею" - -#~ msgid "Flash the browser window if a new tab was opened in the background" -#~ msgstr "Відкривати вікно переглядача, якщо нова вкладка відкрита в фоні" - -#~ msgid "Allow websites to use OpenGL rendering" -#~ msgstr "" -#~ "Дозволити веб-сайтам використовувати OpenGL для формування зображення" - -#~ msgid "Whether to zoom text and images" -#~ msgstr "Чи збільшувати/зменшувати текст і зображення" - -#~ msgid "Find inline while typing" -#~ msgstr "Шукати під час вписування" - -#~ msgid "Whether to automatically find inline while typing" -#~ msgstr "Чи автоматично шукати при вписуванні" - -#~ msgid "The type of proxy server to use" -#~ msgstr "Тип проксі-сервера для використання" - -#~ msgid "HTTP Proxy Server" -#~ msgstr "HTTP сервер проксі" - -#~ msgid "The proxy server used for HTTP connections" -#~ msgstr "Проксі, що використовується для HTTP з'єднань" - -#~ msgid "The proxy server port used for HTTP connections" -#~ msgstr "Проксі, що використовується для HTTP з'єднань" - -#~ msgid "Identification string" -#~ msgstr "Стрічка ідентифікації" - -#~ msgid "The application identification string" -#~ msgstr "Стрічка ідентифікації програми" - -#~ msgid "Clear private data" -#~ msgstr "Очистити приватні дані" - -#~ msgid "The private data selected for deletion" -#~ msgstr "Приватні дані, що вибрані для очищення" - -#~ msgid "Clear data" -#~ msgstr "Очистити дані" - -#~ msgid "The data selected for deletion" -#~ msgstr "Дані, що вибрані для вилучення" - -#~ msgid "Filter:" -#~ msgstr "Фільтр:" - -#~ msgid "" -#~ "Enter a filter string to show only cookies whose name or domain field " -#~ "match the entered filter" -#~ msgstr "" -#~ "Введіть рядок фільтра, щоб показувати тільки тістечко, чиє поле імені або " -#~ "домену відповідає введеному фільтру" - -#~ msgid "Close ot_her Tabs" -#~ msgstr "_Закрити інші вкладки" - -#~ msgid "_Icon:" -#~ msgstr "З_начок:" - -#~ msgid "_Bookmark" -#~ msgstr "_Закладка" - -#~ msgid "_Console" -#~ msgstr "_Консоль" - -#~ msgid "Toplevel folder" -#~ msgstr "Тека рівнем вище" - -#~ msgid "_Title:" -#~ msgstr "_Назва:" - -#~ msgid "_Folder:" -#~ msgstr "_Тека:" - -#~ msgid "_Customize…" -#~ msgstr "_Налаштувати…" - -#~ 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 "Не зберігати будь-яких даних під час перегляду Веб" @@ -3047,13 +2848,13 @@ msgstr "Кешувати комунікацію HTTP на диск" #~ msgid "Add a new bookmark folder" #~ msgstr "Додати нову теку закладок" -#~ msgid "Add, edit and remove search engines…" -#~ msgstr "Додати, редагувати чи видалити пошукові машини…" +#~ msgid "Add, edit and remove search engines..." +#~ msgstr "Додати, редагувати чи видалити пошукові машини..." -#~ msgid "Clear private data…" -#~ msgstr "Очистити приватні дані…" +#~ msgid "Clear private data..." +#~ msgstr "Очистити приватні дані..." -#~ msgid "Inspect page details and access developer tools…" +#~ msgid "Inspect page details and access developer tools..." #~ msgstr "Перевірити сторінку і доступні знаряддя розробника" #~ msgid "Switch to the previous tab" @@ -3110,6 +2911,12 @@ msgstr "Кешувати комунікацію HTTP на диск" #~ msgid "Show statusbar" #~ msgstr "Показати панель стану" +#~ msgid "MD5-Checksum:" +#~ msgstr "Контрольна сума MD5:" + +#~ msgid "SHA1-Checksum:" +#~ msgstr "Контрольна сума SHA1:" + #~ msgid "No filename specified" #~ msgstr "Не вказано назви файлу" @@ -3137,8 +2944,8 @@ msgstr "Кешувати комунікацію HTTP на диск" #~ msgid "Reset the last _session" #~ msgstr "Скинути останню _сесію" -#~ msgid "Configure _Advertisement filters…" -#~ msgstr "Конфігурувати фільтри _реклам…" +#~ msgid "Configure _Advertisement filters..." +#~ msgstr "Конфігурувати фільтри _реклам..." #~ msgid "Not found - %s" #~ msgstr "Не знайдено - %s" @@ -3157,6 +2964,9 @@ msgstr "Кешувати комунікацію HTTP на диск" #~ "Переключити вкладки за допомогою Ctrl+Tab, впорядкованим по часу " #~ "останнього використання" +#~ msgid "_Form History" +#~ msgstr "Сформувати _історію" + #~ msgid "Delete old cookies after 1 hour" #~ msgstr "Вилучити старі тістечка через 1 годину" @@ -3466,6 +3276,9 @@ msgstr "Кешувати комунікацію HTTP на диск" #~ msgid "Both horizontal" #~ msgstr "Обоє горизонтальні" +#~ msgid "_Enable" +#~ msgstr "_Ввімкнути" + #~ msgid "Disable" #~ msgstr "_Заборонити" @@ -3514,14 +3327,17 @@ msgstr "Кешувати комунікацію HTTP на диск" #~ msgid "The character encoding to use by default" #~ msgstr "Типове кодування символів" +#~ msgid "User_styles" +#~ msgstr "Стилі користувача" + #~ msgid "Whether text areas are resizable" #~ msgstr "Чи зберігати останні відвідані сторінки" #~ msgid "Load on Startup" #~ msgstr "Початкові" -#~ msgid "Configure _Toolbar…" -#~ msgstr "Редагувати _панель…" +#~ msgid "Configure _Toolbar..." +#~ msgstr "Редагувати _панель..." #~ msgid "Enable" #~ msgstr "Ввімкнути скрипти" diff --git a/po/zh_CN.po b/po/zh_CN.po index 1adde3b3..a5862989 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -4,32 +4,31 @@ # the midori package. # Stanley Zhang , 2009. # Hunt Xu , 2009, 2010, 2011. -# Chipong Luo , 2011, 2012. -# +# Chipong Luo , 2011. +# msgid "" msgstr "" "Project-Id-Version: midori\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-17 05:03+0000\n" +"POT-Creation-Date: 2011-11-25 15:26+0000\n" "PO-Revision-Date: 2011-02-15 21:26+0800\n" -"Last-Translator: Chipong Luo \n" -"Language-Team: Chinese (Simplified) \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" -"Language: zh_CN\n" -"Plural-Forms: nplurals=1; plural=0;\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:1972 ../midori/main.c:1996 -#: ../midori/main.c:2010 ../midori/midori-websettings.c:313 +#: ../data/midori.desktop.in.h:2 +msgid "Lightweight web browser" +msgstr "轻量级网络浏览器" + +#: ../data/midori.desktop.in.h:3 ../midori/main.c:2009 ../midori/main.c:2029 +#: ../midori/main.c:2045 ../midori/midori-websettings.c:303 msgid "Midori" msgstr "Midori 浏览器" @@ -39,319 +38,344 @@ msgstr "网络浏览器" #: ../data/midori-private.desktop.in.h:1 msgid "Midori Private Browsing" -msgstr "Midori 私人浏览" +msgstr "Midori 浏览器隐私浏览方式" #: ../data/midori-private.desktop.in.h:2 msgid "Open a new private browsing window" -msgstr "打开新的私人浏览窗口" +msgstr "打开新的隐私浏览窗口" -#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4210 +#: ../data/midori-private.desktop.in.h:3 msgid "Private Browsing" -msgstr "私人浏览" +msgstr "隐私浏览方式" -#: ../midori/main.c:97 ../midori/main.c:103 +#: ../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 无效" -#: ../midori/main.c:156 ../midori/main.c:260 +#: ../midori/main.c:155 ../midori/main.c:261 #, c-format msgid "Invalid configuration value '%s'" msgstr "无效的配置值 ‘%s’" -#: ../midori/main.c:381 +#: ../midori/main.c:366 #, c-format msgid "The search engines couldn't be loaded. %s\n" -msgstr "未能载入搜索引擎。%s\n" +msgstr "无法载入搜索引擎。%s\n" -#: ../midori/main.c:435 +#: ../midori/main.c:420 #, c-format msgid "Failed to clear history: %s\n" msgstr "无法清除历史：%s\n" -#: ../midori/main.c:455 ../extensions/formhistory/formhistory.c:531 +#: ../midori/main.c:440 ../midori/main.c:561 ../extensions/formhistory.c:417 #, 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:525 +#: ../midori/main.c:504 #, c-format msgid "Failed to remove old history items: %s\n" -msgstr "无法移除原历史项目：%s\n" +msgstr "无法移除旧的历史项目：%s\n" + +#: ../midori/main.c:544 ../panels/midori-history.c:189 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "无法移除历史项目：%s\n" + +#: ../midori/main.c:591 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "未能保存书签。%s" -#: ../midori/main.c:547 +#: ../midori/main.c:624 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "未能保存配置。%s" -#: ../midori/main.c:582 +#: ../midori/main.c:659 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "未能保存搜索引擎。%s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:619 +#: ../midori/main.c:685 ../midori/main.c:705 #, c-format msgid "The trash couldn't be saved. %s" -msgstr "未能保存回收站。%s" +msgstr "回收站无法保存。%s" -#: ../midori/main.c:660 ../panels/midori-extensions.c:91 +#: ../midori/main.c:739 ../panels/midori-extensions.c:91 msgid "Extensions" msgstr "扩展" -#: ../midori/main.c:674 +#: ../midori/main.c:753 msgid "Privacy" -msgstr "私人" +msgstr "隐私" -#: ../midori/main.c:686 +#: ../midori/main.c:765 msgid "" "Cookies store login data, saved games, or user profiles for advertisement " "purposes." -msgstr "隐私信息存储登录数据、游戏状态或用于广告目的用户分布信息。" +msgstr "隐私信息保存了登录数据、游戏状态或用于广告目的用户分布信息。" -#: ../midori/main.c:742 +#: ../midori/main.c:821 #, c-format msgid "The session couldn't be saved. %s" msgstr "未能保存会话。%s" -#: ../midori/main.c:960 +#: ../midori/main.c:1031 msgid "" "No root certificate file is available. SSL certificates cannot be verified." msgstr "无有效的根证书文件。未能验证 SSL 证书。" -#: ../midori/main.c:1036 +#: ../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 浏览器在上次运行时好像崩溃了。如果这种情况反复出现，尝试下面的某种方法" +"来解决此问题。" -#: ../midori/main.c:1055 +#: ../midori/main.c:1118 msgid "Modify _preferences" msgstr "修改首选项(_P)" -#: ../midori/main.c:1059 +#: ../midori/main.c:1122 msgid "Disable all _extensions" msgstr "禁用所有扩展(_E)" -#: ../midori/main.c:1072 +#: ../midori/main.c:1135 msgid "Discard old tabs" -msgstr "舍弃原标签" +msgstr "舍弃旧标签" -#: ../midori/main.c:1073 ../midori/midori-websettings.c:221 +#: ../midori/main.c:1136 ../midori/midori-websettings.c:212 msgid "Show last tabs without loading" msgstr "显示上次打开的标签但不载入" -#: ../midori/main.c:1074 ../midori/midori-websettings.c:220 +#: ../midori/main.c:1137 ../midori/midori-websettings.c:211 msgid "Show last open tabs" msgstr "显示上次打开的标签" -#: ../midori/main.c:1321 ../midori/main.c:2399 +#: ../midori/main.c:1347 ../midori/main.c:2417 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "未能载入会话：%s\n" -#: ../midori/main.c:1459 +#: ../midori/main.c:1488 #, c-format msgid "Snapshot saved to: %s\n" msgstr "截图保存至：%s\n" -#: ../midori/main.c:1875 +#: ../midori/main.c:1912 msgid "Run ADDRESS as a web application" -msgstr "将‘地址’作为网络应用程序运行" +msgstr "将地址作为网络应用程序运行" -#: ../midori/main.c:1875 +#: ../midori/main.c:1912 msgid "ADDRESS" msgstr "地址" -#: ../midori/main.c:1878 +#: ../midori/main.c:1915 msgid "Use FOLDER as configuration folder" -msgstr "使用‘文件夹’作为配置文件夹" +msgstr "使用文件夹作为配置文件夹" -#: ../midori/main.c:1878 +#: ../midori/main.c:1915 msgid "FOLDER" msgstr "文件夹" -#: ../midori/main.c:1881 +#: ../midori/main.c:1918 msgid "Private browsing, no changes are saved" -msgstr "私人浏览，未保存更改" +msgstr "隐私浏览方式，未保存任何更改" -#: ../midori/main.c:1883 +#: ../midori/main.c:1920 msgid "Show a diagnostic dialog" msgstr "显示诊断对话框" -#: ../midori/main.c:1885 +#: ../midori/main.c:1922 msgid "Run the specified filename as javascript" msgstr "将指定的文件名作为 javascript 运行" -#: ../midori/main.c:1887 +#: ../midori/main.c:1924 msgid "Take a snapshot of the specified URI" -msgstr "对指定的 URI 截图" +msgstr "对指定 URI 截图" -#: ../midori/main.c:1889 +#: ../midori/main.c:1926 msgid "Execute the specified command" msgstr "执行指定的命令" -#: ../midori/main.c:1891 +#: ../midori/main.c:1928 msgid "List available commands to execute with -e/ --execute" msgstr "列出可以带 -e/ --execute 执行的命令" -#: ../midori/main.c:1893 +#: ../midori/main.c:1930 msgid "Display program version" msgstr "显示程序版本" -#: ../midori/main.c:1895 +#: ../midori/main.c:1932 msgid "Addresses" msgstr "地址" -#: ../midori/main.c:1897 +#: ../midori/main.c:1934 msgid "Block URIs according to regular expression PATTERN" -msgstr "按正则表达式‘类型’屏蔽 URI" +msgstr "按正则表达式匹配规则屏蔽 URI" -#: ../midori/main.c:1897 +#: ../midori/main.c:1934 msgid "PATTERN" -msgstr "类型" +msgstr "匹配规则" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1901 +#: ../midori/main.c:1938 msgid "Reset Midori after SECONDS seconds of inactivity" -msgstr "在‘秒’秒内无响应后重置 Midori" +msgstr "在 SECONDS 秒后无响应则重置 Midori 浏览器" -#: ../midori/main.c:1901 +#: ../midori/main.c:1938 msgid "SECONDS" -msgstr "秒" +msgstr "SECONDS" -#: ../midori/main.c:1904 +#: ../midori/main.c:1941 msgid "Redirects console warnings to the specified FILENAME" -msgstr "重定向控制台警告信息至指定的‘文件名’" +msgstr "重定向控制台警告信息至指定的文件名" -#: ../midori/main.c:1904 +#: ../midori/main.c:1941 msgid "FILENAME" msgstr "文件名" -#: ../midori/main.c:1969 +#: ../midori/main.c:2006 msgid "[Addresses]" msgstr "[地址]" -#: ../midori/main.c:2011 +#: ../midori/main.c:2016 +msgid "The specified configuration folder is invalid." +msgstr "指定的配置文件夹无效。" + +#: ../midori/main.c:2046 msgid "Please report comments, suggestions and bugs to:" msgstr "请将意见、建议和缺陷报告至：" -#: ../midori/main.c:2013 +#: ../midori/main.c:2048 msgid "Check for new versions at:" -msgstr "在此检查新版本：" +msgstr "在此查找新版本：" + +#: ../midori/main.c:2131 +msgid "Website icons" +msgstr "网站图标" #. i18n: Logins and passwords in websites and web forms -#: ../midori/main.c:2108 +#: ../midori/main.c:2134 msgid "Saved logins and _passwords" -msgstr "已保存的用户名和密码(_P)" +msgstr "已保存的用户名和密码" + +#: ../midori/main.c:2136 +msgid "Cookies" +msgstr "隐私信息" + +#: ../midori/main.c:2139 +msgid "'Flash' Cookies" +msgstr "‘动画’ 隐私信息" -#: ../midori/main.c:2110 -msgid "Cookies and Website data" -msgstr "隐私信息和网站数据" +#: ../midori/main.c:2142 +msgid "HTML5 _Databases" +msgstr "HTML5 数据库(_D)" -#. TODO: Preserve page icons of search engines and merge privacy items -#: ../midori/main.c:2114 ../midori/midori-websettings.c:997 +#: ../midori/main.c:2145 ../midori/midori-websettings.c:936 #: ../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:2147 +msgid "Offline Application Cache" +msgstr "离线应用程序缓存" -#: ../midori/main.c:2223 +#: ../midori/main.c:2250 msgid "An unknown error occured" msgstr "发生了一个未知错误" -#: ../midori/main.c:2330 +#: ../midori/main.c:2348 msgid "An instance of Midori is already running but not responding.\n" msgstr "已有一个 Midori 实例在运行但无响应。\n" -#: ../midori/main.c:2366 +#: ../midori/main.c:2384 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "未能载入书签：%s\n" -#: ../midori/main.c:2414 +#: ../midori/main.c:2432 #, c-format msgid "The trash couldn't be loaded: %s\n" -msgstr "未能载入回收站：%s\n" +msgstr "回收站无法载入：%s\n" -#: ../midori/main.c:2427 +#: ../midori/main.c:2445 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "未能载入历史：%s\n" -#: ../midori/main.c:2443 +#: ../midori/main.c:2461 msgid "The following errors occured:" msgstr "发生了以下错误：" -#: ../midori/main.c:2459 +#: ../midori/main.c:2477 msgid "_Ignore" msgstr "忽略(_I)" -#: ../midori/midori-app.c:1339 +#: ../midori/midori-app.c:1329 msgid "_Bookmark" msgstr "书签(_B)" -#: ../midori/midori-app.c:1340 ../midori/midori-browser.c:6066 +#: ../midori/midori-app.c:1330 ../midori/midori-browser.c:5980 msgid "_Bookmarks" msgstr "书签(_B)" -#: ../midori/midori-app.c:1341 +#: ../midori/midori-app.c:1331 msgid "Add Boo_kmark" msgstr "添加书签(_K)" -#: ../midori/midori-app.c:1342 +#: ../midori/midori-app.c:1332 msgid "_Console" msgstr "控制台(_C)" -#: ../midori/midori-app.c:1343 +#: ../midori/midori-app.c:1333 msgid "_Extensions" msgstr "扩展(_E)" #. i18n: Browsing history, visited web pages, closed tabs -#: ../midori/midori-app.c:1344 ../midori/midori-browser.c:4591 +#: ../midori/midori-app.c:1334 ../midori/midori-browser.c:4575 msgid "_History" msgstr "历史(_H)" -#: ../midori/midori-app.c:1345 +#: ../midori/midori-app.c:1335 msgid "_Homepage" msgstr "主页(_H)" -#: ../midori/midori-app.c:1346 +#: ../midori/midori-app.c:1336 msgid "_Userscripts" msgstr "用户脚本(_U)" -#: ../midori/midori-app.c:1347 +#: ../midori/midori-app.c:1337 msgid "New _Tab" msgstr "新建标签(_T)" -#: ../midori/midori-app.c:1348 +#: ../midori/midori-app.c:1338 msgid "_Transfers" msgstr "传输(_T)" -#: ../midori/midori-app.c:1349 +#: ../midori/midori-app.c:1339 msgid "Netscape p_lugins" msgstr "Netscape 插件(_L)" -#: ../midori/midori-app.c:1350 +#: ../midori/midori-app.c:1340 msgid "_Closed Tabs" msgstr "已关闭的标签(_C)" -#: ../midori/midori-app.c:1351 ../midori/midori-browser.c:5218 +#: ../midori/midori-app.c:1341 ../midori/midori-browser.c:5163 msgid "New _Window" msgstr "新建窗口(_W)" -#: ../midori/midori-app.c:1352 +#: ../midori/midori-app.c:1342 msgid "New _Folder" msgstr "新建文件夹(_F)" @@ -372,140 +396,124 @@ msgstr "无法识别的书签格式。" msgid "Writing failed." msgstr "无法写入。" -#: ../midori/midori-browser.c:350 ../midori/midori-browser.c:5300 -#: ../midori/midori-browser.c:5309 +#: ../midori/midori-browser.c:329 ../midori/midori-browser.c:5245 +#: ../midori/midori-browser.c:5254 msgid "Reload the current page" msgstr "重载当前页面" -#: ../midori/midori-browser.c:359 ../midori/midori-browser.c:5306 +#: ../midori/midori-browser.c:337 ../midori/midori-browser.c:5251 msgid "Stop loading the current page" msgstr "停止载入当前页面" -#: ../midori/midori-browser.c:476 +#: ../midori/midori-browser.c:462 #, c-format msgid "Failed to update title: %s\n" msgstr "无法更新标题：%s\n" -#: ../midori/midori-browser.c:489 +#: ../midori/midori-browser.c:475 #, c-format msgid "Unexpected action '%s'." msgstr "意外的动作 ‘%s’。" -#: ../midori/midori-browser.c:569 +#: ../midori/midori-browser.c:576 #, c-format msgid "%s (Private Browsing)" -msgstr "%s(私人浏览)" +msgstr "%s(隐私浏览方式)" -#: ../midori/midori-browser.c:683 ../midori/midori-browser.c:716 +#: ../midori/midori-browser.c:687 ../midori/midori-browser.c:720 msgid "Toplevel folder" msgstr "最上层文件夹" -#: ../midori/midori-browser.c:774 +#: ../midori/midori-browser.c:777 msgid "New folder" msgstr "新建文件夹" -#: ../midori/midori-browser.c:774 +#: ../midori/midori-browser.c:777 msgid "Edit folder" msgstr "编辑文件夹" -#: ../midori/midori-browser.c:776 +#: ../midori/midori-browser.c:779 msgid "New bookmark" msgstr "新建书签" -#: ../midori/midori-browser.c:776 +#: ../midori/midori-browser.c:779 msgid "Edit bookmark" msgstr "编辑书签" -#: ../midori/midori-browser.c:818 +#: ../midori/midori-browser.c:810 msgid "_Title:" msgstr "标题(_T)：" -#: ../midori/midori-browser.c:838 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:830 ../midori/midori-searchaction.c:966 #: ../extensions/feed-panel/main.c:377 msgid "_Address:" msgstr "地址(_A)：" -#: ../midori/midori-browser.c:861 ../midori/midori-browser.c:4328 +#: ../midori/midori-browser.c:853 ../midori/midori-browser.c:4310 msgid "_Folder:" msgstr "文件夹(_F)：" -#: ../midori/midori-browser.c:877 +#: ../midori/midori-browser.c:869 msgid "Add to _Speed Dial" msgstr "添加至快速拨号(_S)" -#: ../midori/midori-browser.c:890 +#: ../midori/midori-browser.c:882 msgid "Show in the tool_bar" msgstr "在工具栏中显示(_B)" -#: ../midori/midori-browser.c:905 +#: ../midori/midori-browser.c:897 msgid "Run as _web application" msgstr "作为网络应用程序运行(_W)" -#: ../midori/midori-browser.c:976 +#: ../midori/midori-browser.c:968 #, c-format msgid "The file \"%s\" can't be saved in this folder." -msgstr "未能在此文件夹中保存 “%s“ 文件。" +msgstr "“%s“ 文件未能在此文件夹中保存。" -#: ../midori/midori-browser.c:978 +#: ../midori/midori-browser.c:970 #, c-format msgid "You don't have permission to write in this location." msgstr "您没有权限在此位置写入。" -#: ../midori/midori-browser.c:985 +#: ../midori/midori-browser.c:977 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "没有足够的空闲空间用来下载 “%s”。" -#: ../midori/midori-browser.c:988 +#: ../midori/midori-browser.c:980 #, c-format msgid "The file needs %s but only %s are left." -msgstr "此文件需要 %s 但只剩余 %s。" +msgstr "该文件需要 %s 但只剩余 %s。" -#: ../midori/midori-browser.c:1026 ../midori/midori-browser.c:4397 +#: ../midori/midori-browser.c:1024 ../midori/midori-browser.c:4380 msgid "Save file as" msgstr "文件另存为" -#: ../midori/midori-browser.c:1320 +#: ../midori/midori-browser.c:1333 msgid "New Window" msgstr "新建窗口" -#: ../midori/midori-browser.c:1320 +#: ../midori/midori-browser.c:1333 msgid "A new window has been opened" -msgstr "已打开了一个新窗口" +msgstr "打开了一个新窗口" -#: ../midori/midori-browser.c:1323 +#: ../midori/midori-browser.c:1336 msgid "New Tab" msgstr "新建标签" -#: ../midori/midori-browser.c:1323 +#: ../midori/midori-browser.c:1336 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 +#: ../midori/midori-browser.c:1373 msgid "Save file" msgstr "保存文件" -#: ../midori/midori-browser.c:2367 +#: ../midori/midori-browser.c:2263 msgid "Open file" msgstr "打开文件" -#: ../midori/midori-browser.c:2499 +#: ../midori/midori-browser.c:2394 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" @@ -513,573 +521,561 @@ msgid "" "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:2505 ../extensions/feed-panel/main.c:365 +#: ../midori/midori-browser.c:2400 ../extensions/feed-panel/main.c:365 msgid "New feed" msgstr "新建源" -#: ../midori/midori-browser.c:2548 ../midori/midori-browser.c:5369 -#: ../panels/midori-bookmarks.c:427 +#: ../midori/midori-browser.c:2443 ../midori/midori-browser.c:5314 +#: ../panels/midori-bookmarks.c:432 msgid "Add a new bookmark" msgstr "添加新书签" -#: ../midori/midori-browser.c:3047 ../midori/midori-searchaction.c:488 +#: ../midori/midori-browser.c:2969 ../midori/midori-searchaction.c:487 msgid "Empty" msgstr "清空" -#: ../midori/midori-browser.c:3469 +#: ../midori/midori-browser.c:3459 msgid "Toggle text cursor navigation" -msgstr "切换文字光标导航" +msgstr "切换文本光标导航" -#: ../midori/midori-browser.c:3784 ../midori/midori-browser.c:5759 +#: ../midori/midori-browser.c:3771 ../midori/midori-browser.c:5721 #, c-format msgid "Failed to insert new history item: %s\n" -msgstr "无法插入新的历史项目：%s\n" +msgstr "无法插入新历史项目：%s\n" -#: ../midori/midori-browser.c:4116 ../panels/midori-bookmarks.c:745 -#: ../panels/midori-history.c:803 +#: ../midori/midori-browser.c:4107 ../panels/midori-bookmarks.c:748 +#: ../panels/midori-history.c:747 msgid "Open all in _Tabs" msgstr "全部在标签中打开(_T)" -#: ../midori/midori-browser.c:4123 ../panels/midori-bookmarks.c:751 -#: ../panels/midori-history.c:809 ../extensions/feed-panel/feed-panel.c:528 +#: ../midori/midori-browser.c:4114 ../panels/midori-bookmarks.c:754 +#: ../panels/midori-history.c:753 ../extensions/feed-panel/feed-panel.c:528 msgid "Open in New _Tab" msgstr "在新标签中打开(_T)" -#: ../midori/midori-browser.c:4126 ../midori/midori-view.c:2690 -#: ../midori/midori-view.c:4765 ../panels/midori-bookmarks.c:753 -#: ../panels/midori-history.c:811 ../extensions/feed-panel/feed-panel.c:530 +#: ../midori/midori-browser.c:4117 ../midori/midori-view.c:2530 +#: ../midori/midori-view.c:4357 ../panels/midori-bookmarks.c:756 +#: ../panels/midori-history.c:755 ../extensions/feed-panel/feed-panel.c:530 msgid "Open in New _Window" msgstr "在新窗口中打开(_W)" -#: ../midori/midori-browser.c:4215 +#: ../midori/midori-browser.c:4197 msgid "Arora" -msgstr "Arora" +msgstr "Arora 浏览器" -#: ../midori/midori-browser.c:4216 +#: ../midori/midori-browser.c:4198 msgid "Kazehakase" -msgstr "Kazehakase" +msgstr "Kazehakase 浏览器" -#: ../midori/midori-browser.c:4217 +#: ../midori/midori-browser.c:4199 msgid "Opera" -msgstr "Opera" +msgstr "Opera 浏览器" -#: ../midori/midori-browser.c:4218 +#: ../midori/midori-browser.c:4200 msgid "Konqueror" -msgstr "Konqueror" +msgstr "Konqueror 浏览器" -#: ../midori/midori-browser.c:4219 +#: ../midori/midori-browser.c:4201 msgid "Epiphany" -msgstr "Epiphany" +msgstr "Epiphany 浏览器" -#: ../midori/midori-browser.c:4220 +#: ../midori/midori-browser.c:4202 #, c-format msgid "Firefox (%s)" -msgstr "Firefox(%s)" +msgstr "Firefox 浏览器(%s)" -#: ../midori/midori-browser.c:4241 -msgid "Import bookmarks…" -msgstr "导入书签…" +#: ../midori/midori-browser.c:4223 +msgid "Import bookmarks..." +msgstr "导入书签..." -#: ../midori/midori-browser.c:4244 ../midori/midori-browser.c:5374 +#: ../midori/midori-browser.c:4226 ../midori/midori-browser.c:5319 msgid "_Import bookmarks" msgstr "导入书签(_I)" -#: ../midori/midori-browser.c:4255 +#: ../midori/midori-browser.c:4237 msgid "_Application:" msgstr "应用程序(_A)：" -#: ../midori/midori-browser.c:4320 +#: ../midori/midori-browser.c:4302 msgid "Import from XBEL or HTML file" msgstr "从 XBEL 或 HTML 文件导入" -#: ../midori/midori-browser.c:4355 +#: ../midori/midori-browser.c:4337 msgid "Import from a file" msgstr "从文件导入" -#: ../midori/midori-browser.c:4367 +#: ../midori/midori-browser.c:4349 msgid "Failed to import bookmarks" msgstr "无法导入书签" -#: ../midori/midori-browser.c:4402 +#: ../midori/midori-browser.c:4385 msgid "XBEL Bookmarks" msgstr "XBEL 书签" -#: ../midori/midori-browser.c:4407 +#: ../midori/midori-browser.c:4390 msgid "Netscape Bookmarks" msgstr "Netscape 书签" -#: ../midori/midori-browser.c:4421 +#: ../midori/midori-browser.c:4404 msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)" -msgstr "Midori 只能导出为 XBEL(*.xbel) 和 Netscape(*.html)" +msgstr "Midori 浏览器只能导出为 XBEL(*.xbel) 和 Netscape(*.html)" -#: ../midori/midori-browser.c:4436 +#: ../midori/midori-browser.c:4420 msgid "Failed to export bookmarks" msgstr "无法导出书签" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4558 +#: ../midori/midori-browser.c:4542 msgid "Clear Private Data" msgstr "清除隐私数据" -#: ../midori/midori-browser.c:4562 +#: ../midori/midori-browser.c:4546 msgid "_Clear private data" msgstr "清除隐私数据(_C)" -#: ../midori/midori-browser.c:4575 +#: ../midori/midori-browser.c:4559 msgid "Clear the following data:" msgstr "清除以下数据：" -#: ../midori/midori-browser.c:4585 +#: ../midori/midori-browser.c:4569 msgid "Last open _tabs" msgstr "上次打开的标签(_T)" -#: ../midori/midori-browser.c:4611 +#: ../midori/midori-browser.c:4595 msgid "Clear private data when _quitting Midori" -msgstr "退出 Midori 时清除隐私数据(_Q)" +msgstr "退出 Midori 浏览器时清除隐私数据(_Q)" -#: ../midori/midori-browser.c:4806 +#: ../midori/midori-browser.c:4771 msgid "A lightweight web browser." msgstr "轻量级的网络浏览器。" -#: ../midori/midori-browser.c:4807 +#: ../midori/midori-browser.c:4772 msgid "See about:version for version info." msgstr "查看 about:version 获取版本信息。" -#: ../midori/midori-browser.c:4809 +#: ../midori/midori-browser.c:4774 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 " -"版或(您可以选择)更高版方式重新发布和/或修改它。" +"此库是自由软件；您可以在自由软件基金会发布的 GNU 宽通用公共许可协议的方式下再" +"分发和/或修改它；要么 2.1 版本，要么(由您选择)更高的版本。" -#: ../midori/midori-browser.c:4830 +#: ../midori/midori-browser.c:4795 msgid "translator-credits" msgstr "" "张翼 , 2009.\n" "Hunt Xu , 2009, 2010, 2011.\n" -"Chipong Luo , 2011, 2012." +"Chipong Luo , 2011." -#: ../midori/midori-browser.c:5216 +#: ../midori/midori-browser.c:5161 msgid "_File" msgstr "文件(_F)" -#: ../midori/midori-browser.c:5219 +#: ../midori/midori-browser.c:5164 msgid "Open a new window" -msgstr "打开一个新窗口" +msgstr "打开新窗口" -#: ../midori/midori-browser.c:5222 +#: ../midori/midori-browser.c:5167 msgid "Open a new tab" -msgstr "打开一个新标签" +msgstr "打开新标签" -#: ../midori/midori-browser.c:5224 +#: ../midori/midori-browser.c:5169 msgid "New P_rivate Browsing Window" -msgstr "新建私人浏览窗口(_R)" +msgstr "新建隐私浏览窗口(_R)" -#: ../midori/midori-browser.c:5228 +#: ../midori/midori-browser.c:5173 msgid "Open a file" msgstr "打开文件" -#: ../midori/midori-browser.c:5230 -msgid "_Save Page As…" -msgstr "页面另存为(_S)…" +#: ../midori/midori-browser.c:5175 +msgid "_Save Page As..." +msgstr "页面另存为(_S)..." -#: ../midori/midori-browser.c:5231 +#: ../midori/midori-browser.c:5176 msgid "Save to a file" msgstr "保存至文件" -#: ../midori/midori-browser.c:5233 +#: ../midori/midori-browser.c:5178 msgid "Add to Speed _dial" msgstr "添加至快速拨号(_D)" -#: ../midori/midori-browser.c:5237 +#: ../midori/midori-browser.c:5182 msgid "Add Shortcut to the _desktop" msgstr "添加快捷方式至桌面(_D)" -#: ../midori/midori-browser.c:5239 +#: ../midori/midori-browser.c:5184 msgid "Create _Launcher" msgstr "创建启动器(_L)" -#: ../midori/midori-browser.c:5243 +#: ../midori/midori-browser.c:5188 msgid "Subscribe to News _feed" msgstr "订阅至新闻源(_F)" -#: ../midori/midori-browser.c:5249 +#: ../midori/midori-browser.c:5194 msgid "_Close Tab" msgstr "关闭标签(_C)" -#: ../midori/midori-browser.c:5250 +#: ../midori/midori-browser.c:5195 msgid "Close the current tab" msgstr "关闭当前标签" -#: ../midori/midori-browser.c:5252 +#: ../midori/midori-browser.c:5197 msgid "C_lose Window" msgstr "关闭窗口(_L)" -#: ../midori/midori-browser.c:5256 +#: ../midori/midori-browser.c:5201 msgid "Print the current page" -msgstr "打印当前页面" +msgstr "列印当前页" -#: ../midori/midori-browser.c:5258 +#: ../midori/midori-browser.c:5203 msgid "Close a_ll Windows" msgstr "关闭所有窗口(_L)" -#: ../midori/midori-browser.c:5261 +#: ../midori/midori-browser.c:5206 msgid "_Edit" msgstr "编辑(_E)" -#: ../midori/midori-browser.c:5284 -msgid "_Find…" -msgstr "查找(_F)…" +#: ../midori/midori-browser.c:5229 +msgid "_Find..." +msgstr "查找(_F)..." -#: ../midori/midori-browser.c:5285 +#: ../midori/midori-browser.c:5230 msgid "Find a word or phrase in the page" msgstr "在页面中查找字词或短语" -#: ../midori/midori-browser.c:5287 +#: ../midori/midori-browser.c:5232 msgid "Find _Next" msgstr "查找下一个(_N)" -#: ../midori/midori-browser.c:5290 +#: ../midori/midori-browser.c:5235 msgid "Find _Previous" msgstr "查找上一个(_P)" -#: ../midori/midori-browser.c:5294 +#: ../midori/midori-browser.c:5239 msgid "Configure the application preferences" msgstr "配置应用程序首选项" -#: ../midori/midori-browser.c:5296 +#: ../midori/midori-browser.c:5241 msgid "_View" msgstr "视图(_V)" -#: ../midori/midori-browser.c:5297 +#: ../midori/midori-browser.c:5242 msgid "_Toolbars" msgstr "工具栏(_T)" -#: ../midori/midori-browser.c:5302 +#: ../midori/midori-browser.c:5247 msgid "Reload page without caching" msgstr "重载页面但不缓存" -#: ../midori/midori-browser.c:5312 +#: ../midori/midori-browser.c:5257 msgid "Increase the zoom level" msgstr "增加缩放等级" -#: ../midori/midori-browser.c:5315 +#: ../midori/midori-browser.c:5260 msgid "Decrease the zoom level" msgstr "减小缩放等级" -#: ../midori/midori-browser.c:5319 +#: ../midori/midori-browser.c:5264 msgid "_Encoding" msgstr "编码(_E)" -#: ../midori/midori-browser.c:5321 +#: ../midori/midori-browser.c:5266 msgid "View So_urce" msgstr "查看源码(_U)" -#: ../midori/midori-browser.c:5324 +#: ../midori/midori-browser.c:5269 msgid "Ca_ret Browsing" -msgstr "光标浏览(_R)" +msgstr "光标浏览方式(_R)" -#: ../midori/midori-browser.c:5328 +#: ../midori/midori-browser.c:5273 msgid "Toggle fullscreen view" msgstr "切换全屏视图" -#: ../midori/midori-browser.c:5330 +#: ../midori/midori-browser.c:5275 msgid "Scroll _Left" msgstr "向左滚动(_L)" -#: ../midori/midori-browser.c:5333 +#: ../midori/midori-browser.c:5278 msgid "Scroll _Down" msgstr "向下滚动(_D)" -#: ../midori/midori-browser.c:5336 +#: ../midori/midori-browser.c:5281 msgid "Scroll _Up" msgstr "向上滚动(_U)" -#: ../midori/midori-browser.c:5339 +#: ../midori/midori-browser.c:5284 msgid "Scroll _Right" msgstr "向右滚动(_R)" -#: ../midori/midori-browser.c:5342 +#: ../midori/midori-browser.c:5287 msgid "_Go" -msgstr "转到(_G)" +msgstr "前进(_G)" -#: ../midori/midori-browser.c:5345 +#: ../midori/midori-browser.c:5290 msgid "Go back to the previous page" msgstr "返回上一页面" -#: ../midori/midori-browser.c:5348 +#: ../midori/midori-browser.c:5293 msgid "Go forward to the next page" msgstr "进入下一页面" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5352 +#: ../midori/midori-browser.c:5297 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:5356 +#: ../midori/midori-browser.c:5301 msgid "Go to the next sub-page" msgstr "转到下一子页面" -#: ../midori/midori-browser.c:5359 +#: ../midori/midori-browser.c:5304 msgid "Go to your homepage" -msgstr "进入您的主页" +msgstr "返回主页" -#: ../midori/midori-browser.c:5361 +#: ../midori/midori-browser.c:5306 msgid "Empty Trash" msgstr "清空回收站" -#: ../midori/midori-browser.c:5364 +#: ../midori/midori-browser.c:5309 msgid "Undo _Close Tab" msgstr "撤销关闭标签(_C)" -#: ../midori/midori-browser.c:5371 +#: ../midori/midori-browser.c:5316 msgid "Add a new _folder" msgstr "添加新文件夹(_F)" -#: ../midori/midori-browser.c:5377 +#: ../midori/midori-browser.c:5322 msgid "_Export bookmarks" msgstr "导出书签(_E)" -#: ../midori/midori-browser.c:5380 ../midori/midori-searchaction.c:497 +#: ../midori/midori-browser.c:5325 ../midori/midori-searchaction.c:496 msgid "_Manage Search Engines" msgstr "管理搜索引擎(_M)" -#: ../midori/midori-browser.c:5383 +#: ../midori/midori-browser.c:5328 msgid "_Clear Private Data" msgstr "清除隐私数据(_C)" -#: ../midori/midori-browser.c:5386 +#: ../midori/midori-browser.c:5331 msgid "_Inspect Page" msgstr "检查页面(_I)" -#: ../midori/midori-browser.c:5390 +#: ../midori/midori-browser.c:5335 msgid "_Previous Tab" msgstr "上一标签(_P)" -#: ../midori/midori-browser.c:5393 +#: ../midori/midori-browser.c:5338 msgid "_Next Tab" msgstr "下一标签(_N)" -#: ../midori/midori-browser.c:5395 +#: ../midori/midori-browser.c:5340 msgid "Move Tab _Backward" msgstr "向后移动标签(_B)" -#: ../midori/midori-browser.c:5397 +#: ../midori/midori-browser.c:5342 msgid "_Move Tab Forward" msgstr "向前移动标签(_M)" -#: ../midori/midori-browser.c:5400 +#: ../midori/midori-browser.c:5345 msgid "Focus _Current Tab" msgstr "聚焦当前标签(_C)" -#: ../midori/midori-browser.c:5403 +#: ../midori/midori-browser.c:5348 msgid "Focus _Next view" msgstr "聚焦下一视图(_N)" -#: ../midori/midori-browser.c:5406 +#: ../midori/midori-browser.c:5351 msgid "Only show the Icon of the _Current Tab" msgstr "仅显示当前标签的图标(_C)" -#: ../midori/midori-browser.c:5409 +#: ../midori/midori-browser.c:5354 msgid "_Duplicate Current Tab" msgstr "复制当前标签(_D)" -#: ../midori/midori-browser.c:5412 +#: ../midori/midori-browser.c:5357 msgid "Close Ot_her Tabs" msgstr "关闭其它标签(_H)" -#: ../midori/midori-browser.c:5415 +#: ../midori/midori-browser.c:5360 msgid "Open last _session" msgstr "打开上次会话(_S)" -#: ../midori/midori-browser.c:5418 +#: ../midori/midori-browser.c:5363 msgid "_Help" msgstr "帮助(_H)" -#: ../midori/midori-browser.c:5420 +#: ../midori/midori-browser.c:5365 msgid "_Frequent Questions" msgstr "常见问题(_F)" -#: ../midori/midori-browser.c:5423 -msgid "_Report a Problem…" -msgstr "报告问题(_R)…" +#: ../midori/midori-browser.c:5368 +msgid "_Report a Problem..." +msgstr "报告问题(_R)..." -#: ../midori/midori-browser.c:5435 +#: ../midori/midori-browser.c:5380 msgid "_Menubar" msgstr "菜单栏(_M)" -#: ../midori/midori-browser.c:5439 +#: ../midori/midori-browser.c:5384 msgid "_Navigationbar" msgstr "导航栏(_N)" -#: ../midori/midori-browser.c:5443 +#: ../midori/midori-browser.c:5388 msgid "Side_panel" msgstr "侧边栏(_P)" -#: ../midori/midori-browser.c:5444 +#: ../midori/midori-browser.c:5389 msgid "Sidepanel" msgstr "侧边栏" -#: ../midori/midori-browser.c:5447 +#: ../midori/midori-browser.c:5392 msgid "_Bookmarkbar" msgstr "书签栏(_B)" -#: ../midori/midori-browser.c:5451 +#: ../midori/midori-browser.c:5396 msgid "_Statusbar" msgstr "状态栏(_S)" -#: ../midori/midori-browser.c:5460 ../midori/midori-websettings.c:312 +#: ../midori/midori-browser.c:5405 ../midori/midori-websettings.c:302 msgid "_Automatic" msgstr "自动(_A)" -#: ../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)" +#: ../midori/midori-browser.c:5408 ../midori/midori-websettings.c:227 +msgid "Chinese (BIG5)" +msgstr "中文(BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5470 +#: ../midori/midori-browser.c:5412 msgid "Japanese (SHIFT__JIS)" msgstr "日语(SHIFT_JIS)" -#: ../midori/midori-browser.c:5473 ../midori/midori-websettings.c:239 +#: ../midori/midori-browser.c:5415 ../midori/midori-websettings.c:229 msgid "Korean (EUC-KR)" msgstr "韩语(EUC-KR)" -#: ../midori/midori-browser.c:5476 ../midori/midori-websettings.c:240 +#: ../midori/midori-browser.c:5418 ../midori/midori-websettings.c:230 msgid "Russian (KOI8-R)" msgstr "俄语(KOI8-R)" -#: ../midori/midori-browser.c:5479 ../midori/midori-websettings.c:241 +#: ../midori/midori-browser.c:5421 ../midori/midori-websettings.c:231 msgid "Unicode (UTF-8)" msgstr "Unicode(UTF-8)" -#: ../midori/midori-browser.c:5482 ../midori/midori-websettings.c:242 +#: ../midori/midori-browser.c:5424 ../midori/midori-websettings.c:232 msgid "Western (ISO-8859-1)" msgstr "西方语言(ISO-8859-1)" -#: ../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:5427 ../midori/midori-websettings.c:233 +#: ../midori/midori-websettings.c:308 ../katze/katze-utils.c:635 +msgid "Custom..." +msgstr "自定义..." -#: ../midori/midori-browser.c:5991 +#: ../midori/midori-browser.c:5907 msgid "_Separator" -msgstr "分隔符(_S)" +msgstr "分割符(_S)" -#: ../midori/midori-browser.c:5998 -msgid "_Location…" -msgstr "位置(_L)…" +#: ../midori/midori-browser.c:5914 +msgid "_Location..." +msgstr "位置(_L)..." -#: ../midori/midori-browser.c:6000 +#: ../midori/midori-browser.c:5916 msgid "Open a particular location" msgstr "打开特定位置" -#: ../midori/midori-browser.c:6022 -msgid "_Web Search…" -msgstr "网络搜索(_W)…" +#: ../midori/midori-browser.c:5938 +msgid "_Web Search..." +msgstr "网络搜索(_W)..." -#: ../midori/midori-browser.c:6024 +#: ../midori/midori-browser.c:5940 msgid "Run a web search" msgstr "运行网络搜索" -#: ../midori/midori-browser.c:6051 +#: ../midori/midori-browser.c:5967 msgid "Reopen a previously closed tab or window" msgstr "重新打开先前关闭的标签或窗口" -#: ../midori/midori-browser.c:6068 +#: ../midori/midori-browser.c:5982 msgid "Show the saved bookmarks" msgstr "显示已保存的书签" -#: ../midori/midori-browser.c:6085 +#: ../midori/midori-browser.c:5996 msgid "_Tools" msgstr "工具(_T)" -#: ../midori/midori-browser.c:6101 +#: ../midori/midori-browser.c:6011 msgid "_Window" msgstr "窗口(_W)" -#: ../midori/midori-browser.c:6103 +#: ../midori/midori-browser.c:6013 msgid "Show a list of all open tabs" -msgstr "显示所有打开标签的列表" +msgstr "显示所有已打开标签的列表" -#: ../midori/midori-browser.c:6117 +#: ../midori/midori-browser.c:6027 msgid "_Menu" msgstr "菜单(_M)" -#: ../midori/midori-browser.c:6119 +#: ../midori/midori-browser.c:6029 msgid "Menu" msgstr "菜单" -#: ../midori/midori-browser.c:6933 +#: ../midori/midori-browser.c:6671 #, c-format msgid "Unexpected setting '%s'" msgstr "意外的设置 ‘%s’" -#: ../midori/midori-extension.c:329 +#: ../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:747 ../midori/midori-extension.c:844 -#: ../midori/midori-extension.c:941 ../midori/midori-extension.c:1053 -#: ../extensions/addons.c:1695 +#: ../midori/midori-extension.c:721 ../midori/midori-extension.c:818 +#: ../midori/midori-extension.c:915 ../midori/midori-extension.c:1027 +#: ../extensions/addons.c:1690 #, c-format msgid "The configuration of the extension '%s' couldn't be saved: %s\n" msgstr "未能保存扩展 ‘%s’ 的配置：%s\n" -#: ../midori/midori-locationaction.c:394 -#, c-format -msgid "Search with %s" -msgstr "用 %s 搜索" - -#: ../midori/midori-locationaction.c:412 -msgid "Search with…" -msgstr "搜索方式…" - -#: ../midori/midori-locationaction.c:537 +#: ../midori/midori-locationaction.c:425 #, c-format msgid "Failed to select from history\n" msgstr "无法从历史中选择\n" -#: ../midori/midori-locationaction.c:624 +#: ../midori/midori-locationaction.c:509 #, c-format msgid "Search for %s" msgstr "搜索 %s" +#: ../midori/midori-locationaction.c:535 +#, c-format +msgid "Search with %s" +msgstr "用 %s 搜索" + #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1398 +#: ../midori/midori-locationaction.c:1287 msgid "Paste and p_roceed" msgstr "粘贴并继续(_R)" -#: ../midori/midori-locationaction.c:1739 +#: ../midori/midori-locationaction.c:1656 msgid "Not verified" msgstr "未验证" -#: ../midori/midori-locationaction.c:1759 +#: ../midori/midori-locationaction.c:1671 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 "侧边栏放在右边" +msgstr "侧边栏在右" #: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410 msgid "Close panel" @@ -1087,503 +1083,495 @@ msgstr "关闭侧边栏" #: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566 msgid "Align sidepanel to the left" -msgstr "侧边栏放在左边" +msgstr "侧边栏在左" -#: ../midori/midori-websettings.c:218 +#: ../midori/midori-websettings.c:209 msgid "Show Speed Dial" msgstr "显示快速拨号" -#: ../midori/midori-websettings.c:219 +#: ../midori/midori-websettings.c:210 msgid "Show Homepage" msgstr "显示主页" -#: ../midori/midori-websettings.c:238 +#: ../midori/midori-websettings.c:228 msgid "Japanese (SHIFT_JIS)" msgstr "日语(SHIFT_JIS)" -#: ../midori/midori-websettings.c:258 +#: ../midori/midori-websettings.c:248 msgid "New tab" msgstr "新建标签" -#: ../midori/midori-websettings.c:259 +#: ../midori/midori-websettings.c:249 msgid "New window" msgstr "新建窗口" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:250 msgid "Current tab" msgstr "当前标签" -#: ../midori/midori-websettings.c:275 +#: ../midori/midori-websettings.c:265 msgid "Default" msgstr "默认" -#: ../midori/midori-websettings.c:276 +#: ../midori/midori-websettings.c:266 msgid "Icons" msgstr "图标" -#: ../midori/midori-websettings.c:277 +#: ../midori/midori-websettings.c:267 msgid "Small icons" msgstr "小图标" -#: ../midori/midori-websettings.c:278 +#: ../midori/midori-websettings.c:268 msgid "Text" -msgstr "文字" +msgstr "文本" -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-websettings.c:269 msgid "Icons and text" -msgstr "图标和文字" +msgstr "图标和文本" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:270 msgid "Text beside icons" -msgstr "文字在图标旁" +msgstr "文本在图标旁" -#: ../midori/midori-websettings.c:295 +#: ../midori/midori-websettings.c:285 msgid "Automatic (GNOME or environment)" msgstr "自动(GNOME 或其它环境)" -#: ../midori/midori-websettings.c:296 +#: ../midori/midori-websettings.c:286 msgid "HTTP proxy server" msgstr "HTTP 代理服务器" -#: ../midori/midori-websettings.c:297 +#: ../midori/midori-websettings.c:287 msgid "No proxy server" -msgstr "无代理服务器" +msgstr "不使用代理服务器" -#: ../midori/midori-websettings.c:314 +#: ../midori/midori-websettings.c:304 msgid "Safari" -msgstr "Safari" +msgstr "Safari 浏览器" -#: ../midori/midori-websettings.c:315 +#: ../midori/midori-websettings.c:305 msgid "iPhone" -msgstr "iPhone" +msgstr "iPhone 手机" -#: ../midori/midori-websettings.c:316 +#: ../midori/midori-websettings.c:306 msgid "Firefox" -msgstr "Firefox" +msgstr "Firefox 浏览器" -#: ../midori/midori-websettings.c:317 +#: ../midori/midori-websettings.c:307 msgid "Internet Explorer" -msgstr "Internet Explorer" +msgstr "IE 浏览器" -#: ../midori/midori-websettings.c:401 +#: ../midori/midori-websettings.c:360 msgid "Remember last window size" -msgstr "记住上个窗口的大小" +msgstr "记住上次窗口的大小" -#: ../midori/midori-websettings.c:402 +#: ../midori/midori-websettings.c:361 msgid "Whether to save the last window size" -msgstr "是否保存上个窗口的大小" +msgstr "是否保存上次窗口的大小" -#: ../midori/midori-websettings.c:410 +#: ../midori/midori-websettings.c:369 msgid "Last window width" -msgstr "上个窗口宽度" +msgstr "上次窗口宽度" -#: ../midori/midori-websettings.c:411 +#: ../midori/midori-websettings.c:370 msgid "The last saved window width" -msgstr "上个保存的窗口宽度" +msgstr "上次保存的窗口宽度" -#: ../midori/midori-websettings.c:419 +#: ../midori/midori-websettings.c:378 msgid "Last window height" -msgstr "上个窗口高度" +msgstr "上次窗口高度" -#: ../midori/midori-websettings.c:420 +#: ../midori/midori-websettings.c:379 msgid "The last saved window height" -msgstr "上个保存的窗口高度" +msgstr "上次保存的窗口高度" -#: ../midori/midori-websettings.c:445 +#: ../midori/midori-websettings.c:404 msgid "Last panel position" -msgstr "上个侧边栏位置" +msgstr "上次侧边栏位置" -#: ../midori/midori-websettings.c:446 +#: ../midori/midori-websettings.c:405 msgid "The last saved panel position" -msgstr "上个保存的侧边栏位置" +msgstr "上次保存的侧边栏位置" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:455 +#: ../midori/midori-websettings.c:414 msgid "Last panel page" -msgstr "上个侧边栏页面" +msgstr "上次侧边栏页面" -#: ../midori/midori-websettings.c:456 +#: ../midori/midori-websettings.c:415 msgid "The last saved panel page" -msgstr "上个保存的侧边栏页面" +msgstr "上次保存的侧边栏页面" -#: ../midori/midori-websettings.c:464 +#: ../midori/midori-websettings.c:423 msgid "Last Web search" -msgstr "上个网络搜索" +msgstr "上次网络搜索" -#: ../midori/midori-websettings.c:465 +#: ../midori/midori-websettings.c:424 msgid "The last saved Web search" -msgstr "上个保存的网络搜索" +msgstr "上次保存的网络搜索" -#: ../midori/midori-websettings.c:474 +#: ../midori/midori-websettings.c:433 msgid "Show Menubar" msgstr "显示菜单栏" -#: ../midori/midori-websettings.c:475 +#: ../midori/midori-websettings.c:434 msgid "Whether to show the menubar" msgstr "是否显示菜单栏" -#: ../midori/midori-websettings.c:483 +#: ../midori/midori-websettings.c:442 msgid "Show Navigationbar" msgstr "显示导航栏" -#: ../midori/midori-websettings.c:484 +#: ../midori/midori-websettings.c:443 msgid "Whether to show the navigationbar" msgstr "是否显示导航栏" -#: ../midori/midori-websettings.c:492 +#: ../midori/midori-websettings.c:451 msgid "Show Bookmarkbar" msgstr "显示书签栏" -#: ../midori/midori-websettings.c:493 +#: ../midori/midori-websettings.c:452 msgid "Whether to show the bookmarkbar" msgstr "是否显示书签栏" -#: ../midori/midori-websettings.c:501 +#: ../midori/midori-websettings.c:460 msgid "Show Panel" msgstr "显示侧边栏" -#: ../midori/midori-websettings.c:502 +#: ../midori/midori-websettings.c:461 msgid "Whether to show the panel" msgstr "是否显示侧边栏" -#: ../midori/midori-websettings.c:510 +#: ../midori/midori-websettings.c:469 msgid "Show Statusbar" msgstr "显示状态栏" -#: ../midori/midori-websettings.c:511 +#: ../midori/midori-websettings.c:470 msgid "Whether to show the statusbar" msgstr "是否显示状态栏" -#: ../midori/midori-websettings.c:520 +#: ../midori/midori-websettings.c:479 msgid "Toolbar Style:" msgstr "工具栏样式：" -#: ../midori/midori-websettings.c:521 +#: ../midori/midori-websettings.c:480 msgid "The style of the toolbar" msgstr "工具栏的样式" -#: ../midori/midori-websettings.c:530 +#: ../midori/midori-websettings.c:489 msgid "Toolbar Items" msgstr "工具栏项目" -#: ../midori/midori-websettings.c:531 +#: ../midori/midori-websettings.c:490 msgid "The items to show on the toolbar" msgstr "在工具栏中要显示的项目" -#: ../midori/midori-websettings.c:539 +#: ../midori/midori-websettings.c:498 msgid "Compact Sidepanel" msgstr "紧凑侧边栏" -#: ../midori/midori-websettings.c:540 +#: ../midori/midori-websettings.c:499 msgid "Whether to make the sidepanel compact" msgstr "是否紧凑显示侧边栏" -#: ../midori/midori-websettings.c:555 +#: ../midori/midori-websettings.c:514 msgid "Align sidepanel on the right" -msgstr "侧边栏放在右边" +msgstr "侧边栏在右" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:515 msgid "Whether to align the sidepanel on the right" -msgstr "是否将侧边栏放在右边" +msgstr "是否让侧边栏在右" -#: ../midori/midori-websettings.c:571 +#: ../midori/midori-websettings.c:530 msgid "Open panels in separate windows" msgstr "在单独窗口中打开侧边栏" -#: ../midori/midori-websettings.c:572 +#: ../midori/midori-websettings.c:531 msgid "Whether to always open panels in separate windows" msgstr "是否总是在单独窗口中打开侧边栏" -#: ../midori/midori-websettings.c:581 +#: ../midori/midori-websettings.c:540 msgid "When Midori starts:" -msgstr "Midori 启动时：" +msgstr "Midori 浏览器启动时：" -#: ../midori/midori-websettings.c:582 +#: ../midori/midori-websettings.c:541 msgid "What to do when Midori starts" -msgstr "Midori 启动时做的事" +msgstr "Midori 浏览器启动时做什么" -#: ../midori/midori-websettings.c:591 +#: ../midori/midori-websettings.c:550 msgid "Homepage:" msgstr "主页：" -#: ../midori/midori-websettings.c:592 +#: ../midori/midori-websettings.c:551 msgid "The homepage" msgstr "主页" -#: ../midori/midori-websettings.c:607 +#: ../midori/midori-websettings.c:566 msgid "Show crash dialog" msgstr "显示崩溃对话框" -#: ../midori/midori-websettings.c:608 +#: ../midori/midori-websettings.c:567 msgid "Show a dialog after Midori crashed" -msgstr "Midori 崩溃后显示对话框" +msgstr "Midori 浏览器崩溃后显示对话框" -#: ../midori/midori-websettings.c:616 +#: ../midori/midori-websettings.c:575 msgid "Save downloaded files to:" msgstr "保存下载的文件至：" -#: ../midori/midori-websettings.c:617 +#: ../midori/midori-websettings.c:576 msgid "The folder downloaded files are saved to" msgstr "已下载文件所保存的文件夹" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:584 msgid "Text Editor" msgstr "文本编辑器" -#: ../midori/midori-websettings.c:626 +#: ../midori/midori-websettings.c:585 msgid "An external text editor" msgstr "外部文本编辑器" -#: ../midori/midori-websettings.c:641 +#: ../midori/midori-websettings.c:600 msgid "News Aggregator" msgstr "新闻聚合器" -#: ../midori/midori-websettings.c:642 +#: ../midori/midori-websettings.c:601 msgid "An external news aggregator" msgstr "外部新闻聚合器" -#: ../midori/midori-websettings.c:650 +#: ../midori/midori-websettings.c:609 msgid "Location entry Search" msgstr "位置栏搜索" -#: ../midori/midori-websettings.c:651 +#: ../midori/midori-websettings.c:610 msgid "The search to perform inside the location entry" msgstr "在位置栏内执行的搜索" -#: ../midori/midori-websettings.c:659 +#: ../midori/midori-websettings.c:618 msgid "Preferred Encoding" msgstr "首选编码" -#: ../midori/midori-websettings.c:660 +#: ../midori/midori-websettings.c:619 msgid "The preferred character encoding" msgstr "首选的字符编码" -#: ../midori/midori-websettings.c:670 +#: ../midori/midori-websettings.c:629 msgid "Always Show Tabbar" msgstr "总是显示标签栏" -#: ../midori/midori-websettings.c:671 +#: ../midori/midori-websettings.c:630 msgid "Always show the tabbar" msgstr "总是显示标签栏" -#: ../midori/midori-websettings.c:684 +#: ../midori/midori-websettings.c:638 msgid "Close Buttons on Tabs" msgstr "标签上有关闭按钮" -#: ../midori/midori-websettings.c:685 +#: ../midori/midori-websettings.c:639 msgid "Whether tabs have close buttons" msgstr "标签上是否有关闭按钮" -#: ../midori/midori-websettings.c:710 +#: ../midori/midori-websettings.c:664 msgid "Open new pages in:" -msgstr "在此打开新页面：" +msgstr "新页面打开在：" -#: ../midori/midori-websettings.c:711 +#: ../midori/midori-websettings.c:665 msgid "Where to open new pages" msgstr "在哪里打开新页面" -#: ../midori/midori-websettings.c:720 +#: ../midori/midori-websettings.c:674 msgid "Middle click opens Selection" -msgstr "中击打开所选内容" +msgstr "中击打开选择器" -#: ../midori/midori-websettings.c:721 +#: ../midori/midori-websettings.c:675 msgid "Load an address from the selection via middle click" -msgstr "通过中击从所选内容中载入地址" +msgstr "通过中击从选择器中载入地址" -#: ../midori/midori-websettings.c:729 +#: ../midori/midori-websettings.c:683 msgid "Open tabs in the background" msgstr "在后台打开标签" -#: ../midori/midori-websettings.c:730 +#: ../midori/midori-websettings.c:684 msgid "Whether to open new tabs in the background" msgstr "是否在后台打开新标签" -#: ../midori/midori-websettings.c:738 +#: ../midori/midori-websettings.c:692 msgid "Open Tabs next to Current" msgstr "在当前标签后打开标签" -#: ../midori/midori-websettings.c:739 +#: ../midori/midori-websettings.c:693 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "在当前标签后还是在上一标签后打开新标签" -#: ../midori/midori-websettings.c:747 +#: ../midori/midori-websettings.c:701 msgid "Open popups in tabs" msgstr "在标签中打开弹出窗口" -#: ../midori/midori-websettings.c:748 +#: ../midori/midori-websettings.c:702 msgid "Whether to open popup windows in tabs" -msgstr "是否在标签中打开弹出窗口" +msgstr "是否在新标签中打开弹出窗口" -#: ../midori/midori-websettings.c:758 ../extensions/statusbar-features.c:134 +#: ../midori/midori-websettings.c:712 ../extensions/statusbar-features.c:131 msgid "Load images automatically" msgstr "自动载入图片" -#: ../midori/midori-websettings.c:759 +#: ../midori/midori-websettings.c:713 msgid "Load and display images automatically" msgstr "自动载入并显示图片" -#: ../midori/midori-websettings.c:766 ../extensions/statusbar-features.c:143 +#: ../midori/midori-websettings.c:720 ../extensions/statusbar-features.c:140 msgid "Enable scripts" msgstr "启用脚本" -#: ../midori/midori-websettings.c:767 +#: ../midori/midori-websettings.c:721 msgid "Enable embedded scripting languages" -msgstr "启用已嵌入的脚本语言" +msgstr "启用嵌入的脚本语言" -#: ../midori/midori-websettings.c:774 ../extensions/statusbar-features.c:154 +#: ../midori/midori-websettings.c:728 ../extensions/statusbar-features.c:149 msgid "Enable Netscape plugins" msgstr "启用 Netscape 插件" -#: ../midori/midori-websettings.c:775 +#: ../midori/midori-websettings.c:729 msgid "Enable embedded Netscape plugin objects" -msgstr "启用已嵌入的 Netscape 插件对象" +msgstr "启用嵌入的 Netscape 插件对象" -#: ../midori/midori-websettings.c:790 +#: ../midori/midori-websettings.c:749 msgid "Enable Spell Checking" msgstr "启用拼写检查" -#: ../midori/midori-websettings.c:791 +#: ../midori/midori-websettings.c:750 msgid "Enable spell checking while typing" msgstr "输入时启用拼写检查" -#: ../midori/midori-websettings.c:797 +#: ../midori/midori-websettings.c:756 msgid "Enable HTML5 database support" msgstr "启用 HTML5 数据库支持" -#: ../midori/midori-websettings.c:798 +#: ../midori/midori-websettings.c:757 msgid "Whether to enable HTML5 database support" msgstr "是否启用 HTML5 数据库支持" -#: ../midori/midori-websettings.c:804 +#: ../midori/midori-websettings.c:763 msgid "Enable HTML5 local storage support" msgstr "启用 HTML5 本地存储支持" -#: ../midori/midori-websettings.c:805 +#: ../midori/midori-websettings.c:764 msgid "Whether to enable HTML5 local storage support" msgstr "是否启用 HTML5 本地存储支持" -#: ../midori/midori-websettings.c:811 +#: ../midori/midori-websettings.c:770 msgid "Enable offline web application cache" msgstr "启用离线网络应用程序缓存" -#: ../midori/midori-websettings.c:812 +#: ../midori/midori-websettings.c:771 msgid "Whether to enable offline web application cache" msgstr "是否启用离线网络应用程序缓存" -#: ../midori/midori-websettings.c:828 +#: ../midori/midori-websettings.c:787 msgid "Flash window on background tabs" msgstr "在后台标签的窗口闪烁" -#: ../midori/midori-websettings.c:829 +#: ../midori/midori-websettings.c:788 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 支持" +msgstr "如果新标签在后台打开则此浏览器窗口闪烁" -#: ../midori/midori-websettings.c:838 -msgid "Allow websites to use OpenGL rendering" -msgstr "允许站点使用 OpenGL 渲染" - -#: ../midori/midori-websettings.c:864 +#: ../midori/midori-websettings.c:803 msgid "Zoom Text and Images" -msgstr "缩放文字和图片" +msgstr "缩放文本和图片" -#: ../midori/midori-websettings.c:865 +#: ../midori/midori-websettings.c:804 msgid "Whether to zoom text and images" -msgstr "是否缩放文字和图片" +msgstr "是否缩放文本和图片" -#: ../midori/midori-websettings.c:880 +#: ../midori/midori-websettings.c:819 msgid "Find inline while typing" msgstr "输入时在文中查找" -#: ../midori/midori-websettings.c:881 +#: ../midori/midori-websettings.c:820 msgid "Whether to automatically find inline while typing" -msgstr "输入时是否在文中自动查找" +msgstr "是否在输入时在文中自动查找" -#: ../midori/midori-websettings.c:896 +#: ../midori/midori-websettings.c:835 msgid "Kinetic scrolling" msgstr "动态滚动" -#: ../midori/midori-websettings.c:897 +#: ../midori/midori-websettings.c:836 msgid "Whether scrolling should kinetically move according to speed" msgstr "滚动是否按速度动态地移动" -#: ../midori/midori-websettings.c:905 +#: ../midori/midori-websettings.c:844 msgid "Delete old Cookies after:" -msgstr "删除此后的原隐私信息：" +msgstr "删除此时间之后的旧隐私信息：" -#: ../midori/midori-websettings.c:906 +#: ../midori/midori-websettings.c:845 msgid "The maximum number of days to save cookies for" msgstr "最长隐私信息保存天数" -#: ../midori/midori-websettings.c:922 +#: ../midori/midori-websettings.c:861 msgid "Only accept Cookies from sites you visit" -msgstr "只接受您访问的网站的隐私信息" +msgstr "只接受您访问的站点的隐私信息" -#: ../midori/midori-websettings.c:923 +#: ../midori/midori-websettings.c:862 msgid "Block cookies sent by third-party websites" -msgstr "屏蔽第三方网站发送的隐私信息" +msgstr "屏蔽第三方站点发送的隐私信息" -#: ../midori/midori-websettings.c:937 +#: ../midori/midori-websettings.c:876 msgid "Delete pages from history after:" -msgstr "删除此历史后的页面：" +msgstr "删除此历史之后的页面：" -#: ../midori/midori-websettings.c:938 +#: ../midori/midori-websettings.c:877 msgid "The maximum number of days to save the history for" msgstr "最长历史保存天数" -#: ../midori/midori-websettings.c:953 +#: ../midori/midori-websettings.c:892 msgid "Proxy server" msgstr "代理服务器" -#: ../midori/midori-websettings.c:954 +#: ../midori/midori-websettings.c:893 msgid "The type of proxy server to use" msgstr "所使用的代理服务器类型" -#: ../midori/midori-websettings.c:963 +#: ../midori/midori-websettings.c:902 msgid "HTTP Proxy Server" msgstr "HTTP 代理服务器" -#: ../midori/midori-websettings.c:964 +#: ../midori/midori-websettings.c:903 msgid "The proxy server used for HTTP connections" msgstr "HTTP 连接所使用的代理服务器" -#: ../midori/midori-websettings.c:979 +#: ../midori/midori-websettings.c:918 msgid "Port" msgstr "端口" -#: ../midori/midori-websettings.c:980 +#: ../midori/midori-websettings.c:919 msgid "The proxy server port used for HTTP connections" msgstr "HTTP 连接所使用的代理服务器端口" -#: ../midori/midori-websettings.c:998 +#: ../midori/midori-websettings.c:937 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:1015 +#: ../midori/midori-websettings.c:954 msgid "Identify as" msgstr "识别为" -#: ../midori/midori-websettings.c:1016 +#: ../midori/midori-websettings.c:955 msgid "What to identify as to web pages" msgstr "让网页识别为什么" -#: ../midori/midori-websettings.c:1032 +#: ../midori/midori-websettings.c:971 msgid "Identification string" msgstr "识别字符串" -#: ../midori/midori-websettings.c:1033 +#: ../midori/midori-websettings.c:972 msgid "The application identification string" msgstr "应用程序识别字符串" -#: ../midori/midori-websettings.c:1049 +#: ../midori/midori-websettings.c:988 msgid "Preferred languages" msgstr "首选语言" -#: ../midori/midori-websettings.c:1050 +#: ../midori/midori-websettings.c:989 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\"" @@ -1591,294 +1579,246 @@ msgstr "" "一个由逗号分隔的用以显示多语言网页的首选语言列表，例如 “de”，“ru,nl” 或 “en-" "us;q=1.0, fr-fr;q=0.667”" -#: ../midori/midori-websettings.c:1065 +#: ../midori/midori-websettings.c:1004 msgid "Clear private data" msgstr "清除隐私数据" -#: ../midori/midori-websettings.c:1066 +#: ../midori/midori-websettings.c:1005 msgid "The private data selected for deletion" msgstr "选中的要删除的隐私数据" -#: ../midori/midori-websettings.c:1081 +#: ../midori/midori-websettings.c:1020 msgid "Clear data" msgstr "清除数据" -#: ../midori/midori-websettings.c:1082 +#: ../midori/midori-websettings.c:1021 msgid "The data selected for deletion" msgstr "选中的要删除的数据" #. i18n: Reworded: Shorten details propagated when going to another page -#: ../midori/midori-websettings.c:1131 +#: ../midori/midori-websettings.c:1054 msgid "Strip referrer details sent to websites" -msgstr "剥离向站点发送的提交信息详情" +msgstr "剥离发送至站点的详细提交信息" #. i18n: Referer here is not a typo but a technical term -#: ../midori/midori-websettings.c:1133 +#: ../midori/midori-websettings.c:1056 msgid "Whether the \"Referer\" header should be shortened to the hostname" msgstr "“提交信息” 头文件是否缩短为主机名" -#: ../midori/midori-websettings.c:1147 +#: ../midori/midori-websettings.c:1070 msgid "Always use my font choices" msgstr "总是使用我的字体选择" -#: ../midori/midori-websettings.c:1148 +#: ../midori/midori-websettings.c:1071 msgid "Override fonts picked by websites with user preferences" msgstr "使用用户首选项替换网站采用的字体" -#: ../midori/midori-view.c:1375 +#: ../midori/midori-view.c:1343 #, c-format msgid "%s wants to save an HTML5 database." -msgstr "%s 要保存 HTML5 数据库。" +msgstr "%s 需要保存一个 HTML5 数据库。" -#: ../midori/midori-view.c:1379 ../midori/midori-view.c:1413 +#: ../midori/midori-view.c:1347 ../midori/midori-view.c:1377 msgid "_Deny" msgstr "拒绝(_D)" -#: ../midori/midori-view.c:1379 ../midori/midori-view.c:1413 +#: ../midori/midori-view.c:1347 ../midori/midori-view.c:1377 msgid "_Allow" msgstr "允许(_A)" -#: ../midori/midori-view.c:1408 +#: ../midori/midori-view.c:1373 #, c-format msgid "%s wants to know your location." msgstr "%s 要获知您的位置。" -#: ../midori/midori-view.c:1502 +#: ../midori/midori-view.c:1461 #, c-format msgid "Error - %s" msgstr "错误-%s" -#: ../midori/midori-view.c:1503 +#: ../midori/midori-view.c:1462 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "未能载入 ‘%s’ 页面。" -#: ../midori/midori-view.c:1505 +#: ../midori/midori-view.c:1464 msgid "Try again" msgstr "重试" -#: ../midori/midori-view.c:1703 ../midori/midori-view.c:2625 +#: ../midori/midori-view.c:1626 ../midori/midori-view.c:2471 #, c-format msgid "Send a message to %s" msgstr "向 %s 发送邮件" -#: ../midori/midori-view.c:2455 ../midori/midori-view.c:2781 +#: ../midori/midori-view.c:2313 ../midori/midori-view.c:2624 msgid "Inspect _Element" msgstr "检查元素(_E)" -#: ../midori/midori-view.c:2507 +#: ../midori/midori-view.c:2363 msgid "Open Link in New _Tab" msgstr "在新标签中打开链接(_T)" -#: ../midori/midori-view.c:2511 +#: ../midori/midori-view.c:2367 msgid "Open Link in _Foreground Tab" msgstr "在前台标签中打开链接(_F)" -#: ../midori/midori-view.c:2512 +#: ../midori/midori-view.c:2368 msgid "Open Link in _Background Tab" msgstr "在后台标签中打开链接(_B)" -#: ../midori/midori-view.c:2515 +#: ../midori/midori-view.c:2371 msgid "Open Link in New _Window" msgstr "在新窗口中打开链接(_W)" -#: ../midori/midori-view.c:2518 +#: ../midori/midori-view.c:2374 msgid "Open Link as Web A_pplication" msgstr "将链接作为网络应用程序打开(_P)" -#: ../midori/midori-view.c:2523 +#: ../midori/midori-view.c:2377 msgid "Copy Link de_stination" msgstr "复制链接目的地(_S)" -#: ../midori/midori-view.c:2539 +#: ../midori/midori-view.c:2389 msgid "Open _Image in New Tab" msgstr "在新标签中打开图片(_I)" -#: ../midori/midori-view.c:2542 +#: ../midori/midori-view.c:2392 msgid "Copy Image _Address" msgstr "复制图片地址(_A)" -#: ../midori/midori-view.c:2545 +#: ../midori/midori-view.c:2395 msgid "Save I_mage" msgstr "保存图片(_M)" -#: ../midori/midori-view.c:2548 -msgid "Open in Image _Viewer" -msgstr "在图片查看器中打开(_V)" - -#: ../midori/midori-view.c:2555 +#: ../midori/midori-view.c:2402 msgid "Copy Video _Address" msgstr "复制视频地址(_A)" -#: ../midori/midori-view.c:2558 +#: ../midori/midori-view.c:2405 msgid "Save _Video" msgstr "保存视频(_V)" -#: ../midori/midori-view.c:2558 +#: ../midori/midori-view.c:2405 msgid "Download _Video" msgstr "下载视频(_V)" -#: ../midori/midori-view.c:2584 +#: ../midori/midori-view.c:2431 msgid "Search _with" msgstr "搜索方式(_W)" -#: ../midori/midori-view.c:2616 +#: ../midori/midori-view.c:2463 msgid "_Search the Web" msgstr "搜索网络(_S)" -#: ../midori/midori-view.c:2633 +#: ../midori/midori-view.c:2479 msgid "Open Address in New _Tab" msgstr "在新标签中打开地址(_T)" -#: ../midori/midori-view.c:2686 -msgid "Open _Frame in New Tab" -msgstr "在新标签中打开帧(_F)" - -#: ../midori/midori-view.c:2946 +#: ../midori/midori-view.c:2775 msgid "Open or download file" msgstr "打开或下载文件" -#: ../midori/midori-view.c:2966 +#: ../midori/midori-view.c:2794 #, c-format msgid "File Type: '%s'" msgstr "文件类型：‘%s’" -#: ../midori/midori-view.c:2968 +#: ../midori/midori-view.c:2796 #, c-format msgid "File Type: %s ('%s')" msgstr "文件类型：%s(‘%s’)" -#: ../midori/midori-view.c:2972 -#, c-format -msgid "File Name: %s" -msgstr "文件名：%s" - -#: ../midori/midori-view.c:2999 +#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" +#: ../midori/midori-view.c:2813 #, c-format msgid "Open %s" msgstr "打开 %s" -#: ../midori/midori-view.c:3622 +#: ../midori/midori-view.c:3405 #, c-format msgid "Inspect page - %s" msgstr "检查页面-%s" -#: ../midori/midori-view.c:3969 +#: ../midori/midori-view.c:3692 msgid "Speed Dial" msgstr "快速拨号" -#: ../midori/midori-view.c:3970 ../midori/midori-view.c:4066 +#: ../midori/midori-view.c:3693 ../midori/midori-view.c:3789 msgid "Click to add a shortcut" msgstr "点击添加快捷方式" -#: ../midori/midori-view.c:3971 +#: ../midori/midori-view.c:3694 msgid "Enter shortcut address" msgstr "输入快捷方式地址" -#: ../midori/midori-view.c:3972 +#: ../midori/midori-view.c:3695 msgid "Enter shortcut title" msgstr "输入快捷方式标题" -#: ../midori/midori-view.c:3973 +#: ../midori/midori-view.c:3696 msgid "Are you sure you want to delete this shortcut?" msgstr "您确定要删除此快捷方式吗？" -#: ../midori/midori-view.c:4135 +#: ../midori/midori-view.c:3860 #, c-format msgid "No documentation installed" -msgstr "未安装文档" - -#: ../midori/midori-view.c:4211 -msgid "Midori doesn't store any personal data:" -msgstr "Midori 没有存储任何个人数据：" +msgstr "没有安装文档" -#: ../midori/midori-view.c:4212 -msgid "No history or web cookies are being saved." -msgstr "未保存历史或网络隐私信息。" - -#: ../midori/midori-view.c:4213 -msgid "Extensions are disabled." -msgstr "已禁用扩展。" - -#: ../midori/midori-view.c:4214 -msgid "HTML5 storage, local database and application caches are disabled." -msgstr "已禁用 HTML5 存储、本地数据库和应用程序缓存。" - -#: ../midori/midori-view.c:4215 -msgid "Midori prevents websites from tracking the user:" -msgstr "Midori 阻止网站追踪用户：" - -#: ../midori/midori-view.c:4216 -msgid "Referrer URLs are stripped down to the hostname." -msgstr "剥离提交信息 URL 为主机名。" - -#: ../midori/midori-view.c:4217 -msgid "DNS prefetching is disabled." -msgstr "已禁用 DNS 预取。" - -#: ../midori/midori-view.c:4218 -msgid "The language and timezone are not revealed to websites." -msgstr "不向网站透露语言和时区。" - -#: ../midori/midori-view.c:4219 -msgid "Flash and other Netscape plugins cannot be listed by websites." -msgstr "网站未能列出动画和其它 Netscape 插件。" - -#: ../midori/midori-view.c:4289 +#: ../midori/midori-view.c:3910 msgid "Version numbers in brackets show the version used at runtime." msgstr "在括号中的版本号显示运行时的版本。" -#: ../midori/midori-view.c:4339 +#: ../midori/midori-view.c:3955 msgid "Page loading delayed" msgstr "页面载入发生延迟" -#: ../midori/midori-view.c:4340 +#: ../midori/midori-view.c:3956 msgid "Loading delayed either due to a recent crash or startup preferences." -msgstr "由于最近的崩溃或启动首选项，载入页面发生延迟。" +msgstr "由于最近的程序崩溃或启动首选项，载入页面发生延迟" -#: ../midori/midori-view.c:4341 +#: ../midori/midori-view.c:3957 msgid "Load Page" msgstr "载入页面" -#: ../midori/midori-view.c:4507 +#: ../midori/midori-view.c:4097 msgid "Blank page" msgstr "空白页面" -#: ../midori/midori-view.c:4769 +#: ../midori/midori-view.c:4361 msgid "_Duplicate Tab" msgstr "复制标签(_D)" -#: ../midori/midori-view.c:4774 +#: ../midori/midori-view.c:4366 msgid "Show Tab _Label" msgstr "显示标签标记(_L)" -#: ../midori/midori-view.c:4774 +#: ../midori/midori-view.c:4366 msgid "Show Tab _Icon Only" msgstr "仅显示标签图标(_I)" -#: ../midori/midori-view.c:4780 +#: ../midori/midori-view.c:4372 msgid "Close ot_her Tabs" msgstr "关闭其它标签(_H)" #. i18n: word stem of "previous page" type links, case is not important -#: ../midori/midori-view.c:5593 +#: ../midori/midori-view.c:4989 msgid "previous" msgstr "上一个" #. i18n: word stem of "next page" type links, case is not important -#: ../midori/midori-view.c:5612 +#: ../midori/midori-view.c:5008 msgid "next" msgstr "下一个" -#: ../midori/midori-view.c:5625 +#: ../midori/midori-view.c:5021 msgid "Print background images" -msgstr "打印背景图片" +msgstr "列印背景图片" -#: ../midori/midori-view.c:5626 +#: ../midori/midori-view.c:5022 msgid "Whether background images should be printed" -msgstr "是否打印页面的背景图片" +msgstr "是否列印页面的背景图片" -#: ../midori/midori-view.c:5658 +#: ../midori/midori-view.c:5054 msgid "Features" msgstr "功能" @@ -1905,11 +1845,11 @@ msgstr "合适的字体族" #: ../midori/midori-preferences.c:330 msgid "The default font family used to display text" -msgstr "用来显示文字的默认字体族" +msgstr "用来显示文本的默认字体族" #: ../midori/midori-preferences.c:333 msgid "The default font size used to display text" -msgstr "用来显示文字的默认字体大小" +msgstr "用来显示文本的默认字体大小" #: ../midori/midori-preferences.c:335 msgid "Fixed-width Font Family" @@ -1917,11 +1857,11 @@ msgstr "等宽字体族" #: ../midori/midori-preferences.c:339 msgid "The font family used to display fixed-width text" -msgstr "用来显示等宽文字的字体族" +msgstr "用来显示等宽文本的字体族" #: ../midori/midori-preferences.c:342 msgid "The font size used to display fixed-width text" -msgstr "用来显示等宽文字的字体大小" +msgstr "用来显示等宽文本的字体大小" #: ../midori/midori-preferences.c:344 msgid "Minimum Font Size" @@ -1929,7 +1869,7 @@ msgstr "最小字体大小" #: ../midori/midori-preferences.c:348 msgid "The minimum font size used to display text" -msgstr "用来显示文字的最小字体大小" +msgstr "用来显示文本的最小字体大小" #. Page "Behavior" #: ../midori/midori-preferences.c:359 @@ -1945,143 +1885,143 @@ msgid "Whether scripts are allowed to open popup windows automatically" msgstr "是否允许脚本自动打开弹出窗口" #. Page "Interface" -#: ../midori/midori-preferences.c:416 +#: ../midori/midori-preferences.c:409 msgid "Browsing" msgstr "浏览" #. Page "Network" -#: ../midori/midori-preferences.c:456 +#: ../midori/midori-preferences.c:447 msgid "Network" msgstr "网络" -#: ../midori/midori-preferences.c:463 +#: ../midori/midori-preferences.c:454 msgid "Hostname" msgstr "主机名" -#: ../midori/midori-preferences.c:487 +#: ../midori/midori-preferences.c:478 msgid "MB" -msgstr "M" +msgstr "兆" -#: ../midori/midori-searchaction.c:902 +#: ../midori/midori-searchaction.c:907 msgid "Add search engine" msgstr "添加搜索引擎" -#: ../midori/midori-searchaction.c:902 +#: ../midori/midori-searchaction.c:907 msgid "Edit search engine" msgstr "编辑搜索引擎" -#: ../midori/midori-searchaction.c:931 +#: ../midori/midori-searchaction.c:936 msgid "_Name:" msgstr "名称(_N)：" -#: ../midori/midori-searchaction.c:947 +#: ../midori/midori-searchaction.c:952 msgid "_Description:" msgstr "描述(_D)：" -#: ../midori/midori-searchaction.c:981 +#: ../midori/midori-searchaction.c:985 msgid "_Icon:" msgstr "图标(_I)：" -#: ../midori/midori-searchaction.c:995 +#: ../midori/midori-searchaction.c:999 msgid "_Token:" -msgstr "标志(_T)：" +msgstr "标记(_T)：" -#: ../midori/midori-searchaction.c:1295 +#: ../midori/midori-searchaction.c:1299 msgid "Manage Search Engines" msgstr "管理搜索引擎" -#: ../midori/midori-searchaction.c:1395 +#: ../midori/midori-searchaction.c:1399 msgid "Use as _default" msgstr "用作默认(_D)" -#: ../midori/sokoke.c:354 +#: ../midori/sokoke.c:406 msgid "Open with" msgstr "打开方式" -#: ../midori/sokoke.c:362 +#: ../midori/sokoke.c:414 #, c-format msgid "Choose an application or command to open \"%s\":" -msgstr "挑选打开 “%s” 的应用程序或命令：" +msgstr "选择打开 “%s” 的应用程序或命令：" -#: ../midori/sokoke.c:403 ../midori/sokoke.c:413 ../midori/sokoke.c:441 -#: ../midori/sokoke.c:470 ../midori/sokoke.c:484 +#: ../midori/sokoke.c:455 ../midori/sokoke.c:465 ../midori/sokoke.c:493 +#: ../midori/sokoke.c:522 ../midori/sokoke.c:536 msgid "Could not run external program." msgstr "未能运行外部程序。" -#: ../midori/sokoke.c:1595 +#: ../midori/sokoke.c:1673 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d 小时" -#: ../midori/sokoke.c:1596 +#: ../midori/sokoke.c:1674 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d 分钟" -#: ../midori/sokoke.c:1597 +#: ../midori/sokoke.c:1675 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d 秒" #. i18n: Download tooltip (size): 4KB of 43MB -#: ../midori/sokoke.c:1605 ../panels/midori-transfers.c:268 +#: ../midori/sokoke.c:1683 ../panels/midori-transfers.c:267 #, c-format msgid "%s of %s" -msgstr "%s/%s" +msgstr "%2$s 中的 %1$s" #. i18n: Unknown number of bytes, used for transfer rate like ?B/s -#: ../midori/sokoke.c:1614 +#: ../midori/sokoke.c:1692 msgid "?B" msgstr "?B" #. i18n: Download tooltip (transfer rate): (130KB/s) -#: ../midori/sokoke.c:1617 +#: ../midori/sokoke.c:1695 #, c-format msgid " (%s/s)" -msgstr "(%s/s)" +msgstr " (%s/s)" #. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning -#: ../midori/sokoke.c:1634 +#: ../midori/sokoke.c:1712 #, c-format msgid " - %s remaining" -msgstr "-%s 剩余" +msgstr "-剩余 %s" #. i18n: A panel at the bottom, to search text in pages -#: ../toolbars/midori-findbar.c:291 +#: ../toolbars/midori-findbar.c:264 msgid "_Inline Find:" msgstr "在文中查找(_I)：" -#: ../toolbars/midori-findbar.c:317 +#: ../toolbars/midori-findbar.c:291 msgid "Previous" msgstr "上一个" -#: ../toolbars/midori-findbar.c:323 +#: ../toolbars/midori-findbar.c:297 msgid "Next" msgstr "下一个" -#: ../toolbars/midori-findbar.c:327 +#: ../toolbars/midori-findbar.c:301 msgid "Match Case" msgstr "匹配大小写" -#: ../toolbars/midori-findbar.c:336 +#: ../toolbars/midori-findbar.c:310 msgid "Highlight Matches" -msgstr "突出显示匹配者" +msgstr "高亮显示匹配者" -#: ../toolbars/midori-findbar.c:347 +#: ../toolbars/midori-findbar.c:321 msgid "Close Findbar" msgstr "关闭查找栏" #: ../toolbars/midori-transferbar.c:122 #, c-format msgid "The file '%s' has been downloaded." -msgstr "文件 ‘%s’ 已经下载。" +msgstr "文件 ‘%s’ 已下载。" #: ../toolbars/midori-transferbar.c:125 msgid "Transfer completed" -msgstr "传输已完成" +msgstr "传输完成" #: ../toolbars/midori-transferbar.c:193 msgid "The downloaded file is erroneous." @@ -2091,89 +2031,84 @@ msgstr "已下载的文件不正确。" msgid "" "The checksum provided with the link did not match. This means the file is " "probably incomplete or was modified afterwards." -msgstr "与链接提供的校验值不匹配。这意味着此文件可能未完整下载或后来被修改过。" +msgstr "与链接提供的校验值不匹配。此意味着此文件可能未完整下载或后来被修改过。" -#: ../toolbars/midori-transferbar.c:334 ../panels/midori-transfers.c:141 +#: ../toolbars/midori-transferbar.c:331 ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "全部清除" -#: ../toolbars/midori-transferbar.c:371 ../toolbars/midori-transferbar.c:373 +#: ../toolbars/midori-transferbar.c:368 ../toolbars/midori-transferbar.c:370 msgid "Some files are being downloaded" msgstr "有些文件正在下载" -#: ../toolbars/midori-transferbar.c:377 +#: ../toolbars/midori-transferbar.c:374 msgid "_Quit Midori" -msgstr "退出 Midori(_Q)" +msgstr "退出 Midori 浏览器(_Q)" -#: ../toolbars/midori-transferbar.c:379 +#: ../toolbars/midori-transferbar.c:376 msgid "The transfers will be cancelled if Midori quits." -msgstr "如果退出 Midori 则取消传输。" +msgstr "如果退出 Midori 浏览器则取消传输。" -#: ../panels/midori-bookmarks.c:114 +#: ../panels/midori-bookmarks.c:113 msgid "Bookmarks" msgstr "书签" -#: ../panels/midori-bookmarks.c:257 +#: ../panels/midori-bookmarks.c:260 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "无法添加书签项目：%s\n" -#: ../panels/midori-bookmarks.c:435 +#: ../panels/midori-bookmarks.c:440 msgid "Edit the selected bookmark" msgstr "编辑选中的书签" -#: ../panels/midori-bookmarks.c:443 +#: ../panels/midori-bookmarks.c:448 msgid "Delete the selected bookmark" msgstr "删除选中的书签" -#: ../panels/midori-bookmarks.c:458 +#: ../panels/midori-bookmarks.c:463 msgid "Add a new folder" msgstr "添加新文件夹" -#: ../panels/midori-bookmarks.c:594 ../panels/midori-history.c:635 +#: ../panels/midori-bookmarks.c:597 ../panels/midori-history.c:579 msgid "Separator" msgstr "分隔符" -#: ../panels/midori-history.c:111 +#: ../panels/midori-history.c:110 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:142 +msgid "A week ago" +msgstr "一周前" -#: ../panels/midori-history.c:162 ../panels/midori-history.c:186 +#: ../panels/midori-history.c:144 #, 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:147 +msgid "Today" +msgstr "今天" -#: ../panels/midori-history.c:232 -#, c-format -msgid "Failed to remove history item: %s\n" -msgstr "无法移除历史项目：%s\n" +#: ../panels/midori-history.c:149 +msgid "Yesterday" +msgstr "昨天" -#: ../panels/midori-history.c:360 +#: ../panels/midori-history.c:317 msgid "Are you sure you want to remove all history items?" -msgstr "您确定要移除所有历史项目吗？" +msgstr "您确定要移除所有的历史项目吗？" -#: ../panels/midori-history.c:407 +#: ../panels/midori-history.c:363 msgid "Bookmark the selected history item" msgstr "将选中的历史项目加入书签" -#: ../panels/midori-history.c:416 +#: ../panels/midori-history.c:372 msgid "Delete the selected history item" msgstr "删除选中的历史项目" -#: ../panels/midori-history.c:424 +#: ../panels/midori-history.c:380 msgid "Clear the entire history" msgstr "清除全部历史" @@ -2181,13 +2116,13 @@ msgstr "清除全部历史" msgid "Transfers" msgstr "传输" -#: ../panels/midori-transfers.c:469 +#: ../panels/midori-transfers.c:467 msgid "Open Destination _Folder" msgstr "打开目的地文件夹(_F)" -#: ../panels/midori-transfers.c:472 +#: ../panels/midori-transfers.c:470 msgid "Copy Link Loc_ation" -msgstr "复制链接位置(_A)" +msgstr "复制链接地址(_A)" #: ../katze/katze-http-auth.c:210 msgid "Authentication Required" @@ -2213,55 +2148,55 @@ msgstr "密码" msgid "_Remember password" msgstr "记住密码(_R)" -#: ../katze/katze-throbber.c:949 +#: ../katze/katze-throbber.c:942 #, c-format msgid "Named icon '%s' couldn't be loaded" msgstr "未能载入已命名图标 ‘%s’" -#: ../katze/katze-throbber.c:962 +#: ../katze/katze-throbber.c:955 #, c-format msgid "Stock icon '%s' couldn't be loaded" msgstr "未能载入备用图标 ‘%s’" -#: ../katze/katze-throbber.c:1042 +#: ../katze/katze-throbber.c:1035 msgid "Animation frames are broken" msgstr "动画帧损坏" -#: ../katze/katze-utils.c:445 ../katze/katze-utils.c:879 +#: ../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:491 ../katze/katze-utils.c:520 +#: ../katze/katze-utils.c:485 ../katze/katze-utils.c:514 #: ../extensions/addons.c:308 msgid "Choose file" -msgstr "挑选文件" +msgstr "选择文件" -#: ../katze/katze-utils.c:506 +#: ../katze/katze-utils.c:500 msgid "Choose folder" -msgstr "挑选文件夹" +msgstr "选择文件夹" -#: ../katze/katze-utils.c:610 +#: ../katze/katze-utils.c:604 msgid "None" msgstr "无" -#: ../katze/katze-utils.c:725 +#: ../katze/katze-utils.c:719 msgid "1 hour" msgstr "一小时" -#: ../katze/katze-utils.c:726 +#: ../katze/katze-utils.c:720 msgid "1 day" msgstr "一天" -#: ../katze/katze-utils.c:727 +#: ../katze/katze-utils.c:721 msgid "1 week" msgstr "一周" -#: ../katze/katze-utils.c:728 +#: ../katze/katze-utils.c:722 msgid "1 month" msgstr "一月" -#: ../katze/katze-utils.c:729 +#: ../katze/katze-utils.c:723 msgid "1 year" msgstr "一年" @@ -2270,11 +2205,11 @@ msgstr "一年" msgid "Preferences for %s" msgstr "%s 首选项" -#: ../extensions/adblock.c:473 +#: ../extensions/adblock.c:434 msgid "Configure Advertisement filters" msgstr "配置广告过滤器" -#: ../extensions/adblock.c:504 +#: ../extensions/adblock.c:465 #, c-format msgid "" "Type the address of a preconfigured filter list in the text entry and click " @@ -2283,27 +2218,27 @@ msgstr "" "在文本框中输入预配置的过滤器列表的地址后点击 “添加” 将它加入此列表。您可以在 " "%s 找到更多列表。" -#: ../extensions/adblock.c:882 +#: ../extensions/adblock.c:831 msgid "Edit rule" msgstr "编辑规则" -#: ../extensions/adblock.c:896 +#: ../extensions/adblock.c:845 msgid "_Rule:" msgstr "规则(_R)：" -#: ../extensions/adblock.c:950 +#: ../extensions/adblock.c:899 msgid "Bl_ock image" msgstr "屏蔽图片(_O)" -#: ../extensions/adblock.c:955 +#: ../extensions/adblock.c:904 msgid "Bl_ock link" msgstr "屏蔽链接(_O)" -#: ../extensions/adblock.c:1670 +#: ../extensions/adblock.c:1495 msgid "Advertisement blocker" msgstr "广告屏蔽器" -#: ../extensions/adblock.c:1671 +#: ../extensions/adblock.c:1496 msgid "Block advertisements according to a filter list" msgstr "按过滤器列表屏蔽广告" @@ -2358,7 +2293,7 @@ msgstr "删除用户样式" #: ../extensions/addons.c:431 #, c-format msgid "The file %s will be permanently deleted." -msgstr "将永远删除 %s 文件。" +msgstr "将永久删除 %s 文件。" #: ../extensions/addons.c:570 ../extensions/addons.c:647 msgid "Open in Text Editor" @@ -2376,69 +2311,69 @@ msgstr "添加新插件" msgid "Remove selected addon" msgstr "移除选中的插件" -#: ../extensions/addons.c:1696 ../extensions/addons.c:1914 +#: ../extensions/addons.c:1691 ../extensions/addons.c:1909 msgid "User addons" msgstr "用户插件" -#: ../extensions/addons.c:1826 +#: ../extensions/addons.c:1821 #, c-format msgid "Can't monitor folder '%s': %s" msgstr "未能监视 ‘%s’ 文件夹：%s" -#: ../extensions/addons.c:1915 +#: ../extensions/addons.c:1910 msgid "Support for userscripts and userstyles" msgstr "支持用户脚本和用户样式" -#: ../extensions/colorful-tabs.c:201 +#: ../extensions/colorful-tabs.c:202 msgid "Colorful Tabs" msgstr "彩色标签" -#: ../extensions/colorful-tabs.c:202 +#: ../extensions/colorful-tabs.c:203 msgid "Tint each tab distinctly" msgstr "用不同颜色区分标签" -#: ../extensions/cookie-manager/cookie-manager-page.c:73 +#: ../extensions/cookie-manager/cookie-manager-page.c:80 #: ../extensions/cookie-manager/main.c:35 msgid "Cookie Manager" msgstr "隐私信息管理器" -#: ../extensions/cookie-manager/cookie-manager-page.c:103 +#: ../extensions/cookie-manager/cookie-manager-page.c:110 msgid "Delete All" msgstr "全部删除" -#: ../extensions/cookie-manager/cookie-manager-page.c:105 +#: ../extensions/cookie-manager/cookie-manager-page.c:112 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 +#: ../extensions/cookie-manager/cookie-manager-page.c:127 msgid "Expand All" msgstr "全部展开" -#: ../extensions/cookie-manager/cookie-manager-page.c:127 +#: ../extensions/cookie-manager/cookie-manager-page.c:134 msgid "Collapse All" msgstr "全部折叠" -#: ../extensions/cookie-manager/cookie-manager-page.c:572 +#: ../extensions/cookie-manager/cookie-manager-page.c:576 msgid "Do you really want to delete all cookies?" msgstr "您真的要删除所有隐私信息吗？" -#: ../extensions/cookie-manager/cookie-manager-page.c:574 +#: ../extensions/cookie-manager/cookie-manager-page.c:578 msgid "Question" msgstr "问题" -#: ../extensions/cookie-manager/cookie-manager-page.c:583 +#: ../extensions/cookie-manager/cookie-manager-page.c:587 msgid "Only cookies which match the filter will be deleted." msgstr "只删除与此过滤器匹配的隐私信息。" -#: ../extensions/cookie-manager/cookie-manager-page.c:671 +#: ../extensions/cookie-manager/cookie-manager-page.c:675 msgid "At the end of the session" msgstr "在会话结束时" -#: ../extensions/cookie-manager/cookie-manager-page.c:674 +#: ../extensions/cookie-manager/cookie-manager-page.c:678 #, c-format msgid "" "Host: %s\n" @@ -2455,15 +2390,15 @@ msgstr "" "安全：%s\n" "有效期：%s" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:684 msgid "Yes" msgstr "是" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:684 msgid "No" msgstr "否" -#: ../extensions/cookie-manager/cookie-manager-page.c:694 +#: ../extensions/cookie-manager/cookie-manager-page.c:698 #, c-format msgid "" "Domain: %s\n" @@ -2472,27 +2407,27 @@ msgstr "" "域：%s\n" "隐私信息：%d" -#: ../extensions/cookie-manager/cookie-manager-page.c:1024 +#: ../extensions/cookie-manager/cookie-manager-page.c:1028 msgid "Name" msgstr "名称" -#: ../extensions/cookie-manager/cookie-manager-page.c:1077 +#: ../extensions/cookie-manager/cookie-manager-page.c:1081 msgid "_Expand All" msgstr "全部展开(_E)" -#: ../extensions/cookie-manager/cookie-manager-page.c:1085 +#: ../extensions/cookie-manager/cookie-manager-page.c:1089 msgid "_Collapse All" msgstr "全部折叠(_C)" -#: ../extensions/cookie-manager/cookie-manager-page.c:1139 +#: ../extensions/cookie-manager/cookie-manager-page.c:1142 msgid "Filter:" msgstr "过滤器：" -#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +#: ../extensions/cookie-manager/cookie-manager-page.c:1147 msgid "" "Enter a filter string to show only cookies whose name or domain field match " "the entered filter" -msgstr "输入过滤器字符串以便只显示与输入的过滤器名称或域区域匹配的隐私信息" +msgstr "输入过滤器字符串只显示与输入的过滤器名称或域匹配的隐私信息" #: ../extensions/cookie-manager/main.c:36 msgid "List, view and delete cookies" @@ -2580,7 +2515,7 @@ msgstr "源 ‘%s’ 已经存在" #: ../extensions/feed-panel/main.c:208 #, c-format msgid "Error loading feed '%s'" -msgstr "载入源 ‘%s’ 时出错" +msgstr "载入源 ‘%s’ 出错" #: ../extensions/feed-panel/main.c:518 msgid "Feed Panel" @@ -2590,70 +2525,44 @@ msgstr "源面板" msgid "Read Atom/ RSS feeds" msgstr "阅读 Atom/RSS 源" -#: ../extensions/formhistory/formhistory.c:39 +#: ../extensions/formhistory.c:143 #, 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 +#: ../extensions/formhistory.c:295 msgid "Toggle form history state" msgstr "切换表单历史状态" -#: ../extensions/formhistory/formhistory.c:438 +#: ../extensions/formhistory.c:296 msgid "Activate or deactivate form history for the current tab." msgstr "为当前标签激活或停用表单历史。" -#: ../extensions/formhistory/formhistory.c:549 -#: ../extensions/formhistory/formhistory.c:553 +#: ../extensions/formhistory.c:432 ../extensions/formhistory.c:436 #, 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.c:511 +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 +#: ../extensions/formhistory.c:570 msgid "Stores history of entered form data" msgstr "存储已输入的表单数据历史" -#: ../extensions/formhistory/formhistory-gdom-frontend.c:225 -#: ../extensions/formhistory/formhistory-js-frontend.c:106 +#: ../extensions/formhistory.c:574 #, c-format -msgid "Failed to select suggestions\n" -msgstr "无法选择建议\n" +msgid "Not available: %s" +msgstr "不可用：%s" + +#: ../extensions/formhistory.c:575 +msgid "Resource files not installed" +msgstr "资源文件没有安装" + +#: ../extensions/formhistory.c:581 +msgid "Form history filler" +msgstr "表单历史填写器" #: ../extensions/history-list.vala:197 msgid "There are no unvisited tabs" @@ -2710,7 +2619,7 @@ msgstr "历史列表" #: ../extensions/history-list.vala:570 msgid "Move to the last used tab when switching or closing tabs" -msgstr "切换或关闭标签时移动至上次使用的标签" +msgstr "切换或关闭标签时移至上次使用的标签" #: ../extensions/mouse-gestures.c:301 msgid "Mouse Gestures" @@ -2718,7 +2627,7 @@ msgstr "鼠标手势" #: ../extensions/mouse-gestures.c:302 msgid "Control Midori by moving the mouse" -msgstr "通过移动鼠标控制 Midori" +msgstr "通过移动鼠标控制 Midori 浏览器" #: ../extensions/shortcuts.c:109 msgid "Reload page or stop loading" @@ -2728,15 +2637,15 @@ msgstr "重载页面或停止载入" msgid "Customize Keyboard shortcuts" msgstr "自定义键盘快捷键" -#: ../extensions/shortcuts.c:283 -msgid "Customize Sh_ortcuts…" -msgstr "自定义快捷键(_O)…" +#: ../extensions/shortcuts.c:285 +msgid "Customize Sh_ortcuts..." +msgstr "自定义快捷键(_O)..." -#: ../extensions/shortcuts.c:320 +#: ../extensions/shortcuts.c:322 msgid "Shortcuts" msgstr "快捷键" -#: ../extensions/shortcuts.c:321 +#: ../extensions/shortcuts.c:323 msgid "View and edit keyboard shortcuts" msgstr "查看和编辑键盘快捷键" @@ -2748,41 +2657,41 @@ msgstr "状态栏时钟" msgid "Display date and time in the statusbar" msgstr "在状态栏中显示日期和时间" -#: ../extensions/statusbar-features.c:131 +#: ../extensions/statusbar-features.c:128 msgid "Images" msgstr "图片" -#: ../extensions/statusbar-features.c:140 +#: ../extensions/statusbar-features.c:137 msgid "Scripts" msgstr "脚本" -#: ../extensions/statusbar-features.c:151 +#: ../extensions/statusbar-features.c:146 msgid "Netscape plugins" msgstr "Netscape 插件" -#: ../extensions/statusbar-features.c:199 +#: ../extensions/statusbar-features.c:192 msgid "Statusbar Features" msgstr "状态栏功能" -#: ../extensions/statusbar-features.c:200 +#: ../extensions/statusbar-features.c:193 msgid "Easily toggle features on web pages on and off" msgstr "方便地打开或关闭网页中的功能" -#: ../extensions/tab-panel.c:593 ../extensions/tab-panel.c:680 +#: ../extensions/tab-panel.c:596 ../extensions/tab-panel.c:683 msgid "Tab Panel" msgstr "标签面板" -#: ../extensions/tab-panel.c:663 +#: ../extensions/tab-panel.c:666 msgid "T_ab Panel" msgstr "标签面板(_A)" -#: ../extensions/tab-panel.c:681 +#: ../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 "默认仅标签上的图标" +msgstr "默认仅在标签上显示图标" #: ../extensions/tabs-minimized.c:77 msgid "New tabs have no label by default" @@ -2792,54 +2701,36 @@ msgstr "新标签默认没有标记" msgid "Customize Toolbar" msgstr "自定义工具栏" -#: ../extensions/toolbar-editor.c:409 +#: ../extensions/toolbar-editor.c:413 msgid "" -"Select items to be displayed on the toolbar. Items can be reordered by drag " +"Select items to be displayed on the toolbar. Items can be reodered by drag " "and drop." -msgstr "选择要在工具栏上显示的项目。可以拖放各项目调整顺序。" +msgstr "选择要在工具栏上显示的项目。可以拖动各项目调整顺序。" -#: ../extensions/toolbar-editor.c:425 +#: ../extensions/toolbar-editor.c:429 msgid "Available Items" -msgstr "可用项目" +msgstr "可用的项目" -#: ../extensions/toolbar-editor.c:446 +#: ../extensions/toolbar-editor.c:450 msgid "Displayed Items" msgstr "已显示的项目" -#: ../extensions/toolbar-editor.c:581 -msgid "Customize _Toolbar…" -msgstr "自定义工具栏(_T)…" +#: ../extensions/toolbar-editor.c:585 +msgid "Customize _Toolbar..." +msgstr "自定义工具栏(_T)..." -#: ../extensions/toolbar-editor.c:597 -msgid "_Customize…" -msgstr "自定义(_C)…" +#: ../extensions/toolbar-editor.c:601 +msgid "_Customize..." +msgstr "自定义(_C)..." -#: ../extensions/toolbar-editor.c:627 +#: ../extensions/toolbar-editor.c:631 msgid "Toolbar Editor" msgstr "工具栏编辑器" -#: ../extensions/toolbar-editor.c:628 +#: ../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 "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 数据库(_D)" - -#~ msgid "Offline Application Cache" -#~ msgstr "离线应用程序缓存" diff --git a/po/zh_TW.po b/po/zh_TW.po index e6a806df..ebc7f2b6 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -3,51 +3,38 @@ # 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 master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-09 11:21+0000\n" -"PO-Revision-Date: 2012-07-17 14:22+0800\n" +"POT-Creation-Date: 2011-12-09 04:15+0000\n" +"PO-Revision-Date: 2011-12-09 18:12+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" -"Language: \n" "Plural-Forms: nplurals=1; plural=0;\n" #: ../data/midori.desktop.in.h:1 -msgid "Browse the Web" -msgstr "瀏覽網頁" - -#: ../data/midori.desktop.in.h:2 msgid "Internet;WWW;Explorer" msgstr "Internet;WWW;Explorer" -#: ../data/midori.desktop.in.h:3 ../midori/main.c:2025 ../midori/main.c:2049 -#: ../midori/main.c:2063 ../midori/midori-websettings.c:315 +#: ../data/midori.desktop.in.h:2 +msgid "Lightweight web browser" +msgstr "輕量網頁瀏覽器" + +#: ../data/midori.desktop.in.h:3 +#: ../midori/main.c:1992 +#: ../midori/main.c:2012 +#: ../midori/main.c:2023 +#: ../midori/midori-websettings.c:303 msgid "Midori" msgstr "Midori" #: ../data/midori.desktop.in.h:4 -msgid "Midori Web Browser" -msgstr "Midori 網頁瀏覽器" - -#: ../data/midori.desktop.in.h:5 -msgid "New Private Browsing Window" -msgstr "新增私人瀏覽視窗" - -#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1479 -msgid "New Tab" -msgstr "新分頁" - -#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1476 -msgid "New Window" -msgstr "新增視窗" - -#: ../data/midori.desktop.in.h:8 msgid "Web Browser" msgstr "網頁瀏覽器" @@ -59,319 +46,356 @@ msgstr "Midori 私密瀏覽" msgid "Open a new private browsing window" msgstr "開啟新的私密瀏覽視窗" -#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4494 +#: ../data/midori-private.desktop.in.h:3 msgid "Private Browsing" msgstr "私密瀏覽" -#: ../midori/main.c:91 ../midori/main.c:97 +#: ../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:145 +#: ../midori/main.c:150 #, c-format msgid "Value '%s' is invalid for %s" msgstr "「%s」值對於 %s 無效" -#: ../midori/main.c:150 ../midori/main.c:254 +#: ../midori/main.c:155 +#: ../midori/main.c:261 #, c-format msgid "Invalid configuration value '%s'" msgstr "無效的組態值「%s」" -#: ../midori/main.c:375 +#: ../midori/main.c:366 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "無法載入搜尋引擎。%s\n" -#: ../midori/main.c:429 +#: ../midori/main.c:420 #, c-format msgid "Failed to clear history: %s\n" msgstr "清空歷史時失敗：%s\n" -#: ../midori/main.c:451 ../extensions/formhistory/formhistory.c:531 +#: ../midori/main.c:440 +#: ../midori/main.c:561 +#: ../extensions/formhistory.c:423 #, 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:523 +#: ../midori/main.c:504 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "移除舊的歷史項目時失敗：%s\n" -#: ../midori/main.c:545 +#: ../midori/main.c:544 +#: ../panels/midori-history.c:189 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "移除歷史項目時失敗：%s\n" + +#: ../midori/main.c:591 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "無法儲存書籤。%s" + +#: ../midori/main.c:613 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "無法儲存組態。%s" -#: ../midori/main.c:571 +#: ../midori/main.c:648 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "無法儲存搜尋引擎。%s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:608 +#: ../midori/main.c:685 #, c-format msgid "The trash couldn't be saved. %s" msgstr "無法儲存回收筒。%s" -#: ../midori/main.c:681 ../panels/midori-extensions.c:90 +#: ../midori/main.c:726 +#: ../panels/midori-extensions.c:91 msgid "Extensions" msgstr "擴充功能" -#: ../midori/main.c:695 +#: ../midori/main.c:740 msgid "Privacy" msgstr "隱私" -#: ../midori/main.c:707 -msgid "" -"Cookies store login data, saved games, or user profiles for advertisement " -"purposes." +#: ../midori/main.c:752 +msgid "Cookies store login data, saved games, or user profiles for advertisement purposes." msgstr "訊餅用來儲藏登入資料、儲存的遊戲，或為廣告目的採集使用者個人資料。" -#: ../midori/main.c:763 +#: ../midori/main.c:808 #, c-format msgid "The session couldn't be saved. %s" msgstr "無法儲存執行階段。%s" -#: ../midori/main.c:1001 -msgid "" -"No root certificate file is available. SSL certificates cannot be verified." +#: ../midori/main.c:1018 +msgid "No root certificate file is available. SSL certificates cannot be verified." msgstr "沒有可用的根憑證。SSL 憑證無法通過驗證。" -#: ../midori/main.c:1093 -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:1086 +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:1112 +#: ../midori/main.c:1105 msgid "Modify _preferences" msgstr "修改偏好設定(_P)" -#: ../midori/main.c:1116 +#: ../midori/main.c:1109 msgid "Disable all _extensions" msgstr "停用所有擴充功能(_E)" -#: ../midori/main.c:1129 +#: ../midori/main.c:1122 msgid "Discard old tabs" msgstr "丟棄舊分頁" -#: ../midori/main.c:1130 ../midori/midori-websettings.c:223 +#: ../midori/main.c:1123 +#: ../midori/midori-websettings.c:212 msgid "Show last tabs without loading" msgstr "顯示上次的分頁但不要載入" -#: ../midori/main.c:1131 ../midori/midori-websettings.c:222 +#: ../midori/main.c:1124 +#: ../midori/midori-websettings.c:211 msgid "Show last open tabs" msgstr "顯示最近開啟的分頁" -#: ../midori/main.c:1379 ../midori/main.c:2433 +#: ../midori/main.c:1332 +#: ../midori/main.c:2397 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "無法載入執行階段：%s\n" -#: ../midori/main.c:1517 +#: ../midori/main.c:1471 #, c-format msgid "Snapshot saved to: %s\n" msgstr "快照已儲存至：%s\n" -#: ../midori/main.c:1933 +#: ../midori/main.c:1895 msgid "Run ADDRESS as a web application" msgstr "將 ADDRESS 作為網頁應用程式執行" -#: ../midori/main.c:1933 +#: ../midori/main.c:1895 msgid "ADDRESS" msgstr "ADDRESS" -#: ../midori/main.c:1936 +#: ../midori/main.c:1898 msgid "Use FOLDER as configuration folder" msgstr "使用 FOLDER 作為組態資料夾" -#: ../midori/main.c:1936 +#: ../midori/main.c:1898 msgid "FOLDER" msgstr "FOLDER" -#: ../midori/main.c:1939 +#: ../midori/main.c:1901 msgid "Private browsing, no changes are saved" msgstr "私密瀏覽，不會儲存任何更動" -#: ../midori/main.c:1941 +#: ../midori/main.c:1903 msgid "Show a diagnostic dialog" msgstr "顯示診斷對話窗" -#: ../midori/main.c:1943 +#: ../midori/main.c:1905 msgid "Run the specified filename as javascript" msgstr "將指定檔名當做 javascript 來執行" -#: ../midori/main.c:1945 +#: ../midori/main.c:1907 msgid "Take a snapshot of the specified URI" msgstr "拍攝指定 URI 的快照" -#: ../midori/main.c:1947 +#: ../midori/main.c:1909 msgid "Execute the specified command" msgstr "執行指定的指令" -#: ../midori/main.c:1949 +#: ../midori/main.c:1911 msgid "List available commands to execute with -e/ --execute" msgstr "列出可透過 -e/ --execute 執行的指令" -#: ../midori/main.c:1951 +#: ../midori/main.c:1913 msgid "Display program version" msgstr "顯示程式版本" -#: ../midori/main.c:1953 +#: ../midori/main.c:1915 msgid "Addresses" msgstr "位址" -#: ../midori/main.c:1955 +#: ../midori/main.c:1917 msgid "Block URIs according to regular expression PATTERN" msgstr "根據常規表示式 PATTERN 封鎖 URI" -#: ../midori/main.c:1955 +#: ../midori/main.c:1917 msgid "PATTERN" msgstr "PATTERN" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1959 +#: ../midori/main.c:1921 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "在 SECONDS 秒不活動後重設 Midori" -#: ../midori/main.c:1959 +#: ../midori/main.c:1921 msgid "SECONDS" msgstr "SECONDS" -#: ../midori/main.c:1962 +#: ../midori/main.c:1924 msgid "Redirects console warnings to the specified FILENAME" msgstr "將主控臺警告重新導向至指定的 FILENAME" -#: ../midori/main.c:1962 +#: ../midori/main.c:1924 msgid "FILENAME" msgstr "FILENAME" -#: ../midori/main.c:2064 +#: ../midori/main.c:1989 +msgid "[Addresses]" +msgstr "[位址]" + +#: ../midori/main.c:1999 +msgid "The specified configuration folder is invalid." +msgstr "指定的組態資料夾無效。" + +#: ../midori/main.c:2024 msgid "Please report comments, suggestions and bugs to:" msgstr "請回報意見、建議和錯誤給：" -#: ../midori/main.c:2066 +#: ../midori/main.c:2026 msgid "Check for new versions at:" msgstr "檢查看看新版本於：" +#: ../midori/main.c:2109 +msgid "Website icons" +msgstr "網站圖示" + #. i18n: Logins and passwords in websites and web forms -#: ../midori/main.c:2161 +#: ../midori/main.c:2112 msgid "Saved logins and _passwords" msgstr "儲存登入名稱與密碼(_P)" -#: ../midori/main.c:2163 -msgid "Cookies and Website data" -msgstr "訊餅與網站資料" +#: ../midori/main.c:2114 +msgid "Cookies" +msgstr "訊餅" + +#: ../midori/main.c:2117 +msgid "'Flash' Cookies" +msgstr "'Flash' 訊餅" -#. TODO: Preserve page icons of search engines and merge privacy items -#: ../midori/main.c:2167 ../midori/midori-websettings.c:1020 -#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471 +#: ../midori/main.c:2120 +msgid "HTML5 _Databases" +msgstr "HTML5 資料庫(_D)" + +#: ../midori/main.c:2123 +#: ../midori/midori-websettings.c:936 +#: ../extensions/web-cache.c:462 +#: ../extensions/web-cache.c:471 msgid "Web Cache" msgstr "網頁快取" -#: ../midori/main.c:2170 -msgid "Website icons" -msgstr "網站圖示" +#: ../midori/main.c:2125 +msgid "Offline Application Cache" +msgstr "離線應用程式快取" -#: ../midori/main.c:2274 +#: ../midori/main.c:2230 msgid "An unknown error occured" msgstr "遭遇未知錯誤" -#: ../midori/main.c:2381 +#: ../midori/main.c:2328 msgid "An instance of Midori is already running but not responding.\n" msgstr "Midori 的實體已經在執行中但沒有回應。\n" -#: ../midori/main.c:2415 +#: ../midori/main.c:2364 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "無法載入書籤：%s\n" -#: ../midori/main.c:2448 +#: ../midori/main.c:2412 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "無法載入回收筒：%s\n" -#: ../midori/main.c:2461 +#: ../midori/main.c:2425 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "無法載入歷史：%s\n" -#: ../midori/main.c:2476 +#: ../midori/main.c:2441 msgid "The following errors occured:" msgstr "發生下列錯誤：" -#: ../midori/main.c:2492 +#: ../midori/main.c:2457 msgid "_Ignore" msgstr "忽略(_I)" -#: ../midori/midori-app.c:1155 ../midori/midori-browser.c:545 -#, c-format -msgid "Unexpected action '%s'." -msgstr "未預期的動作「%s」。" +#: ../midori/midori-app.c:1335 +msgid "_Bookmark" +msgstr "書籤(_B)" -#: ../midori/midori-app.c:1457 ../midori/midori-browser.c:6435 +#: ../midori/midori-app.c:1336 +#: ../midori/midori-browser.c:6002 msgid "_Bookmarks" msgstr "書籤(_B)" -#: ../midori/midori-app.c:1458 +#: ../midori/midori-app.c:1337 msgid "Add Boo_kmark" msgstr "加入書籤(_K)" -#: ../midori/midori-app.c:1459 +#: ../midori/midori-app.c:1338 +msgid "_Console" +msgstr "主控臺(_C)" + +#: ../midori/midori-app.c:1339 msgid "_Extensions" msgstr "擴充功能(_E)" #. i18n: Browsing history, visited web pages, closed tabs -#: ../midori/midori-app.c:1460 ../midori/midori-browser.c:4891 +#: ../midori/midori-app.c:1340 +#: ../midori/midori-browser.c:4556 msgid "_History" msgstr "歷史(_H)" -#: ../midori/midori-app.c:1461 +#: ../midori/midori-app.c:1341 +msgid "_Homepage" +msgstr "首頁(_H)" + +#: ../midori/midori-app.c:1342 msgid "_Userscripts" msgstr "使用者指令稿(_U)" -#: ../midori/midori-app.c:1462 -msgid "User_styles" -msgstr "使用者樣式(_S)" - -#: ../midori/midori-app.c:1463 +#: ../midori/midori-app.c:1343 msgid "New _Tab" msgstr "新分頁(_T)" -#: ../midori/midori-app.c:1464 +#: ../midori/midori-app.c:1344 msgid "_Transfers" msgstr "傳輸(_T)" -#: ../midori/midori-app.c:1465 +#: ../midori/midori-app.c:1345 msgid "Netscape p_lugins" msgstr "Netscape 外掛程式(_L)" -#: ../midori/midori-app.c:1466 +#: ../midori/midori-app.c:1346 msgid "_Closed Tabs" msgstr "關閉的分頁(_C)" -#: ../midori/midori-app.c:1467 ../midori/midori-browser.c:5574 +#: ../midori/midori-app.c:1347 +#: ../midori/midori-browser.c:5141 msgid "New _Window" msgstr "開新視窗(_W)" -#: ../midori/midori-app.c:1468 +#: ../midori/midori-app.c:1348 msgid "New _Folder" msgstr "新資料夾(_F)" -#: ../midori/midori-app.c:1497 -msgid "[Addresses]" -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 +#: ../midori/midori-array.c:547 +#: ../midori/midori-array.c:586 +#: ../midori/midori-array.c:609 +#: ../midori/midori-array.c:619 msgid "Malformed document." msgstr "異常文件。" @@ -383,1914 +407,1760 @@ msgstr "無法辨識的書籤格式。" msgid "Writing failed." msgstr "寫入失敗。" -#: ../midori/midori-browser.c:364 ../midori/midori-browser.c:5662 -#: ../midori/midori-browser.c:5671 +#: ../midori/midori-browser.c:331 +#: ../midori/midori-browser.c:5223 +#: ../midori/midori-browser.c:5232 msgid "Reload the current page" msgstr "重新載入目前頁面" -#: ../midori/midori-browser.c:373 ../midori/midori-browser.c:5668 +#: ../midori/midori-browser.c:339 +#: ../midori/midori-browser.c:5229 msgid "Stop loading the current page" msgstr "停止載入目前頁面" -#: ../midori/midori-browser.c:530 +#: ../midori/midori-browser.c:464 #, c-format msgid "Failed to update title: %s\n" msgstr "更新標題失敗：%s\n" -#: ../midori/midori-browser.c:625 +#: ../midori/midori-browser.c:477 +#, c-format +msgid "Unexpected action '%s'." +msgstr "未預期的動作「%s」。" + +#: ../midori/midori-browser.c:570 #, c-format msgid "%s (Private Browsing)" msgstr "%s (私密瀏覽)" -#: ../midori/midori-browser.c:735 ../midori/midori-browser.c:777 -#: ../panels/midori-bookmarks.c:114 -msgid "Bookmarks" -msgstr "書籤" +#: ../midori/midori-browser.c:681 +#: ../midori/midori-browser.c:714 +msgid "Toplevel folder" +msgstr "最上層資料夾" -#: ../midori/midori-browser.c:837 +#: ../midori/midori-browser.c:771 msgid "New folder" msgstr "新資料夾" -#: ../midori/midori-browser.c:837 +#: ../midori/midori-browser.c:771 msgid "Edit folder" msgstr "編輯資料夾" -#: ../midori/midori-browser.c:839 +#: ../midori/midori-browser.c:773 msgid "New bookmark" msgstr "新書籤" -#: ../midori/midori-browser.c:839 +#: ../midori/midori-browser.c:773 msgid "Edit bookmark" msgstr "編輯書籤" -#: ../midori/midori-browser.c:873 -msgid "Type a name for this bookmark and choose where to keep it." -msgstr "請為此書籤輸入個名稱，並選擇您想將它保存在哪個地方。" +#: ../midori/midori-browser.c:804 +msgid "_Title:" +msgstr "標題(_T)：" + +#: ../midori/midori-browser.c:824 +#: ../midori/midori-searchaction.c:966 +#: ../extensions/feed-panel/main.c:377 +msgid "_Address:" +msgstr "位址(_A)：" -#: ../midori/midori-browser.c:934 +#: ../midori/midori-browser.c:847 +#: ../midori/midori-browser.c:4291 +msgid "_Folder:" +msgstr "資料夾(_F)：" + +#: ../midori/midori-browser.c:863 msgid "Add to _Speed Dial" msgstr "加入至快速播號(_S)" -#: ../midori/midori-browser.c:940 +#: ../midori/midori-browser.c:876 msgid "Show in the tool_bar" msgstr "顯示於工具列內(_B)" -#: ../midori/midori-browser.c:948 +#: ../midori/midori-browser.c:891 msgid "Run as _web application" msgstr "以網頁應用程式執行(_W)" -#: ../midori/midori-browser.c:1019 +#: ../midori/midori-browser.c:962 #, c-format msgid "The file \"%s\" can't be saved in this folder." msgstr "標題「%s」無法儲存於此資料夾。" -#: ../midori/midori-browser.c:1021 +#: ../midori/midori-browser.c:964 #, c-format msgid "You don't have permission to write in this location." msgstr "您尚未獲得寫入此位置的許可。" -#: ../midori/midori-browser.c:1028 +#: ../midori/midori-browser.c:971 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "沒有足夠的空間可以讓您下載「%s」。" -#: ../midori/midori-browser.c:1031 +#: ../midori/midori-browser.c:974 #, c-format msgid "The file needs %s but only %s are left." msgstr "該檔案需要 %s，但僅剩 %s。" -#: ../midori/midori-browser.c:1167 ../midori/midori-browser.c:4695 +#: ../midori/midori-browser.c:1018 +#: ../midori/midori-browser.c:4361 msgid "Save file as" msgstr "檔案另存為" -#: ../midori/midori-browser.c:1173 -msgid "Save associated _resources" -msgstr "儲存相關資源(_R)" +#: ../midori/midori-browser.c:1327 +msgid "New Window" +msgstr "新增視窗" -#: ../midori/midori-browser.c:1476 +#: ../midori/midori-browser.c:1327 msgid "A new window has been opened" msgstr "新視窗已經開啟" -#: ../midori/midori-browser.c:1479 +#: ../midori/midori-browser.c:1330 +msgid "New Tab" +msgstr "新分頁" + +#: ../midori/midori-browser.c:1330 msgid "A new tab has been opened" msgstr "新分頁已經開啟" -#: ../midori/midori-browser.c:1496 -msgid "Error opening the image!" -msgstr "開啟影像時發生錯誤！" - -#: ../midori/midori-browser.c:1497 -msgid "Can not open selected image in a default viewer." -msgstr "無法在預設檢視器中開啟所選的影像。" - -#: ../midori/midori-browser.c:1503 -msgid "Error downloading the image!" -msgstr "下載影像流時發生錯誤！" - -#: ../midori/midori-browser.c:1504 -msgid "Can not download selected image." -msgstr "無法下載所選的影像。" - -#: ../midori/midori-browser.c:1625 +#: ../midori/midori-browser.c:1367 msgid "Save file" msgstr "儲存檔案" -#: ../midori/midori-browser.c:2528 +#: ../midori/midori-browser.c:2241 msgid "Open file" msgstr "開啟檔案" -#: ../midori/midori-browser.c:2660 +#: ../midori/midori-browser.c:2372 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，請開啟新聞匯流器。通常都會有個名為「新聞訂閱」、「新聞 " -"Feed」等類似的選單或按鈕。\n" -"或者前往 Midori 中「偏好設定」的「應用程式」內，並選取一個新聞匯流器。下一次" -"您按下新聞饋流按鈕時，它就會被自動加入。" +"若要使用上方的 URI，請開啟新聞匯流器。通常都會有個名為「新聞訂閱」、「新聞 Feed」等類似的選單或按鈕。\n" +"或者前往 Midori 中「偏好設定」的「應用程式」內，並選取一個新聞匯流器。下一次您按下新聞饋流按鈕時，它就會被自動加入。" -#: ../midori/midori-browser.c:2666 ../extensions/feed-panel/main.c:365 +#: ../midori/midori-browser.c:2378 +#: ../extensions/feed-panel/main.c:365 msgid "New feed" msgstr "新饋流" -#: ../midori/midori-browser.c:2709 ../midori/midori-browser.c:5734 -#: ../panels/midori-bookmarks.c:527 +#: ../midori/midori-browser.c:2421 +#: ../midori/midori-browser.c:5292 +#: ../panels/midori-bookmarks.c:432 msgid "Add a new bookmark" msgstr "加入新的書籤" -#: ../midori/midori-browser.c:3253 ../midori/midori-searchaction.c:487 +#: ../midori/midori-browser.c:2956 +#: ../midori/midori-searchaction.c:487 msgid "Empty" msgstr "清空" -#: ../midori/midori-browser.c:3699 ../midori/midori-browser.c:3700 +#: ../midori/midori-browser.c:3444 msgid "Toggle text cursor navigation" msgstr "切換文字游標導覽" -#: ../midori/midori-browser.c:3702 -msgid "" -"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in " -"all websites." -msgstr "請按下 F7 來切換鍵盤瀏覽功能。啟用時，所有的網站都會出現文字游標。" - -#: ../midori/midori-browser.c:3705 -msgid "_Enable Caret Browsing" -msgstr "啟用鍵盤瀏覽(_E)" - -#: ../midori/midori-browser.c:4095 ../midori/midori-browser.c:6128 +#: ../midori/midori-browser.c:3753 +#: ../midori/midori-browser.c:5699 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "無法插入新歷史項目：%s\n" -#: ../midori/midori-browser.c:4421 ../panels/midori-bookmarks.c:850 -#: ../panels/midori-history.c:806 +#: ../midori/midori-browser.c:4088 +#: ../panels/midori-bookmarks.c:748 +#: ../panels/midori-history.c:747 msgid "Open all in _Tabs" msgstr "以分頁開啟全部(_T)" -#: ../midori/midori-browser.c:4428 ../panels/midori-bookmarks.c:856 -#: ../panels/midori-history.c:812 ../extensions/feed-panel/feed-panel.c:528 +#: ../midori/midori-browser.c:4095 +#: ../panels/midori-bookmarks.c:754 +#: ../panels/midori-history.c:753 +#: ../extensions/feed-panel/feed-panel.c:528 msgid "Open in New _Tab" msgstr "在新分頁中開啟(_T)" -#: ../midori/midori-browser.c:4431 ../midori/midori-view.c:2940 -#: ../midori/midori-view.c:5071 ../panels/midori-bookmarks.c:858 -#: ../panels/midori-history.c:814 ../extensions/feed-panel/feed-panel.c:530 +#: ../midori/midori-browser.c:4098 +#: ../midori/midori-view.c:2518 +#: ../midori/midori-view.c:4368 +#: ../panels/midori-bookmarks.c:756 +#: ../panels/midori-history.c:755 +#: ../extensions/feed-panel/feed-panel.c:530 msgid "Open in New _Window" msgstr "在新視窗中開啟(_W)" -#: ../midori/midori-browser.c:4520 +#: ../midori/midori-browser.c:4178 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4521 +#: ../midori/midori-browser.c:4179 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4522 +#: ../midori/midori-browser.c:4180 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4523 +#: ../midori/midori-browser.c:4181 msgid "Konqueror" msgstr "征服家" -#: ../midori/midori-browser.c:4524 +#: ../midori/midori-browser.c:4182 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4525 +#: ../midori/midori-browser.c:4183 #, c-format msgid "Firefox (%s)" msgstr "Firefox (%s)" -#: ../midori/midori-browser.c:4526 -msgid "Midori 0.2.6" -msgstr "Midori 0.2.6" - -#: ../midori/midori-browser.c:4547 -msgid "Import bookmarks…" -msgstr "匯入書籤…" +#: ../midori/midori-browser.c:4204 +msgid "Import bookmarks..." +msgstr "匯入書籤..." -#: ../midori/midori-browser.c:4550 ../midori/midori-browser.c:5739 +#: ../midori/midori-browser.c:4207 +#: ../midori/midori-browser.c:5297 msgid "_Import bookmarks" msgstr "匯入書籤(_I)" -#: ../midori/midori-browser.c:4561 +#: ../midori/midori-browser.c:4218 msgid "_Application:" msgstr "應用程式(_A)：" -#: ../midori/midori-browser.c:4626 +#: ../midori/midori-browser.c:4283 msgid "Import from XBEL or HTML file" msgstr "從 XBEL 或 HTML 檔案匯入" -#: ../midori/midori-browser.c:4654 +#: ../midori/midori-browser.c:4318 msgid "Import from a file" msgstr "從檔案匯入" -#: ../midori/midori-browser.c:4666 +#: ../midori/midori-browser.c:4330 msgid "Failed to import bookmarks" msgstr "匯入書籤失敗" -#: ../midori/midori-browser.c:4700 +#: ../midori/midori-browser.c:4366 msgid "XBEL Bookmarks" msgstr "XBEL 書籤" -#: ../midori/midori-browser.c:4705 +#: ../midori/midori-browser.c:4371 msgid "Netscape Bookmarks" msgstr "Netscape 書籤" -#: ../midori/midori-browser.c:4719 +#: ../midori/midori-browser.c:4385 msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)" msgstr "Midori 僅能匯出為 XBEL (*.xbel) 與 Netscape (*.html)" -#: ../midori/midori-browser.c:4734 +#: ../midori/midori-browser.c:4401 msgid "Failed to export bookmarks" msgstr "無法匯出書籤" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4856 +#: ../midori/midori-browser.c:4523 msgid "Clear Private Data" msgstr "清除隱私資料" -#: ../midori/midori-browser.c:4860 +#: ../midori/midori-browser.c:4527 msgid "_Clear private data" msgstr "清除隱私資料(_C)" -#: ../midori/midori-browser.c:4875 +#: ../midori/midori-browser.c:4540 msgid "Clear the following data:" msgstr "清除下列資料：" -#: ../midori/midori-browser.c:4885 +#: ../midori/midori-browser.c:4550 msgid "Last open _tabs" msgstr "上次開啟頁面(_T)" -#: ../midori/midori-browser.c:4911 +#: ../midori/midori-browser.c:4576 msgid "Clear private data when _quitting Midori" msgstr "當退出 Midori 時清除隱私資料(_Q)" -#: ../midori/midori-browser.c:5126 +#: ../midori/midori-browser.c:4752 msgid "A lightweight web browser." msgstr "輕量網頁瀏覽器。" -#: ../midori/midori-browser.c:5127 +#: ../midori/midori-browser.c:4753 msgid "See about:version for version info." msgstr "查看 about:version 來取得版本資訊。" -#: ../midori/midori-browser.c:5129 -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:4755 +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:5159 +#: ../midori/midori-browser.c:4776 msgid "translator-credits" msgstr "" "趙惟倫 , 2009.\n" "曾政嘉 , 2010." -#: ../midori/midori-browser.c:5572 +#: ../midori/midori-browser.c:5139 msgid "_File" msgstr "檔案(_F)" -#: ../midori/midori-browser.c:5575 +#: ../midori/midori-browser.c:5142 msgid "Open a new window" msgstr "開啟新視窗" -#: ../midori/midori-browser.c:5578 +#: ../midori/midori-browser.c:5145 msgid "Open a new tab" msgstr "開啟新分頁" -#: ../midori/midori-browser.c:5580 +#: ../midori/midori-browser.c:5147 msgid "New P_rivate Browsing Window" msgstr "新增私人瀏覽視窗(_R)" -#: ../midori/midori-browser.c:5584 +#: ../midori/midori-browser.c:5151 msgid "Open a file" msgstr "開啟檔案" -#: ../midori/midori-browser.c:5586 -msgid "_Save Page As…" -msgstr "另存網頁為(_S)…" +#: ../midori/midori-browser.c:5153 +msgid "_Save Page As..." +msgstr "另存網頁為(_S)..." -#: ../midori/midori-browser.c:5587 +#: ../midori/midori-browser.c:5154 msgid "Save to a file" msgstr "儲存到檔案" -#: ../midori/midori-browser.c:5589 +#: ../midori/midori-browser.c:5156 msgid "Add to Speed _dial" msgstr "加入快速播號(_D)" -#: ../midori/midori-browser.c:5593 +#: ../midori/midori-browser.c:5160 msgid "Add Shortcut to the _desktop" msgstr "將捷徑加入至桌面(_D)" -#: ../midori/midori-browser.c:5595 +#: ../midori/midori-browser.c:5162 msgid "Create _Launcher" msgstr "建立啟動器(_L)" -#: ../midori/midori-browser.c:5599 +#: ../midori/midori-browser.c:5166 msgid "Subscribe to News _feed" msgstr "訂閱新聞饋流(_F)" -#: ../midori/midori-browser.c:5605 +#: ../midori/midori-browser.c:5172 msgid "_Close Tab" msgstr "關閉分頁(_C)" -#: ../midori/midori-browser.c:5606 +#: ../midori/midori-browser.c:5173 msgid "Close the current tab" msgstr "關閉目前分頁" -#: ../midori/midori-browser.c:5608 +#: ../midori/midori-browser.c:5175 msgid "C_lose Window" msgstr "關閉視窗(_L)" -#: ../midori/midori-browser.c:5612 -msgid "_Share" -msgstr "分享(_S)" - -#: ../midori/midori-browser.c:5617 +#: ../midori/midori-browser.c:5179 msgid "Print the current page" msgstr "列印目前頁面" -#: ../midori/midori-browser.c:5620 +#: ../midori/midori-browser.c:5181 msgid "Close a_ll Windows" msgstr "關閉所有視窗(_L)" -#: ../midori/midori-browser.c:5623 +#: ../midori/midori-browser.c:5184 msgid "_Edit" msgstr "編輯(_E)" -#: ../midori/midori-browser.c:5646 -msgid "_Find…" +#: ../midori/midori-browser.c:5207 +msgid "_Find..." msgstr "尋找(_F)…" -#: ../midori/midori-browser.c:5647 +#: ../midori/midori-browser.c:5208 msgid "Find a word or phrase in the page" msgstr "在頁面中尋找字詞或片語" -#: ../midori/midori-browser.c:5649 +#: ../midori/midori-browser.c:5210 msgid "Find _Next" msgstr "找下一個(_N)" -#: ../midori/midori-browser.c:5652 +#: ../midori/midori-browser.c:5213 msgid "Find _Previous" msgstr "找上一個(_P)" -#: ../midori/midori-browser.c:5656 +#: ../midori/midori-browser.c:5217 msgid "Configure the application preferences" msgstr "組配應用程式偏好設定" -#: ../midori/midori-browser.c:5658 +#: ../midori/midori-browser.c:5219 msgid "_View" msgstr "檢視(_V)" -#: ../midori/midori-browser.c:5659 +#: ../midori/midori-browser.c:5220 msgid "_Toolbars" msgstr "工具列(_T)" -#: ../midori/midori-browser.c:5664 +#: ../midori/midori-browser.c:5225 msgid "Reload page without caching" msgstr "重新載入頁面而不使用快取功能" -#: ../midori/midori-browser.c:5674 +#: ../midori/midori-browser.c:5235 msgid "Increase the zoom level" msgstr "增加縮放等級" -#: ../midori/midori-browser.c:5677 +#: ../midori/midori-browser.c:5238 msgid "Decrease the zoom level" msgstr "減少縮放等級" -#: ../midori/midori-browser.c:5681 +#: ../midori/midori-browser.c:5242 msgid "_Encoding" msgstr "編碼(_E)" -#: ../midori/midori-browser.c:5683 +#: ../midori/midori-browser.c:5244 msgid "View So_urce" msgstr "檢視源碼(_U)" -#: ../midori/midori-browser.c:5686 +#: ../midori/midori-browser.c:5247 msgid "Ca_ret Browsing" msgstr "鍵盤瀏覽(_R)" -#: ../midori/midori-browser.c:5690 +#: ../midori/midori-browser.c:5251 msgid "Toggle fullscreen view" msgstr "切換全螢幕檢視" -#: ../midori/midori-browser.c:5692 +#: ../midori/midori-browser.c:5253 msgid "Scroll _Left" msgstr "向左捲(_L)" -#: ../midori/midori-browser.c:5695 +#: ../midori/midori-browser.c:5256 msgid "Scroll _Down" msgstr "向下捲(_D)" -#: ../midori/midori-browser.c:5698 +#: ../midori/midori-browser.c:5259 msgid "Scroll _Up" msgstr "向上捲(_U)" -#: ../midori/midori-browser.c:5701 +#: ../midori/midori-browser.c:5262 msgid "Scroll _Right" msgstr "向右捲(_R)" -#: ../midori/midori-browser.c:5704 -msgid "_Readable" -msgstr "可讀(_E)" - -#: ../midori/midori-browser.c:5707 +#: ../midori/midori-browser.c:5265 msgid "_Go" msgstr "前往(_G)" -#: ../midori/midori-browser.c:5710 +#: ../midori/midori-browser.c:5268 msgid "Go back to the previous page" msgstr "回到上一頁" -#: ../midori/midori-browser.c:5713 +#: ../midori/midori-browser.c:5271 msgid "Go forward to the next page" msgstr "前往下一頁" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5717 +#: ../midori/midori-browser.c:5275 msgid "Go to the previous sub-page" msgstr "回到上一子頁" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5721 +#: ../midori/midori-browser.c:5279 msgid "Go to the next sub-page" msgstr "前往下一子頁" -#: ../midori/midori-browser.c:5723 -msgid "_Homepage" -msgstr "首頁(_H)" - -#: ../midori/midori-browser.c:5724 +#: ../midori/midori-browser.c:5282 msgid "Go to your homepage" msgstr "前往您的首頁" -#: ../midori/midori-browser.c:5726 +#: ../midori/midori-browser.c:5284 msgid "Empty Trash" msgstr "清空回收筒" -#: ../midori/midori-browser.c:5729 +#: ../midori/midori-browser.c:5287 msgid "Undo _Close Tab" msgstr "復原關閉分頁(_C)" -#: ../midori/midori-browser.c:5736 +#: ../midori/midori-browser.c:5294 msgid "Add a new _folder" msgstr "加入新的資料夾(_F)" -#: ../midori/midori-browser.c:5742 +#: ../midori/midori-browser.c:5300 msgid "_Export bookmarks" msgstr "匯出書籤(_E)" -#: ../midori/midori-browser.c:5745 ../midori/midori-searchaction.c:496 +#: ../midori/midori-browser.c:5303 +#: ../midori/midori-searchaction.c:496 msgid "_Manage Search Engines" msgstr "管理搜尋引擎(_M)" -#: ../midori/midori-browser.c:5748 +#: ../midori/midori-browser.c:5306 msgid "_Clear Private Data" msgstr "清除隱私資料(_C)" -#: ../midori/midori-browser.c:5751 +#: ../midori/midori-browser.c:5309 msgid "_Inspect Page" msgstr "審閱頁面(_I)" -#: ../midori/midori-browser.c:5755 +#: ../midori/midori-browser.c:5313 msgid "_Previous Tab" msgstr "上一個分頁(_P)" -#: ../midori/midori-browser.c:5758 +#: ../midori/midori-browser.c:5316 msgid "_Next Tab" msgstr "下一個分頁(_N)" -#: ../midori/midori-browser.c:5760 +#: ../midori/midori-browser.c:5318 msgid "Move Tab _Backward" msgstr "將分頁往後移(_B)" -#: ../midori/midori-browser.c:5762 +#: ../midori/midori-browser.c:5320 msgid "_Move Tab Forward" msgstr "將分頁往前移(_M)" -#: ../midori/midori-browser.c:5765 +#: ../midori/midori-browser.c:5323 msgid "Focus _Current Tab" msgstr "專注於目前分頁(_C)" -#: ../midori/midori-browser.c:5768 +#: ../midori/midori-browser.c:5326 msgid "Focus _Next view" msgstr "聚焦下個檢視點(_N)" -#: ../midori/midori-browser.c:5771 +#: ../midori/midori-browser.c:5329 msgid "Only show the Icon of the _Current Tab" msgstr "只顯示目前分頁的圖示(_C)" -#: ../midori/midori-browser.c:5774 +#: ../midori/midori-browser.c:5332 msgid "_Duplicate Current Tab" msgstr "製作目前分頁的複本(_D)" -#: ../midori/midori-browser.c:5777 +#: ../midori/midori-browser.c:5335 msgid "Close Ot_her Tabs" msgstr "關閉其它分頁(_H)" -#: ../midori/midori-browser.c:5780 +#: ../midori/midori-browser.c:5338 msgid "Open last _session" msgstr "開啟上次工作階段(_S)" -#: ../midori/midori-browser.c:5783 +#: ../midori/midori-browser.c:5341 msgid "_Help" msgstr "求助(_H)" -#: ../midori/midori-browser.c:5785 +#: ../midori/midori-browser.c:5343 msgid "_Frequent Questions" msgstr "常見問題(_F)" -#: ../midori/midori-browser.c:5788 -msgid "_Report a Problem…" -msgstr "回報問題(_R)…" +#: ../midori/midori-browser.c:5346 +msgid "_Report a Problem..." +msgstr "回報問題(_R)..." -#: ../midori/midori-browser.c:5793 ../midori/midori-browser.c:6454 -msgid "_Tools" -msgstr "工具(_T)" - -#: ../midori/midori-browser.c:5800 +#: ../midori/midori-browser.c:5358 msgid "_Menubar" msgstr "選單列(_M)" -#: ../midori/midori-browser.c:5804 +#: ../midori/midori-browser.c:5362 msgid "_Navigationbar" msgstr "導覽列(_N)" -#: ../midori/midori-browser.c:5808 +#: ../midori/midori-browser.c:5366 msgid "Side_panel" msgstr "側邊面板(_P)" -#: ../midori/midori-browser.c:5809 +#: ../midori/midori-browser.c:5367 msgid "Sidepanel" msgstr "側邊面板" -#: ../midori/midori-browser.c:5812 +#: ../midori/midori-browser.c:5370 msgid "_Bookmarkbar" msgstr "書籤列(_B)" -#: ../midori/midori-browser.c:5816 +#: ../midori/midori-browser.c:5374 msgid "_Statusbar" msgstr "狀態列(_S)" -#: ../midori/midori-browser.c:5825 ../midori/midori-websettings.c:314 +#: ../midori/midori-browser.c:5383 +#: ../midori/midori-websettings.c:302 msgid "_Automatic" msgstr "自動(_A)" -#: ../midori/midori-browser.c:5828 ../midori/midori-websettings.c:238 -msgid "Chinese Traditional (BIG5)" -msgstr "正體中文 (BIG5)" - -#: ../midori/midori-browser.c:5831 ../midori/midori-websettings.c:239 -msgid "Chinese Simplified (GB18030)" -msgstr "簡體中文 (GB18030)" +#: ../midori/midori-browser.c:5386 +#: ../midori/midori-websettings.c:227 +msgid "Chinese (BIG5)" +msgstr "中文 (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5835 +#: ../midori/midori-browser.c:5390 msgid "Japanese (SHIFT__JIS)" msgstr "日文 (SHIFT__JIS)" -#: ../midori/midori-browser.c:5838 ../midori/midori-websettings.c:241 +#: ../midori/midori-browser.c:5393 +#: ../midori/midori-websettings.c:229 msgid "Korean (EUC-KR)" msgstr "韓文 (EUC-KR)" -#: ../midori/midori-browser.c:5841 ../midori/midori-websettings.c:242 +#: ../midori/midori-browser.c:5396 +#: ../midori/midori-websettings.c:230 msgid "Russian (KOI8-R)" msgstr "俄文 (KOI8-R)" -#: ../midori/midori-browser.c:5844 ../midori/midori-websettings.c:243 +#: ../midori/midori-browser.c:5399 +#: ../midori/midori-websettings.c:231 msgid "Unicode (UTF-8)" msgstr "統一碼 (UTF-8)" -#: ../midori/midori-browser.c:5847 ../midori/midori-websettings.c:244 +#: ../midori/midori-browser.c:5402 +#: ../midori/midori-websettings.c:232 msgid "Western (ISO-8859-1)" msgstr "西歐 (ISO-8859-1)" -#: ../midori/midori-browser.c:5850 -msgid "Custom…" +#: ../midori/midori-browser.c:5405 +#: ../midori/midori-websettings.c:233 +#: ../midori/midori-websettings.c:308 +#: ../katze/katze-utils.c:635 +msgid "Custom..." msgstr "自訂…" -#: ../midori/midori-browser.c:6360 +#: ../midori/midori-browser.c:5929 msgid "_Separator" msgstr "分隔符號(_S)" -#: ../midori/midori-browser.c:6367 -msgid "_Location…" +#: ../midori/midori-browser.c:5936 +msgid "_Location..." msgstr "位置(_L)…" -#: ../midori/midori-browser.c:6369 +#: ../midori/midori-browser.c:5938 msgid "Open a particular location" msgstr "開啟特定位置" -#: ../midori/midori-browser.c:6391 -msgid "_Web Search…" +#: ../midori/midori-browser.c:5960 +msgid "_Web Search..." msgstr "網頁搜尋(_W)…" -#: ../midori/midori-browser.c:6393 +#: ../midori/midori-browser.c:5962 msgid "Run a web search" msgstr "執行網頁搜尋" -#: ../midori/midori-browser.c:6420 +#: ../midori/midori-browser.c:5989 msgid "Reopen a previously closed tab or window" msgstr "重新開啟之前關閉的分頁或視窗" -#: ../midori/midori-browser.c:6437 +#: ../midori/midori-browser.c:6004 msgid "Show the saved bookmarks" msgstr "顯示已儲存書籤" -#: ../midori/midori-browser.c:6470 +#: ../midori/midori-browser.c:6018 +msgid "_Tools" +msgstr "工具(_T)" + +#: ../midori/midori-browser.c:6033 msgid "_Window" msgstr "視窗(_W)" -#: ../midori/midori-browser.c:6472 +#: ../midori/midori-browser.c:6035 msgid "Show a list of all open tabs" msgstr "顯示所有開啟分頁的清單" -#: ../midori/midori-browser.c:6486 +#: ../midori/midori-browser.c:6049 msgid "_Menu" msgstr "選單(_M)" -#: ../midori/midori-browser.c:6488 +#: ../midori/midori-browser.c:6051 msgid "Menu" msgstr "選單" -#: ../midori/midori-browser.c:7313 +#: ../midori/midori-browser.c:6699 #, c-format msgid "Unexpected setting '%s'" msgstr "未預期的設定「%s」" -#: ../midori/midori-extension.c:329 +#: ../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:747 ../midori/midori-extension.c:844 -#: ../midori/midori-extension.c:941 ../midori/midori-extension.c:1053 -#: ../extensions/addons.c:1688 +#: ../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:394 -#, c-format -msgid "Search with %s" -msgstr "以 %s 搜尋" - -#: ../midori/midori-locationaction.c:414 -msgid "Search with…" -msgstr "搜尋採用…" - -#: ../midori/midori-locationaction.c:541 +#: ../midori/midori-locationaction.c:425 #, c-format msgid "Failed to select from history\n" msgstr "從歷史選取時失敗\n" -#: ../midori/midori-locationaction.c:628 +#: ../midori/midori-locationaction.c:509 #, c-format msgid "Search for %s" msgstr "搜尋 %s" -#: ../midori/midori-locationaction.c:1223 -msgid "Export certificate" -msgstr "匯出憑證" - -#: ../midori/midori-locationaction.c:1255 -msgid "The signing certificate authority is not known." -msgstr "簽署憑證的授權機構未知。" - -#: ../midori/midori-locationaction.c:1257 -msgid "" -"The certificate does not match the expected identity of the site that it was " -"retrieved from." -msgstr "憑證不符合其由來網站的預期身份。" - -#: ../midori/midori-locationaction.c:1259 -msgid "The certificate's activation time is still in the future." -msgstr "憑證的啟用時間仍在未來。" - -#: ../midori/midori-locationaction.c:1261 -msgid "The certificate has expired" -msgstr "憑證已過期" - -#: ../midori/midori-locationaction.c:1263 -msgid "" -"The certificate has been revoked according to the GTlsConnection's " -"certificate revocation list." -msgstr "憑證已根據 GTlsConnection 的憑證撤銷清單而被撤銷。" - -#: ../midori/midori-locationaction.c:1265 -msgid "The certificate's algorithm is considered insecure." -msgstr "憑證的演算法被認為是不安全的。" - -#: ../midori/midori-locationaction.c:1267 -msgid "Some other error occurred validating the certificate." -msgstr "驗證平證實遭遇一些其他錯誤。" - -#: ../midori/midori-locationaction.c:1314 -msgid "_Export certificate" -msgstr "匯出憑證(_E)" - -#: ../midori/midori-locationaction.c:1329 -msgid "Self-signed" -msgstr "自我簽署" - -#: ../midori/midori-locationaction.c:1363 -msgid "Security details" -msgstr "安全性細節" +#: ../midori/midori-locationaction.c:535 +#, c-format +msgid "Search with %s" +msgstr "以 %s 搜尋" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1646 +#: ../midori/midori-locationaction.c:1287 msgid "Paste and p_roceed" msgstr "貼上並處理(_R)" -#: ../midori/midori-locationaction.c:1970 +#: ../midori/midori-locationaction.c:1656 msgid "Not verified" msgstr "尚未驗證" -#: ../midori/midori-locationaction.c:1978 +#: ../midori/midori-locationaction.c:1671 msgid "Verified and encrypted connection" msgstr "通過驗證且經過加密的連線" -#: ../midori/midori-locationaction.c:1985 -msgid "Open, unencrypted connection" -msgstr "開放、未加密的連線" - -#: ../midori/midori-panel.c:317 ../midori/midori-panel.c:319 -#: ../midori/midori-panel.c:483 ../midori/midori-panel.c:486 +#: ../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:329 ../midori/midori-panel.c:330 +#: ../midori/midori-panel.c:409 +#: ../midori/midori-panel.c:410 msgid "Close panel" msgstr "關閉面板" -#: ../midori/midori-panel.c:484 ../midori/midori-panel.c:487 +#: ../midori/midori-panel.c:563 +#: ../midori/midori-panel.c:566 msgid "Align sidepanel to the left" msgstr "側面板靠左對齊" -#: ../midori/midori-websettings.c:220 +#: ../midori/midori-websettings.c:209 msgid "Show Speed Dial" msgstr "顯示快速播號" -#: ../midori/midori-websettings.c:221 +#: ../midori/midori-websettings.c:210 msgid "Show Homepage" msgstr "顯示首頁" -#: ../midori/midori-websettings.c:240 +#: ../midori/midori-websettings.c:228 msgid "Japanese (SHIFT_JIS)" msgstr "日文 (SHIFT_JIS)" -#: ../midori/midori-websettings.c:245 ../midori/midori-websettings.c:321 -#: ../katze/katze-utils.c:633 -msgid "Custom..." -msgstr "自訂..." - -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:248 msgid "New tab" msgstr "新分頁" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:249 msgid "New window" msgstr "新視窗" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:250 msgid "Current tab" msgstr "目前分頁" -#: ../midori/midori-websettings.c:277 +#: ../midori/midori-websettings.c:265 msgid "Default" msgstr "預設" -#: ../midori/midori-websettings.c:278 +#: ../midori/midori-websettings.c:266 msgid "Icons" msgstr "圖示" -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-websettings.c:267 msgid "Small icons" msgstr "小圖示" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:268 msgid "Text" msgstr "文字" -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:269 msgid "Icons and text" msgstr "圖示與文字" -#: ../midori/midori-websettings.c:282 +#: ../midori/midori-websettings.c:270 msgid "Text beside icons" msgstr "文字於圖示旁" -#: ../midori/midori-websettings.c:297 +#: ../midori/midori-websettings.c:285 msgid "Automatic (GNOME or environment)" msgstr "自動 (GNOME 或環境)" -#: ../midori/midori-websettings.c:298 +#: ../midori/midori-websettings.c:286 msgid "HTTP proxy server" msgstr "HTTP 代理伺服器" -#: ../midori/midori-websettings.c:299 +#: ../midori/midori-websettings.c:287 msgid "No proxy server" msgstr "無代理伺服器" -#: ../midori/midori-websettings.c:316 -msgid "Chrome" -msgstr "Chrome" - -#: ../midori/midori-websettings.c:317 +#: ../midori/midori-websettings.c:304 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:318 +#: ../midori/midori-websettings.c:305 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:319 +#: ../midori/midori-websettings.c:306 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:320 +#: ../midori/midori-websettings.c:307 msgid "Internet Explorer" msgstr "網路探險家" -#: ../midori/midori-websettings.c:404 +#: ../midori/midori-websettings.c:360 msgid "Remember last window size" msgstr "記住上次視窗大小" -#: ../midori/midori-websettings.c:405 +#: ../midori/midori-websettings.c:361 msgid "Whether to save the last window size" msgstr "是否要儲存上次視窗大小" -#: ../midori/midori-websettings.c:413 +#: ../midori/midori-websettings.c:369 msgid "Last window width" msgstr "上次視窗寬度" -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:370 msgid "The last saved window width" msgstr "上次儲存的視窗寬度" -#: ../midori/midori-websettings.c:422 +#: ../midori/midori-websettings.c:378 msgid "Last window height" msgstr "上次視窗高度" -#: ../midori/midori-websettings.c:423 +#: ../midori/midori-websettings.c:379 msgid "The last saved window height" msgstr "上次儲存的視窗高度" -#: ../midori/midori-websettings.c:448 +#: ../midori/midori-websettings.c:404 msgid "Last panel position" msgstr "上次面板位置" -#: ../midori/midori-websettings.c:449 +#: ../midori/midori-websettings.c:405 msgid "The last saved panel position" msgstr "上次儲存的面板位置" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:458 +#: ../midori/midori-websettings.c:414 msgid "Last panel page" msgstr "上次面板頁面" -#: ../midori/midori-websettings.c:459 +#: ../midori/midori-websettings.c:415 msgid "The last saved panel page" msgstr "上次儲存的面板頁面" -#: ../midori/midori-websettings.c:467 +#: ../midori/midori-websettings.c:423 msgid "Last Web search" msgstr "上次網頁搜尋" -#: ../midori/midori-websettings.c:468 +#: ../midori/midori-websettings.c:424 msgid "The last saved Web search" msgstr "上次儲存的網頁搜尋" -#: ../midori/midori-websettings.c:492 +#: ../midori/midori-websettings.c:433 msgid "Show Menubar" msgstr "顯示選單列" -#: ../midori/midori-websettings.c:493 +#: ../midori/midori-websettings.c:434 msgid "Whether to show the menubar" msgstr "是否要顯示選單列" -#: ../midori/midori-websettings.c:501 +#: ../midori/midori-websettings.c:442 msgid "Show Navigationbar" msgstr "顯示導覽列" -#: ../midori/midori-websettings.c:502 +#: ../midori/midori-websettings.c:443 msgid "Whether to show the navigationbar" msgstr "是否要顯示導覽列" -#: ../midori/midori-websettings.c:510 +#: ../midori/midori-websettings.c:451 msgid "Show Bookmarkbar" msgstr "顯示書籤列" -#: ../midori/midori-websettings.c:511 +#: ../midori/midori-websettings.c:452 msgid "Whether to show the bookmarkbar" msgstr "是否要顯示書籤列" -#: ../midori/midori-websettings.c:519 +#: ../midori/midori-websettings.c:460 msgid "Show Panel" msgstr "顯示面板" -#: ../midori/midori-websettings.c:520 +#: ../midori/midori-websettings.c:461 msgid "Whether to show the panel" msgstr "是否要顯示面板" -#: ../midori/midori-websettings.c:528 +#: ../midori/midori-websettings.c:469 msgid "Show Statusbar" msgstr "顯示狀態列" -#: ../midori/midori-websettings.c:529 +#: ../midori/midori-websettings.c:470 msgid "Whether to show the statusbar" msgstr "是否要顯示狀態列" -#: ../midori/midori-websettings.c:538 +#: ../midori/midori-websettings.c:479 msgid "Toolbar Style:" msgstr "工具列樣式：" -#: ../midori/midori-websettings.c:539 +#: ../midori/midori-websettings.c:480 msgid "The style of the toolbar" msgstr "工具列的樣式" -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:489 msgid "Toolbar Items" msgstr "工具列項目" -#: ../midori/midori-websettings.c:549 +#: ../midori/midori-websettings.c:490 msgid "The items to show on the toolbar" msgstr "顯示在工具列上的項目" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:498 msgid "Compact Sidepanel" msgstr "壓縮側邊面板" -#: ../midori/midori-websettings.c:558 +#: ../midori/midori-websettings.c:499 msgid "Whether to make the sidepanel compact" msgstr "是否要壓縮側邊面板" -#: ../midori/midori-websettings.c:573 +#: ../midori/midori-websettings.c:514 msgid "Align sidepanel on the right" msgstr "側邊面板靠右對齊" -#: ../midori/midori-websettings.c:574 +#: ../midori/midori-websettings.c:515 msgid "Whether to align the sidepanel on the right" msgstr "是否要將側邊面板靠右對齊" -#: ../midori/midori-websettings.c:589 +#: ../midori/midori-websettings.c:530 msgid "Open panels in separate windows" msgstr "在獨立的視窗中開啟面板" -#: ../midori/midori-websettings.c:590 +#: ../midori/midori-websettings.c:531 msgid "Whether to always open panels in separate windows" msgstr "是否總是要在獨立的視窗中開啟面板" -#: ../midori/midori-websettings.c:599 +#: ../midori/midori-websettings.c:540 msgid "When Midori starts:" msgstr "當 Midori 啟動時：" -#: ../midori/midori-websettings.c:600 +#: ../midori/midori-websettings.c:541 msgid "What to do when Midori starts" msgstr "Midori 啟動時要載入什麼" -#: ../midori/midori-websettings.c:609 +#: ../midori/midori-websettings.c:550 msgid "Homepage:" msgstr "首頁：" -#: ../midori/midori-websettings.c:610 +#: ../midori/midori-websettings.c:551 msgid "The homepage" msgstr "首頁" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:566 msgid "Show crash dialog" msgstr "顯示當機對話窗" -#: ../midori/midori-websettings.c:626 +#: ../midori/midori-websettings.c:567 msgid "Show a dialog after Midori crashed" msgstr "Midori 當機之後顯示對話窗" -#: ../midori/midori-websettings.c:634 +#: ../midori/midori-websettings.c:575 msgid "Save downloaded files to:" msgstr "儲存下載檔案至：" -#: ../midori/midori-websettings.c:635 +#: ../midori/midori-websettings.c:576 msgid "The folder downloaded files are saved to" msgstr "儲存下載檔案的資料夾" -#: ../midori/midori-websettings.c:643 +#: ../midori/midori-websettings.c:584 msgid "Text Editor" msgstr "文字編輯器" -#: ../midori/midori-websettings.c:644 +#: ../midori/midori-websettings.c:585 msgid "An external text editor" msgstr "外部文字編輯器" -#: ../midori/midori-websettings.c:659 +#: ../midori/midori-websettings.c:600 msgid "News Aggregator" msgstr "新聞匯流器" -#: ../midori/midori-websettings.c:660 +#: ../midori/midori-websettings.c:601 msgid "An external news aggregator" msgstr "外部新聞匯流程式" -#: ../midori/midori-websettings.c:668 +#: ../midori/midori-websettings.c:609 msgid "Location entry Search" msgstr "位置欄搜尋" -#: ../midori/midori-websettings.c:669 +#: ../midori/midori-websettings.c:610 msgid "The search to perform inside the location entry" msgstr "於位置列之內進行的搜尋" -#: ../midori/midori-websettings.c:677 +#: ../midori/midori-websettings.c:618 msgid "Preferred Encoding" msgstr "偏好的編碼" -#: ../midori/midori-websettings.c:678 +#: ../midori/midori-websettings.c:619 msgid "The preferred character encoding" msgstr "偏好的字元編碼" -#: ../midori/midori-websettings.c:688 +#: ../midori/midori-websettings.c:629 msgid "Always Show Tabbar" msgstr "固定顯示分頁列" -#: ../midori/midori-websettings.c:689 +#: ../midori/midori-websettings.c:630 msgid "Always show the tabbar" msgstr "固定顯示分頁列" -#: ../midori/midori-websettings.c:702 +#: ../midori/midori-websettings.c:638 msgid "Close Buttons on Tabs" msgstr "關閉按鈕位於分頁上" -#: ../midori/midori-websettings.c:703 +#: ../midori/midori-websettings.c:639 msgid "Whether tabs have close buttons" msgstr "分頁上是否有關閉按鈕" -#: ../midori/midori-websettings.c:728 +#: ../midori/midori-websettings.c:664 msgid "Open new pages in:" msgstr "開啟新頁面於：" -#: ../midori/midori-websettings.c:729 +#: ../midori/midori-websettings.c:665 msgid "Where to open new pages" msgstr "何處開啟新頁面" -#: ../midori/midori-websettings.c:738 +#: ../midori/midori-websettings.c:674 msgid "Middle click opens Selection" msgstr "按下滑鼠中鍵開啟所選" -#: ../midori/midori-websettings.c:739 +#: ../midori/midori-websettings.c:675 msgid "Load an address from the selection via middle click" msgstr "透過按下滑鼠中鍵以載入所選位址" -#: ../midori/midori-websettings.c:747 +#: ../midori/midori-websettings.c:683 msgid "Open tabs in the background" msgstr "在背景中開啟分頁" -#: ../midori/midori-websettings.c:748 +#: ../midori/midori-websettings.c:684 msgid "Whether to open new tabs in the background" msgstr "是否要在背景中開啟分頁" -#: ../midori/midori-websettings.c:756 +#: ../midori/midori-websettings.c:692 msgid "Open Tabs next to Current" msgstr "於目前之下開啟分頁" -#: ../midori/midori-websettings.c:757 +#: ../midori/midori-websettings.c:693 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "是否要開啟新分頁於目前分頁之下或最後一頁之後" -#: ../midori/midori-websettings.c:765 +#: ../midori/midori-websettings.c:701 msgid "Open popups in tabs" msgstr "在分頁中開啟對話框" -#: ../midori/midori-websettings.c:766 +#: ../midori/midori-websettings.c:702 msgid "Whether to open popup windows in tabs" msgstr "是否要在分頁中開啟彈出視窗" -#: ../midori/midori-websettings.c:776 ../extensions/statusbar-features.c:155 +#: ../midori/midori-websettings.c:712 +#: ../extensions/statusbar-features.c:131 msgid "Load images automatically" msgstr "自動載入圖像" -#: ../midori/midori-websettings.c:777 +#: ../midori/midori-websettings.c:713 msgid "Load and display images automatically" msgstr "自動載入與顯示圖像" -#: ../midori/midori-websettings.c:784 ../extensions/statusbar-features.c:165 +#: ../midori/midori-websettings.c:720 +#: ../extensions/statusbar-features.c:140 msgid "Enable scripts" msgstr "啟用命令稿" -#: ../midori/midori-websettings.c:785 +#: ../midori/midori-websettings.c:721 msgid "Enable embedded scripting languages" msgstr "啟用嵌入式命令稿語言" -#: ../midori/midori-websettings.c:792 ../extensions/statusbar-features.c:177 +#: ../midori/midori-websettings.c:728 +#: ../extensions/statusbar-features.c:149 msgid "Enable Netscape plugins" msgstr "啟用 Netscape 外掛程式" -#: ../midori/midori-websettings.c:793 +#: ../midori/midori-websettings.c:729 msgid "Enable embedded Netscape plugin objects" msgstr "啟用嵌入式 Netscape 外掛程式物件" -#: ../midori/midori-websettings.c:808 +#: ../midori/midori-websettings.c:749 msgid "Enable Spell Checking" msgstr "啟用拼字檢查" -#: ../midori/midori-websettings.c:809 +#: ../midori/midori-websettings.c:750 msgid "Enable spell checking while typing" msgstr "啟用打字時的拼字檢查" -#: ../midori/midori-websettings.c:815 +#: ../midori/midori-websettings.c:756 msgid "Enable HTML5 database support" msgstr "啟用 HTML 資料庫支援" -#: ../midori/midori-websettings.c:816 +#: ../midori/midori-websettings.c:757 msgid "Whether to enable HTML5 database support" msgstr "是否要啟用 HTML5 資料庫支援" -#: ../midori/midori-websettings.c:822 +#: ../midori/midori-websettings.c:763 msgid "Enable HTML5 local storage support" msgstr "啟用 HTML 本地端儲存支援" -#: ../midori/midori-websettings.c:823 +#: ../midori/midori-websettings.c:764 msgid "Whether to enable HTML5 local storage support" msgstr "是否要啟用 HTML 本地端儲存支援" -#: ../midori/midori-websettings.c:829 +#: ../midori/midori-websettings.c:770 msgid "Enable offline web application cache" msgstr "啟用離線網頁應用程式快取" -#: ../midori/midori-websettings.c:830 +#: ../midori/midori-websettings.c:771 msgid "Whether to enable offline web application cache" msgstr "是否啟用離線網頁應用程式快取" -#: ../midori/midori-websettings.c:851 +#: ../midori/midori-websettings.c:787 msgid "Flash window on background tabs" msgstr "於背景分頁閃動視窗" -#: ../midori/midori-websettings.c:852 +#: ../midori/midori-websettings.c:788 msgid "Flash the browser window if a new tab was opened in the background" msgstr "新分頁在背景開啟時是否要閃動瀏覽器視窗" -#: ../midori/midori-websettings.c:860 -msgid "Enable WebGL support" -msgstr "啟用 WebGL 支援" - -#: ../midori/midori-websettings.c:861 -msgid "Allow websites to use OpenGL rendering" -msgstr "允許網站使用 OpenGL 算圖" - -#: ../midori/midori-websettings.c:887 +#: ../midori/midori-websettings.c:803 msgid "Zoom Text and Images" msgstr "縮放文字和圖像" -#: ../midori/midori-websettings.c:888 +#: ../midori/midori-websettings.c:804 msgid "Whether to zoom text and images" msgstr "是否要縮放文字和圖像" -#: ../midori/midori-websettings.c:903 +#: ../midori/midori-websettings.c:819 msgid "Find inline while typing" msgstr "輸入時於列內尋找" -#: ../midori/midori-websettings.c:904 +#: ../midori/midori-websettings.c:820 msgid "Whether to automatically find inline while typing" msgstr "是否要在輸入時自動在列內尋找" -#: ../midori/midori-websettings.c:919 +#: ../midori/midori-websettings.c:835 msgid "Kinetic scrolling" msgstr "動力捲動" -#: ../midori/midori-websettings.c:920 +#: ../midori/midori-websettings.c:836 msgid "Whether scrolling should kinetically move according to speed" msgstr "捲動是否該根據速度動態移動" -#: ../midori/midori-websettings.c:928 +#: ../midori/midori-websettings.c:844 msgid "Delete old Cookies after:" msgstr "刪除舊訊餅經過：" -#: ../midori/midori-websettings.c:929 +#: ../midori/midori-websettings.c:845 msgid "The maximum number of days to save cookies for" msgstr "訊餅的最大儲存日數限制" -#: ../midori/midori-websettings.c:945 +#: ../midori/midori-websettings.c:861 msgid "Only accept Cookies from sites you visit" msgstr "只接受來自您造訪網站的訊餅" -#: ../midori/midori-websettings.c:946 +#: ../midori/midori-websettings.c:862 msgid "Block cookies sent by third-party websites" msgstr "阻擋第三方網站訊餅" -#: ../midori/midori-websettings.c:960 +#: ../midori/midori-websettings.c:876 msgid "Delete pages from history after:" msgstr "從歷史刪除頁面經過：" -#: ../midori/midori-websettings.c:961 +#: ../midori/midori-websettings.c:877 msgid "The maximum number of days to save the history for" msgstr "造訪歷史的最大儲存日數限制" -#: ../midori/midori-websettings.c:976 +#: ../midori/midori-websettings.c:892 msgid "Proxy server" msgstr "代理伺服器" -#: ../midori/midori-websettings.c:977 +#: ../midori/midori-websettings.c:893 msgid "The type of proxy server to use" msgstr "要使用的代理伺服器類型" -#: ../midori/midori-websettings.c:986 +#: ../midori/midori-websettings.c:902 msgid "HTTP Proxy Server" msgstr "HTTP 代理伺服器" -#: ../midori/midori-websettings.c:987 +#: ../midori/midori-websettings.c:903 msgid "The proxy server used for HTTP connections" msgstr "用於 HTTP 連接的代理伺服器" -#: ../midori/midori-websettings.c:1002 +#: ../midori/midori-websettings.c:918 msgid "Port" msgstr "連接埠" -#: ../midori/midori-websettings.c:1003 +#: ../midori/midori-websettings.c:919 msgid "The proxy server port used for HTTP connections" msgstr "用於 HTTP 連線的代理伺服器" -#: ../midori/midori-websettings.c:1021 +#: ../midori/midori-websettings.c:937 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:954 msgid "Identify as" msgstr "識別為" -#: ../midori/midori-websettings.c:1039 +#: ../midori/midori-websettings.c:955 msgid "What to identify as to web pages" msgstr "要讓網頁識別為什麼" -#: ../midori/midori-websettings.c:1055 +#: ../midori/midori-websettings.c:971 msgid "Identification string" msgstr "識別字串" -#: ../midori/midori-websettings.c:1056 +#: ../midori/midori-websettings.c:972 msgid "The application identification string" msgstr "應用程式識別字串" -#: ../midori/midori-websettings.c:1072 +#: ../midori/midori-websettings.c:988 msgid "Preferred languages" msgstr "偏好的語言" -#: ../midori/midori-websettings.c:1073 -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:989 +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:1004 msgid "Clear private data" msgstr "清除隱私資料" -#: ../midori/midori-websettings.c:1089 +#: ../midori/midori-websettings.c:1005 msgid "The private data selected for deletion" msgstr "選取要刪除的隱私資料" -#: ../midori/midori-websettings.c:1104 +#: ../midori/midori-websettings.c:1020 msgid "Clear data" msgstr "清除資料" -#: ../midori/midori-websettings.c:1105 +#: ../midori/midori-websettings.c:1021 msgid "The data selected for deletion" msgstr "選取要刪除的資料" #. i18n: Reworded: Shorten details propagated when going to another page -#: ../midori/midori-websettings.c:1154 +#: ../midori/midori-websettings.c:1054 msgid "Strip referrer details sent to websites" msgstr "截短傳送給網站的 referrer 細節" #. i18n: Referer here is not a typo but a technical term -#: ../midori/midori-websettings.c:1156 +#: ../midori/midori-websettings.c:1056 msgid "Whether the \"Referer\" header should be shortened to the hostname" msgstr "是否「Referer」標頭要被截短成主機名稱" -#: ../midori/midori-websettings.c:1170 +#: ../midori/midori-websettings.c:1070 msgid "Always use my font choices" msgstr "總是使用我的字型選擇" -#: ../midori/midori-websettings.c:1171 +#: ../midori/midori-websettings.c:1071 msgid "Override fonts picked by websites with user preferences" msgstr "用使用者的偏好設定凌駕網站挑選的字型" -#: ../midori/midori-view.c:1002 ../midori/midori-view.c:1140 -msgid "Trust this website" -msgstr "信任此網站" - -#: ../midori/midori-view.c:1138 -msgid "Security unknown" -msgstr "安全性未知" - -#: ../midori/midori-view.c:1436 +#: ../midori/midori-view.c:1331 #, c-format msgid "%s wants to save an HTML5 database." msgstr "%s 想要儲存一門 HTML 資料庫。" -#: ../midori/midori-view.c:1440 ../midori/midori-view.c:1474 +#: ../midori/midori-view.c:1335 +#: ../midori/midori-view.c:1365 msgid "_Deny" msgstr "拒絕(_D)" -#: ../midori/midori-view.c:1440 ../midori/midori-view.c:1474 +#: ../midori/midori-view.c:1335 +#: ../midori/midori-view.c:1365 msgid "_Allow" msgstr "允許(_A)" -#: ../midori/midori-view.c:1469 +#: ../midori/midori-view.c:1361 #, c-format msgid "%s wants to know your location." msgstr "%s 想要知道您的所在位置。" -#: ../midori/midori-view.c:1565 +#: ../midori/midori-view.c:1449 #, c-format msgid "Error - %s" msgstr "錯誤 - %s" -#: ../midori/midori-view.c:1566 +#: ../midori/midori-view.c:1450 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "無法載入「%s」頁面。" -#: ../midori/midori-view.c:1568 +#: ../midori/midori-view.c:1452 msgid "Try again" msgstr "重試" -#: ../midori/midori-view.c:1766 ../midori/midori-view.c:2875 +#: ../midori/midori-view.c:1614 +#: ../midori/midori-view.c:2459 #, c-format msgid "Send a message to %s" msgstr "傳送訊息至 %s" -#: ../midori/midori-view.c:2661 -msgid "Add _search engine..." -msgstr "加入搜尋引擎(_S)..." - -#: ../midori/midori-view.c:2705 ../midori/midori-view.c:3031 +#: ../midori/midori-view.c:2301 +#: ../midori/midori-view.c:2612 msgid "Inspect _Element" msgstr "審閱元素(_E)" -#: ../midori/midori-view.c:2757 +#: ../midori/midori-view.c:2351 msgid "Open Link in New _Tab" msgstr "在新分頁中開啟鏈結(_T)" -#: ../midori/midori-view.c:2761 +#: ../midori/midori-view.c:2355 msgid "Open Link in _Foreground Tab" msgstr "在前景分頁中開啟鏈結(_F)" -#: ../midori/midori-view.c:2762 +#: ../midori/midori-view.c:2356 msgid "Open Link in _Background Tab" msgstr "在背景分頁中開啟鏈結(_B)" -#: ../midori/midori-view.c:2765 +#: ../midori/midori-view.c:2359 msgid "Open Link in New _Window" msgstr "在開新視窗中開啟鏈結(_W)" -#: ../midori/midori-view.c:2768 +#: ../midori/midori-view.c:2362 msgid "Open Link as Web A_pplication" msgstr "開啟鏈結為網頁應用程式(_P)" -#: ../midori/midori-view.c:2773 +#: ../midori/midori-view.c:2365 msgid "Copy Link de_stination" msgstr "複製鏈結目的地(_S)" -#: ../midori/midori-view.c:2789 +#: ../midori/midori-view.c:2377 msgid "Open _Image in New Tab" msgstr "於新分頁中開啟影像(_I)" -#: ../midori/midori-view.c:2792 +#: ../midori/midori-view.c:2380 msgid "Copy Image _Address" msgstr "複製影像位址(_A)" -#: ../midori/midori-view.c:2795 +#: ../midori/midori-view.c:2383 msgid "Save I_mage" msgstr "儲存影像(_M)" -#: ../midori/midori-view.c:2798 -msgid "Open in Image _Viewer" -msgstr "於影像檢視器中開啟(_V)" - -#: ../midori/midori-view.c:2805 +#: ../midori/midori-view.c:2390 msgid "Copy Video _Address" msgstr "複製視訊位址(_A)" -#: ../midori/midori-view.c:2808 +#: ../midori/midori-view.c:2393 msgid "Save _Video" msgstr "儲存視訊(_V)" -#: ../midori/midori-view.c:2808 +#: ../midori/midori-view.c:2393 msgid "Download _Video" msgstr "下載視訊(_V)" -#: ../midori/midori-view.c:2834 +#: ../midori/midori-view.c:2419 msgid "Search _with" msgstr "以此搜尋(_S)" -#: ../midori/midori-view.c:2866 +#: ../midori/midori-view.c:2451 msgid "_Search the Web" msgstr "搜尋網頁(_S)" -#: ../midori/midori-view.c:2883 +#: ../midori/midori-view.c:2467 msgid "Open Address in New _Tab" msgstr "在新分頁中開啟位址(_T)" -#: ../midori/midori-view.c:2936 -msgid "Open _Frame in New Tab" -msgstr "於新分頁中開啟框架(_F)" - -#: ../midori/midori-view.c:3190 +#: ../midori/midori-view.c:2763 msgid "Open or download file" msgstr "開啟或下載檔案" -#: ../midori/midori-view.c:3214 -#, c-format -msgid "File Name: %s" -msgstr "檔案名稱：%s" - -#: ../midori/midori-view.c:3219 +#: ../midori/midori-view.c:2782 #, c-format msgid "File Type: '%s'" msgstr "檔案類型：'%s'" -#: ../midori/midori-view.c:3221 +#: ../midori/midori-view.c:2784 #, c-format msgid "File Type: %s ('%s')" msgstr "檔案類型：%s ('%s')" -#: ../midori/midori-view.c:3256 -#, c-format -msgid "Size: %s" -msgstr "大小：%s" - #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:3267 +#: ../midori/midori-view.c:2801 #, c-format msgid "Open %s" msgstr "開啟 %s" -#: ../midori/midori-view.c:3886 +#: ../midori/midori-view.c:3418 #, c-format msgid "Inspect page - %s" msgstr "審閱頁面 - %s" -#: ../midori/midori-view.c:4241 +#: ../midori/midori-view.c:3705 msgid "Speed Dial" msgstr "快速播號" -#: ../midori/midori-view.c:4242 ../midori/midori-view.c:4348 +#: ../midori/midori-view.c:3706 +#: ../midori/midori-view.c:3802 msgid "Click to add a shortcut" msgstr "按一下以加入捷徑" -#: ../midori/midori-view.c:4243 +#: ../midori/midori-view.c:3707 msgid "Enter shortcut address" msgstr "輸入捷徑位址" -#: ../midori/midori-view.c:4244 +#: ../midori/midori-view.c:3708 msgid "Enter shortcut title" msgstr "輸入捷徑標題" -#: ../midori/midori-view.c:4245 +#: ../midori/midori-view.c:3709 msgid "Are you sure you want to delete this shortcut?" msgstr "確定要刪除這個捷徑？" -#: ../midori/midori-view.c:4418 +#: ../midori/midori-view.c:3869 #, c-format msgid "No documentation installed" msgstr "沒有已安裝文件" -#: ../midori/midori-view.c:4495 -msgid "Midori doesn't store any personal data:" -msgstr "Midori 不會儲存任何個人資料；" - -#: ../midori/midori-view.c:4496 -msgid "No history or web cookies are being saved." -msgstr "沒有歷史或網頁訊餅將被儲存。" - -#: ../midori/midori-view.c:4497 -msgid "Extensions are disabled." -msgstr "擴充套件已停用。" - -#: ../midori/midori-view.c:4498 -msgid "HTML5 storage, local database and application caches are disabled." -msgstr "HTML 5 儲存、本地端資料庫、應用程式快取等皆已停用。" - -#: ../midori/midori-view.c:4499 -msgid "Midori prevents websites from tracking the user:" -msgstr "Midori 防止下列網站追蹤使用者：" - -#: ../midori/midori-view.c:4500 -msgid "Referrer URLs are stripped down to the hostname." -msgstr "Referrer URL 被截短成主機名稱。" - -#: ../midori/midori-view.c:4501 -msgid "DNS prefetching is disabled." -msgstr "DNS 預擷取已停用。" - -#: ../midori/midori-view.c:4502 -msgid "The language and timezone are not revealed to websites." -msgstr "語言與時區不顯露給這些網站。" - -#: ../midori/midori-view.c:4503 -msgid "Flash and other Netscape plugins cannot be listed by websites." -msgstr "Flash 與其他 Netscape 插件無法被這些網站列出。" - -#: ../midori/midori-view.c:4592 +#: ../midori/midori-view.c:3920 msgid "Version numbers in brackets show the version used at runtime." msgstr "中括號內的版本編號顯示執行時期使用的版本。" -#: ../midori/midori-view.c:4642 +#: ../midori/midori-view.c:3967 msgid "Page loading delayed" msgstr "頁面載入延遲" -#: ../midori/midori-view.c:4643 +#: ../midori/midori-view.c:3968 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "載入延遲，可能是因為最近的當掉或啟動偏好設定之故。" -#: ../midori/midori-view.c:4644 +#: ../midori/midori-view.c:3969 msgid "Load Page" msgstr "載入頁面" -#: ../midori/midori-view.c:4811 +#: ../midori/midori-view.c:4108 msgid "Blank page" msgstr "空白頁面" -#: ../midori/midori-view.c:5075 +#: ../midori/midori-view.c:4372 msgid "_Duplicate Tab" msgstr "製作頁面複本(_E)" -#: ../midori/midori-view.c:5080 +#: ../midori/midori-view.c:4377 msgid "Show Tab _Label" msgstr "顯示分頁標籤(_L)" -#: ../midori/midori-view.c:5080 +#: ../midori/midori-view.c:4377 msgid "Show Tab _Icon Only" msgstr "只顯示分頁圖示(_I)" -#: ../midori/midori-view.c:5087 -msgid "Close Ot_her Tab" -msgid_plural "Close Ot_her Tabs" -msgstr[0] "關閉其他分頁(_H)" +#: ../midori/midori-view.c:4383 +msgid "Close ot_her Tabs" +msgstr "關閉其它分頁(_H)" #. i18n: word stem of "previous page" type links, case is not important -#: ../midori/midori-view.c:5923 +#: ../midori/midori-view.c:5000 msgid "previous" msgstr "上一頁" #. i18n: word stem of "next page" type links, case is not important -#: ../midori/midori-view.c:5942 +#: ../midori/midori-view.c:5019 msgid "next" msgstr "下一頁" -#: ../midori/midori-view.c:5955 +#: ../midori/midori-view.c:5032 msgid "Print background images" msgstr "列印背景圖像" -#: ../midori/midori-view.c:5956 +#: ../midori/midori-view.c:5033 msgid "Whether background images should be printed" msgstr "是否應該列印背景圖像" -#: ../midori/midori-view.c:5988 +#: ../midori/midori-view.c:5065 msgid "Features" msgstr "特色" -#: ../midori/midori-preferences.c:298 +#: ../midori/midori-preferences.c:297 msgid "Startup" msgstr "啟動" -#: ../midori/midori-preferences.c:311 +#: ../midori/midori-preferences.c:310 msgid "Use _current page" msgstr "使用目前頁面(_C)" -#: ../midori/midori-preferences.c:315 +#: ../midori/midori-preferences.c:314 msgid "Use current page as homepage" msgstr "使用目前頁面作為首頁" #. Page "Appearance" -#: ../midori/midori-preferences.c:324 +#: ../midori/midori-preferences.c:323 msgid "Fonts" msgstr "字型" -#: ../midori/midori-preferences.c:327 +#: ../midori/midori-preferences.c:326 msgid "Proportional Font Family" msgstr "比例字族" -#: ../midori/midori-preferences.c:331 +#: ../midori/midori-preferences.c:330 msgid "The default font family used to display text" msgstr "用來顯示文字的預設字族" -#: ../midori/midori-preferences.c:334 +#: ../midori/midori-preferences.c:333 msgid "The default font size used to display text" msgstr "用來顯示文字的預設字型大小" -#: ../midori/midori-preferences.c:336 +#: ../midori/midori-preferences.c:335 msgid "Fixed-width Font Family" msgstr "等寬字族" -#: ../midori/midori-preferences.c:340 +#: ../midori/midori-preferences.c:339 msgid "The font family used to display fixed-width text" msgstr "用來顯示等寬文字的字族" -#: ../midori/midori-preferences.c:343 +#: ../midori/midori-preferences.c:342 msgid "The font size used to display fixed-width text" msgstr "用來顯示等寬文字的字型大小" -#: ../midori/midori-preferences.c:345 +#: ../midori/midori-preferences.c:344 msgid "Minimum Font Size" msgstr "最小字型尺寸" -#: ../midori/midori-preferences.c:349 +#: ../midori/midori-preferences.c:348 msgid "The minimum font size used to display text" msgstr "用來顯示文字的最小字型尺寸" #. Page "Behavior" -#: ../midori/midori-preferences.c:360 +#: ../midori/midori-preferences.c:359 msgid "Behavior" msgstr "行為" -#: ../midori/midori-preferences.c:386 +#: ../midori/midori-preferences.c:385 msgid "Allow scripts to open popups" msgstr "允許指令稿開啟彈出式視窗" -#: ../midori/midori-preferences.c:387 +#: ../midori/midori-preferences.c:386 msgid "Whether scripts are allowed to open popup windows automatically" msgstr "是否允許指令稿自動開啟彈出視窗" #. Page "Interface" -#: ../midori/midori-preferences.c:418 +#: ../midori/midori-preferences.c:409 msgid "Browsing" msgstr "瀏覽" #. Page "Network" -#: ../midori/midori-preferences.c:458 +#: ../midori/midori-preferences.c:447 msgid "Network" msgstr "網路" -#: ../midori/midori-preferences.c:465 +#: ../midori/midori-preferences.c:454 msgid "Hostname" msgstr "主機名稱" -#: ../midori/midori-preferences.c:489 +#: ../midori/midori-preferences.c:478 msgid "MB" msgstr "MB" -#: ../midori/midori-searchaction.c:957 +#: ../midori/midori-searchaction.c:907 msgid "Add search engine" msgstr "加入搜尋引擎" -#: ../midori/midori-searchaction.c:957 +#: ../midori/midori-searchaction.c:907 msgid "Edit search engine" msgstr "編輯搜尋引擎" -#: ../midori/midori-searchaction.c:985 +#: ../midori/midori-searchaction.c:936 msgid "_Name:" msgstr "名稱(_N)：" -#: ../midori/midori-searchaction.c:1000 +#: ../midori/midori-searchaction.c:952 msgid "_Description:" msgstr "描述(_D)：" -#: ../midori/midori-searchaction.c:1013 ../extensions/feed-panel/main.c:377 -msgid "_Address:" -msgstr "位址(_A)：" +#: ../midori/midori-searchaction.c:985 +msgid "_Icon:" +msgstr "圖示(_I)：" -#: ../midori/midori-searchaction.c:1032 +#: ../midori/midori-searchaction.c:999 msgid "_Token:" msgstr "符記(_T)：" -#: ../midori/midori-searchaction.c:1330 +#: ../midori/midori-searchaction.c:1299 msgid "Manage Search Engines" msgstr "管理搜尋引擎" -#: ../midori/midori-searchaction.c:1432 +#: ../midori/midori-searchaction.c:1399 msgid "Use as _default" msgstr "作為預設使用(_D)" -#: ../midori/sokoke.c:346 +#: ../midori/sokoke.c:410 msgid "Open with" msgstr "以此開啟" -#: ../midori/sokoke.c:354 +#: ../midori/sokoke.c:418 #, c-format msgid "Choose an application or command to open \"%s\":" msgstr "選擇開啟「%s」用的應用程式或指令：" -#: ../midori/sokoke.c:468 ../midori/sokoke.c:482 +#: ../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:1529 +#: ../midori/sokoke.c:1677 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d 小時" -#: ../midori/sokoke.c:1530 +#: ../midori/sokoke.c:1678 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d 分鐘" -#: ../midori/sokoke.c:1531 +#: ../midori/sokoke.c:1679 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d 秒" #. i18n: Download tooltip (size): 4KB of 43MB -#: ../midori/sokoke.c:1539 ../panels/midori-transfers.c:269 +#: ../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:1548 +#: ../midori/sokoke.c:1696 msgid "?B" msgstr "?B" #. i18n: Download tooltip (transfer rate): (130KB/s) -#: ../midori/sokoke.c:1551 +#: ../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:1568 +#: ../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:265 +#: ../toolbars/midori-findbar.c:264 msgid "_Inline Find:" msgstr "列內尋找(_I)：" -#: ../toolbars/midori-findbar.c:287 +#: ../toolbars/midori-findbar.c:291 msgid "Previous" msgstr "上一個" -#: ../toolbars/midori-findbar.c:293 +#: ../toolbars/midori-findbar.c:297 msgid "Next" msgstr "下一個" -#: ../toolbars/midori-findbar.c:297 +#: ../toolbars/midori-findbar.c:301 msgid "Match Case" msgstr "符合大小寫" -#: ../toolbars/midori-findbar.c:306 +#: ../toolbars/midori-findbar.c:310 msgid "Highlight Matches" msgstr "突顯相符者" -#: ../toolbars/midori-findbar.c:317 +#: ../toolbars/midori-findbar.c:321 msgid "Close Findbar" msgstr "關閉尋找列" -#: ../toolbars/midori-transferbar.c:124 +#: ../toolbars/midori-transferbar.c:122 #, c-format msgid "The file '%s' has been downloaded." msgstr "已下載「%s」檔案。" -#: ../toolbars/midori-transferbar.c:129 +#: ../toolbars/midori-transferbar.c:125 msgid "Transfer completed" msgstr "傳輸完成" -#: ../toolbars/midori-transferbar.c:201 +#: ../toolbars/midori-transferbar.c:193 msgid "The downloaded file is erroneous." msgstr "下載的檔案有錯誤。" -#: ../toolbars/midori-transferbar.c:202 -msgid "" -"The checksum provided with the link did not match. This means the file is " -"probably incomplete or was modified afterwards." +#: ../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:345 ../panels/midori-transfers.c:142 +#: ../toolbars/midori-transferbar.c:331 +#: ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "清除全部" -#: ../toolbars/midori-transferbar.c:382 ../toolbars/midori-transferbar.c:384 +#: ../toolbars/midori-transferbar.c:368 +#: ../toolbars/midori-transferbar.c:370 msgid "Some files are being downloaded" msgstr "有些檔案正在下載中" -#: ../toolbars/midori-transferbar.c:388 +#: ../toolbars/midori-transferbar.c:374 msgid "_Quit Midori" msgstr "退出 Midori(_Q)" -#: ../toolbars/midori-transferbar.c:390 +#: ../toolbars/midori-transferbar.c:376 msgid "The transfers will be cancelled if Midori quits." msgstr "若退出 Midori，將會取消傳輸作業。" -#: ../panels/midori-bookmarks.c:308 +#: ../panels/midori-bookmarks.c:113 +msgid "Bookmarks" +msgstr "書籤" + +#: ../panels/midori-bookmarks.c:260 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "加入書籤項目失敗：%s\n" -#: ../panels/midori-bookmarks.c:475 -#, c-format -msgid "Failed to update bookmark : %s\n" -msgstr "無法更新書籤：%s\n" - -#: ../panels/midori-bookmarks.c:535 +#: ../panels/midori-bookmarks.c:440 msgid "Edit the selected bookmark" msgstr "編輯所選書籤" -#: ../panels/midori-bookmarks.c:543 +#: ../panels/midori-bookmarks.c:448 msgid "Delete the selected bookmark" msgstr "刪除所選書籤" -#: ../panels/midori-bookmarks.c:558 +#: ../panels/midori-bookmarks.c:463 msgid "Add a new folder" msgstr "加入新的資料夾" -#: ../panels/midori-bookmarks.c:697 ../panels/midori-history.c:638 +#: ../panels/midori-bookmarks.c:597 +#: ../panels/midori-history.c:579 msgid "Separator" msgstr "分隔符號" -#. Create the filter entry -#: ../panels/midori-bookmarks.c:1027 -msgid "Search Bookmarks" -msgstr "搜尋書籤" - -#: ../panels/midori-history.c:111 +#: ../panels/midori-history.c:110 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:142 +msgid "A week ago" +msgstr "一週前" -#: ../panels/midori-history.c:162 ../panels/midori-history.c:186 +#: ../panels/midori-history.c:144 #, 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:147 +msgid "Today" +msgstr "今天" -#: ../panels/midori-history.c:232 -#, c-format -msgid "Failed to remove history item: %s\n" -msgstr "移除歷史項目時失敗：%s\n" +#: ../panels/midori-history.c:149 +msgid "Yesterday" +msgstr "昨天" -#: ../panels/midori-history.c:360 +#: ../panels/midori-history.c:317 msgid "Are you sure you want to remove all history items?" msgstr "確定要移除所有歷史項目？" -#: ../panels/midori-history.c:407 +#: ../panels/midori-history.c:363 msgid "Bookmark the selected history item" msgstr "將所選歷史項目加入書籤" -#: ../panels/midori-history.c:416 +#: ../panels/midori-history.c:372 msgid "Delete the selected history item" msgstr "刪除所選歷史項目" -#: ../panels/midori-history.c:424 +#: ../panels/midori-history.c:380 msgid "Clear the entire history" msgstr "清空整個歷史" -#. Create the filter entry -#: ../panels/midori-history.c:997 -msgid "Search History" -msgstr "搜尋歷史" - -#: ../panels/midori-transfers.c:87 +#: ../panels/midori-transfers.c:86 msgid "Transfers" msgstr "傳輸" -#: ../panels/midori-transfers.c:470 +#: ../panels/midori-transfers.c:467 msgid "Open Destination _Folder" msgstr "開啟目的地資料夾(_F)" -#: ../panels/midori-transfers.c:473 +#: ../panels/midori-transfers.c:470 msgid "Copy Link Loc_ation" msgstr "複製鏈結位置(_A)" @@ -2318,97 +2188,96 @@ msgstr "密碼" msgid "_Remember password" msgstr "記住密碼(_R)" -#: ../katze/katze-throbber.c:949 +#: ../katze/katze-throbber.c:942 #, c-format msgid "Named icon '%s' couldn't be loaded" msgstr "無法載入名為「%s」的圖示" -#: ../katze/katze-throbber.c:962 +#: ../katze/katze-throbber.c:955 #, c-format msgid "Stock icon '%s' couldn't be loaded" msgstr "無法載入庫存圖示「%s」" -#: ../katze/katze-throbber.c:1042 +#: ../katze/katze-throbber.c:1035 msgid "Animation frames are broken" msgstr "動畫訊框損壞" -#: ../katze/katze-utils.c:443 ../katze/katze-utils.c:867 +#: ../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:489 ../katze/katze-utils.c:518 +#: ../katze/katze-utils.c:485 +#: ../katze/katze-utils.c:514 #: ../extensions/addons.c:308 msgid "Choose file" msgstr "選擇檔案" -#: ../katze/katze-utils.c:504 +#: ../katze/katze-utils.c:500 msgid "Choose folder" msgstr "選擇資料夾" -#: ../katze/katze-utils.c:602 +#: ../katze/katze-utils.c:604 msgid "None" msgstr "無" -#: ../katze/katze-utils.c:717 +#: ../katze/katze-utils.c:719 msgid "1 hour" msgstr "一小時" -#: ../katze/katze-utils.c:718 +#: ../katze/katze-utils.c:720 msgid "1 day" msgstr "一天" -#: ../katze/katze-utils.c:719 +#: ../katze/katze-utils.c:721 msgid "1 week" msgstr "一週" -#: ../katze/katze-utils.c:720 +#: ../katze/katze-utils.c:722 msgid "1 month" msgstr "一個月" -#: ../katze/katze-utils.c:721 +#: ../katze/katze-utils.c:723 msgid "1 year" msgstr "一年" -#: ../katze/katze-preferences.c:98 ../extensions/history-list.vala:235 +#: ../katze/katze-preferences.c:91 +#: ../extensions/history-list.vala:235 #, c-format msgid "Preferences for %s" msgstr "偏好設定用於 %s" -#: ../extensions/adblock.c:470 +#: ../extensions/adblock.c:441 msgid "Configure Advertisement filters" msgstr "設定廣告過濾條件" -#: ../extensions/adblock.c:503 +#: ../extensions/adblock.c:472 #, 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:917 +#: ../extensions/adblock.c:823 msgid "Edit rule" msgstr "編輯規則" -#: ../extensions/adblock.c:931 +#: ../extensions/adblock.c:837 msgid "_Rule:" msgstr "規則(_R)：" -#: ../extensions/adblock.c:985 +#: ../extensions/adblock.c:891 msgid "Bl_ock image" msgstr "阻擋影像(_O)" -#: ../extensions/adblock.c:990 +#: ../extensions/adblock.c:896 msgid "Bl_ock link" msgstr "阻擋鏈結(_O)" -#: ../extensions/adblock.c:1689 +#: ../extensions/adblock.c:1499 msgid "Advertisement blocker" msgstr "廣告阻擋器" -#: ../extensions/adblock.c:1690 +#: ../extensions/adblock.c:1500 msgid "Block advertisements according to a filter list" msgstr "根據過濾清單阻擋廣告" @@ -2434,115 +2303,118 @@ msgstr "安裝使用者樣式(_I)" msgid "Don't install" msgstr "不要安裝" -#: ../extensions/addons.c:319 ../extensions/addons.c:677 +#: ../extensions/addons.c:319 +#: ../extensions/addons.c:681 msgid "Userscripts" msgstr "使用者指令稿" -#: ../extensions/addons.c:324 ../extensions/addons.c:679 +#: ../extensions/addons.c:324 +#: ../extensions/addons.c:683 msgid "Userstyles" msgstr "使用者樣式" -#: ../extensions/addons.c:370 ../extensions/addons.c:449 +#: ../extensions/addons.c:380 +#: ../extensions/addons.c:459 #: ../extensions/feed-panel/main.c:129 msgid "Error" msgstr "錯誤" -#: ../extensions/addons.c:411 +#: ../extensions/addons.c:421 #, c-format msgid "Do you want to delete '%s'?" msgstr "您想要刪除「%s」嗎？" -#: ../extensions/addons.c:417 +#: ../extensions/addons.c:427 msgid "Delete user script" msgstr "刪除使用者指令稿" -#: ../extensions/addons.c:418 +#: ../extensions/addons.c:428 msgid "Delete user style" msgstr "刪除使用者樣式" -#: ../extensions/addons.c:421 +#: ../extensions/addons.c:431 #, c-format msgid "The file %s will be permanently deleted." msgstr "將永遠刪除 %s 檔案。" -#: ../extensions/addons.c:566 ../extensions/addons.c:643 +#: ../extensions/addons.c:570 +#: ../extensions/addons.c:647 msgid "Open in Text Editor" msgstr "以文字編輯器開啟" -#: ../extensions/addons.c:568 ../extensions/addons.c:652 +#: ../extensions/addons.c:572 +#: ../extensions/addons.c:656 msgid "Open Target Folder" msgstr "開啟目標資料夾" -#: ../extensions/addons.c:634 +#: ../extensions/addons.c:638 msgid "Add new addon" msgstr "加入新的附加元件" -#: ../extensions/addons.c:660 +#: ../extensions/addons.c:664 msgid "Remove selected addon" msgstr "移除所選的附加元件" -#: ../extensions/addons.c:1689 ../extensions/addons.c:1907 +#: ../extensions/addons.c:1696 +#: ../extensions/addons.c:1914 msgid "User addons" msgstr "使用者附加元件" -#: ../extensions/addons.c:1819 +#: ../extensions/addons.c:1826 #, c-format msgid "Can't monitor folder '%s': %s" msgstr "無法監控「%s」資料夾：%s" -#: ../extensions/addons.c:1908 +#: ../extensions/addons.c:1915 msgid "Support for userscripts and userstyles" msgstr "支援使用者指令稿與使用者樣式" -#: ../extensions/colorful-tabs.c:201 +#: ../extensions/colorful-tabs.c:202 msgid "Colorful Tabs" msgstr "彩色分頁" -#: ../extensions/colorful-tabs.c:202 +#: ../extensions/colorful-tabs.c:203 msgid "Tint each tab distinctly" msgstr "將每個分頁著上不同的色彩" -#: ../extensions/cookie-manager/cookie-manager-page.c:73 +#: ../extensions/cookie-manager/cookie-manager-page.c:80 #: ../extensions/cookie-manager/main.c:35 msgid "Cookie Manager" msgstr "訊餅管理員" -#: ../extensions/cookie-manager/cookie-manager-page.c:103 +#: ../extensions/cookie-manager/cookie-manager-page.c:110 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:112 +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 +#: ../extensions/cookie-manager/cookie-manager-page.c:127 msgid "Expand All" msgstr "全部擴展" -#: ../extensions/cookie-manager/cookie-manager-page.c:127 +#: ../extensions/cookie-manager/cookie-manager-page.c:134 msgid "Collapse All" msgstr "全部折疊" -#: ../extensions/cookie-manager/cookie-manager-page.c:572 +#: ../extensions/cookie-manager/cookie-manager-page.c:576 msgid "Do you really want to delete all cookies?" msgstr "確定要移除所有訊餅？" -#: ../extensions/cookie-manager/cookie-manager-page.c:574 +#: ../extensions/cookie-manager/cookie-manager-page.c:578 msgid "Question" msgstr "問題" -#: ../extensions/cookie-manager/cookie-manager-page.c:583 +#: ../extensions/cookie-manager/cookie-manager-page.c:587 msgid "Only cookies which match the filter will be deleted." msgstr "只有符合過濾條件的訊餅會被刪除。" -#: ../extensions/cookie-manager/cookie-manager-page.c:671 +#: ../extensions/cookie-manager/cookie-manager-page.c:675 msgid "At the end of the session" msgstr "於工作階段結束" -#: ../extensions/cookie-manager/cookie-manager-page.c:674 +#: ../extensions/cookie-manager/cookie-manager-page.c:678 #, c-format msgid "" "Host: %s\n" @@ -2559,15 +2431,15 @@ msgstr "" "安全：%s\n" "期限：%s" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:684 msgid "Yes" msgstr "是" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:684 msgid "No" msgstr "否" -#: ../extensions/cookie-manager/cookie-manager-page.c:694 +#: ../extensions/cookie-manager/cookie-manager-page.c:698 #, c-format msgid "" "Domain: %s\n" @@ -2576,21 +2448,25 @@ msgstr "" "網域：%s\n" "訊餅：%d" -#: ../extensions/cookie-manager/cookie-manager-page.c:1017 +#: ../extensions/cookie-manager/cookie-manager-page.c:1028 msgid "Name" msgstr "名稱" -#: ../extensions/cookie-manager/cookie-manager-page.c:1069 +#: ../extensions/cookie-manager/cookie-manager-page.c:1081 msgid "_Expand All" msgstr "全部擴展(_E)" -#: ../extensions/cookie-manager/cookie-manager-page.c:1077 +#: ../extensions/cookie-manager/cookie-manager-page.c:1089 msgid "_Collapse All" msgstr "全部折疊(_C)" -#: ../extensions/cookie-manager/cookie-manager-page.c:1129 -msgid "Search Cookies by Name or Domain" -msgstr "按名稱或網域搜尋 Cookies" +#: ../extensions/cookie-manager/cookie-manager-page.c:1142 +msgid "Filter:" +msgstr "過濾條件：" + +#: ../extensions/cookie-manager/cookie-manager-page.c:1147 +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" @@ -2688,70 +2564,45 @@ msgstr "饋流面板" msgid "Read Atom/ RSS feeds" msgstr "閱讀 Atom/ RSS 饋流" -#: ../extensions/formhistory/formhistory.c:39 +#: ../extensions/formhistory.c:143 #, 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 +#: ../extensions/formhistory.c:301 msgid "Toggle form history state" msgstr "從歷史狀態切換" -#: ../extensions/formhistory/formhistory.c:438 +#: ../extensions/formhistory.c:302 msgid "Activate or deactivate form history for the current tab." msgstr "為目前分頁啟動或關閉表單歷史。" -#: ../extensions/formhistory/formhistory.c:549 -#: ../extensions/formhistory/formhistory.c:553 +#: ../extensions/formhistory.c:438 +#: ../extensions/formhistory.c:442 #, 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" +#: ../extensions/formhistory.c:517 +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 +#: ../extensions/formhistory.c:576 msgid "Stores history of entered form data" msgstr "儲存已輸入表單資料的歷史" -#: ../extensions/formhistory/formhistory-gdom-frontend.c:225 -#: ../extensions/formhistory/formhistory-js-frontend.c:106 +#: ../extensions/formhistory.c:580 #, c-format -msgid "Failed to select suggestions\n" -msgstr "無法選取建議\n" +msgid "Not available: %s" +msgstr "不可用：%s" + +#: ../extensions/formhistory.c:581 +msgid "Resource files not installed" +msgstr "尚未安裝資源檔" + +#: ../extensions/formhistory.c:587 +msgid "Form history filler" +msgstr "表單歷史填寫器" #: ../extensions/history-list.vala:197 msgid "There are no unvisited tabs" @@ -2826,15 +2677,15 @@ msgstr "重新載入頁面或停止載入" msgid "Customize Keyboard shortcuts" msgstr "自訂鍵盤捷徑" -#: ../extensions/shortcuts.c:283 +#: ../extensions/shortcuts.c:285 msgid "Customize Sh_ortcuts..." msgstr "自訂捷徑(_O)..." -#: ../extensions/shortcuts.c:320 +#: ../extensions/shortcuts.c:322 msgid "Shortcuts" msgstr "捷徑" -#: ../extensions/shortcuts.c:321 +#: ../extensions/shortcuts.c:323 msgid "View and edit keyboard shortcuts" msgstr "檢視並編輯鍵盤捷徑" @@ -2846,35 +2697,36 @@ msgstr "狀態列時鐘" msgid "Display date and time in the statusbar" msgstr "於狀態列顯示日期與時間" -#: ../extensions/statusbar-features.c:152 +#: ../extensions/statusbar-features.c:128 msgid "Images" msgstr "影像" -#: ../extensions/statusbar-features.c:162 +#: ../extensions/statusbar-features.c:137 msgid "Scripts" msgstr "指令稿" -#: ../extensions/statusbar-features.c:174 +#: ../extensions/statusbar-features.c:146 msgid "Netscape plugins" msgstr "Netscapte 外掛程式" -#: ../extensions/statusbar-features.c:259 +#: ../extensions/statusbar-features.c:192 msgid "Statusbar Features" msgstr "狀態列特色" -#: ../extensions/statusbar-features.c:260 +#: ../extensions/statusbar-features.c:193 msgid "Easily toggle features on web pages on and off" msgstr "輕鬆開啟或關閉網頁上的功能" -#: ../extensions/tab-panel.c:589 ../extensions/tab-panel.c:676 +#: ../extensions/tab-panel.c:596 +#: ../extensions/tab-panel.c:683 msgid "Tab Panel" msgstr "分頁面板" -#: ../extensions/tab-panel.c:659 +#: ../extensions/tab-panel.c:666 msgid "T_ab Panel" msgstr "分頁面板(_A)" -#: ../extensions/tab-panel.c:677 +#: ../extensions/tab-panel.c:684 msgid "Show tabs in a vertical panel" msgstr "以垂直面板顯示分頁" @@ -2886,33 +2738,35 @@ msgstr "分頁預設只使用圖示表示" msgid "New tabs have no label by default" msgstr "新分頁預設情況下沒有分頁標籤" -#: ../extensions/toolbar-editor.c:395 +#: ../extensions/toolbar-editor.c:393 msgid "Customize Toolbar" msgstr "自訂工具列" -#: ../extensions/toolbar-editor.c:411 -msgid "" -"Select items to be displayed on the toolbar. Items can be reordered by drag " -"and drop." +#: ../extensions/toolbar-editor.c:413 +msgid "Select items to be displayed on the toolbar. Items can be reodered by drag and drop." msgstr "選取工具列上要顯示的項目。這些項目可以利用拖曳方式來重新調整位置。" -#: ../extensions/toolbar-editor.c:427 +#: ../extensions/toolbar-editor.c:429 msgid "Available Items" msgstr "可用項目" -#: ../extensions/toolbar-editor.c:448 +#: ../extensions/toolbar-editor.c:450 msgid "Displayed Items" msgstr "顯示的項目" -#: ../extensions/toolbar-editor.c:588 -msgid "_Customize Toolbar…" -msgstr "自訂工具列(_C)…" +#: ../extensions/toolbar-editor.c:585 +msgid "Customize _Toolbar..." +msgstr "自訂工具列(_T)…" + +#: ../extensions/toolbar-editor.c:601 +msgid "_Customize..." +msgstr "自訂(_C)…" -#: ../extensions/toolbar-editor.c:617 +#: ../extensions/toolbar-editor.c:631 msgid "Toolbar Editor" msgstr "工具列編輯器" -#: ../extensions/toolbar-editor.c:618 +#: ../extensions/toolbar-editor.c:632 msgid "Easily edit the toolbar layout" msgstr "輕鬆編輯工具列配置" @@ -2920,68 +2774,6 @@ msgstr "輕鬆編輯工具列配置" msgid "Cache HTTP communication on disk" msgstr "對 HTTP 通訊製作一份硬碟快取" -#~ msgid "Load page" -#~ msgstr "載入頁面" - -#~ msgid "Close ot_her Tabs" -#~ msgstr "關閉其它分頁(_H)" - -#~ msgid "_Icon:" -#~ msgstr "圖示(_I)：" - -#~ msgid "Filter:" -#~ msgstr "過濾條件：" - -#~ msgid "" -#~ "Enter a filter string to show only cookies whose name or domain field " -#~ "match the entered filter" -#~ msgstr "輸入過濾條件字串，只會顯示名稱或網域符合輸入的過濾字串的訊餅" - -#~ msgid "_Bookmark" -#~ msgstr "書籤(_B)" - -#~ msgid "_Console" -#~ msgstr "主控臺(_C)" - -#~ msgid "The bookmarks couldn't be saved. %s" -#~ msgstr "無法儲存書籤。%s" - -#~ msgid "The specified configuration folder is invalid." -#~ msgstr "指定的組態資料夾無效。" - -#~ msgid "Toplevel folder" -#~ msgstr "最上層資料夾" - -#~ msgid "_Title:" -#~ msgstr "標題(_T)：" - -#~ msgid "_Folder:" -#~ msgstr "資料夾(_F)：" - -#~ msgid "_Customize…" -#~ msgstr "自訂(_C)…" - -#~ 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 "未指定任何檔名" @@ -3060,14 +2852,14 @@ msgstr "對 HTTP 通訊製作一份硬碟快取" #~ msgid "Add a new bookmark folder" #~ msgstr "加入新的書籤資料夾" -#~ msgid "Add, edit and remove search engines…" +#~ msgid "Add, edit and remove search engines..." #~ msgstr "加入、編輯、移除搜尋引擎…" -#~ msgid "Clear private data…" -#~ msgstr "清除隱私資料…" +#~ msgid "Clear private data..." +#~ msgstr "清除隱私資料..." -#~ msgid "Inspect page details and access developer tools…" -#~ msgstr "審閱頁面詳細資料並存取開發者工具…" +#~ msgid "Inspect page details and access developer tools..." +#~ msgstr "審閱頁面詳細資料並存取開發者工具..." #~ msgid "Switch to the previous tab" #~ msgstr "切換至上一個分頁" @@ -3180,9 +2972,11 @@ msgstr "對 HTTP 通訊製作一份硬碟快取" #~ 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 "是否要在位置欄中顯示載入進度" @@ -3282,12 +3076,15 @@ msgstr "對 HTTP 通訊製作一份硬碟快取" #~ msgid "Delete old cookies after 1 year" #~ msgstr "刪除大於 1 年的舊訊餅" -#~ msgid "Configure _Advertisement filters…" -#~ msgstr "設定廣告過濾條件(_A)…" +#~ msgid "Configure _Advertisement filters..." +#~ msgstr "設定廣告過濾條件(_A)..." #~ msgid "Open target folder for selected addon" #~ msgstr "為所選的附加元件開啟目標資料夾" +#~ msgid "_Form History" +#~ msgstr "表單歷史(_F)" + #~ msgid "Next Tab (History List)" #~ msgstr "下一個分頁 (歷史清單)" @@ -3430,6 +3227,9 @@ msgstr "對 HTTP 通訊製作一份硬碟快取" #~ msgid "Warning: You are using a superuser account!" #~ msgstr "警告：您正在使用超級使用者帳號！" +#~ msgid "User_styles" +#~ msgstr "使用者樣式(_S)" + #~ msgid "%s has no property '%s'" #~ msgstr "%s 沒有任何「%s」屬性" @@ -3439,6 +3239,9 @@ msgstr "對 HTTP 通訊製作一份硬碟快取" #~ msgid "%s.%s cannot be accessed" #~ msgstr "%s.%s 無法被存取" +#~ msgid "_Enable" +#~ msgstr "啟用(_E)" + #~ msgid "_Disable" #~ msgstr "停用(_D)" diff --git a/tests/bookmarks.c b/tests/bookmarks.c deleted file mode 100644 index eaf11dab..00000000 --- a/tests/bookmarks.c +++ /dev/null @@ -1,208 +0,0 @@ -/* - 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 - 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.h" -#include "panels/midori-bookmarks.h" - -typedef struct -{ - KatzeArray* db_bookmarks; - KatzeArray* test_bookmarks; -} BookmarksFixture; - -typedef struct -{ - 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; - -typedef void (*FixtureFunc)(BookmarksFixture*, const void*); - - -static void -fixture_setup (BookmarksFixture* fixture, - const TestParameters* params) -{ - KatzeItem* item; - KatzeArray* folder; - sqlite3* db; - gchar *errmsg = NULL; - - fixture->db_bookmarks = katze_array_new (KATZE_TYPE_ARRAY); - db = NULL; /* FIXME 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 void -fixture_teardown (BookmarksFixture* fixture, - const TestParameters *params) -{ - 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 void -print_bookmark (KatzeItem *bookmark) -{ - 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")); -} - -/* 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 -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); -} - -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) -{ - //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}; - - g_test_init (&argc, &argv, NULL); - midori_app_setup (&argc, &argv, NULL, NULL); - - g_test_add ("/bookmarks/simple test", - BookmarksFixture, &default_params, - (FixtureFunc) fixture_setup, - (FixtureFunc) simple_test, - (FixtureFunc) fixture_teardown); - - return g_test_run (); -} diff --git a/tests/browser.c b/tests/browser.c index fa949124..2317ad78 100644 --- a/tests/browser.c +++ b/tests/browser.c @@ -15,16 +15,32 @@ static void browser_create (void) { MidoriApp* app; - MidoriSpeedDial* dial; MidoriBrowser* browser; + GtkActionGroup* action_group; + GList* actions; app = midori_app_new (); - dial = midori_speed_dial_new ("/", NULL); - g_object_set (app, "speed-dial", dial, NULL); browser = midori_app_create_browser (app); gtk_widget_destroy (GTK_WIDGET (browser)); + + app = midori_app_new (); + browser = midori_app_create_browser (app); + action_group = midori_browser_get_action_group (browser); + actions = gtk_action_group_list_actions (action_group); + while (actions) + { + GtkAction* action = actions->data; + 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")) + 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); + gtk_widget_destroy (GTK_WIDGET (browser)); g_object_unref (app); - g_object_unref (dial); } static void @@ -78,52 +94,18 @@ browser_tooltips (void) 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) { - g_test_init (&argc, &argv, NULL); - midori_app_setup (&argc, &argv, NULL, NULL); - midori_paths_init (MIDORI_RUNTIME_MODE_PRIVATE, 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); 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 --git a/tests/download.vala b/tests/download.vala deleted file mode 100644 index c5e0f98e..00000000 --- a/tests/download.vala +++ /dev/null @@ -1,58 +0,0 @@ -/* - 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 - 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. -*/ - -struct TestCase { - public string data; - public string? expected; -} - -const TestCase[] filenames = { - { "/tmp/midori-user/tumblr123.jpg", ".jpg" }, - { "https://green.cat/8019B6/a.b/500.jpg", ".jpg" }, - { "http://example.com/file.png", ".png" } -}; - -static void download_extension () { - foreach (var filename in filenames) { - string? result = Midori.Download.get_extension_for_uri (filename.data); - Katze.assert_str_equal (filename.data, result, filename.expected); - } -} - -static void download_unique () { - string folder = DirUtils.make_tmp ("cacheXXXXXX"); - string filename = Path.build_path (Path.DIR_SEPARATOR_S, folder, "foo.png"); - string unique = Midori.Download.get_unique_filename (filename); - Katze.assert_str_equal (folder, unique, filename); - FileUtils.set_contents (filename, "12345"); - unique = Midori.Download.get_unique_filename (filename); - filename = Path.build_path (Path.DIR_SEPARATOR_S, folder, "foo-0.png"); - Katze.assert_str_equal (folder, unique, filename); - FileUtils.set_contents (filename, "12345"); - unique = Midori.Download.get_unique_filename (filename); - filename = Path.build_path (Path.DIR_SEPARATOR_S, folder, "foo-1.png"); - Katze.assert_str_equal (folder, unique, filename); - - filename = Path.build_path (Path.DIR_SEPARATOR_S, folder, "foo-9.png"); - FileUtils.set_contents (filename, "12345"); - unique = Midori.Download.get_unique_filename (filename); - filename = Path.build_path (Path.DIR_SEPARATOR_S, folder, "foo-10.png"); - Katze.assert_str_equal (folder, unique, filename); - DirUtils.remove (folder); -} - -void main (string[] args) { - Test.init (ref args); - Test.add_func ("/download/extension", download_extension); - Test.add_func ("/download/unique", download_unique); - Test.run (); -} - diff --git a/tests/extensions.c b/tests/extensions.c index b3d5330f..22b6853a 100644 --- a/tests/extensions.c +++ b/tests/extensions.c @@ -166,25 +166,13 @@ extension_settings (void) static void extension_activate (gconstpointer data) { - MidoriExtension* extension; MidoriApp* app = midori_app_new (); + MidoriExtension* extension = MIDORI_EXTENSION (data); + if (extension == NULL) + return; 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_signal_emit_by_name (extension, "activate", app); + midori_extension_deactivate (extension); g_object_unref (app); } @@ -245,9 +233,9 @@ int main (int argc, char** argv) { + midori_app_setup (argv); g_test_init (&argc, &argv, NULL); - midori_app_setup (&argc, &argv, NULL, NULL); - midori_paths_init (MIDORI_RUNTIME_MODE_PRIVATE, NULL); + gtk_init_check (&argc, &argv); soup_session_add_feature_by_type (webkit_get_default_session (), SOUP_TYPE_COOKIE_JAR); diff --git a/tests/hsts.vala b/tests/hsts.vala deleted file mode 100644 index a71ec9da..00000000 --- a/tests/hsts.vala +++ /dev/null @@ -1,31 +0,0 @@ -/* - 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 - 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. -*/ - -static void http_hsts () { - Midori.HSTS.Directive d; - d = new Midori.HSTS.Directive.from_header ("max-age=31536000"); - assert (d.is_valid () && !d.sub_domains); - d = new Midori.HSTS.Directive.from_header ("max-age=15768000 ; includeSubDomains"); - assert (d.is_valid () && d.sub_domains); - - /* Invalid */ - d = new Midori.HSTS.Directive.from_header (""); - assert (!d.is_valid () && !d.sub_domains); - d = new Midori.HSTS.Directive.from_header ("includeSubDomains"); - assert (!d.is_valid () && d.sub_domains); -} - -void main (string[] args) { - Test.init (ref args); - Test.add_func ("/http/hsts", http_hsts); - Test.run (); -} - diff --git a/tests/magic-uri.c b/tests/magic-uri.c index be9a1999..d596dd52 100644 --- a/tests/magic-uri.c +++ b/tests/magic-uri.c @@ -13,7 +13,6 @@ #include #define SM "http://www.searchmash.com/search/" -#define HTTP_PREFIX "midori-unit-test-expected-http-prefix" static void test_input (const gchar* input, @@ -21,7 +20,6 @@ test_input (const gchar* input, { static KatzeArray* search_engines = NULL; gchar* uri; - gchar* real_expected = NULL; if (G_UNLIKELY (!search_engines)) { @@ -38,44 +36,33 @@ test_input (const gchar* input, "token", "se", NULL); katze_array_add_item (search_engines, item); g_object_unref (item); - item = g_object_new (KATZE_TYPE_ITEM, - "uri", "ddg.gg", - "token", "dd", NULL); - katze_array_add_item (search_engines, item); - g_object_unref (item); - item = g_object_new (KATZE_TYPE_ITEM, - "uri", "google.com", - "token", "d", NULL); - katze_array_add_item (search_engines, item); - g_object_unref (item); } uri = sokoke_magic_uri (input); if (!uri) { - const gchar* keywords = NULL; + gchar** parts; + gchar* keywords = NULL; const gchar* search_uri = NULL; - KatzeItem* item; /* Do we have a keyword and a string? */ - if ((item = katze_array_find_token (search_engines, input))) + parts = g_strsplit (input, " ", 2); + if (parts[0]) { - keywords = strchr (input, ' '); - if (keywords != NULL) - keywords++; - else - keywords = ""; - search_uri = katze_item_get_uri (item); + 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); + } } + g_strfreev (parts); - uri = search_uri ? midori_uri_for_search (search_uri, keywords) : NULL; - } - - if (!g_strcmp0 (expected, HTTP_PREFIX)) - real_expected = g_strconcat ("http://", input, NULL); + uri = keywords ? midori_uri_for_search (search_uri, keywords) : NULL; - katze_assert_str_equal (input, uri, real_expected ? real_expected : expected); - g_free (real_expected); + g_free (keywords); + } + katze_assert_str_equal (input, uri, expected); g_free (uri); } @@ -110,13 +97,6 @@ magic_uri_uri (void) /* 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"; @@ -170,8 +150,6 @@ static void magic_uri_search (void) { test_input ("sm midori", SM "midori"); - test_input ("d midori browser", "google.com" "midori%20browser"); - test_input ("dd midori browser", "ddg.gg" "midori%20browser"); test_input ("sm cats dogs", SM "cats%20dogs"); test_input ("se cats dogs", SM "cats%20dogs"); test_input ("dict midori", NULL); @@ -212,6 +190,7 @@ static void magic_uri_pseudo (void) { test_input ("javascript:alert(1)", "javascript:alert(1)"); + test_input ("mailto:christian@twotoasts.de", "mailto:christian@twotoasts.de"); test_input ("data:text/html;charset=utf-8,TestTest", "data:text/html;charset=utf-8,TestTest"); } @@ -248,22 +227,6 @@ magic_uri_fingerprint (void) 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); - uri = "http://midori-0.4.1.tar.bz2"; - g_assert_cmpint (midori_uri_get_fingerprint (uri, NULL, NULL), ==, G_MAXINT); -} - -static void -magic_uri_ip (void) -{ - g_assert (midori_uri_is_ip_address ("192.168.1.1")); - g_assert (midori_uri_is_ip_address ("192.168.1.1:1234")); - g_assert (!midori_uri_is_ip_address ("0.168.1.1")); - g_assert (midori_uri_is_ip_address ("user@192.168.1.1")); - g_assert (midori_uri_is_ip_address ("user:password@192.168.1.1")); - g_assert (midori_uri_is_ip_address ("2001:0db8:85a3:0000:0000:8a2e:0370:7334")); - g_assert (midori_uri_is_ip_address ("fe80:0:0:0:202:b3ff:fe1e:8329")); - g_assert (midori_uri_is_ip_address ("fe80::202:b3ff:fe1e:8329")); - g_assert (midori_uri_is_ip_address ("fe80::76e5:bff:fe04:38e0/64")); } static void @@ -314,55 +277,13 @@ magic_uri_prefetch (void) g_assert (!sokoke_prefetch_uri (NULL, "javascript: alert()", NULL, NULL)); } -static void -magic_uri_commands (void) -{ - typedef struct - { - const gchar* command; - gboolean quote; - const gchar* expected; - } CommandItem; - - static const CommandItem commands[] = { - { "midori", TRUE, NULL }, - { "/usr/bin/midori", TRUE, NULL }, - { "C:/Program Files/Midori/bin/midori.exe", TRUE, NULL }, - { "C:/Programme/Midori/bin/midori.exe", TRUE, NULL }, - }; - static const CommandItem arguments[] = { - { "-a 'http://lunduke.com/?p=3606'", FALSE, NULL }, - { "about:private", FALSE, NULL }, - }; - guint i, j; - - for (i = 0; i < G_N_ELEMENTS (commands); i++) - for (j = 0; j < G_N_ELEMENTS (arguments); j++) - { - gchar* input = g_strconcat (commands[i].command, " ", arguments[j].command, NULL); - gchar* ce = commands[i].expected ? (gchar*)commands[i].expected - : g_strconcat ("'", commands[i].command, "'", NULL); - gchar* ae = arguments[j].expected ? (gchar*)arguments[j].expected - : (arguments[j].quote ? g_strconcat ("'", arguments[j].command, "'", NULL) - : g_strdup (arguments[j].command)); - gchar* expected = g_strconcat (ce, " ", ae, NULL); - gchar* result = sokoke_prepare_command (commands[i].command, - commands[i].quote, arguments[j].command, arguments[j].quote); - katze_assert_str_equal (input, result, expected); - g_free (input); - g_free (ce); - g_free (ae); - g_free (expected); - g_free (result); - } -} - int main (int argc, char** argv) { + midori_app_setup (argv); g_test_init (&argc, &argv, NULL); - midori_app_setup (&argc, &argv, NULL, NULL); + gtk_init_check (&argc, &argv); g_test_add_func ("/magic-uri/uri", magic_uri_uri); g_test_add_func ("/magic-uri/idn", magic_uri_idn); @@ -370,10 +291,8 @@ main (int argc, 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/ip", magic_uri_ip); g_test_add_func ("/magic-uri/format", magic_uri_format); g_test_add_func ("/magic-uri/prefetch", magic_uri_prefetch); - g_test_add_func ("/magic-uri/commands", magic_uri_commands); return g_test_run (); } diff --git a/tests/properties.c b/tests/properties.c index 2613fdb7..05c1358e 100644 --- a/tests/properties.c +++ b/tests/properties.c @@ -10,6 +10,30 @@ */ #include "midori.h" +#include "midori-bookmarks.h" + +typedef struct +{ + const gchar* type; + const gchar* property; +} ObjectProperty; + +static ObjectProperty properties_object_skip[] = +{ + { "MidoriWebSettings", "user-agent" }, +}; + +static gboolean +properties_should_skip (const gchar* type, + const gchar* property) +{ + guint i; + for (i = 0; i < G_N_ELEMENTS (properties_object_skip); i++) + if (g_str_equal (properties_object_skip[i].type, type)) + if (g_str_equal (properties_object_skip[i].property, property)) + return TRUE; + return FALSE; +} #define pspec_is_writable(pspec) (pspec->flags & G_PARAM_WRITABLE \ && !(pspec->flags & (G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT_ONLY))) @@ -26,12 +50,19 @@ properties_object_get_set (GObject* object) for (i = 0; i < n_properties; i++) { GParamSpec *pspec = pspecs[i]; + GType type = G_PARAM_SPEC_TYPE (pspec); + const gchar* property = g_param_spec_get_name (pspec); + void* value = NULL; guint j; /* Skip properties of parent classes */ if (pspec->owner_type != G_OBJECT_TYPE (object)) continue; + /* Skip properties that cannot be tested generically */ + if (properties_should_skip (G_OBJECT_TYPE_NAME (object), property)) + continue; + /* Verify that the ID is unique */ if (pspecs[i]->owner_type == G_OBJECT_TYPE (object)) for (j = 0; j < n_properties; j++) @@ -41,6 +72,81 @@ properties_object_get_set (GObject* object) pspec->param_id, g_param_spec_get_name (pspec), g_param_spec_get_name (pspecs[j])); + + if (!(pspec->flags & G_PARAM_READABLE)) + continue; + + g_object_get (object, property, &value, NULL); + if (type == G_TYPE_PARAM_BOOLEAN) + { + gboolean current_value = value ? TRUE : FALSE; + gboolean default_value = G_PARAM_SPEC_BOOLEAN (pspec)->default_value; + if (current_value != default_value) + g_error ("Set %s.%s to default (%d), but returned '%d'", + G_OBJECT_TYPE_NAME (object), property, + G_PARAM_SPEC_BOOLEAN (pspec)->default_value, current_value); + if (pspec_is_writable (pspec)) + { + g_object_set (object, property, !default_value, NULL); + g_object_get (object, property, ¤t_value, NULL); + if (current_value == default_value) + g_error ("Set %s.%s to non-default (%d), but returned '%d'", + G_OBJECT_TYPE_NAME (object), property, + !G_PARAM_SPEC_BOOLEAN (pspec)->default_value, current_value); + g_object_set (object, property, default_value, NULL); + g_object_get (object, property, ¤t_value, NULL); + if (current_value != default_value) + g_error ("Set %s.%s to default again (%d), but returned '%d'", + G_OBJECT_TYPE_NAME (object), property, + G_PARAM_SPEC_BOOLEAN (pspec)->default_value, current_value); + } + } + else if (type == G_TYPE_PARAM_STRING) + { + g_free (value); + if (pspec_is_writable (pspec)) + { + g_object_set (object, property, + G_PARAM_SPEC_STRING (pspec)->default_value, NULL); + g_object_get (object, property, &value, NULL); + if (g_strcmp0 (value, G_PARAM_SPEC_STRING (pspec)->default_value)) + g_error ("Set %s.%s to %s, but returned '%s'", + G_OBJECT_TYPE_NAME (object), property, + G_PARAM_SPEC_STRING (pspec)->default_value, (gchar*)value); + g_free (value); + } + } + else if (type == G_TYPE_PARAM_ENUM) + { + GEnumClass* enum_class = G_ENUM_CLASS ( + g_type_class_ref (pspec->value_type)); + + if (pspec_is_writable (pspec)) + { + gint k; + g_object_set (object, property, + G_PARAM_SPEC_ENUM (pspec)->default_value, NULL); + for (k = enum_class->minimum; k < enum_class->maximum; 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); + 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'", + G_OBJECT_TYPE_NAME (object), property, enum_value->value_name); + g_assert_cmpint (enum_value->value, ==, enum_value_->value); + g_object_set (object, property, k, NULL); + } + } + + g_type_class_unref (enum_class); + } } g_free (pspecs); } @@ -48,13 +154,13 @@ properties_object_get_set (GObject* object) static void properties_object_test (gconstpointer object) { - if (GTK_IS_WIDGET (object)) + if (GTK_IS_OBJECT (object)) g_object_ref_sink ((GObject*)object); properties_object_get_set ((GObject*)object); - if (GTK_IS_WIDGET (object)) - gtk_widget_destroy (GTK_WIDGET (object)); + if (GTK_IS_OBJECT (object)) + gtk_object_destroy (GTK_OBJECT (object)); g_object_unref ((GObject*)object); } @@ -82,12 +188,11 @@ int main (int argc, char** argv) { - g_test_init (&argc, &argv, NULL); - midori_app_setup (&argc, &argv, NULL, NULL); - midori_paths_init (MIDORI_RUNTIME_MODE_PRIVATE, 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); g_test_add_data_func ("/properties/app", (gconstpointer)MIDORI_TYPE_APP, properties_type_test); diff --git a/tests/searchaction.vala b/tests/searchaction.vala deleted file mode 100644 index 60dc81a0..00000000 --- a/tests/searchaction.vala +++ /dev/null @@ -1,46 +0,0 @@ -/* - 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 - 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. -*/ - -/* -struct FormSpec { - public string html; - public Pango.EllipsizeMode ellipsize; - public string? uri; - public string? title; -} - -const FormSpec[] forms = { - { "
    ", Pango.EllipsizeMode.END, null, null }, - { "
    ", Pango.EllipsizeMode.END, null, null } -}; -*/ - -void searchaction_form () { - /* - foreach (var form in forms) { - var view = new Midori.View.with_title (); - view.get_web_view ().load_html_string (form.html, ""); - Katze.Item? result = Midori.SearchAction.get_engine_for_form ( - view.get_web_view (), form.ellipsize); - Katze.assert_str_equal (form.html, - result != null ? result.uri : null, form.uri); - Katze.assert_str_equal (form.html, - result != null ? result.name : null, form.title); - } - */ -} - -void main (string[] args) { - Test.init (ref args); - Test.add_func ("/searchaction/form", searchaction_form); - Test.run (); -} - diff --git a/tests/speeddial.vala b/tests/speeddial.vala deleted file mode 100644 index 513f0b50..00000000 --- a/tests/speeddial.vala +++ /dev/null @@ -1,92 +0,0 @@ -/* - 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 - 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. -*/ -string get_test_file (string contents) { - string file; - int fd = FileUtils.open_tmp ("speeddialXXXXXX", out file); - FileUtils.set_contents (file, contents, -1); - FileUtils.close (fd); - return file; -} - -static void speeddial_load () { - string data = get_test_file (""" - [Dial 1] - uri=http://example.com - title=Example - [settings] - columns=3 - rows=3 - """); - - string json = get_test_file (""" - '{"shortcuts":[{"id":"s1","href":"http://example.com","title":"Example","img":"a2F0emU="}]}' - """); - - var dial_data = new Midori.SpeedDial (data, ""); - var dial_json = new Midori.SpeedDial ("", json); - FileUtils.remove (data); - FileUtils.remove (json); - - Katze.assert_str_equal (json, dial_data.keyfile.to_data (), dial_json.keyfile.to_data ()); - Katze.assert_str_equal (json, dial_data.get_next_free_slot (), "Dial 2"); - Katze.assert_str_equal (json, dial_json.get_next_free_slot (), "Dial 2"); - - try { - dial_data.save_message ("SpeedDial"); - assert_not_reached (); - } - catch (Error error) { /* Error expected: pass */ } - try { - dial_data.save_message ("speed_dial-save-rename "); - assert_not_reached (); - } - catch (Error error) { /* Error expected: pass */ } - try { - dial_data.save_message ("speed_dial-save-foo 1"); - assert_not_reached (); - } - catch (Error error) { /* Error expected: pass */ } - - dial_data.save_message ("speed_dial-save-rename 1 Lorem"); - Katze.assert_str_equal (data, dial_data.keyfile.get_string ("Dial 1", "title"), "Lorem"); - dial_data.save_message ("speed_dial-save-delete 1"); - Katze.assert_str_equal (data, dial_data.get_next_free_slot (), "Dial 1"); - - data = get_test_file (""" - [settings] - columns=3 - rows=3 - - [Dial 2] - uri=http://green.cat - title=Green cat is green - - [Dial 4] - uri=http://heise.de - title=IT-News - """); - dial_data = new Midori.SpeedDial (data, ""); - FileUtils.remove (data); - Katze.assert_str_equal (data, dial_data.get_next_free_slot (), "Dial 1"); - dial_data.save_message ("speed_dial-save-swap 2 4"); - Katze.assert_str_equal (data, dial_data.keyfile.get_string ("Dial 2", "title"), "IT-News"); -} - -void main (string[] args) { - string temporary_cache = DirUtils.make_tmp ("cacheXXXXXX"); - Environment.set_variable ("XDG_CACHE_HOME", temporary_cache, true); - Test.init (ref args); - Midori.Paths.init (Midori.RuntimeMode.PRIVATE, null); - Test.add_func ("/speeddial/load", speeddial_load); - Test.run (); - DirUtils.remove (temporary_cache); -} - diff --git a/tests/wscript_build b/tests/wscript_build index 28b8c0c7..58b2d8ef 100644 --- a/tests/wscript_build +++ b/tests/wscript_build @@ -14,7 +14,7 @@ for test in tests: for fila in files: if fila[-2:] == '.c': source += ' ' + test + os.sep + fila - elif file[-5:] == '.vala': + elif 'VALAC' in bld.env and file[-5:] == '.vala': source += ' ' + test + os.sep + fila if not source: Utils.pprint ('RED', folder + ': No source files found') @@ -22,7 +22,7 @@ for test in tests: else: if test[-2:] == '.c': target = test[:-2] - elif test[-5:] == '.vala': + elif 'VALAC' in bld.env and test[-5:] == '.vala': target = test[:-5] else: continue @@ -31,14 +31,10 @@ for test in tests: 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 ../katze' - obj.packages = 'glib-2.0 gio-2.0 libsoup-2.4 katze midori midori-core' - if bld.env['HAVE_GTK3']: - obj.packages += ' gtk+-3.0 webkitgtk-3.0' - else: - obj.packages += ' gtk+-2.0 webkit-1.0' - obj.uselib = 'UNIQUE LIBSOUP GIO GTK SQLITE WEBKIT LIBXML GRANITE ZEITGEIST' + 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_local = 'midori-core' obj.unit_test = 1 diff --git a/toolbars/midori-findbar.c b/toolbars/midori-findbar.c index 3c617956..548b546d 100644 --- a/toolbars/midori-findbar.c +++ b/toolbars/midori-findbar.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2008-2012 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 @@ -50,16 +50,27 @@ midori_findbar_set_icon (MidoriFindbar* findbar, GtkIconEntryPosition icon_pos, const gchar* icon_name) { - if (icon_name != NULL) + #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) { - gchar* symbolic_icon_name = g_strconcat (icon_name, "-symbolic", NULL); - gtk_entry_set_icon_from_gicon (GTK_ENTRY (findbar->find_text), icon_pos, - g_themed_icon_new_with_default_fallbacks (symbolic_icon_name)); - g_free (symbolic_icon_name); + 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, NULL); + icon_pos, icon_name); + g_free (symbolic_icon_name); + #endif } static void @@ -86,13 +97,26 @@ midori_findbar_find_key_press_event_cb (MidoriFindbar* findbar, else if (event->keyval == GDK_KEY_Return && (event->state & GDK_SHIFT_MASK)) { - midori_findbar_find_text (findbar, NULL, FALSE); + midori_findbar_find (findbar, FALSE); return TRUE; } return FALSE; } +static void +midori_findbar_entry_clear_icon_released_cb (GtkIconEntry* entry, + gint icon_pos, + gint button, + 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 midori_findbar_case_sensitive (MidoriFindbar* findbar) { @@ -118,43 +142,16 @@ midori_findbar_find_text (MidoriFindbar* findbar, if (!(view = midori_browser_get_current_tab (browser))) return; - 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); + const gchar* text = gtk_entry_get_text (GTK_ENTRY (findbar->find_text)); + midori_findbar_find_text (findbar, text, forward); } void @@ -168,7 +165,7 @@ midori_findbar_invoke (MidoriFindbar* findbar) GtkWidget* view = midori_browser_get_current_tab (browser); const gchar* text; - midori_findbar_set_icon (findbar, GTK_ICON_ENTRY_PRIMARY, STOCK_EDIT_FIND); + midori_findbar_set_icon (findbar, GTK_ICON_ENTRY_PRIMARY, "edit-find"); gtk_widget_show (GTK_WIDGET (findbar->find_case)); gtk_widget_show (GTK_WIDGET (findbar->find_highlight)); gtk_widget_show (GTK_WIDGET (findbar->find_close)); @@ -183,14 +180,14 @@ static void midori_findbar_next_activate_cb (GtkWidget* entry, MidoriFindbar* findbar) { - midori_findbar_find_text (findbar, NULL, TRUE); + midori_findbar_find (findbar, TRUE); } static void midori_findbar_previous_clicked_cb (GtkWidget* entry, MidoriFindbar* findbar) { - midori_findbar_find_text (findbar, NULL, FALSE); + midori_findbar_find (findbar, FALSE); } static void @@ -210,7 +207,7 @@ midori_findbar_preedit_changed_cb (GtkWidget* entry, midori_view_unmark_text_matches (MIDORI_VIEW (view)); if (g_utf8_strlen (preedit, -1) >= 1) { - midori_findbar_set_icon (findbar, GTK_ICON_ENTRY_SECONDARY, STOCK_EDIT_CLEAR); + midori_findbar_set_icon (findbar, GTK_ICON_ENTRY_SECONDARY, "edit-clear"); midori_findbar_find_text (findbar, preedit, TRUE); } else @@ -251,10 +248,12 @@ midori_findbar_init (MidoriFindbar* findbar) GtkToolItem* toolitem; gtk_widget_set_name (GTK_WIDGET (findbar), "MidoriFindbar"); - katze_widget_add_class (GTK_WIDGET (findbar), "bottom-toolbar"); + #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); @@ -264,7 +263,12 @@ midori_findbar_init (MidoriFindbar* findbar) /* i18n: A panel at the bottom, to search text in pages */ gtk_label_new_with_mnemonic (_("_Inline Find:"))); gtk_toolbar_insert (GTK_TOOLBAR (findbar), toolitem, -1); - findbar->find_text = sokoke_search_entry_new (NULL); + findbar->find_text = gtk_icon_entry_new (); + midori_findbar_set_icon (findbar, GTK_ICON_ENTRY_PRIMARY, "edit-find"); + gtk_icon_entry_set_icon_highlight (GTK_ICON_ENTRY (findbar->find_text), + GTK_ICON_ENTRY_SECONDARY, TRUE); + g_signal_connect (findbar->find_text, "icon-release", + 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", @@ -334,13 +338,13 @@ void midori_findbar_search_text (MidoriFindbar* findbar, GtkWidget* view, gboolean found, - const gchar* typing) + gchar* typing) { const gchar* text; gboolean case_sensitive; gboolean highlight; - midori_findbar_set_icon (findbar, GTK_ICON_ENTRY_PRIMARY, found ? STOCK_EDIT_FIND : STOCK_STOP); + midori_findbar_set_icon (findbar, GTK_ICON_ENTRY_PRIMARY, found ? "edit-find" : "stop"); if (typing) { diff --git a/toolbars/midori-findbar.h b/toolbars/midori-findbar.h index 7a7ea194..e5871732 100644 --- a/toolbars/midori-findbar.h +++ b/toolbars/midori-findbar.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Christian Dywan + 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 @@ -47,9 +47,6 @@ 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); @@ -58,7 +55,7 @@ void midori_findbar_search_text (MidoriFindbar* findbar, GtkWidget* view, gboolean found, - const gchar* typing); + gchar* typing); void midori_findbar_set_close_button_left (MidoriFindbar* findbar, diff --git a/toolbars/midori-transferbar.c b/toolbars/midori-transferbar.c index 81ad85a5..bbe1bfac 100644 --- a/toolbars/midori-transferbar.c +++ b/toolbars/midori-transferbar.c @@ -76,11 +76,17 @@ midori_transferbar_download_notify_progress_cb (WebKitDownload* download, GtkWidget* progress) { gchar* tooltip; + gchar* text; + gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progress), - midori_download_get_progress (download)); - tooltip = midori_download_get_tooltip (download); - gtk_widget_set_tooltip_text (progress, tooltip); + webkit_download_get_progress (download)); + 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 @@ -89,39 +95,78 @@ midori_transferbar_download_notify_status_cb (WebKitDownload* download, TransferInfo* info) { GtkWidget* button = info->button; + GtkWidget* icon; - const gchar* stock_id = midori_download_action_stock_id (download); - GtkWidget* icon = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_MENU); - gtk_button_set_image (GTK_BUTTON (button), icon); - - if (webkit_download_get_status (download) == WEBKIT_DOWNLOAD_STATUS_FINISHED) + switch (webkit_download_get_status (download)) { + case WEBKIT_DOWNLOAD_STATUS_FINISHED: + { MidoriBrowser* browser = midori_browser_get_for_widget (button); - MidoriDownloadType type = midori_download_get_type (download); - - if (type == MIDORI_DOWNLOAD_OPEN) + 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 (1) { const gchar* uri = webkit_download_get_destination_uri (download); - gchar* filename = g_path_get_basename (uri); + gchar* path = soup_uri_decode (uri); + gchar* filename = g_strrstr (path, "/") + 1; gchar* msg = g_strdup_printf ( _("The file '%s' has been downloaded."), filename); - KatzeItem* item = katze_item_new (); - item->uri = (gchar*)uri; - item->name = filename; + g_free (path); g_signal_emit_by_name (browser, "send-notification", _("Transfer completed"), msg); g_free (msg); - midori_browser_update_history (item, "download", "create"); - item->uri = item->name = NULL; - g_object_unref (item); - g_free (filename); } - if (!midori_download_has_wrong_checksum (download)) - gtk_recent_manager_add_item (gtk_recent_manager_get_default (), - webkit_download_get_destination_uri (download)); + /* 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: + case WEBKIT_DOWNLOAD_STATUS_ERROR: + icon = gtk_image_new_from_stock (GTK_STOCK_CLEAR, GTK_ICON_SIZE_MENU); + gtk_button_set_image (GTK_BUTTON (button), icon); + break; + default: + break; } } @@ -130,8 +175,37 @@ midori_transferbar_download_button_clicked_cb (GtkWidget* button, TransferInfo* info) { WebKitDownload* download = info->download; - if (midori_download_action_clear (download, button, NULL)) - gtk_widget_destroy (button); + + switch (webkit_download_get_status (download)) + { + case WEBKIT_DOWNLOAD_STATUS_STARTED: + webkit_download_cancel (download); + break; + case WEBKIT_DOWNLOAD_STATUS_FINISHED: + { + const gchar* uri = webkit_download_get_destination_uri (download); + 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; + } + case WEBKIT_DOWNLOAD_STATUS_CANCELLED: + gtk_widget_destroy (button); + default: + break; + } } void @@ -152,9 +226,13 @@ midori_transferbar_check_size (GtkWidget* statusbar, for (list = transferbar->infos; list != NULL; list = g_list_next (list)) { TransferInfo* info = list->data; - if (midori_download_is_finished (info->download) - || webkit_download_get_status (info->download) == WEBKIT_DOWNLOAD_STATUS_STARTED) + 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); + } } } } @@ -168,25 +246,32 @@ midori_transferbar_add_download_item (MidoriTransferbar* transferbar, GtkToolItem* toolitem; GtkWidget* button; GtkWidget* progress; - const gchar* filename; + const gchar* uri; gint width; TransferInfo* info; box = gtk_hbox_new (FALSE, 0); progress = gtk_progress_bar_new (); - #if GTK_CHECK_VERSION (3, 0, 0) - gtk_progress_bar_set_show_text (GTK_PROGRESS_BAR (progress), TRUE); - #endif - gtk_progress_bar_set_ellipsize (GTK_PROGRESS_BAR (progress), PANGO_ELLIPSIZE_MIDDLE); - filename = g_strrstr (webkit_download_get_destination_uri (download), "/") + 1; - gtk_progress_bar_set_text (GTK_PROGRESS_BAR (progress), filename); + gtk_progress_bar_set_ellipsize (GTK_PROGRESS_BAR (progress), + PANGO_ELLIPSIZE_MIDDLE); + if ((uri = webkit_download_get_destination_uri (download))) + { + gchar* path = soup_uri_decode (uri); + gchar* filename = g_strrstr (path, "/") + 1; + gtk_progress_bar_set_text (GTK_PROGRESS_BAR (progress), filename); + g_free (path); + } + else + gtk_progress_bar_set_text (GTK_PROGRESS_BAR (progress), + webkit_download_get_suggested_filename (download)); sokoke_widget_get_text_size (progress, "M", &width, NULL); gtk_widget_set_size_request (progress, width * 10, 1); - gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progress), - midori_download_get_progress (download)); + /* Avoid a bug in WebKit */ + if (webkit_download_get_status (download) != WEBKIT_DOWNLOAD_STATUS_CREATED) + gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progress), + webkit_download_get_progress (download)); gtk_box_pack_start (GTK_BOX (box), progress, FALSE, FALSE, 0); - icon = gtk_image_new_from_stock ( - midori_download_action_stock_id (download), GTK_ICON_SIZE_MENU); + icon = gtk_image_new_from_stock (GTK_STOCK_CANCEL, GTK_ICON_SIZE_MENU); button = gtk_button_new (); gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE); gtk_button_set_focus_on_click (GTK_BUTTON (button), FALSE); @@ -213,6 +298,8 @@ midori_transferbar_add_download_item (MidoriTransferbar* transferbar, 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 @@ -224,8 +311,13 @@ midori_transferbar_clear_clicked_cb (GtkWidget* button, for (list = transferbar->infos; list != NULL; list = g_list_next (list)) { TransferInfo* info = list->data; - if (midori_download_is_finished (info->download)) + 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); + } } } @@ -256,7 +348,11 @@ midori_transferbar_confirm_delete (MidoriTransferbar* transferbar) for (list = transferbar->infos; list != NULL; list = g_list_next (list)) { TransferInfo* info = list->data; - if (!midori_download_is_finished (info->download)) + WebKitDownloadStatus status = webkit_download_get_status (info->download); + + if (status != WEBKIT_DOWNLOAD_STATUS_FINISHED + && status != WEBKIT_DOWNLOAD_STATUS_CANCELLED + && status != WEBKIT_DOWNLOAD_STATUS_ERROR) { all_done = FALSE; break; @@ -281,7 +377,7 @@ midori_transferbar_confirm_delete (MidoriTransferbar* transferbar) } if (dialog != NULL) { - if (gtk_dialog_run (GTK_DIALOG (dialog)) != GTK_RESPONSE_ACCEPT) + if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_CANCEL) cancel = TRUE; gtk_widget_destroy (dialog); } diff --git a/tools/midori-dev b/tools/midori-dev index 95f9ebdf..2b6ce7d5 100755 --- a/tools/midori-dev +++ b/tools/midori-dev @@ -19,7 +19,7 @@ LOG=~/.midori.out #----------------------------------------------------------------------------- -BIN=_build/default/midori/midori +BIN=_build_/default/midori/midori BASENAME=`basename $0` ulimit -c unlimited diff --git a/waf b/waf deleted file mode 100755 index 212113dec324b4d3441bdbabac937059f00c9217..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 92452 zcmcF~by$?$`YtFcsF#Fv=)f>AjC4u&0E6UE0wOuU(4EpLAuS~#ji5A0OE*Z1lz>P{ zcb|9g`@X&R@3*gW{yJPT^UiwLdg6ZWbw6vE5lqYGm_eNE>^v-->>TWO@6yrH-9@5| z(GHIGXhSDQw2d{$z}gt(k+__fxR2Z#Kzvrff?k2b~FRo*k3=} zI62<60(_dFjSMgbm_Y{iD3C46-U{vLh%yG*+S@pzje!eCGXqE90R}a zSR11;iyZD^7FnSj1@7MEU6 zjzCSXb9HpMjtFq-49qkE?)?GT!N$bV1ye)m2V0a8h84g%G=?ko7(Q74VTOYP zP;?+9HCcozNL5K%O;a2R2Pg|tMk;9_q~KB@2`!MCEF2`Rt|qI51ks7B0(a>^;)+th zuNDaYTp0;hRRt*_?;;eGCFRwn5Q;L)APIFfkfM?rNFJep zPy?o^DKTFg{%hIYe=P$kNrM#NNJ&}1ins(q9-*dn?N1t^rik$+4a6Z1QWi(5Atcr1 z#gQOob)>SADi9+Qepd>iDk(3HP=HIZ0^R|SAh-rxQ4ORjD=shp@0m!zfl$OHI%mw^89LQ80sl^Or4U$w+RE4Xk1CxN8 zASrPLaT&PkUFiQKaR6OObtGH?6B&@Ls=9=#8bVE74Gxk~Qj)rcQx%TXKuE$>1wryk z7=Wcg>Z)*Nz=N9jwPU~p00?j!2tq<#6>$v>LQxHlM5-&RA(RxE?#e1@0?7k0iUUhA z^^yW9DPETisHhTB3u6?6!8OFpAWc~~Fpk8)24tm%6vu#}s)j^JVygDfG{B#l5>gHH zuN*;&a2a`o3|vtXj)_JIV?`683TFZ;f&e0u0U*70t0@ln1b6`W#c&FU>d)oBaSy;3 zs22z!4HB2q0BisuUr)XZR9F@97aM>fRdq?(zu;!QR?oX=D_a|TKwbb@bZ~RHiw301 z&4JYn9DH;Dj;a6|<%Jm;?@DqAGlF5jGbiv2VZ3YPVhj?- zgk_3y1g-(U<~Bf_*F&}jj%KWwmv@0}CN0e9Vqn5}*BE62GK9J^0r3M8?qqKba=p&; zKT#85cg0|aLG3Qy-;22z@8bR2@_*I?kYM@(;QQJ-%HAGog|QC^kF_Hd%J_nvi%W-} z!|EDx0T9IDdVt-E5d;BQF#$+ne4|{^j!=%jOgLHF8W>sV0RbDM?V-Rg#+(TzD_fK` z6f@nx-qcx#U6+~B-jETnU4Sp%|Bj^05E{`f%!l{{~jW( zFvg&eu<*6P>j*J(Ij`p$0;yQs{jbKjfC+zG1CKf!0xTT5K;pKR21Y2TAykrsi5U|q z#wgRjk8}PtZV!y#1uXyBUJho!>BJJ~=LYsB0G@xi5Bf98YH#Iek3wCS>2KD90Aa># zFagjt{jawQkQ;D*0l8xKkq)Dpjg6%PBQuDR%ih@5z~0e~QTG}xfXY?|7QmUv-T{i? zF2*b{>u<1u6|NY{{MlUpxB+Zmmrl~a8dJFwcTcD1Nj;x06oWM@N6!n^pz&JCb z%QX!hSut%E1qBetpwDV#Y2$FcFRo`R+F1XE91t#M`Cn+V{%z);yf8>$)CG9LL;(=q z5oHBsG<33dN856O{)7O`{x4=29WndiZ}Iudz@Ib#efYBmu>4^liGnA19a0&s=mxkBzIXKx~i!yNbvjub&I5}a&^k3BnDDMbt zct?8!BS%1r{u8PHH%G4P0-SmO@Z;a8;R=@5W_ef_6nY07JHaU$X)u|FGoWSaS{cwIVvA92~Dn1QZlgR*YUd z0H?|SN^mA7LCoPAqs+jxYYjIrbih3S#l!zW{XaFj_G5y!Hr4|O55)-2^*K}cI*Gr; z@-CjC0nq>c)f<4QF|(lm(+_6wdiR5kQO*w6Z%62XCIFm|06i7H&IVZWS0lu99w_6V z+nD`~(G3jzE~3@kA(Y-}C>2-!b5pq~Kl{!0>n zV}e-;v_K#rM%KTB0p#T`0t0&OhQRI0YvdnSbu{0AHV`J{n^%c@&0!U{^!5|EWLXdK>CmGf06Dk#`tw8e{TM}Y%|@( z2;QHY!1y2aXS$2&>HiG=(+QaFVp{y)`_lzzJIo-H|Jae3lbN0#hDCaM*U;$cSpjWX zPmd8`{$HC_)yN)g>j-q}yLkUxvI2SpbQ?gS0oif^wCkT*{|On84ovU93zpC}-97)FORXk7sN*;P<=f5pjSCf-A_G_mZXh({gO9iFF#jZ0>xx8C%r+;YKAG(kNWNx3NDbQ?tEgqxtdW z1`ZaV4;D5E+Xsn_h4l?K5;fIgZ7qOKu9Q-8K-OvG+OejK6FF3^V6qfp~ES6)t84{9`+k6zrKJWH?=?D zB$!VPmZ!gZ(EQkX#w=RUa;-S%;Lu{Z%R*e-X9S8C-w?Ks<66+2d zOyulQb!9coGxddzXZ07)qgsu#Mes&47*gK*JI++NaWLIR(`ueaeB;-T{VwVw&&`6B z^_fk){>Jat!dsqo{i`;y6E?L)TXm_z)En8EvFk*iJ~qtRJgwRWLmn%1Z=URSHm+Az zjZ<{bY|MTv^w1rd-RmbyuuXwRfblRz5&Q!}-*BZ?prP|8`zZub|>;er; z2Q3kn_cnaKS)DAjSNF}dv3Yo+*n^8cBMJu$^C2b@SM;qb^r8O1l5QQUYraJ@F=s7u z@{xNprOw)9Iyf_JXGW^X!9}-EocpMXq*JkK&be;$)3GpCb;`S!KIKzlopU@xhDSGM zQUsh`DD#}-Ti5xH>L0l{S|TQu&wdFo7HjQd$x=2nQ$M3A7>w<#S^l)H^y#Sa_F<=j zZdjFvbL30Dw45!K&Ay1Vjm{f;(>@R8T;8C59b0U9Gz^^8%nW==U~#FKE^M514UQ0D z)b*(HY!zPed93V%#q+W+MSasg=drHa{ux2L|AdKl{ceWCOw2c-I)c|~w!9_FB{fdtF$>F^xDtc;Tj(s zJ}bDm$cXIWd%AS|9Q}0UV&nXa&F=GLd$rrt$jf%8?_^UV`*y^sO4Yj0z>wqvM=YAU zLD=R@-Ihz*CRN|bV~@=mmEoo8go2T7J~xYnMh!|cpJXf_oUd5YK8eX@4{?UFBvl!L zvWVLbC^&Big(pACeK?G#fP)M2Nyhn#^EHXvFbH?lJ&9XMwVS&+e`JV~((I-f78Xvj zREQt083C3U!RWqJe`X|FL0BQKU*VBdTN^spHv@p@hLTzifmDm}2%WiU!Ob2@cLHv1 zU>FM5|^wn;VR{AAB+*KqpOpXu@AL1Hzdze)U2vqmN(RA!k-^$7k(zBTs;jHtxlBxtyLySd z_%UmHi1ld!`#?b zjdxx zqszE>SYjcPV2Hi}y%jAXQDXkkdx?nGyj?x9w3)dk(b&?@Zp$Vc;aDd5Cgqz*T22yj z#`v0agCV!u9-@t-3%~?lDB_56NfJZBFbeuuD~3=NLT;$xP&nEElp@ZQlWY>yR$(?| zsX`vY35FqFGxwQEVxSAySs&geYd&>^NEoceDOicoH0rfR2s^ z^h3j+w=scXuce};hG>~W*u`2(UQ6Q|@kse4wj~p_LOW!K(6Zba1sNl9%vM~akno6H z26L$)iUJ%QbSwviNUH5iP7)!g{0TzcqU??^1jC8r;_>_fqIsXuB}Qi(^1>+!=zPQzhk5W2$xLR6^4f?@l}rUg zZX-1$y*6|RLH~S&*$OAwhHWS#2r5ib-?cfUgW$lpP(}lgvov z1hq#vi~@~l^lKzja3^+~ zeT|mSx*eCSLhg?yMnJ#o=Zg8o+`B=JEDMZa5o1Rnjk!G!K0PBejvC^DKV*=9O9hV) z%`T{zl43#*YlZri7IMe5Nk=eDqPQqYO?o7`;Y>s^L6R)kIOgF2h$J{+sa#HOi>!n+ zl`K7Bc%gjaB!o`mA%utLeuM%~5+so@YWR6foQ08E5fUjsTGrK;+!2=y=PWal>rcu? z1>}z!@~Ts^lzwCSHoT+!!+esAphgoMlX5!}5g3u?$b%&cXu`qCeA#g)W z%b^$zlP{BDkX-s!{b9H`o-b~w2}fzH5!^C@8`)063)b)GYtIamvLMvYuV~{yM@hY> z;v6DOQs5v7sZcTN;Z}RCZ9>Eu1UFXYy(JwIk`&ib5g#D|hGeT{$Tyq44&sn_LYwr2 zH%5htG`yXA*jzlOOe-l`8k$VW0?A>(drM3oW5i5qL_*3%Kh6;$XHGw5(n}g4j-X^P zHtQwjRvWH(O-tNoA`ga{bVc=LNs*Uy6DL83!U#ASq_r6$qQ;x6c*NlqIYCK?Ku9bn z7lcPTFqRIHqhjeBdlN;)*;fF~Zeh4b*I`y7r6H$a2mmi9)oREhWx=FPsd6Lb26PB5 zpG7K9%C2UCSJnp)?@>`z$?W)IPCi*FZ>VOLJ;`B-rjKA~PmF^n<|1&w5PuzHG&0`L z1X@lPL0~qNMap7^V(=TXB*80^GfVDKeRfm+MteCAwpn&|pBcO$|0{Ex`4F6!z9oy2 zS;d$x0s+&ClO9$>-46&v#Pq0VOXYJ)Y4C5uWq;33 z(vJ9;J)9yvr9xWC6Yi^Q4x`P)Nx6?i7l0vBDYQ}&Ccwt>8{y4i;<=UBFlxZ59|DyN zDT_XD>iOy5Skd%)Ilh1KAw&v zQFYZR(KUF67kQliR_{c3pyaCd+_qX^@Tek>Y&KCxSWJuj%N66cX|uPHKDA$|U{g(h zL{%8?0_xRfx9Vz+^8N&;_oQMh;qNL?WuW)G=u)e|(tWho@2n}(=AbHt{Z>MepY=Ie zMDcXRS)^Kf$6D{+d%f%8mpqFkiQ3nk2`1aNq&t=q za`Z9fU-j!e+2juG#~J%2K5z>X-|J3AFnq#7EnUP?^d$shf7Pl}L4 zKReLOD$v-k^Ca0&jYQ8&o|wZV=dA91$m7HBU3AhM@19Y)_uiL-Y%Zn=?Mg(rKjm2* z+?s2yKR`oEGrpIU(cRzHmigIQk;ozH$+0r$@5ivjb$L5e%HSyH^#BFJvT}E^HxX<$g9_h8WuJ7}K#4Vw`!H#yOj^oVB&+W-%omx+` zX2P1^lb_bF>4e%-?sJVNC(bHg!H<>7N~7;&7rAynlNF{A?Hi;~9aIxgnu`nVoY_bZ zWezkc5%8qTFYSGDIBQZO<&YG@WSfV0vo5Eh{Jd&19cB%gomz_;rx2-dm0m55TV`um zUQ1w6LPRx5{CX;0u|atML}CmctntG9BCc?dyU)^)1bI#p|MF8#zqJ;D+|Vl?!Z703 z+d0qCk^{sq)20b`o?TI@t5(#TQYRtcbvMCWUIef3Jj?Tp6xz;?(SjR1udz1`4RV=IbGZ6R%GY+0#|Wx zI2f{YvjyS1|K14Our;DXg@9CYVUy%-6pS!5zmcHu_ed|cm{1ux`%=?Zj+*M^=xIbN zn^kD2Z;a@p7xkpIsAHN(A8m8?!9@?<4{92nhO=yfYmq1qg2setqxHoU7Qd^;iN`-P zJhcqjauVLE2$SDh%E$t}rY>K;NOtHC*8MhP+-KaNTtvKuKH^gDYE^CzVXJitR1FVK z$dYsIIa5XQBNVE4r{1b~P<~*mQs%6)<7~}6)!u=qNoiUwzF}S)8CfzIpU7=Cm@48B z;aE<^o)Vp$AIwP(>-?2?oFh<{hMsA%$X+|x|9WA0-}w6}tv@N4lOa_U|hXO&9Ws@v5UOrw&oX{ z7POa}GW!tv1jkiW``p&Zz`$Xt;v`b84EKnUcFTpcB;kB)@x%PXR#C_@(6KLZ^79Hc zZV{YOtpECQ{(7zZ+$&+>q*CqT>6qXow7g?}ZbI^KpDdb6g(VebKe;cmo0xei9bDbB zxY(hm`(>&VDjYb$I}&SsTCGs*5O^c!!S6u4d(9G$TU=KjYpbo7#hn&?Sb1G^u(z)8 zV>g6OauLnuYWSvlEWL@*J7z0yt1l!?U@+{vd2ff%($dIT)T*RYumRq^TIWbQ*>@}x z!swW8YK@cj{)>4w;*LLY5b! z(s!R_-o%eb&do}3eyo-9XTza9;$C`Y`)*#e25XVtS(>z-v8@!r9=%k2vTS#wIPT}A zq8qp#)8^_CYoHV*+}@-ai8gtw-5M2m5;iliZ5(z+p8c6{1*%6lIXY@EcFgG|sQUZi#v${V zWOWaDx6ORT?D|kZ``U#nM3?ID^^W75>Eq%={jd#pyX{7U%Wg;Fv&rt@)rWY4Pw<(e z7xts~-yzuJplXL}zb0*3pN!?E)3i`VtN3;8w(Jh!JJu`&aS*DLM-FUi?HeSz_V#ul z{7NU-Gri6x;9J3CvBwX4n^4t7&6>Zfz%XdZBQ1Pp2GMU7SHZi>cMLuF`jnemcLv$Y zhn+W7%f>Ib2z!%~?rjoeq(+%YNK>?x*{*yoi^+5{D?6$eS0k+7s~{)yZg_BeQ{b(4 zHt))0LQj>ZDq?i^=e`R(>~S9K6EBnT1r3$^|7p zc*QYqr_BZ}hfUUnDY*>a5q}gS#b=Q47>URQ{8_?%bA;?DMfwI4@PpN#P2r#lG~4XyhSueWi_k2ps#I8cSJfHjKBmLW`<~*$^Z((26Y3r|@ z*dzxz>g$URdk3~b!xBbCeDSBINZSIrb<_FVe0Jpz=o!Pr4e@WcS*XapF>%XlPvpsu zksx#N#yf~?&3S*@3Wx8VE;UUPMI^^hx!y{?MDQ{Wo`lu@MeO&loWylg!iEe4Bf_du ze7ip^{e4ttdWhP-KUK*wkvF~E z!o+uYNBPP%sI@%Jz3<)_=Q&L*X_!t3e}X*jW#^rn{U{C!I~QZC2d{}j9k!FD7-Y*E zJyXj{x-96rNMATYU)c!`G>XPQj1Tcdr-l&B1SxD84jM%1d*z(edq=seqJig&jA_GV_R<${@zj?-NXxd_Um1I;Mna|!St#vi#ku& zCN2Z^tU;s%7)JQ3;i_&>^uhZ@@2M(_kJjOgX=zS<-{vU$+D?W2)e%idr{6_cb(euH zGx79|7r{he$f*Zw%m^X*@#g{E-b}(UDPC9S($#7=Y~9VIx(+I|HzR-W45^l8Z?yuS z8%wk-sh(_rzzkK!?BI{X##$3sVFx@A_u1z2?00VAxozgFQ^}$dVnGs8r;^CabgOQY z%O|eo);Zoo86oc5HqtE@%N|ihky57R$x?I)Nx{js&z8}FrCwZjKDj;tj@Gx!rInw4 zH0F?vk_E%;%nw2{@PvL3dxx%v?NeDiCvNQZLD4?U{0W@FaWW`sDsF>e+9KXDHLYq> zyruUtM<)kj9c{PYkC9OZiac5f2n>bMaMhL4$>z7w_xI$qYh(-Nn7+tiiTJ?0w_LBQ zzP|sWKhLYPvQ3)>DF(=OZ4L~}N^@!(o(!zrPbIE_IjKXkM0 za{nW_WzD=g+Y6dkj;Yd4V=#Y`o_50h_uG!qhimCI>7_r8A8)xE_%R)P{e{eI6gh7* zX3ftTMTv;sKv3!y%p1xIrFIv`Nf4wA1#fwnO4xJeovUS!KG__gJ^0>O^-^_=XMBG( z22mu$-xfnJvtAtG6>qHNuPEK!{vh*21o-~nO+q&dPSdx<+QiJ7USEmJR zZn+B1Hv602{&tZVbnfd)hi+NvGm0^=%FA=j6KNN*i5m<<8Q#g|+|Q35Wz;zlO@A=i z7K}bLP)c~xYM{^VAkg_rCkH@Qb9pEORJ+(|QZ=^1+E%g;zTf1KuYGUwRU z;Fv^%w_+cXPSGLl$I}kmn`AZ!LPP z@0<{Cqkp#Re-J04D;v5m(i~O3M-hu1^ZibGZTHs|A#zgpqdIQp9R0TEA|p{J=7)9DS)C0G)7s+2hWT(P&GtmO^ex+5DfOyNfFYCYqcUFg8#_|P z{GWefb+dp4E;>cKPm{}pj261{;^bgl#BHsWDw|FY?sG$WQck2No{2x6y*7 z1^czRHx@cGzDaF=kqQVW>w~vLD5vh|1uZu$e3VOvkB>p)hE)gwNg5SAFKjWj;7w2) zNR|Bj6l#EL?3?*`e3M1psCCnSbu>B@6Q~A5Oh|`ajKmt0ql|SH;>kI2lt*b)yPeY9O&#)(9-6|% z@8;*9?%U)W5=TX=a2mLdY2pj0&{5vB2N;S{&MBRD%vCDb{mDW!*0-`eF^erDB5Pn|$DteEIH)m(-xT zhEhzYgIk{Fa;e>yOZT|~G|z;04NTrg>=H$=PJkQKihn1|#Y^3nUWDd^@=K`?k;Dc; zM!oguvgyhQDK1k`j=h)ZxuTc1R|Eer3A-p?4ZSQO$OAotZmI_HM<;w9_vgRLL7ij=#y{0Sn8YEfch!%;9vUjVBD5+lil z9x%)_j*g3DaQHFOo5iL??&qhz7t0Y~hz@^|#S1bvDZIY20D<6cslJ&XNozkU8*^SNV>32Wa9~5Y)XVYSy3dxJjbB?|7DVbp9evt*Xs$vPgWY_M@3v z84Nj$u#mU=k))=yKaUU zTI0Oc*~CfFtv*S5_%fkcK?c}QyryiLMH(~6O`0-i&w+-DJ@GSGUYfnGQF~3)n)E#F zT-bYkW@c(%2;bGm`BJDpvJdo_^)n}yw8)4SmhIk^HjeSlXtFGAY&|;Zry5yMYpW&; ze~_Xa&toIOjDnCVZzgW3Bp*|OMkmOUTP4*#f&bD?XupFedb zg`9t;1Vc6yhjH!zx^n|Nhn-_##vieADa^_ghl^IZxV7cl;D;=|SxT8Oo|N##l||Jh z@?w0?a!!5yGlX?zUtrby9pkBajw}HaF+OF+SyztipxSmSj|)k#U82Ov8*M}FON-ml z1aS)pw*+G5(abLbBE6T!_ov>cc<&0ID=d1XT?#{=?DZ@AEC`@V^b3adrn5GkkFRR- zO~X!II6VrIL7wOSaqJ$ft_;||TLsYz3E${gL^CC7^i(Ek=uFMKzpp*KxjA%uk2Za& zu{z{ENZ#32hnqxxr)J-j{=R;JL;Z}!2}x63({n@eGX7S?^2^J5D{T&cjdCz#RX|XG zNf(xX$}Hc8Z~FDX%}gN8rz>#XS8OQ!=g>RVl{$G`%}~w97Jg|m>YQ&Rd`j^pDDEeY zw~;9=Y2bV}c;FZQ$o!6|e2G}>zC)~$v~SxdzHW&-2>PcCN>#AM!AgfPULx(9fXFc} z_aN`}(p%j@ZB&mF)_30C^Sp{W>%ISOf4!L+xr#S!5Dn>c+scnkU7s7Fq+H;ro$bkf z4u%AZ+tTA~mL21_Sdf=-#!!`qDMn9NEcN_CeEUE_G7Nl#28P-De`%h+Ox$EtS6<5W za_y;l%2=G%*e-84P`Y|wEQgElt?v9+9=@cS5ES#)*km%<(^opY=9)ae7nUeB5V>*QMI9L+5n*N>Ia0aGvt6Su&mqyx?<@0eA@%!Du3Rs% zjrH%#FKewYy;%^sA8tIrCgMxA>JJOi76=neBAQi4C#Z?9b9kh=pf&RfoQ&B?UVTHYri9e>Oe5r4) zvDmBjEPkl`TZHpq+^V%*x|L;}-eN-y;T}O{tXhTl8%9xw!Y;yZoh@ z(D?>|l{emlVGt4>0hNoH%jp-=Qd5)8nfFt8N5)E~$|n6)bL2VEOBc3NM_m@^nq|?> z%-IN0Jh7D#AwDs4a_6@+Ur+OmvmKp}KHHx4_AhN*kn?YdOvm5U4WXgpThVJiF%zN3 zZ#m6w&|xl5p#AID4PPf{%`^aeJ4zx+GlO^yYDv2>VRyW};~%=YqD&5|~b$$GI_ zko>xrPPh6}F)>79t9M{PmDiY*KP-VKoLaVf-m)c8Wj*!Ba6a=L3&UV~C;G-ux$-o~cA;O{oAaic3NezgCx8+TurIv{>L zZRCfO{8j5*2>yfT5f|w_lcUF?^k#2aaarAt6XzZ=S;amL-&_3d9XM$5hL(QXCNJ%s zId<<$;etUNqY^(lgM*ua_7^pDu!7@*EKM8FxwoeouEx7r%gDY*@YGM>#aH6k6XdRh z%*sJ2`gxa*2T~j_99c@Lz{`un-|lUn2HtRy!(YfH?${fqZ(b&Kv3U8_WV9h({yQVS z_q`ey``wwY6MkI!Sb-%%?tnYqajxtiB&~=8v)ETY-ZFV5^77r*=93*+SK=y(68*Bc zQWbb8JV^V#J~X3*e|65g_-SLk$5Q_V>A9u+<$JCa^J=tfL~p*x zpY!kSue{?~-5hniK`LOAyFgWvrR-T!jC3asER=lxwOLZ=;P`h5sY9(9T!cv;m%-T1 zvD@@rMyM^@l_*7o`9SGT0+pQ>dJ1n-sl|Z1%zV`_#sATrnB?bo2%{M!Ezw8KDjf_o zDR{woIEgeoa#4*;CQAC$ktq`Ie+L`GhiKl?fHZujYV=ASCdMsiPESjBCe+iK2J49u z$w#9L zuMszUVD>h_H~(>-BngU>Ba_>yL&mZA_ZM^hn#!^XU=FdknoNqtd9RB%r4`%2 z5QK8GPp)cNqSzOMH6JZx&`=Vy`7N2P5O4fKPcY>E*ZalPkLuQcbL=f8B)$9uOSm;` z;G>0=3GH^Ae17XSsCDf92uA=%Q2sh7+X4)E8z}yS`=0Sbc5_^l6}5GOXpe^t1~ss~ z7D?3)a{gnCnfFi&hJK&HkTx4Hf!{fAG-D>Kr#_y1l}i4|lcvM!P1r^4cWhcj%NVkDr_e|}cA1*<&w6J!kyPL5eJ1&h))lQQe>%^@O<9pndjRJsOZNaxsL+)t}M9%JS!m| zHt6t-xf1P{c-T`fZHKso0v~z@FPuIvs(VSaMhCuWv2#|=KjlM>6Tddue40WS`PtWt zbaYyhxFo3!od07KjcTd(_^!DVqssj~%uDzYf9?YHw>@&~OPZ(mb9aLl?4zPqp^oOJ zihjh1XRb7E9=(&OW!mq8$;L{X`w;B$eos7C%9_c9v zX&#AB?|Wr;48Gfj_Ll1C^9?d^(l0to*?D6uJ|w z_xKrxo8Ro+lVh-cQAqk#qPysWT@1;TVc=_cbf|(s|JQfb6xlk~?C-On@52eBE8--| z)QK`CjZ5lV4E5h)zo-$FrYag%ff&$<`-$h*WDdkqddAHXPV{w-p znpLtFDEvM=4-6R{vAk;KNnz`$?aJt5|H!OhqG3bsebf7%f{QMFgFF}_8_=3DY%quq zDkP3P^6tit<9&FiyapFHxW*fo7ugg4abb*3P$7Fpg1w%2qnw~JQ+ROhWdT(B;{j82 zqO4P;yX%-3{R8_7?qpYMV`~17H_UZs;8f7paHVPvi+xx5ClOhcmny$LRxn(uw5Z^L zXUC0nQTkm%r$5+$FE$;?f6yuaAvsnRzwpBC`}W+jpAu`;plj|HWwhkzx9NaX&p@Fw;(NwGnh zrl(I#zo|h)tq}H6%MvF}O4Sr*$;dyg9a}YH4QG~IQhV^8KkloRuqxx(pnsaH2i;;G z=?+0zug23r9-?lrY04z=g(1t1x1(G8*QTk5r88Q$_nKX^m5n3`cf3*a8ygGkcV^}n z==t_}O=g^3d`!KP!@y-*tlIBD+Ha=eEF>WmhydfdUK29nq#L&s zr3b(9fBHdy#bn_I?%JBP%81}fY_p+E(3s0t(?9=xyY=(QJCY!_w{d3BmD4X2{^@4! zKi0RYMq+;9JR;U1n>lP5tQ!y&^*)iVSQ#c`y|_2+_`5%~(^>2Ck~^|lL`anG(K|KR z&G`WlW|CLuLVg9uaAlmm^p9_n@FdV)xBp%Zy&e!wge!o(Zr)|zrTvL>92pr^=UTO5g+o9N^ zCF+wEZtAg!{dBiG6FPT36^nR|i`?qro(Vnt<;p)BMPOI1M2{na6)L3UJ^&K0uYY+( zMou^Vt5likK96qmX>Ca}s}fK~Mb;P0kL#;bvX8(p;M1SOUzbAPQ0F(?K2CEB2Hf^` zshi6in)(oZG%xp9RQZw0n6h@pRF1!xQvU+qO0Y~`X|3Q>&*7B>;gY^qe+J(gvDk?f z9esgM!ws98dd>tPb#c{tqVoqDL|>n9e5#$^K4>tSzf~ByxS{ecocmcS_o@Y}idl6w z_E#{>Aw2R&;LV>mJos74~_xMhPj}NErlpItaD>!=K~Xdt?AY#t|FzF=aY*T zVvx3%k^~F~_YDS<44!9ZB}sl{DuT&n%B4@AUMC#S67_(c-Nk9|6AQ3ow@aGjEN(8wlPx z^o7&K%eha#s)?xSL*&)gv8lk2&Yz>LVTI#wsKK9vGT+9o!5&m&SJv+>>PHPBqtivp zwphThy_ym0LIsXoZ#XA!jb>7qaGXjxK%VR7P7k>ja`j=n+nk{+mi5;3(z z?KaI_h@1#UvVYb*89}WQ&>96$KYxANtkNtIY+v>k4EykMlR=xV9UhX=#kSe>u3M=f z_#v^HRh?NWXKJpOh5j+{Im|>H<0@^NAHfO^or`s)N%||hlerUnkA&%g;29Ox9fE0w z%St*Ta*0a^>pa!-J>kZqQoo>z=zCyD5ojk=moRv1V&=a0+!fpL;d8&avpqf>e@8rJ z)l=rU(2)G}Ak*A;Hd-;YVVrw)DN}J{4jR9vc5)(g*xqf#lw{sw@jZQDEBfP7lXo^ zuikrG^S8)-GH#aKE$K40<>ebSet1bI=rO=845qUQrXq?>5?Wp@e6dU}1NEA`J>*gT z;c*mqQ5yqlHK3uH)Nmzv#7kn}XG$TscNlV7Ux;7v0Y+Egm8A}|GIh)H=5 zo?=JpckTxTHNPtLmI)n<)9+=E9oUP;D#jmeDw9e{9z>@X)9TYJyf-y23kAWLdXSzu z(56qKy=OM(bCG9!=4y{Lkg|K&>0d(#XOG>on)=fxTk>e)6kaDxlShtz5;<92o%(&c z`m*_{x3v?g16Hn4PGQih4$vJ6~ z3;*7!m8yESdT4K?)U~S?YTAEb>ZwyxoVKUta3dQGq35G*H|)8*ZEc5Vr)p60#%=jv zN~kI8bJg>4_lnVBXh3>w0 z+qgKVWNwk@R$aWbm|Z_uw#jg%edI>{O?c@}6xl6iWqyfVu^Og}O~kKIz46GhrDW`j z?k>&r z*jN1Y`;zU!FNl!tkD&sISE)1fv~**S2RBa_omB1%!+UF_O~Ej6RktPI*=KL~+&Oky zr>t9KTVySu_&r8A<+Q6-)CBoP(7=0AWm){O_o>!}E+va4`-n;&1AjwXtZ8|EAH93$ z^)B>d@aF<9irjg;urrQZZff{Ix7(wlieS(VV?w?aBhUiFn%|2X!-<@|gAb~wl1^r> z2+X*?pS1q?(d?7%wfTy_5%&oABxvXfzO%gN41(vTxPH_n*804(_cuLC#>vK&@E`-vFfjT%|Uqz00 z*9xoSKRoV@WYk{~Hd@=e69GS5&28Y5=oIKN+UTzo@n#H^aDM)FV!6TMduOm^YSmDD zQcA+I)8*L8S%hO@II0^z#rcxPc^B1XUbsS?f3jRGvf&JdP^QGZ&#^lB-5Tw9`T_(o zoOs7FTsrPnF!RQu;Yd@w@Xb5dedDAbk7tWWN)#w@;5+BjS2yqIExZu$N`EC|<$@nL z;Yj^;vsh=E{ToxT>}1`MmFs0%f$NZ*8?oDokZ35$+BbTgQHIwJD2cbY zs-fb%0D-5Ds?|n{`m$!P@`OpVxt4Mg7(2fav9W$G)g^1QH#1{R+O z4cO0nkPy;E^U%96r_?&7Zc}tp;8oIEKx2Ct-l=&4@UiBto8p9pQs5V`A$KAEJAGZN zre4S0`RvuFuTHA0A83S-Hwe{<`0iPbE*A0^*~>`1Pd`3>^FD8KLUiV{kOKeaspNAf z{O=RlqFQU#+ICB^_guZE>Vgk`bdMakc-79m)7q;Y*kY+~dGVcGy3>5g5&nj$#xzSt z=6C!m$EJo&+nZ$QmkC0G9n{oTz|+I0)`PVTG^sjQY@xzl^>YteYDA+~fBqhN^C?{> zt+n3EOG%V50Sbm)S(mrzHGTGqHtvi%V^U8OwY;5hCNvlBb72-R9UeTE`cks{+_kc} z{|?C8fpI3(6hCt7MfdOuh;%r?wW&|C>n0OjznaROo>qqkeVb+<;q;Gh-^WtQ$guUX z7pBfpHmR_rXnH#F8@ocQPp}*%F>{(hv;I4{VHKCHb6|enVOA8**~>~@%M!M^Z|@+n zz>z@Ka4sy8h_&2i5etT0?%Z)aE|fu})~(h}Ok30H?vE0ZWw=DUqPH*7O-%#qch=9( zMEZEVdBlUwz$do0AOfDqFP_Se>+OAi2(-mg0{?mKl)oe3VE^I*tiQKP8JI;v8h(Z6 z+_=SlrdQ!{TF}3^NuztwxXp1?UJXpV=Lp7$R(u-dh{nRa;Z91X*wnp!dZtMU%5-Ni2BYb8dt>dEXl zaRTs2(13zKt46Kvd-m!P>QH_aG1m9Wu+K+)?pUMFNUEThoY|eTm~T#G(CyC~NgZYD4cmjGLq`)fIV|3&7OTQfB zz(efE+ooMEhYy4I47VmC-PQfP@n6tC&UF3Wk0YCHlo@wtYdawcjsu^@d@A+}BPHeN z7;&Tsa`}aXd1fS@K>Qxwj<-pcLLQZW+e#I!G$ShQgcOWASXAlsyM<34L~=H71ts8q z=_rN4BhuvZO8s7QzvNw~X9l;9s0duJ6zna0_%~~B->V}k<6k18=nG~2Fk5FhkA1ZM z*7*jM?jtH0KR8t?NelFaLaH%bT9$rXDF!k>yJi9WFHrwruSQ6flIBA&1etJQD22;F za{`qNCIumwLm;Iv!wjceu+v~-U^OP(npi{;v`MNAZ6p4hQOj`0L6QmQ$IQxmrTLDX}ZIX8AEMEZ}fj(kH6k@e_4 z=eaTcUyJ9O1bA%M@A*Uh7b44=@#%h#Tl@9r#)KD)v|QGG9UV74-Bfp$)uWF?xR2d{ zQHT;$@MKhR1%%VRIy}-ERlup|9o*i}lj>S=&yMWra3F)Y+Ry{zawdaP)9T{!8qS}( zcYN>Nr*`|bLmHu)3_Xk-T;S#oz$o+kKOUbBxBcE9htDI{9z);F{*2iVPL2N;x5G&e z*Cpw0_%F&npV8&?{an|?dinpF{*K(Q=}%Ygem;AJphzyB@WXSyVPJ*ZkaG`>Q)>kb zs})oMnVYnzVv71x{2BfQ^>2&I&C$j{)=H(y+Tm%|LqI;F^CuWBkAo``BP5Qr4kjTi zLk<*zQ*bO)0*ev`&l$~}V6DAnVhDtrVYaYRDP?e5NBW&fj+lkQl^DPji4saC2_Tis z%DHpXDq+@9yeJMEN|}tdmwr3JHd$0Fd}leQH4%D(uwYclh={Z>W(+*ja(Z57=aQ5( zPZ`1@VVGeAU|=#FGRVe5Io9I@=%FJjauzWdM}`<;@Bk?_SjLlb$-D z{15RTwhqIl+>Gov8fbCQzic|z_p#7pzdjYOA4lefk=GGpHm|>~mTr7gKtAr<+nU8V zDdmrE=Khc4i1>W-i2exSD!!H0K=@&%5tx`IL~cjXZS8&q2Ayi26Hq=&JpWIR+#SR> z+R5k{DYI2$O%<3v{;-zSO7>b6q>m8%v~87wi=TM(Il3dB*Mz&UI^q;JHk@tg=*+p|!AyS}CPobFzmY5A%ZVPKCba@HeQa94Aa-9WViNSHFti?8X+`m0hyC9ZkBj_b78Eytj$*JfJv0o z>JtH2BANvuO(sc@KA2w@r#i*Jr{T4oiKHPDH-xO9kh<9H722xkBPEfG;j3ykdb#2? zUCLut>)P%U%OfRd`0b$BBPHO+HMGLoRl3>l(`BTs25Uu0BTFD)1<7X^`)4^q%{|7q z(I1j<%!dJd$WNBcbZ_44E_Gqa$|=)YI%DKu+Geqzx0Cu2{XX>2oA;m+ByZ}gQBE`2 zM_8*FY{48H%(=wau9dbSmVy2Zu*|$Mv^5l`EU~w?YAs=X(D3K#uMTgA>HGfwd}|iw zZtuT){Rc<#Dp3I>paV%oAqZGWn-xTvr75X$`h2-Q{W=p(iXw<47>TzJywfX8xTV65 zDUM!Yq#dQ#5ySknxLEt4lP!}nAB&0;So-E-GOJ4X@w$AkB0Bg>CwgQuP)uXi84S?R zPDP+g;+Il(bN;>dLSXPvSt;s9a5P_kj|7%Cco<0X9IiC)KTR*l?T@jwjK_8vSGr}9aKM) zFZ|6jIqmJZTfUcKJmzA>1v(H$puZ0HbjnHwE+|4RwES(;s!gH^8vwOTZ zayVMX-L;?7|3gDv3j;ZC@9FXC9leN0J>2J~+8mmfLa{ik0V!% zLq$OH7Lvu0tH;YNrrQvEViXnWEDI~h@%01tpJB9N~U$ptO;xx%m^69#fn@ zt<&(QOBksbriTpZG&-NchKS=2?J~TfWKAXcvcW?OWeedjaBPLjDOnoU79JfO6s4$v zdTc>B>^NJYu4Y%NO*SWlr$MtZsF#^=JIOG{rwpW?LS}*EODGHubmM@VOLoj7C5BX8i*jH!#F;rbAhVPvV1rEYpX(Q`)lg;b9GSU>()Ki)FBTO zxK9fVmbd88#9^7N3rildt|_@gPJIuTITN^6MN)XTCvc6<%Urf;nUuA{nA}=rJSW=d z%~6#Gyrui*(kYh96I+=2+Z{ZdnrM>kYKCEgrJmVHq(%}sqsynKC%0Y>Qs$i;;!w;m z>3~)m!zfH(Y_5TYm@z$ivw5Z!Y6j$|D8r1D!kI96kTbqzamt*rFs4r&zI^rHbi65) zb19RQ(9F|juq+cv+&!{rr=^EZ2?XoGfs8bz(IYBQvl2(w+wjwm`=iuDzlI)$SRVnF z3CdBX(6ZAz+iF~bm?XQym_>ZvUb?~JwS#{Gr|vFTRLI(LtST57C7j;oSxvTaT^JN_N2T2X|?$Zqywz};Cf zx_-3IXQ(|bI_6#_6H>R2*KFChWpZL*DlaP!?D-zAYH}bSBsa{v{Ay98P>y0w!^uzJ zph^BI0z!{D>SayKwjLO3dR%qq=-==9yLl~wGsZpy7g zp|AT;?9lEtG5*cd|8Kpt8ohAsgg3PNc53V%a?4x;WF{E(E4*2?9WYw2bR} zw6o~C@uKUF(HOWFH;srx$~KpGg(h3$Zn>9MZ4xGAor*_%(c68UV$P4CUt; zCrnyG2iS4&5`g+^i8QW@2-1|DIV#-GOK-QL;}jhmTWg|RWTIaoCmNg=YxJhsxEjIN zUQRw3zsv8r4tlR}Z;Mn~TD0u%#Pjg+Hq&ccr;>IOm%|xme#0z7g_^qBYWB;7#MM@??;|B*nC4_$GJPEi#~wnTK*+HrKx>OCWAvS=ngsB?QOb*^LmJPFGqD(gbN z7Wk@1PLNt&UuTov!!X+O1dW2pBUjb=|x%$ z)%dXSzRp3uwHK#{=JR`xO%CFjA{_KlKKLa>aKYkDuO$H(k(HF8fK|}7I~IHtQLSZt z>=dvjL-IS!PkA!6)alUhnpR#>Th54;2!9DRROO^0S#GSFG1gd{`dSw&ev=!gLKY{s zYZhhF*-X`o$Z=_zhljyOvq|LsBPtAG;NB#{J2D>66~zBEw?P*|DLozYrO3+AsR=vcOTf?3<4__+C znEX0Cr~x6lxU8yCQ5zRakmYIDc1-|4oz@R7Z)iI_O}({VQ3 zKETZBT-Q*D=l8%&@L<#P-$MRr`=G+3!S%Q2W~GA(?S^*0c{`S|N5tv;v0)hya=PKP zl{tZjI6N7MK+{osZ?igjNc}?I?I^i}Fs*My9~0uhsSboWD=?f7Sje zL-}21ZT#gHo_!myv(|GgoV@4ExV~!ST=LF~B>_`Z4}gp#D$03rJKWvY8OHbQ1*T~0B22Phach&#D4t85B%x{<~NS5a1M5&8d9undjX#LeWdEE(4Y6!`K zSvge~cO$LCzmA7{Ja&Ee*wMAC2%%Mwog}Fg2~)TZ){MM<`&^_J*l|9t>^qkF+$cfg zdq~&R+n)o*rB%6-0}gJXWz*P8+3SFw`%;33?oB)GEcQBP!bGYPxP-;nAVC z8Zb|}B!p_`OS2V^=trTe2(a1U)AVb3Hyk99$tUv~B_wX2$mTpA_?s#Hvn$G|6{L49 z+j{7GXxsqJ5YDfa9iP|Is?~D)EKK$IqoL0R_clMt`E%aYxpht~%xriBU1}NiI5!Df}Y-18Z z7loCFa>}qeLrF7I&1-z}Tq^~T%Qt9{=U!pU*xW~_=_ibwag*LW+L_y#*oG$djuXX) z`kK=f<2nn89JDG=ES}?rkm9D#E(ov5clt)FK)W zIVaw|5s>QQu6pvOi~o7yvAX%|oT+z7GEHXGQpBOo2R++fRQf+@yBJ-POd> zR^9D;{g9r)E;%$JDLT&wVT63rj>&gjJl1udfC~-gebv-pzCV z*{wH)nA!(l_fMAbx$7e(o~*_J)w`bQC0fOx6MNkBhoE!DFLD5w>3AZko6ckzCZ?6d zFpc6uXFJdbYcU7kzq9~TUEWWsk`y6&^ z6`k)cW@@inX4k}D5nZCAXy^O=V{KmA+GC|m_JYdkVfRJ6577k|*NptK^J{IiaIpQN z6!MNEC2Nq(9dJVJ(l2MObVPJh&AN7Zeh!SoGk0s@+el`@0Md87Sv&T<`z~MQ#!ifm zJYR#EBFv$-tVOK$9i7M=i{0-`_Ms$NU?8?|V+ND=MtjMfy3>+%h#=)Y*A5mIvgSp8 zm@yJ>LDKsbu(#0UvNXQGIFetS&5^~sEF$ZrgA232ihS*kb~`CW*>Zu@kYr7H93u(@?=<;q!H(E@tz2 zd=7akwL&cQ0HCI6C^o%o->J5fHtQRW>BiysQA;AZf=Cq!alW=OJy>XGZ2thGj<)j|u#^1m~~x*;JNx=eYPB#2!mh#`QhlTL4H?y+XOl6*O#XjJgQR%H*+HBPB4r z+Y#1b_b-qg69&4lbDWm#-n=hSZe1fP3;0V#ZX1N#W)|DO*wlVYdS?M91&#=BrW~+` zT7MaX2rJ=dlQi4ih~byV80pnN)|x~JRgWYKl(LEJf<2-js+J&jy}`@~bOU?)b;9ce z2;MW@BydxjTQ2d|&SySwLXpRHQGYgwsxFHsefNR~t-8xo7;HDBa>@=BTQ-({0CvxgFN?l1o++(TsLQBPCP_NQ1!DfMKY)X%t4q zlp%Lv2_EMk&D}KY?Rd3|YxDHJGi=HpCEMvBryk6-E^fq*K<_5@NE;0x7GW-^3ZR(tl?JY=eM>ew;ka3 zBU7=~CmtGABc5;WMRAV0a%<5<^!RqPBjxpSegb+uu8y2*&K+4xs?yBt*8u=C?a8H@ zQNx7An&oBJFB={@9J8|D!Xbv`j9SHKs*LzqYo7JOE=tIK2H2~)A+~w!!Szf|u3viz zdLq3O8^j-sYILpWuL7!yNr?Iv%)L zf-s$vu2XpCvJ)I(7ZB;x+}q(e-Cld46EM(O7YrVth0ckDj4>QB2} zr%>vTeD7I~E;E$Ul?d^^RIy2EwA^L>*XXbm5_XDo826n7I3aTZ;^#52F6>Y?;eKFonKj{%Fa=l zR2s}IceX8)tI`#Ym9K89;VYv~!#5YUb}kYG^hsBPG#nULTq|YN`v# zx~SufK^J25URxOw#|!FovR*^05T?km%;n2aXcoO&L$k)aT@Y@4T88!nAOj5wy{@%5vJM zXsM()@aBpWf&6Ng6nCv zs#>^<1t@VMsJzp5#)Z&(JP234tg=sABj`D_QbQGW*WUM{p;+1^hV@5nxy6qoC4TOt z#ushf(F%*~-!-UyxoxKCiTQ7H-``Y@aO2s|+`UZ_Ne5x}O7e}a0iur08;hNm7)(OKAYWjk zWn3wccn~r)DHLbB&*|a|&7zm0@cYd^UHzFwPV9NCxCnUO8vSmzWwP}p% z8daE7NPM%h)((=WOffI-a^2r=3=m?_MG=VZ?@XNtp9L`R_{CI^_*^(LipZ)mSK7F^ zRzcY4^&0~tB^s0nPJ&aOtf67Gaxa+>t6TKxCw{od>Bgr}Q=aA> zPr0zCa5`XQ{Yw1z2)M4b8J^chJM^n#3CnZQti7M9`njO`N=739_qFxigt!qpN{gNR zMfviE$5z5-QMQo~Qjje=#0JF@(kAW+*lC+B^v5|q<%T~C& z*QrIBXS=8D@ zgIKgnlNLl$*E2>$tDh!`{ZUwLr4yja1#nq7I*nVIq(y+hLONw1FQ~L>=smOp>A}v+ z(i`K%nt2Z>@_nuCvGa!C%9`t9`Kdxy_*(ZFyL&}-O7~VuT=vlSJ{AdC&tZ6|+_y@~ z*6h|ZmJ`1+&B2{%xzy$|ex+!ur(~JhvRBPFCcV(4Hl9dV?@CsjoR3(GKmEv4^G zc*{!NntFr+_-1Gj2?nKMbTmTPTZRrtVFd{#xrBq4KIMTVMzZ>(^u18Bdi5Qmoh8%f zS8mCY4z}&K-u^1M*BUsyO7mIjw}XuCvo#wR`P+{Scbb9Q-<`Pf_>j07j-{c;hI>#t z&ayBC99Y~U{I!t|t>~xqCbkVz*tNO>r z)@bp5>l`!M(;t^}d-F~g%=}PbD|BRgZXQK0S z9?48bUaWTY@GIb-39?S92sjf5mi2RIu`bA{Yt}HU!lziZ#xYZ=ZNF7Q1hbyiK4D{1 z#4I*u(UmJ$%B|~^p9R$F^)`DY9u>|r0_IRFB&vmwIu^|tbHWkM8-a?rv>vOS_K_nc zQ5JiVwAKgT&tBLvY0Qz$pMSwklfrlaU&%v zfIDKNoU~=8-FjD0ud72l%%F2YL#Jah9$75v>ULPdltPO6t!6jWk7HG_3#n~kC##7}YLm2lUdYY%43s+y z`C;JETc>QqV&_jlmLk6l9YK~x`bqUiIt5#0caSwxbtUZ&s@mJxELEy`0od-j_@*+2 z?LqIYTD=fcP_ctuN#8gJ6o7nA_XoM*aem5*eXEX-w%x3_#LL1p`r^ii+I_EH*4Uhj zF#ORo=}qzCwV13fPO}{&Dkd#&%ks?M&f&!$&EYnUwvBc>2&u)R zKvi4uRG4|lCSY=khjfhW9N>LEmd*stNOb-(fgm`c)gvXNPTk1?Zjm`Rz*BR=Av8Jq zB?2m$m5A`UpCVqn-_IBp67@**C=X4su(;)fN?rfj%QoQ#`RqBqaqwtZ}u63vt!B=O1lgrjg;&538j(#Z9Y9@i#WL~1b| zS?k*fN0na(ugvSQZ7)J2C6^+S+qg!M+V=W(%NJ?w@7Im?lI=@<&u;R0BBSY}Mkg-I zJ)ms#wOi9`-D$`DiU@4G_K?CZmy6!tRh{`Bc&l}wc=HrHxoOj57Y-vO4`jHQ%~3?v zBPGim(1?jpRAmPcY6k{l_XU2w;r$6Vu>3!)I!%W1#EL`eM#5&GIGi z)f+Wg;7Z(dzbdRRi{IUfwyAr(VkwEVym&X5dF)>2B04NWbnf^a{9W{%JEW}|5z6A7 zq0W(^Z^uOrD=EA%XeY8Ggq6yBx%n{k?5QVoAz8=f`{s|R&kzQ&R`()fJzEIII;m~6 zI|nWiqVq&q!jvF7qj^y?**l}wi6J3zX!vyP=XNQO%Yy#XJe?zCb)3N>vcclxN*Y&W z+{B43r!wLsa?!L`9=GCb{UY=`^-O<6P1)Ec^1UO*s|N5!Eok0P^uy4(ckd?S(W^5x zCUJVbLFebi+gFZnIgUI||5V$J5@etvI^(=s|-EGXWpzT_jblK*ArOHdl?}#g- zeWW)JUlIGZ$B~8Y&1X9!Dp(vKSlmOA%Ap>?p3W@pI&5-T&~IIOyx-5h5+d3AO-=0S z@sq7Kvfr_^WTGy1jQ*V>aSO`NV0BcANFo)*t)c(-{kI{L4(?WmB{8xw`C9iS z&0-^JUekk65-;8B7Q3DpjH~An8c0`^@dR2+0x}_aV2vEq$VwB*JlKnA4D}~weON?q zH))VyNhnFZRHiWU`!v-Ut=3<{723ISFRyGvOF5Hl1ZKTmm-z7M>QC#-^tS#a|4rC> zf$fWS<*}HuzDA9;b=^GkIULO~Q4rX(EIM#lnPsf9$(uxAIX8 z(d&l*G!O726+Zw0>ToaGYMWps5h!k2zq&Ww2qu$@j}P=4a2y}crzJ`Rl1!O|Mj$9b zNGwKsfgqrKzj=n4?tHoq0oe(`&$_7kW))Bm2bEr6dQLe%$q7LkD)L-xLI8qx=Tr*? z(c+;=@#|M3qgZb!i~%Dm6v}GFYXjKk7mK94xp|MGTN2PS^S$(tc0wB=eGrLaLmF#A|~g9f#!vpbRy+A$&D*E<=LV zBPEEe9sVWC0+DPv8h>_Py|o7GV(U-x{)pL6LV;ERYcUiKWs0xJ$<670NNd=N$Qsbl z%$p^(;yJur`YQ1ILx?3e!Rv79YfA3_svC5ClQIzB*E;jMHH&9r4Wgp<3S*=$@(ppRazds@kCJLo}A1B2n(4m;jX6_x}r-GnycW|`~J z+=3^#ps;;Ezgp2B>Gt>3o}PY!lMS{9QzX8|}r z0xtv*!)%B$;B-L9hN9w&Nbt3{EmP2F) z1p-(62=#uy0Mo1lxz!SvmeISiE9;frCHlV9>@lK-kkjYQv5bm9;ljJ zQz6cZm#`tj3l;}tM$^@SJUGe4K1`$hzYm<|#(OV}-B8DIt~e%zE*8&ESm8XP0?yhy z@FU(Sd(T`Od`Y3fRh*@PZ0uy-uA0{LvHJdqyd=oJ5U%bCnLXlSU29bX(g!Zt*S28! zxzSb{;bvO*ZwK7Sl)<#>1dx-GsUpHkfr6FeN}pFffLU(9GZvU~OWh+SeWMUJ;#km; zgdi3=h_||I;e}-)^2Nm4-RoDV9+Ee<#A2lFBz;KzY(mRl%C@tDU~g$gXCS#nFu=Wj z=~(wWXG2XiZjE>CwA!?7({~IM&9p3Tc@#DQkt@NO`PNfL=eJGm(@u{p<+0ON!KQQh zEEq`=xiu&yMaUV=Nn^2;DGjyxCGAb@wsT0z%cCx4E+< zofWU%akD1aFnoI&(VlrVtkD3O43jcTdp%xlb{6Q%GWj@CAYBqWXUse!~wO#w(+Tr%LCEshB3RdQeq=2gqi*~$+_ni zxs>kiozoEiDTrtj>%L_Wc~<$`@Rl)$@j;%xjkFVYKYQ9ECDT;!T1@ikGC(UW&v_vn^QF(l8zUv|z6hU4 zj(U~FUj9+rEtfTx7oN55-tnY(mPgA5#mh0~n!+WlO8S1A)h(M@TJqfdMS#4#u2@~n`kwar>vcrCY8bS>lc+w2^wXvyclcwaCtnWUoaVyPcP(A>W$-DZtlYa|X`Y>W zK2fx^SCV=oC5L|YBPEDzDA^be+3K)KZ$qm_?b6rS+TL->tksU0-$pAH+pOuhxOYh; zz>w*OLrTQQ>qU*R1U4Ja@^oj>ygK@Iv8jDKu8uv*>K!iDH@}t}M`YX~(Q~kVj;}lK zeVY>%;1Yyhl%%X93;W088yvSBJdAVz)5emPtzs@*pEByM?!#{l=Tb zrGBzG-&awiujjrdSH?Fir5=vthRU0jvrQm5F}|t1JVNK9SWs#M6ujI#aIbP$pv*Cj z71-T#y@R?u$Rf+@2tXj zUgk2$2L)m@h%nIZBuQ;(Y0VltL@SGh4yx?Y)Tc|MY@6LjTrY>~TI0?J|MSCyD2_1+ z0(QzIQlMA*fw^R;f+|!&C}C*hOG3=I{6HkCJ7^R`{Qu^^p8Nyv`_nK>9(sE<_0MN~ z{#Ud2s{U{Bzj+Z!BPw9qUjIwxYtX+;@BL=eE|auE75&oZxlD zwH-kSLH#j9``{xb{@8e2ewd5ZWX8<0D5UA4!j8NmrKBS0wPE- z0Z|91aDYdb4%)Uude}{Vfk#8lS6L6P#t5K;fG>HQvjRlL)6YXEd_xpJ-|%b5ZkXp-+}gd&ef{IXYZ=s= zkm6=z%%LHg$UMUB`1HXeQhstt)RQVuX))p3`O-o}7_cR25?*q}BO@i~5gKh~H~vQG ze|MR;h1=B|rc*G-EJzz2M)$%-SC;Mai>(CCo4$_Sk^~D%_rRh;(fdyT{FD58bkP0JuY(791l`|A zei7PLKZzt;qfl`ni9bEZ&#PDOapk4{`1b7F^NIOt^TYgWH-6dLN$IW8ss{WC$6EDb zM>Ld|O~P!!3xKoOCS+^yr*t>!=2O~6y;u_?pBO2VU#wVGhYs0#O0!sNj`J~4nKBrB zp55o6aNBM1qGA@SzIyX5zUV_Q5+}=HQ|**!I5LlH%M!LdrT4XA^V<)T zFi3f424Ax>GvjJR5lFIpnJ?94L}yNN^pNCdi&5fvL7+=Bsl}!XY}3}%%LsDN&vnc= zOD{&j`RTHadWuVsy zjDAIz147`Kz_~1$f>nu)#e!C%-9@G&=j)u?EeP~jB0rT^FcH;9z>kpxkm@X>;oZyv zG<(QqK0@c`+s)IPpxJPk^I%=Fjup`yGdSo-NifB@dd>(VCC$e(vI!s(2aEv8#0Z3m z1_-qi@jEg(FV#vpT3NvLqKQ2;`XGxbIqiw*(d>n+F=+TkCHE>J!Tt|$BPG$v>nz%& z6A8uVcvGgFF!ho`83sCVB#X=cf9s2gd zP-5u~Z9#kIarzgwEvtmGuj4P8NVdPQP&Tk_sGaQa}cIO`*yj*$7k{KX5 zl1MHxa4VxGmq@(okf)_dbqBQ%O&JBPICMhLP8a zAUh<8MWY)f6kADs)pEu*h@)36q}+>bCe&4>HDs-OS6Q-N*^S-Nbl0Me!`)`u-$Pza zZHsMt;v*$SgeplSk&kgMG2k`NO%kC}-3YWV4-$j&+}U3^R4XUf2%WGMr1~EjCZC9v zI6}S;OTIh;2q)NKIu>vUu{&vOf-(`Aogk%3s=)~uHS)4)B;@Mbbs$0rVnG2yew%{2 z)L3pa;L-Sd@D3eW9x}*$T#^x!pBv$YwoUTixMzk=`nazQ`v={DMz)Qn-3DD<khAfnC(P7wn`Y_fVGrw&X!V^1$WuR4+$hW6NF!>xfhREb2I4H> z9sA@*j__ z6*#z|txjp|fMmx)RTWIYOtZ} z0PP@za4_4M1P3xe3l1cx+a;ii9;kXq1R|c8Q30^CrD)X3G^^Lonsi!@6by z%iz2=zFU3HrOd2q9Gg>lC&C;Mh+y`$rR&V9XOO%Y256@-p*pkUeYl_XGsEqq5>X;6yx1&9BdQG#BF|*N5 zEF6d-)=wRrON~T!kpo_gBxMqzP$U>=!0;P13CoTHNL&~MM=ts?H}6eVc(>l|dnWp` zzGr2795fR}u-{v6CcIf08tc=%gC%|0fRxb5Zh0z1o!xn3BPD!C6${!2?l&^;m!igHnn>SGel687aNLBVksMNbp$6&LFy!qh z*DHueKn@opDuro=m+NyhbZsuW50tTtBKYyz?Yhpmn61_u&Lg|pgI!dGvy~o3&hzGBm~DDBP#5g zIK(i}xeOdCL8Y>!dm-BV*GZH&iW@(ncR(jxx+U`%WBPtsG@_4l> zJTu(0?YDdG^jdR&t0OAoSBLu8-iRt->W@@8muFiB=Vu6W$jrLU9hayhSDk%5G$ z5=g)v^!|ePnvYqOq}=WJB^cMgw*+i0ju5M1#oSI!F1;@!CD~1%)k^{JFvp+LVU80H z2?7T}P--F6#HjDyQe6i5AXQKrM<+vu^&1vBC`Xd?!GbmqWZo?0kOJ``fw!8(5PEd- zf^29(@C>-egnY;avDMjOqh;3uPGL_~6jA1gQrAk`ApnDNmBu!Xduq{k!u_o%a_L6p z9YM5!NWhB7Fjz%d1|uqa&_;3@EbyZt?=YuAL129$){<{bikWtZdR~t@E>U({;iqoX z*NUDy)GLiwqSsn%F=e)ByhxyPqLY!V-NrTv-3#CxYKP36OeNyF(oK?hU?5<<+MRg+ zCEaEZ!mmyTfJ5-I9~<>;#s$wzE>FVYQ%)N+(?z73wH4=kT52ODIN;w2BPHYB;F608 zo9+nT7pJlq1tW};^iqt(dC2*lk45jHcyZ1^6d(x{Qh+f?19^{Q^Jvf7`Q|8z@>Ct} z)989v>)f%qKxj>gKARFt2Yo2~kK?n1= z!I2_HZm3EqIUYWI}N~lj3syS)?9~nQq&+}8)uhr)a}%1=|vs;sM{0}YB1#_WFso5h=WIjx_^i9KZ^a|hwZ)4{}_n; zn0~%2Vac&XXmk52{OLloEyCYU>XmA1MK*`dg780BPAjroeo0Lf0k(({o=r*^QcHk%FAq!KOl>F zJwB6%qsIHOjZfx)CiO!jDxjz+``L2DO3V?o2dj!@ziwd!V8kgS?$XSC`kDvW8QIe+MW=I0VUE%@!FE& zF^fB)k{ZhQu8c_8Oj`tE!uGP!^@nBeAfV~}oO-%v6Gmh-D8Gc)Cf|zWf=I~75-R~j zaOv#p*H=MKJs@}v&#A*AVS#ByKy0xE2qdM}Sj8FKaSZDDxiN|(DnSJpv4Bf85{8S9 zHF}>P@%=uo?|-k$%hT$sU3{rDkny+2yPiL@_%HRHBP9|NqF)2{Fnk~%?ucFBc-{L` z*H!ez;e22E!UL!D@KlZbh-a|qSS;<>IQ!rtG~*zw7zP8&e*H3BlgBdZse7MTu6dj% zT5BL=&K1}dtJI>f=*R~9gQVdL`o~fwcXS(^CoHRwIl%-XH)!B-_y-hB(m%!MVXLL* zyWPP6E7#%k`fd9@2Vc~WBPDw3t830nKJ!_dU8(2GX1!O*PCwl^&*)2M$*H^KeB4F^ zYi2BF2b3ZU%6bUuVbaRZ?IR_d z<4&H12Y->t@jL)|f1`h^UVS}auayFhd)fPEmuH#}fH8g9^iE=H=6{RC9`9z|`?|+K z>QVb!-JQ<;*~C4rXs+Els{N1LPwIj6tON9TiRGht90w->y@7AMb@@6&{Xl7s?427H8SOBC_ zBmVQAXw*SdIi?i)8=F89HG4)JSOv2=y_x5V>4 zG;Ig-OC55U0N?td%kK&Jc~-7yq3Wildp&tDu~SU&yWEAJ=F8BC@`&0A#`AXDt1P(h z(}xxH%wjl0*W=%wcaD2ScI8u9_P(K3SP(4W0%64?>!(pJ4lQ~ryF3-nR1j5~P`qA_t&f>d#MVnA8yz;=`nDlL(n>Lij_)w}*N;id zx?;}J`QOg-U(0^ba+7jOge!Rx>yP0>%gWjulwD%q!lJ~(K9WQ;eJbZ^_ZB53;cA&0 z!#s`=*foM6Y(n@$W*JV+)&9PMOvcJYfVUMOKWq~EQmPdLF6FgUxUe=`b zdn;59oqX=?2F|`t>$N^R)J9i=%^je`9FAtyoco9C)V7O;wf=34d~{O9SDzK7e?Lku z)~wod6EUNo87*{K$?IyY-fx3jV#*;`F<;#F8B*TsESO$c@*{la;Zrb;6;%Y;nu?^j zBZ}Qnl*uF$gyR|V40T1yL)@f=qVsQ~AsRmRl&lAd4kQ~%1wgq|kr|H=@cIXgoZ?1X z^Y3(pg`>w$&`a!owsng{c_nasroS&GEqrn5t8L!Bmk6=f8xnjGt`Z%c8xZZbB zk~>mFFDf9sy7?zMlKob>v$-BN9y@fnme;lTC38087jueLf<=jCoN}%YmC;I>Cv&6= zNA%BxBn%@ZZv@E7Rp&IDI~d2_P9Z33P2D5$sBX88z4)EGJL6b3Ufyweyk1Pk2nCY% zB)lH6H*=}jeF(Zq9*zF?r!>Y>E{(%0zxqTA@%i>Z-3JHO3ZALg7< zmi2bL`a`1K>Ife3u(n0)tf?>7L}Yt`~uPh55Ypyi=SB+MUb!cARbLc_SsZ$ukRFjz<;RUT$hk^|d*@>$FAs zwIPELVxu{u!BoEn+{}e7mJ><6wGt<~t(vUJSX#JX#i~b)=WE}su?q<;oy3t4MBZu09JMx~ZYOXPxP&L`jSzM7-?7WukSD>r@NNwj) zdq1-kH11lRcoO~Ru5T4eEs2+?hwvP+FDN|GdS1^-J(=lw`Nom87$FYsr-|`<5wiDd z5r?e0T@(G4!qG(!t_EB_9DA9VZ&P(9v83Y+Z@pih$Vm;n(K*vKjN*F>Gjm9H08)BM4QaxhV4<$_2 zuZjMsjKSI%~6zQe$L}{mZgzu&lRcaH^1C zl)>vMGdzNc6B3pbK;j}#7k_iRB-TZv5EoLJj4bluDC^TWByB+FHXrEj(t17o^jcUu zMcz4EV0L>s=T6KR$B0A-!@VHyF1k6ws}5nlPI+$iXFbK-7N1bz$LM#o%}%n%DIK}@ z6yEuS#kbAxcbHb6_A=8RSMiSp1aoM};iuP*A+5S}j!?!O$%pp90|Zdx0bO>XKG+0+ z4xyylSU06IAinq`g4(W}b;1d>LED7~VHHc${E*EP-T=B`wp4&(G}=8=+E&5s{aD5E zCDnaFghzx!2GKeD?B-~^)z1L!u&|9bKSn!RNSJMitTlEUP1r{uU=JyCC72Z-^G2f7^C;aB!Ltp9+e-^tQ+ilz@*AswxNhlpa|r9@FOLbuCV;_ z4@3c_f_4GOj}Gq(_3=^TIaf9zg(ziI-GS^cbo`QRT%(dH&Xyq~DlH$>>u;SC5V>3{ zvT*ShNv2_ltW?OuNo0#ewf$1DZQb1VFLoapNQTv#FN_`pL|id9i12tryU18S+w$_~ z1p{C=d_vPt^KmupXl6M?pcXrH(N31`duI@he)m17G+XQ5)xV+6`6_D94p&y3iXvzf zP#XNTc)s1XE@w`p6w%#cBPz^Zg3CIclgNj2yXcl(^U9&e^&rnUZ4&8Ou%w@SStQen zFZ|~_v`dH7u7>q3Z;jm!y*I0$BPGYM5RV4NBPt^$X*;qBW^p)!AS@B^A8i1#&roF6 z39gqnMh2%NCA!!8KjF#!pOfZv>ezk)>BXPv?YG-z_+)CoRG(6MdFy-E;oZ;h(WV6n z<+I1X-%ZmKImU~#0`T8i>2t_^khclWQPr6KJ0ntvkpcpg2m4T8iVknHh{eb}`9xHj zuA?I*{I#XI!?%O_JbzCiPK<^0CeG7d6_?M`|6S)lm}m9s^KG4g{~C~WOe$aX6d{LN zeS;>7-${OW1{Ow|zL*C5@m7m`-p9N-0{nS6gYS|E2s(wyXaXV-qN-8FrMK(DAC4os zRoh6wD!E6w`wI)yN-ywmgX)fq1mvh}aVGK6!W&`-6S&}|z3qzQCd(*kRO0uLh&WIz0&0b2mBy9P6J}4G?PHqJy zZ9&@^1RzmJb~BU&B@iYR95IX|r1X(qu*Cu z&TG*1d5Lb61w>&HHo~B=fjgxJ9sDqlefR`{)@J1z{&yaUexk6el+MT>JtrEw1F}Gp z`z`mZPj9|ccPi@bDI+EGZfdkdnN>uSTq2z*=x~*UMi@%+uPyXjj4+e(P*y~w$Ron) zA(iR#f$F?B;t#)p#yfSWCY6IPJY>`ku(~n>)+=(YDoiYJecxzcuz&VP}zN zW*dbcZ0NzlLngJs$x+NPg@w<9*tK5IYa=C}oma6(j&B57-^m;l)%m+|$t{qOJ_GCD zlF;p8499yB*Q2(RDYIU`$KxV>HLzs`ymcRz*d^NxzKs4fo?F|;D;H}y<7>&{aoidh z9KIe4LC&jY@hsMy!&3%OcnCyQ0E*<&U3g{GEU@bHFKwfkby^3ms}w5 zX|f2;^+FnSX(LjF+HHy>D*d~!_TP>t35vew#}1fJY}Yvw8WYVJSR^JarF@fiH^?<5 zvQN5#f~#zP{>wEwZA$^PKiANYzA#MOl&A#-N}&$E7cP}o>c@ghH zGk(W6^76bj-*?`@ru-x(?(ymLap)WQ0Ph6(Iu~=6NS}>`{6B)h6eN@(B!Lxan*9_+ zrn2WpSXsLqzEo4@236f~ZyLp8A(;|$1n=*vB;Dq!1k-WHt4rOT% zaSxs&CG*=R4(l|%BPE%QmU?tM7SWl_%-Q{4b5#Wx#OBi8THCy zKs#hF&VDLq%On+1G@*N2JLcQ+)-i_n2j;>ikR(<9j{iLS_oeGx0wVns+0k#+H~qa{ z*G%I8r@`N3L{7MJ1|>V2(ER1CFU;VH7FN#v8HGs;jc`^`CP9%x{xr1)`>}w&2|Ii# zolLLZ2Kd@bwS%6zd%wX>-8eHNFuq(3t#MOC0?GxKCILa?3EMQ;P62Z}5n8A-W7 zR(K9~9r;g0sn<(%o2iZHYqVBl;IX1vBUCL zy#A)?MO_l{Eml6PwM0oLyk}q?KTPq|uTg3K7V`Ch96%_7D&woW^y;x&FIJdI{x~G~ z7tP?GhCibdO#Xpl?!gHn1jZw>snv;%4(r6Xiq?%L$)BmC5<2YHjNsxZR*0(zBvryjb@pLk!jqnb)?><1_T|aL$(Y6!hg19A{XbXABqJn(UW&e2icn@mEGW~YO4DkSRh&H@_Vls+hSrWc(0bQ?VL7@n6({x z^eB66o#wA%Ja#-QiyyBo>GjK4HsQYlIl<%WEoR>*t?2PhZ>5+6bKmq$YxUoVG|PbD zh@i*>(jzJWog6M3Y6~E;#u!jTBv=W(?y$&+oxd8obfFB?RbN~B7>*jHaL ztw~QVQkG_(ak{ZLNy?<;s#hYuND-eypAn8QyHMOSdVvmHZlG zc+=-T$LOsngcQ(+7rCqm#NZsn&gC1Q0vZzGmoh(N;K6~II@1Mv)Kw!YaeLk;xy=I~ zJp`S`2_6euT^D4p+s?o+5-F4^RkcY3O_w?E5Bp~I+Kt|24*tG-Oxh-IJy!&h4{hJ% zq_FlA^>eFIaKn5qvawWUnxQBqCRiN{id0>+Vkpa{70=yUWUm?aSrMP&(hOBydCYh)kS%qqvG{bw;pXk3Qz)n!;+e*FQP0BLV|P^m z)a1|3Gwe_pi|#tHU7%IF8o_)BXG+Zxv?`4{UW=!(K*lIDylM_DPGxr8dcVnt#1KK~ z%)zZ7RV4#b5V-}*@J?ITQS0M>2At+NoxaEOX(?2(q>w_sqxZk~7 zHsR#;m-Zpr6?wVPTiZ(Nj$hhGWp@^>cJQQj#yo`qku>5S72tIvg3NC{Jd-Qwnq#>Z zsHnMWqBB@or3nVM0=t8nTp2`;3rJ-2zIEcZ2@Bod@O16$v=r|sBW2b7{!xscbmU32 z2W@a+zkgG?qt-5{7mXU6jfEp6uj76CGsbp-IQ6`9*BhDHq(hl>9xo1(u!0b)Y%|m= zk1O3yGMbUjfR27qbQt=C(TB(np`@ES2YGFxgDm>(HxQ9?opYZDLMUreHXvkAjA;6K zz-9GcsHjvxzEtHrE}WHcpLCEq&NTc5r;6@<;1dO2N=kLi0tdqX$22WWR>S!zCqPL%pMS#BEyi-As;^zYPV~j3?7~%o){e`5h{}p5L(~W`}wZ^<{!x#Iv-roiXZ?VinkM}1d zDp}~~M8VGvcE#fbN(*RBE}20BGX8(huUGT?Jwxg59-pIF+(!f*jrTczfwr%L6b6ck z%E|z-+0@UMd;30=S={$HvvEPkufwJ621QBuU*(H&C@GMM7|AC;M?mIs`sjS&D5T}f z^6vp(U9)p<%Ebo7q0Tn|N&EKdtGUi_I;`8=_(S2-!iln(VNlm}cnHm}-hT;k>$9Gr zvL4;G4!`C}ICmJ2Bq|4(r;O9}57Gzaw#v>AKoZF(x{3USeDJCi{1A1GABcg-Z`IxS z0Cg98JU_p0^v~Q(596B;=Tr5Z$#eIqWIu_D{>((bFVr8(u^Rq0{~*DL|ET^FT#6xy z{&$_vCyxmnW$1 zuk*^Rf2Pa3!Uh&>y+C1ke<33!ICLW=LOB<%iEtE}pmALFLk{bvv#oeQgu`=_xWa#r zAoJyU*MyN~!grysUk)MtLewm6zy^qKAy)#|fj$%22C-EqLVB!4yt^<3uFW*BLZj7IrBUxjJ?6gB6 zKJUxWnW+*aI$*!A31vb3!LuY7A)Y8z=X>=)KZeC4C4qNYp>N0%$$MUeJZt0~I(v%& zuQPm2rNdKfloA7s$Je}u$RCT*IcI-GV0}~sy$(7c`Z6v95%PbCMUwNXGGYDA zH$d@x_#P09IIFM&NFl_k1HJ(uNF@elzGZ5z@e9D_eNcwM;zOz1gY?sf5^uiwZKe#T z8LqY|p{@3M-MJDij3X+6Aug63K;Zi56PQFHN?e{tmjw%+Bqi6q%5hxr2uyP;3p5gO zWLvWN&h8|B2J{Y=^k2+AuD^+!er`a0Q2L4VJSf6y*Rrl6n%V@31`xDI$H)GpH*Q1p z1P8VR0exeyVT#7qpg*C%8*(#{uS^x7UytyoXl8JvrEoj@$UYO&dMGXEmbq?%o=dyi zPCQRw-Nli2h3#6y*UnNJ&*NSp2ozW8*u(d5+$&T0_)4mwmh(L$Dt`eF+GYI*@bEWn z@)@bP-hKY!1bVX%s5%wSNRml4O}?7#&?)GXKVQ%B{&7|NJ`#KGimyMOON-DoRY{Z3 z9FF7*R~eI<^GN=I+q97g#xb?eVaT|e-i|K02udR=1E{bbCBudZkQ#!wJ;anss!AGV2ae0Keyhb!(LoWxr9^Qs|Q%tIynno>?~g}*p8c;>=Pg~-+hI%ltD>oAD$)_1_( zShOXBx`X;7C4sGQPZi|(?r8GcV+clW=YxElGiH&uYc&!<13?+MsbYatRMG-3mj?taW|fXHnz~^LLK;#MK5dl*Q@UsZT&kgu(YQF( zJh4kB5ki*i2b!u*hgm=ZtKX$it< zs@hRn%Y|*Dw{r%AP+nz0JS$KvaaC=>m6GZAm)Sq68 zK!dGa;9?s5D7{0pBI^z#h>V1zmP!<={yyECocRE`nI91By|J!T<=k2B>sSkniI#dF zBSi2cuNfqg86pRC1@Isl+bA!l0{I-9hJr>gMp#Ib&+C3&o|ohp1~XJ6DuKVVsPMi> zR2qvO%)UCn0000zpNn4x_+I1btLDCNB9G+v(Je+B(4yr&K?rsPTw=iiVIN!Z`F3$5 zDk_f1H51ZR!c*$;L!a*Q@bLQmdk@QqV#sBGn&oXO7SdZ_{behRwUlP%D+V%DCALbA zSuujky<_v<`<>o%Jv@G!jy_mav&EPb{c2gyB_5Ka?S`I$&gd-fskrlURZI5y6z8QkYafn5!kjcP#)QCh1T!0*{okhWyddCF zmI(eEx|h41^)o3^A0;O~lS;n*b7T}UPQg35LbW(+KduXZt*$;aZRuB*bP3&?ghV8i zLQHP%O!QqQl0^~6>+*>#)>L+gC9q_C!%Z;TX-%id;k?@N<|8GDwp}a4m&D8CO|p>U zIknz7vA0*X)$Z`OLg3#m+=cExQDNU@^?nfv5#%0zKAl9^_4ol`SlYg?N6D|Z?e}}q zW>!GiH|UpsCn+N$fff;f2j`ZyzsR5L{(ph6K2wSFf2=+S)9ZE<78v+^sYAH>yUFq) z$|EHZPk{m+cj4oE@-8U4zkkO~{$$t%9}pudg?&dn7o0tkNLbx;cilOdbS|80?6gYY zs;?L-e2sF_D0M!+iO*B(UwCyW@QcfF{xJdU>YrcNe^UNub>s6g}+n+^-iqs zcG(BUDulZ=kO|LN^!Y}nbN(YLe5Gp}F8haN$U8?rq9Hs80F&|u*7UCLh!)lTLXcaE zi2?#8@Z1857((M|Kqsk)+44O|c){argWeyU&)|8T?IR^8h6#`bln;*dX&^xR_k@6T z@daosLC!s#=_I%+sVXSlle`};X7Xts@nDQXkO);g&ha;|Xm^3sEijNrLhyIzAj7!j z+(RR%b1=Ax5m#63Jsn-Oth@r=8vb*y0C0yca!DDXWBK2e+H(i6J4ESxgivG&8L@vs z%~v*`NIt^l>_i;$jyU27E;qmdDF5I@4h2jasp z!L*otpvVrhQmYItl)eoqev!YX{+GB8UjWBM+E1&mq_cVW>ft z`ArevhLkCAoU;_8qAZCxA;?T z;t9|W1Zh;L-tAj@?;l7UAUp@rz(#wJpa@Wu1cTY&#Dz~_{;%>V1yy0#)=EL>2h#OK z5J?mLbN<5V2&RnZl`=o8!{liuo+Bz*qMR81JEoVD$UWg0r`Nu~x6xnr`;DOFe$L#Q z*ietG3TGUYE z6(c1Kfka}CVvsIPW(M`V{z!-i0331*z_!Xy(_NL@HOY z>c&+LkmCbb3z(kES+d;D}NvM03&0Xf#xwUxO^i#X3xx8z6Hqx<@5h5u{&CR^K zb>*F*6RO6yn_7`c20>-NfV#gszpulIJrce+`i{cyfqeRe#Ifypg(m(ad?Qtheu?T} zc9aL^J%_P4C%B+AZ7qahBNzk-PVmd!r^~>}xU^bY^&eG^U~0T@JG-oE?FfE3DMlyP zc+ZFJfoOh45Hu!dQ4GzfrZ5&okfA7SBPw(YBPGg6mO|Hwa+)q6cLV1D?$d+9fatAPZ1X4vh1rwl1crC&ezuL%f(fvYaqs zP{U{yStA;pD)V1=>^X<-+r0Psl>8;!P_IYc{MNw!gc)47neF?7{66E+Qe=)?_lMh& zeGCrdDF<}EVzXHhBPAoflaTWTV3QT-UVaf^Z=9tG%*pyQKLP!IZ?Z+$!bEK3;vii(0aRBH1gT63-A_caFn$i!VAbF41rQF9X z!Vxnzt7{4KHE-x#b?n*PYfsD2#Q3jS2ZJ`IYf3 zat!stc7t$5xE;k8!(Q8a$o5|Ld-ROWlFe_oE8&&UY-OPczQ0CaTkso?(jPD|3y&F! zG6&kJ-d*V|Tf~YCn?Sa5&#QQ_(=!e>+ z!zNOZBMd1aMG?dg)A!g88o6{NTjfilU2^>+DhMX8LijlN7V;=RXBVq~E3jW+KruD} zNQEp?L|x#YFm{_#=Odm$v?KNa;2mm)p6rLW?76u4^>|G{Z6Ge7XedSxS|k97ts2v@ zyrVk<^``ML9Hvd+Pz%wpb_7capd7q&Xw@Uq;+M9?G=+HZ&3pmc9}{slw-QMumi8gG zZk+zFQMpGI7GG4jY{uFIBPnHqw7vNGcc)z?*BX*;6bN?8AsJ>K?YO8C@>M65 z0q8~+Wk=R)pB!%$$e6S%osYJAHR+BSo<~vT-$dqEAU*!5d346_%u&hV*u*BliN?x1 z5n6oN>o{|_(gx4MHtkXzplT1BpR3E!I;%k5>=Zdk21x|FVTq2$ny~$Y;!@}1L;Z~; zn%8NhJ3#g+&#i$dI=x*xiD+@a#M)~7!C>ePNU#LeqVFRrX{0$->>z}S0aR2YC8!(n z)lyY&+39mR$#4m}#W1=;Up?F5xi ze1EWm0^sWp{R}+pIS_qZD*l>FnFk!3HjZKkaoNQ{-V2BUN_Y?@BoA$0Jr!8bVeqoc z73+n2Loo$3;a>4~bm6NgCH$ys>hx@tA%BGG?|66n+g3|hV zu_kGy1uPEebkS)8+969oA>r5;#D3hnow6e(BY6*jYN%{49RlIxeEI^u7DwSeRe(a` z=!VW__mLM91a%-0R}c{06ZgJKox#KlDX74p1UkcE+&sCSyN2*EC5ne!AEzM5!-OD6 z&e&=TB`z;pVcXMSZ<|$Hf_EQ4JR>Ec%^iNJxxB=nbZDS~fFmWyL^+OL@WBTnM?;Vn zb1fq(3_^MiBP!Wx3>#foW9jPmzXpC6W<5hP1(FgG50#J1(9>#76Ne)zM*cn6Xnv%M zFi=Jakq&P6Jb32FjK9yz{n~$r&-gI%$s(wvk}@Wsn)Ts!YU@`ETl3LbY_CqA-gsME z_Q#AQ17ZIM^V4j*q=6$M$e|#XYo|;c$0966jUZRWUo5+7Wnwkey5T5>`)z=KG3Gu; zDkCbL(W;~mXMca(VF>+QBPCbjBOL<*EI&Y4L0$fXHK_s zql7w~m-j0%YS;#4OIqk~NO2CxO1dBLM*k)c6SqMo1dX`niwW@1A_wU$_=bKziT2Kz z#3Lo-h?(VwOk(eq;d37}&^+JUn)SqAgq^~#w zK%q}PC=abTsUeWOuW1CK9q8{NHxABSJ1xGX#=1J5()IVes@VZTL%JUr5v3llfAAmW z&%~fY0Q^7)BP9?a2_{Hyr2SrhW*;J`sd~)GpN?s=EJ(_drEP3R4`7K8@MX&c*jNGw ziAo^F5-$>lhSreV2a(%#kkIoq#`6dP@lXR-^z|#PQ%G~fq9)lCG(NfYm+`P!`QJfw z)qT}YF-PTZRlEj!P-#Nqz$1h2J&N1&9?{&3XgxsUJBB?+VEqH3U{A#U!2RFw_4)}v z#Gi5RZRqUo%i*0EU}n)D;DCgZD4uL0fQWyy0xJzWaVwj6@Ue_{No{*P#v(K|BiLd-{CY&(=F>{-}idS4iu_s(`50T z^)ya(k!w508Nam=4%%gZ)&jzCGZQXe^Q6V9LErG%pC=&oUW*R}mK_;DJeRD2*PikK zqZVRijkMD|NgE)L`9!1)s3Zp%C4wao4oM>=07Ia@#TmdPkUM^V?@5BXH~5>{HF|MF z9|l)Ms(xO`fRY3`?Sr60SBqAp4#q!_q(=bg0WCDvVV2kA&@qIY?>AWj;UT zxj%jL{5D5IIG-0v|qGBqX{TB7sU0gpd?~fPG~%@?ltl z5$EvGzDI%Qhoyr{#jAY5C+es@;O-#{)5?61PtCt0B~PWTjI*IR=LEI>K}IJRwol5! zSwROza`J77EPlyyk?MYY+{+h!_t)|GV_+mgM$z-Qq50P+UQF|WuV9kXVzSc9<)|V# zcq1iw)RNZ_9lLDv*&col7dLXj$Bb7M`(Wfyi4YOLTib^tD2Ic*VjGi6u)3xjlwvP~xS=r@3wR~y zoT`3A-im)xWQmIF<)$CA=tYo)IKLuL(Jj$Hm5Kj_6Ho4kOT+nR`C#-$RZvin~2RmTKHG#NB6=%=CliB zomXq&_+BIQ|E`w-?jrD*?fPg*sPaD#ZiQ5mN$2}0f`f)_+dhMs5F|@Cs^InY^6hwd zanIG^y&#*4o6VI2)$uvb`I;;TC=zzD8yG}B`1u(ePH5GDA_p_zI|+Q#G~rwy_CMdr zpUuo3Js&gRK2d@GIE=Z1ej2r26u2QEKGB?TMh<=kfxpFVT|&J(k4a(qozKgp8kKyR z%A}dWtyAJzfZwmxrOff_smwUe5PhakQ0TLI$P<^U7af9SRu&v6=c_V?yN1>}Kkx8? zcHTGF&jbIbySIuh8e8?OT~gnggQbyzZNX!GJz@`esHlgg=essB4$VfcDhJH*Jt~;I zWccNpCNZb%eS!jcYw?8Y&0nhO+8K%nl#v@u2)0+j%tyyv@NlViPGK5r7^3K_Gi*DB zmEm^l?9V%VBBKR#6c$F`GZsu&k`sFrQq`2;^&%u~JPbV=s&WGi*kMnO5grtJ0d`{9oUt3Mb-wY82NPrnDCI!5 zC+hv4BF9go&sAL=*gvs9&D*&SD~{uiW*sJt-Jyn!-^OKgF|yw$uSbYh!@Zn?CTWNp z=Mm}Y-+Rwzo`%@AqiBdWOeLt!+nBvD%Hy(3Qk%H^yK(GS6NJQn)RJUBwE*(iEL^u( zT0+cMS&2AC)ojb6KTwSGm;=oe^{Dc8tO*_w9sS zEvf~GUT3L+v_872;Vu-dnx`6wE>xp88zEbRShrxHG!@?b9aU=FtSmgoQ=|JW?`(9Y zzITD09c!*8#o?bX6RuRWgb-y<**$DJ5I zFL}62VoH6mD~3BRutCZPaYg8O9u=wx9)lE$5hA2_qRfgy3@Fhd_ieWAFcRWnF=dKJ zA~GbBd%mw$C%araV!1?)JRCf~H}OqmFhSB3AEC!baX)8g2dA;m1)u>VW7+mRdP4Xx zxThm3vSp=IaHUyUt}O+=_Dn$9d4F1QJ(`&m6w7?aT#(G;H{A@rZxOXGPq_4<9E z=3b>8d#+w^`NOU%0o4G$0#51yY&$yHTgvI7t0UfR*^MGXpw!DFDjfRskrU*}MD|G` zJ%%hLM7JwuH#z#O7cStC9%-zhOCy9#`=GO=<&e;|OHB;uZV<%$XX}Xm?&XHuTF~b~ zBP9qtE8*+K=DgwA*1AP$;&iNe@*A+~0jM;Ja7`l0#blEBto&Tf)+h z6EJPK6)uJl_InKbMLEr z{PRDzu+;80=vFeLYaNDe zOt{Q7{@PPxr@x|x>Afl0`NWyt%j_BPF2N+;80M)zrx&1J8j?;L7fq#5(OGf(w*4Pp89h zy$K2KU~NOjC)kFkKVt$uVGkn8lI5H`Hsl2}Vu~i;y0RG@id$hpNaqFICNMzYnK`T^ z67mnBF|%w#Gse*9n0T4oYaMWP(=)Lh7*H<%TxlD7zESUbLR8Z3%|2_P39qAbY=Eap z{};7Tb)>lf+(93ucKn`w8nfiL_+!7>(Jeodx$Vku7Gge__*>PHv#We6=|wFxT{^3z zF8LqDa2E)cja8gTbvt20ghWsEZ8~&1I>!7h5@6U2k|QM}DkZYu*vv4(@!W^#2w9f? zPnYGtBPH6kBPE8DTOvrhoS9NJO{k)R)9~JQsr&2Fzv*~e$P-x_g;AExEyxH_ANoFD zL;E<9u;$+7pY&|I5f9Lt&j|@6psJ#)%|n=KJV+;;TOND;yJH!$kw*+V-vB;Lw zxN$6YILdnEa#PGXyTCCh+F5B#Ji^0IUlufK6ilBU%%6Bv$CLu$xs>>jIG}~UW527* zLt}gG(2VXhz@}-mD^!s>CxB65AHck5>XJzyK#L!LbI_Tp`mYR;+=0e`tp z4uBX~e~jvwGx4>_sCvDghhI{SI|JO0yy5E{Ct+qYwVmDx!KJnzR$-Dw7>Jf0^Pu<= z7#Hh0hepGef|lr+#3xd$E~NGOom$J_e_VGV@^Aq9AVNz-<6``2D>BGk#?bG1uK+hkQSNZA zi-Xnvx^6}>HJpQKjgu;(60RB@xWGCP`n`9aD|dPabrnUSV;K0bd&??ocN$0!O>LV(LZIO!(h^Q%97`=!iDrqjqRvnW~%(^>a*!E-? zi>DrK6l%O-kwhRsyu(6C%EL9{6u%y}DPs=KufzkUm|$ za`e9%knf`z%`^;R4$vn(UBiP=lVGuB`6%d%@jd)}X~#0lZXv$KhD5o5%DTBC$HmcCY zG)CAEi)IeH9Fx7HStFfX&G;O>H{yMGq@!4XpH=Rry_N7+=Pk=42{{@-kUI-53nIG+ z?`CHsC3`W-zB9)`(w_Iz#;T(FlOrXaT5qGM#>bht0qMATQN`>uOmGm^K(IiJM~G

    1zQHj|fQAv7T)CGr^qJZ<&(>)9qDWs+ph?BiI$kBIE|t78|wD8Y*u z)5CYJjaSXg7Ok#j#1f3`4}c;0Ii1oW(xa_wnq3pWM4|3MwKSrnaJvwOv+?SCl|P8-SmdQnVzF#)8YPc zFmj4*lwirhDf4o{WYx*JE?~ zZSarnBk0y*Vf)H<82t#cZxj(YaN(W+t#?BxFGH z2%O7;mJVS^nE4&jS6_}JB_7V|m0M3-!Gyc_=A4+GD55>BRCp{Uf+W>y?Uf|g(XQoo*Qm0z5jgwAM|JXOrb~p z|NA}7`WfL{H1hcz(OQR^1o00f0g+y^zKMZA&=M?!AtM?^{&*;Q>{xpI@e{|ipmnFn z^qb+4JtQcr)U~O-k1j?2!j&+*@xvzXchO$|uksU3M6iuU%0*VQBPxiJ0|bczAV5!g z(PvOLSTYx-RaoMNK!{V_)N+-{hq%NGh)6N!9^kulB@#&tdnZg7>&-VgBPt^$K~7>u zZo(o3s!I%j{#WdOo(zfN#GsW*DL^UMYOO(&{T!aPQtpa#!a=x&j8nF$n;oOfJgSzW zQZ+>^BE@3re!%G@MgT%WJI)r?q-&mNEfyxB5r%w_Y!ZX27+wg3h!m7*Eh8$F%Ve$k zPiN73T1t1Z57z~{GvWD70rLojqa!6kqH#y9i$Tk+=oqJJqvt3D)%(wpqM-99s-eHyB=2**RZSzT`|AX^znv8LxB^5bdaYbonULf9T44& zNFTh%z;2>Q8jx!Ie<*eMbql+O4->HUBPyOj6;qc@{zgtJf_eZ5f_gREl;(maBv9Gw zz&CF|8{(jU1d&x)0YGGFf+Gm1u?8S>R5RlK0g+E`NH6R5_R4R(GdR0)qEgnPib&c* zWU`xOlvF}cLamJ{@*pPSiOu;Ro7bJ9KCC~_K=?=e=(Aao7GpBmF$-*hgw(9Wt64!- z8t3sAYl#N7RsikA&s@ea%XYApA~1(wNfI!D7#h&#JXS1Wszg&N(i`9P$FNx>2_g_+ zNJO^9e{KT z6-pTx$lfK}L?XsQ4&%Ir+=GEMw)hlA5r||AfqTOo|3EZ@kTqwS5>R<8fDVsGl(Z>` zJCED0v*t)Z7)Vfe9e)eZuV2zk^*WJ7FM%Mi{WudpF8p&N>L{uyWRlgE*?X?Lq9P(A zCEIsK``fs@)pZo13q=%BMJ={kTT5uNmWn8%mIbofTScX@PZ>QA>}kO|9DIv7Y`y^= zKx}xU&|nY38IS4d;hAz8X-UI#Cj{;zB`uIY5rO1qh8GVo_quUYR{;ygSZ!7F*EV~MCW1@&2; zJsgB5!~-C0K|MTPkfMM9z(7C0^f6f!k)eUkHWC)F01lwMIlSP}Nxn34_UYS)UJs`S zMSiHFhmpUr`gnvPzV1$q$NSYzoT;f)I7E~CDKdtHTTpfTKchzkkACeRO))XxC9Y-} z7(!z_>i3q93$+$a^0i`JG$jSCs4gu7v+}_~_?_B4tFDdWhn6D1Q_Ol(l^u-yr5f3jj0wdiE(~K2ZA8 z_-UJlOj)zITO1yLJ2^#Ooew;Hr`~^Vi7V3ENh2cN14=mubU=_Dfz%JZVInYq0V0DG znvIo4vo^9)rj@js+eVQ>tg4oqN-efw0D>T%CcdaojSpt)RW~MR9jH2pk}60b!B#~H z1P6Y6yo1gvUaQ;*sCkzE4>~(B%SS6zcY!oCKL|GqB~=w#xN#ViQ-RFDTTX5SrN|zU zQ}~n;Wf#i;uEx1$Yn4`)Qn2?pzq3I!aqqikJOH3SWs7E6JSC$kRAUpQxhY32hfR*~ z(r5;ff=oIm0K-5-5XI2s&VXP_KsR8B@&r-$z!X?P85Tq&5D5TNFC-`hxQgt8JME(D z4ipqJMoh{Hax|7TLKfr>RUr^z?>yuW#vWufc8Dy9Xo_kS?Rv80yRT#dM4ER5UEn9u z1f6$ut<6`-HOk4GBPC-*QX1vLEJ;yUy=`6RRwBbk>JIx~Bpg`-)Q%CuAm)!YBPxUv z5+fiBh>6-DrenyqodRt29a}9o-*@_4d^qd>kG&AbhI}lim~x+aK}*KGJeVha&{+Xb z#wh$Z6fp9-6-6-P^+-?ocXj=rwfesA*Zv>y)Mo|ni|zSV_=3&#(4xIloKUC+aZ>1* z$zP%&r^b*!2r0obMfyIO7|2347cH7#9(yUOqbD8HjIMlczyk;w5O~PL$bmf>1J=+d z`lsiv1{i+leG3DMD)xmc{@CdwCFf#F#Q~Tv5Z|SRK<@dU&KEYDZC@nSDQ!s*n^k;% z&GHZBOP8?&yEx9!*5WHIU`!S!XIpK=#4*=QY=QOnL3Bounrw?3T)v{h7Q)wXp&34!VR;q(wM#6ME;56gY?x)k}h-r#D}!S7yz-ZG|*rBPy0r(3NNrGX{YYTIHL#nDj6*FsIV38e2{3t%TtSNJxQ+6*NZ9 zB##v?68(1G{nw)tcMqewdcJa#us>0|;&vxlc*9!!MHWO)Rg~w{B@TsTIS!Fh4G*h zx~3y&D!u574vejnq$Rb^CPlhuWnpg{`?fE+FLZ7Yn}y7|=juNvmxK=qX`2M&U3>C1 zcIP-pyM0E@WYD{X#yy9RkC#V|{Uq>$CgA!qg^-!H<(TK0W5#aAz?i+eUHWa>Jp3HB z@Z(lpkvVnOr=STk=F`A^{^EU^X{M7QkTG>ognEqqdhXM4t+SBA<&u?L;0O`|qD8^< zT>R=T2vY?ryd>P8aj9$5gPJ9X%Ld|@V5AoCvP*<#OO-V`H`T=0?=RZ`i{ewP++ zHK1}xZkS*h-;~qhozFi)SYvkBM3P9b>NUEHAYP`AQJ%-W*SA38y0=Fq*PA8=8Sq!# zPT}zb4;DkCxNK6`2#Ax1=t^Z4T zH3Z-)dEcI%?#jlr%D-1T9ui5ypshvsDR)2)wi?4)BPt^$N2D*p^8F;fP4Jn4XH9V> zR@)~Y#iLC4mCN$FaeM}09_L}v5%keU&EU@tUH!4>MD}B@V!OyMm9l!davbwyl1L{u za*SAE?8@(Hy`Cc~d5Z``Whr!;wSlc2+t5UfYdBXc5q=kH#syxXk+ z-~6~(UY*n-*asTRjZrOoRd%T=irdz%TNMjTCQ>LYv5nnbW4oCuG zGdRI?^Am*_IX@#MHT&=2d+w}4*HUfWx|Dhy%lON2p-d;)BqJ)SsLEr)+rFoyDE4g3 z_+C7c0nGVcT<_{bE(v4G1x6uKK&VC{pvx#4GK*|bX=X@C5I}^WX#&-SoVa`^rlsBJ z27;yoZtkNPEQp_9i#3vJ6#~DxBPx@Ftou7?5No3Ru=)5h6G{hXN9ufV^@D5-5`n~;pn-+`XF87;!S$Gtm*?;Gcb!-r;rSvV zH<{}83F;#y@H_{WnE9bKIU59jW$e@4pd{oIs|)j=SZBPbh`f@4k!d2NQEiw5Bn97# zO@t7_zLu-*Co?pf)%|u>$Pqv|yOJ8hqh7t6j!lDZa3#dPnZp_{K+NfwNMYVwx)Kv6 z^s-c`t~rU7hdTVS&RprqJKUg|;v^W2&yc1a8$IsADtBjhwgvIkLn~08o}_w#kwzHd zeQv(0P{?k@_GUSjKL6QeOmy2-RaHP1-_O}tlZ@hH281x6YXPZNnmkM=PN0s4?aD?n z85ySsWHrG=B5>G)L8&rA9BeGO%|4wAOfGX86JJCkP7`8;Lj)AP7ASzmq>e<0#X=={-G&}1JYit? z3s(yQkIb}Ftjy`G(Ow-C(PKu;x-z9W=IA3O#5&y1$X(tz!;aH7Lu?MWmvnqEM4l09 zNK0ZZ<5`Oa#>t8V0!Rg_G*kx&pGb4DTX*4A*b#&4nNCd1>%t?$s#~8cTy=MdE0f$q z9C9D>!yAO!>$0Ke94BoD5*S_ubS$TXBPz+Qn?*ZRkU*SIP>F`WfVn~~!Mlw4CXF5uY%qYP4ayMOFeve1l@KD|hcpdx`sL1SS-ksDZcAge> zPUo;C((kc&F00VPP3uQ72tgon>BRV|_HJlYoeSYPLRE@42~32N`2uxKiP`AwKc#}C zA+bm&Qm;}T;XHJA-5z^npFq;&J$Lf&&$Ba>9GI*QWR@yg!u73=q#fJ*h)D#53G}A7 z()(d_NF~jH43SYK_Om0zq!cts{jDyF8eGbwkYQc95iXe~>F>0`WbdNu5f(tuSalJU zpg%Y0-ou24C$HP^BPBM{$t8)|fl0l6GeJNR1(GP(5!JbFtS*n=paIiiix{hr@6f;` zm>ma*?hhhCP@WPzC+Z6yS?`gX^1ZD{z=PDdTGhBQxWOgM2UL;lUyGdlbifv5322*z zn>=`x0zxMaCkQ9#9yyN^G1lqEW+!vd(rau+CAfZqL-{wLdCw#8ET!?ZArgvcDiX;< z`4|o%5~K4rdvnfb*{{C%x)05aeor$S?CW#!($3AywrX}1_By->u9Fg6w?$^m^ai~U z?gO##`L9*f`TaeQ-kIhZ>N^BCcOm*R#~NZDO)J9lDm7T&`%haA9q-H1hWea1c?CkeFvBa<*nhamgvW`WFW=*?bw6%meO@vcr9`mc)gvl@ zp>k^vR$@FN(fU576w@#fI?8$;?N0#Gawj{Wd>WO8VCDg&VToj8AasR@uo8H?4CpYKb!kq_QG6`2K(Vi5ZAvw=;g1?RaQNj% z8f*0T%qi(9@6nGx9vO$y&e&|hrka*+wW1v^)9y_WaZ}=OtZM(nE`BYwjr-nJG)j|g zTvApmQ@1LNqVyyrkd!;XV{i7qw{V)rX&cx`c$z`>(B~Uivmv-4CJ$_c)L* z*Wj)~9w^xlb{)NsOe-TLX2k6jFl3ZMK|@$zz&mG1oe8|ptnuGxW6+Lfb#uL*9=fQ6 zV^O!EoJ>PRfuJzN*NAu6Q2RvmNhfNJFHmJA^&(-nRZB`EC9XU?TKJZAGf{bXaHyQk zts-Zk<|8G@tQLr}iJBe^y`!?hwj(7iaQTQopWi{VHtT*(&|{6i(n@F$(86!bCTCcT z>xXbo=z@aevPRZwk=hdkoe(vm$SH|tIWJ#zuF%tYxW+?eK=pT*fip`h7WQk18!YhL zzG1VL6Koa^sOdlj!S>8VnQ3ql6vl^nXmiOxn~fE8(p*B?^Y_|7Oo<4rJR>D{1EC`& z+PRv{v~rsu!SudW3yY5q^D?fc?oFB7p=;iXCen&?PDH>eTkbatPhy^)iRr&Ky>;Cv zz5d&Y#Nq3yDg{H@u~fm|8tuEjH<^t!ml-2)vEv1s zzo%!+nHX_(2g}4e8%g`uDBsP%FIXfP7Z?)7 z1|~+_g#}nxQcR2-kWkFJ9p;)?aUZfYCZN@(fn>YkqLvS@*T)GRTpgsjBVw8I;`#}N z-*&Uc+_cjyt>pGV7{Q7{F@qdKTiDUy!!hsCD_*wWD5fJS_GAHF^ z?4r0l=VWRDR^PWQGX8URW2_R-Ih_U*)J|h}p3-EdSiD-5QKKT>k(@ENA+-yI7 zTW$2qQE4h!KyQ`0P)2REQz&Gb%2YIrr5P+*DN7qv%!>dSVvH$}(rn3~X{NA7MP$WF z6fBY@s6~w#7Hp8&V2l!pv1NrMOv)2fh?z!*cDiVm7A&f4np09tMrK4wB0>-$0y0Sg z){<-oUMNR&Hy!-W35cc~zne&<#{-QcD%d?+@|Ud4Y6+Zc&DLrWg4T~KUKp^5FZ>z- z!z^sca_Qwjp?itj6n&WzF3%BuVC{@vl)?sWm0TZnr5Ux%1RR>2$B*I zj(Ym5vZc=WlmN$!J_I)${SN{Wmo+wuwVO4cGe0uTWF%RMI56X;VWc6CQgkqB4kRCc z%&_WUt+=;R?DV4dA3-^b1EIejb18U-9S zlTq4hx?55B_UA{}Rrq;Fxb2x2$M4SguwY1i@o&d}6;+Oxsl~4ISK?!M`P&(^Un_@+ z;Yy?GTveGvxF;Ql@Oyf=H`bYsu&tt^HSGCpo;R5-%$NDB_w~M`?efdNp1(UqvSh`e zOE}Eusu7l$VBwHy6n1J!*u=Ebk7|W+xrcoCWUEwsS366qMLE@I(Z9kwPr(-2{#^H) zowGsCjiVD~$1reMezMkXO_hu9<81qKa}wVc!24~tp48|(P0u7|bi0jKK$Dlk12zFYr2!RsEaoK zTH`xYwi(Y4y+XN>NWm=Jq0oV=%nQGC{mSdZBPCBl6OPk<1cc{{I%Ja=P>3|~MyBqe z;)c5LO;@@$!Z~9JA2ZqVeYS+IzZ=Xa9VvGbeq0f<_a1}~7VF|7ex3MXJvnVC^cH4j z&qo#8^MwVd5D}C&0#_|P0u0Q|(Q1>D&U-D=1|d7URC}a|fH`eWN30h|j5R}il_M%T zwL0Q#svE)6PYY$gg)gJKTLVUDem*Vr$a00BRIj3-=n!a@-!rUh0bg1im3g~5d+|*r z-XWiOM4}tCuT3ePIrx6w4q34%uoePR-7LknWbah*LI>q+!c-^CAF#4yN z&k&*{N4yEiw3ohYhFj!2C$uDQ6K6-gYdQ%?RJIg$IwId}$ zw7R(7S-i>3kv3GV%*-#P#$bth!sc)@D!b!`=D{kZ=}+Nk#a_x`+0(u3P?!-i=y+;{ zr-C=Lp;~rQV=&mclF6+b7NHJRBKE#;lf9!480C=RdrQX=f$HmywX9&Nop0ASu{f8M zoPxwi`Er(1szShRf44i{=o(?^6R6szFFRUx{UhbJ?u%K8VAE?xgvH8sW@{h;u9=Hd z?uMe3Pw1uApM91Di#Y2E63*yKG}g$pVlfP5T2$3odk#HQUj?>AS4d{mHH6ug#AiT} zE>l_n&}{E_*)|xd?9Wd--5#r{aH$LN`5gp1CvK-tswKKJ=INCkW+pJ>a_jS9sHlvV zR&riQPF*nTla2SqpnOujIBu9u(4t1^F+AzbkWQaYKJfvs`0Zo)-Ns$H;^u7I8Y(WD z)_eq5u}rT7Do*3`d&4q77Zh|8=8SWTTukE2EDP*?EsU8p1S2?M#2c%I=-nl&X2QXu zj@&-jf}${fhEta>)aMM=**(TK+gnDU-A?S0-0vE_M_r?3Non!Z5SX%0zZb@@#@H@P z0ODaG87`rnbc;j98HVVnwl<5ukBv+z9=2XruDt2V z&IhNhsYEGN(W&K!B;if9;VLxqrkf9w54UJ^vXy=T4%ie*$>k)Kk)~s!FCf__NK?mx zFab&JoVXD%y&y~&F!kueoOroCLB4!p!PT|2Miy<%%!MtPKS|g&U@;Jzd_$6Gjj^VKNeI zUomYtN*08&=IDtZO`VF`w$0(5?Z%wz!(KW4$2?HQfX+r%nk;QJfUiV&B?$o2b)g^L8eaGQGK5RdFmId3^4PjvPop38WKwL%t(^eoOMDGT@uN?Slr=5d3}*CfHvo*TA!wPj@)S@Dk_8{DuQMS!3zSipiuyh(18Sm zIlO0%T{bzH#EFHWsLVcmx{1~ZMRcn0;5vQlMmPpC@|3DvT&>73{|j5sHva$gv-XrC)fYh{?j zA7;wRB=>9&1vn4mA7|KT)^plJ-)4XX}d$2@`p0`E|>dj6eUGW-yOsUfkBPCBB zl*SxPdq-^4T^SDpHTWkzterE<#11c3zOHhIggD56mUn!O?+gw+OGs*pL z8-)7<+1-*zjvRDpBPB*W@6F|;nj2)*s33%snW0yW;#|zpJUt^NVuy^_BgA~>XuD0A8yp>qvAz<5=8$)Uc$b_b z!Yt4tkQk`7hmb-zcG*ST!HK_03s@`&9D(wLnmA#eQFB_2tZYLE<%Yh@$pt3mafd45 zZ##6A-d!fVgv7{E1c||vJm!Uq2cs?0`!Hjjbh#u}c_Ssw^%KHQR`_`0pY2O4iq<1h z#5$29DoB(ZlyKVeAO%B=9O^iFAv8=8=NBU-F{Z+ba)p^gbirxbXH}ddDqM!RWC%gi zA!OhsrH2GHUW5cyRa8ZKJ39Cr4(A{eqpzjS z-iUM}Y8ob#Ndk@YB$S)-Rtf7p{f{yzESH8B&h)b~hkg?+2S)5=q01vGM$-_@WR+-X zE{mC9-O?n$@#ys|_alt4gBiGvlZN}P= z;DM6hP>sqX)F35)f1p2`Vg+wBP#n1u2?-sLl87TCDy3-wj0xph&x8LwM-VZ0f{AdW zfW$V^CVR&Ky@&ft*Y`U>Ih2?%U z!?VZGeKa+R(iIlg2>ru-9l_lNNTcdz#*k-02b9bl7J*uZ4|{NBnHwsl(=J=FV#I1m zF}H<_l`s}f7Moevhm|E*-IBE{(Y@u$f;ODEKOY;x@2o?yDcj$Bjhq7{fi2O{c4D|1 zOdxC;8#ljIDapAerRZ2<9f)o3<*w<|D)lDm6$lXMc}77iq%a8>MR<=-?@*QnsDoyt zrCauSZA2!kDwekD32{XLEJSyhfDSeR+2I7I07D2kEL~x@4m?oQoLoab5Y$IeoxCdD1>rET z1n^#XgeYo2@N$4~74*Gi8Ps5f$R^J@*oo&KkXkeDq5HRSd?O`;>roVvfH6FbEMUSU2%&|r zqf166S^+@;xr+FW3AXHdP<9T*{G&Zzm+dv`g9L#HCQTS(b}*?v6SAo3u!I~Qfl!n1 zizFzLlAuVZ?9iY~h`ml2T{HWH1D@y~4lkb`#jRzGVkv25EVkQfVp7XzL7l(d^n30AV)xnKQ ziz6j%@0WI#OUt7)?uB1(Z0{^Ry{}eJmI#u0K-44cd`g0rmRMjb?&cmqbbL^|yraE> zEfr9LP=Raq9>9cbOyMi_kwVn95TuGsQYrS@qG%uq1%kSqSlC3$4u{0}$}xOPxj~~M zQ2OfyhunSgu@WWhf*b4Vy-C2G3scW+Nr_!e&V! z&nhOe-0brxQxM-$y1Az=CQNSQTGqUoavjG9ea9|-&4%bAFQu2<=9=lc*VZWQ_FJx2=Z2$cEI9vl3Q+ zmeD9djcQu+gEL`Xz=_1uvS=M|0l9ZFPOmJ6DV!6!yvR-yaPwzds%9*AmxbHRJ$CFg z^K{ugrwiFQ_R{-|Ag0)}NXUkeNG@0$Yqf(68U}%eBh|2xg(gza&=8_$7Set(31u=PDjdZ+^w#TrQAQDxcyzgf}`xyudr~4 zF$FVY<1%IOvnfh#8@A&!^v&}#($4#&q1z;x`YX(9MINto>`YZ#G)tU z+GLQ^{I*D;A|L@GC`hV@c!}w~m=AgNiI$ppnMvoB{-Vz=QoES7%KEV8VsTb( zmLf85m$2p3SviF(5B>lxY?Ow#Mt!1|Ka#IX7==)qbydt#>gO=?eQhJ_kiQ>&>~nV0w4C=J%8j zl+%e2u0$II)-41>mP0ekwVI-Dv=%ER>Ow-`?35x9&8dl&2O-m7#oI<6`TH{>+K$^7 zXvLsXT)f`awcal?4jO^zMboH?R+5WM?RWytI?X{P(x--mAgN$EKc%e*_;N7Xsq=P6YS+@^b9PfZ?!r154M4xC0I@LsdKklhi5!!rWUk7ew4 z+~}VOUwfmW+GYvf9b0a4DueKfEQThat~Ahr7z_bbU>>9hkfMIRLUH}5XOk`>t)cG$ zgoZG6xpM_$H0Bf2*R74V?0WUNcC4n@SW{pabO`D@VFJ_|R3jxMB0>y`b|gA+10fqM zzw_ZP?9|B|&!^YC%F>m_RZq1vo~FmxvuNE zjYA~s8RlD->#o{OtHz`&F5NY!{a@@JBxANRmR02u1A$^P7%a+Fky|#%YfQ4(nyMrk z2!PV05+Fqgq(qUAk1va}h|Qavas-T0Mlwb)WKbALKp_#4i4lQ)kEfY6VHiEaW~kkf zlVKDd;WP{|hCrf`g0e7y)hQ$klmt!u$19P9RrPli8!ny9Iu6`V!UZHhhmOqwvY629 zzC{mQL^z^q#F`&gA&q1|F;b!$kw!4XsZZ=+RF)$uk_S~c4son%l#)Z+pKo=JLuyZV z)$qK%{vG`Alztp&EB0AuAThQC>kvt0C+&?u;F`doDoZoQ5*xG>lCnz#0m^D5fHEs2 ziy(wb{NJ+5m%HU_*gLIv2wZM~foCp5NJOa;CZc|iOM_NGH>l1-qg9J+7Sc6eihocG zyiAhhTo^2b?p4j|*Hl9MWZUCPX_&@J?xeGf*AE;&H!U@VeOD zBPxP?JGSPWV6%CKzTC33GBNI6KUemLL_MtMk_)dg2R4$wTlyUHZ0o!{J0EY6Wb|T+Ugov8xwY&g zYADlDV#_9*S&4##t#@^mvN!c5v52<;1mzbnZHYw&_bH?RxP*WlUgl%-(SCdz7UNh2lw0HwG{1Y#->Vx$O)+6B95 zFpQL~BPy*nX|at-N)}Txij5kQRBalvjN2)bAyR1&p(LV9B-w_Rl_|2xG(y%YWVSU; zv7l^d(jlmlO^DQ`me|sgmQyy?Nv}NXZ#1p8k}#x*XB8=k1)_l>Ai^ThL1LN94d)b$>2IU6))pJ|Y>K;OrsK;R%oHxsP( zTip+60$(E~$RjFWo_?+6V&Zt}gzBTX-k4~e+;dIHSjbEc2INxst94l_5ikh}9vB5( z6of$4B-TTL$pdN!HYwb!n_w3JdQdiL(GJZ5=xZl9Q8fm*JOT(DfDx#sswC?x@wno0 zfxag>?={iwjl>KXB$#%c_A^g>UV#G`8Ac)m$B#aH!MVJ4K_q^RebAhh;Im5iR;JRV znhD%;?IYR{yf&%9B^|pkLsWT|NjG82e+N1ceYPyS%r{i$mw$0(b3JPo6VF+jE{@Kb zZ9sP$$ixu%caL7{ARfaAwXi002?PY+*m%Y0@!*HzS>WOVq8?%x+n>X* zT*k^RjG=4g$R7K-;g~IR0~F!DpLY1DkG0=%RaN$SXDsuRBVwzr2fEw&Tf0!%cYn5USRT`0mC zX^01{BO=I&AmBIn=_4vPp9uUc-UJSFj6lwtqHd@HbEbZ$$aadS*0(TOm?J7l1R>H) z8z}9dSZG{7YPC$Z{3Sy(^zHRG(j%%-Rta&4>n}Edj zhWs2}fnJ=!)In6bA*u^0d3`x3TiFjdsiJ>R_Y%nq+R9I6BPwJV$yi_4U}du5Y7nTw zSVTb7l`DxVWA!jUPbn6R;GS6tz0mC^7>=e|TXn@@6xYMXLg-NCvr$PY{g!rRg2%dV zG<^#LQ0>zK#f3stBHNf>G${7lDi&U{;4v+oGNvW)oWRk9UI|4*Mk6KoU=?__RVN4( zNN+=kg~Pj|4u^I5fDYw*P!bh`MG!aDcwU2X?uwU@1`GhxZjx<`RLw8FiShWn?tYG& zH?gaZ;r3ER7jD$(?@y~_^n$%2EPB}Q3jwN9k8WUg+oVU&4YWoN5FF()CTtjjd zBLnCG@&m}ZNHd2e{xTqsf~)a0?AE6QxG8Vb`a*mJl9Fq=CExS-dXzW9OuB;*<U=jS+6keid9kli{XB`MUJke22U zF(AE6CPy%&JE=}&8Y0~hkcAWnG8jHZ9d^LH>AYOgE;^^Gk|QOSM=#VBuVnKER3eb# zD9%Kp3>8Z_v`|JLdeW9M#fL0>egM3X3|@m$O!CCM3K1svE)iFY?=fE&qM2bb%_EaJ$Sb#WgAr>)hH0eGgfS+?!! z>hb(~BPBa@3)IaB*BPDSh2d?Mc z<}26&#{m`IaZsp2G6^Adb+DaU=g8poI4znCaFP&M>?0~FND$;v*X-A~g;iBmcN^1h zzpmyeddUfyzP8838&PKP-YX92C6`rEGVlHzdb41c&}ti8b2pDNQ3(+!U_@aes}vZ4 z0)ebtBqD@j!4BdJP>2X*h8eA`^tqQ5I|CiLaCdeuX`5T=W3;y&k6ilV3Dyq*O|Ii{ zNTGC6DhAmsVtR2XHI=XF6G=Aev{hJ@q;eD5VTRBvf&~>;g@s_^PiFE%aTscYlOrm? zb8It`ofI=PNyaV@Z^iQPR6&emBwEQst6-e!H|c$oBcIoYwdZn-cjjSFtzWGRfv zF+q^<9wcFX2)A8p7hy)x);uIA@Pw=*B`gqrJ%b63;~!I;fSBq5u3Gv@h<6@X2pt65ppIMO zxUp_rKL4)C{39i&H}@B2*b5gZBPGFrJ^X`=+yg-Bw2_g5Fim--AY&7&MO3oHX{A2D zJH|qgsc)k8*TY{O@VCrE+9Jc?lTpYL&_i~W1u>_Z1sDjy+5v4PlkQ22Iw=3Xp(KnQ+ z%v8hxxTzq>fCN$?fry|}{HN4Uk>2oGUtxiAlZY6a%7!wascb(K4lpF zzXe?CAwPjQ#1pA!Jd841p#-)_U>))2t>=GkqPm1l*hj)Mjsn%g)eeW8kvc#mbX0i2 zKe$bRA{Lyq=XS+fGW~`Ic>XT4uZ}#`)NDnd9_57v`T9#Lh)&f1*$p z615_u2~Z_MmXZ$9fV1>?9yY%85-=_(1RO~aY`kFoHF76bB_E`~^7H#S8BSeWbfTfWHNJvK5)goc zz=}wM{QJN&)myb1{>^_26*R$6yAHzJP9fu$R{iw-3wy7)hpK1lF`nCD41x9pMXV#^ zK13Uc5#ceAlk9Ya%H8<)tAus5Yf;fW)shQf=Qo{KLeVbL%$5IcBgj6#%^xwr+1VhS zy>?tl8P%vaKB4&$Zx@2|V#a(fnELyfpWVwb(T%ruhVYW%F}IoiTR7jtq7E>$sqhF~ zk|YCjnZaB(%(b0mh^q*x zgkTA(s~pbbfh@bS@eg=FI|!20dBQ@NR7nQJQWqRSGI9>Xe&c{qzvpiknwmef@YaT1 zw;rBf-Vh@s*x_nsp5iR-LhV6kF5Y8 zX(0p00pW@*spf^O^EPB3iTKj%8@i|xLJ#w0$$ziDTfRS{gErX$J| zDN16~Rse+%?VP<@_0JgAFIiV2dBRjo#ym;6s+6_kT-$iuUz>L4)odBcaS;Q#Y=WAA zvJ{N(o4Y1EwqSsvH5@;y2x=43(rQj4C1n1#Vcy)9(kCe@2jTsKkd%D>_1PoMbnq$WeqUPA3?-l&p-(L$t)=LZB6qKsd+? z34;L@I_iYP16UpI;Ff_<3_(c(u(zsS_D-V|J43jJJoD+D^O(0R@|wll-B%(t!h)q9 zN(K)3yh9i(v1yEuth07)&5Jv+BuQJABNp4HG?Z&|7LCqPxy^2n`k6PnRMiy}5f&Vl zQDUqqUW`2<6%=%*5Tj5QY&pI*f{Q&Yh1(}oq``&0G)p~y+v{}ZQKgcK6SOaO6)P>b zmSZqLuO258i8y;!KAqj*R98ckF^}>5X^9msSYr_dBv2xqXuf1Ux@ zzJdhsp#x11+iR5Na`>OAJc6QBBNho8D{4}OB`H=!P^FEK{N_T^%2FjXl#nnC8~(@c zLYD!Ne{|;wZ*^?9v(og3qaeIQ*oXw+L&!}7^r<3~Z7ujOKT51v+Zipi$t^V5O=Qze zMr&_vuP5^qYDRMNQ@d`Jnw1pH%T2dcMq=jXH8z^byjHE*w=J$!Zk2M%rAnH!SFJ_> zL?bE`0~jPmEh>QpQasOtfLP2I7%C(CK-^jq31@?sS@JmU&_6s;+c0JSS3&aXmFMZX zT*M4Y^pV(O@G>`sJwy8+k`tO07$U$K2#h0Av!CdhtR|6RC14{eO2DmvOM+%vD3t^Q zQ;6ZA69US4IAH^`rW80sJtHNa?YX}@u`$ak_8w2|`p-v^m~M}hO(L5}uZ&ZP58x%D zg`rAtq$(nq#LMAESIAN+i9CoNtPf-cOF%e8WLTpuV{02Nu3EihR)VVdcc)PnX4?BB zCAH|*rf(Fnl&L1v&9>&-TqTw5ZF;XZZD>Ud6-yvg7Kn!;C{huZ!HBP9k1#`8g&HeK{1h!3ZxiF(MkTMr!O>vY^;6s_K5YTAampib-o+a>Ip2OIVp$v@A+?nSm zcC01CZ?k~hoifAmK4xTNSBa7=>Ash3e(AE`7WDc^Pt#-W!=XFEVb`G%oytDDAGJ0~ zN`-lT!j@lO^Iv-<^ycFj%MK)+(-UDfVcMOr1pVxy8m<)!5J4UeUV!?~vD$6a>!@DV zrbhz~n#47)dMB+IkOF?2Zz8`8?MLVQj zq@yN~%>si7w?m>37+q8WKD|**9#d0K%;Df`xVs#S&Nsf^XK%1?IpZTGL-16aftDzW zt?(PU@V15<{ia+iaF8P<8;u7t?IR^PajY0hiHvSDgCU1p? zfK8c6LQQ%WhNmqitsS8dAnuernC<{(vFJpce?B3ir&GE1P?c>QyW6(*|6Ug~0<$yc zdb%vs3!yhQvod@G;Mez5F`d#6Z*k~R^B$m%8i-Tyu2*Q?R95M1UY!O#$bsk&G4V1r zP*KE(~jpP7iFF<>JqC`g-PDXFO@LT1sdYRhbjOj~co>Qd~*W-2OV%1cWt zHk4LXD9S}oB4#+DAM9(q=*zmWyLyev2Z^R zzOnsZreH%@8$WnB*oZIbmlc18g>z`&joP}dQ_`p`Z5 zbg_ehx*Q0&h?YgL)l8oNIL&3imqip?VMP!js2-dBv1zAjB{mh=BRyR7Zg|eQ!XG$~ z;7Ci4njeSo7EYogD&w7F_-UeIWHf_l@VMFuWDxcG=JB6txzirq3`}DqCE~OTa5LK3 zjuun>O{l$6b;ktGPua+MkYI$9GGGKC2*LZWjn1XExy<>HJ|WsAow_$QMHdJu-kVO) zv5ZThrk~l093p;bPB8phnw6iatePT|@->>>${3KMY5Dm#*EXu7#}=U`KD@$KO+Q_N z5O++@l1PWqy{Dnqeo)?UqwArMqd1D%Ns4{63zV~ZE>=|c%}lo}(gblhk~uk^*6K|Q zmEvi-!C;01D1DUpw9mM=5BhqUgf=w*T2S2Mid=4Go3kbk9Tbtl2~-_ zKAaC|x`KpFA|>xo+HIK&?%!Far*pG?(1gN)-$fE5Dx_gjf+%FDWc8PU6J01jlwbkI za*8v0t!Ne7)*a?-UWK1kH?5bk= zRoz(D*kUJ4h6YG?2XxV}>@WvIqqVva#W*6%#QL9_Fih{-)AtcLoWLN4&^w4Hg^DH? z(2W4bfk^g{BPu|&AwrBmr3bmuut1}`UzyolY-)Rzav~QU-Y*d>j->+^pdXfqo9OWm zZ1la@k zaKe7SWK~joAR<(vum@8vwMrydrPbow#eH5Y(%htCC983nTmXmRpHa-PvwKr}tGH&~s|!x>xv+R#Guv{1VbhGU@s^b`Wy?W#lCfGA zxa&hFy0^c6T-edE+-tu_Im$f206sCH7r&g3W>WdH6CyM2b|J5L4g}2Q-t7T&8Nd?I z!xAEi9nNs%gJMs4w&gEbYFec?<)+0-(gvnD%%LGA93h!L?4Zwa@tz)oLWr#&RFE+V zZHLsJQY(2O1e^;fH(IAj`G{#`Cv)VXuu)S1Ab(@|nSLJ#dreW|WP#*v&{)+%M0hQ< zgV<3(+DbdBL9}w1TU?P!QZY;{N)Zmm!h*sY5m^Eu9~b!7gQ-^?9jL))&&!) z7(%!23|mwj7)8LjvFY}Kf_1onZvYH^vsaoT9dTAM*~fdh^cxJzOe)i=>u6QGa<R#JuUL%g4OlaP!^u?U3}qGW|^I=L{F@QPxLT!^8VQw5cUu~WuanPil-6gVZ1+;vSM*F%Sip`F=N zdNhYdPD^2cB*_pZh!`TW+7OMZ(wIOqz(D@DB=j#7bH^PZM=+3K1}246WfV0kmXI&j z?X2~@xyjY1mNW_Z2_>2-%ja6l5PVTX7DA*ceT7^@mH}Ln=N$gcruA}XS((yt&Q5!~ z(Mg|FkSp>2&fBfG%Gca&MXGF)Sw$AoXw*ikO|OsbcCK0^w`S^Bd3K%E9%OBF#<_D? zhVe7WKI4(?B^MV^cb>7;+NgpLpeXLSC@2f1^c07CtMd3BcDAjuQgubPKJz0bTia$5 zG(W;H8N0kOQ4l-k@c4)MwrF-8$f))h_dm1d^~+`a49BvRwz9=V7|GJA$vl2~Z2DbN zso)UJ&P=Mj3kJECCWagIprrw#R3qpVhrF-^_|Ezpvu;3$An7BhCAVF6q@Z-PFxdt< z?U3>PH8xZAzZSE3Th-v`bN)nejwn*yI+HDf&cuV9BPAmxK6bMn8EH7I7p1HA$-t~?1Y=O9Qc~1VhElVCpvV(bkuDKelZaMbA zx#Y-Aih|#;Z+5`x25)C_?n`SxoOGOt3(iPsD}TT0vJ+gxGi^T3SYIeFq6;7%WM6X} zBPITN>>0|_SbURa9Exfll;#*^tuzxt)b!?NT+^GIhVZ4Rp_Y`G8Ed%18{9A~ZjH~3 z>KUCz9Yz{ona;!1{H7R%QzDYDg|?zZsxLdL@p3d|E&#}%8=!bD)M;?EYRY1L{#3ec zS7MMcig(dWhq8(TV7qu{bkZF0K?9lKC9VUw_j3%w`s{V>@IbN|5ctQk8sjZMWSd}Z zq8{`NjEC_E6cSMmaJ$zYF7GqUr7GQVQC=w5Fi@8$gkaTEWt18OL3ARh#w8F_Mgsx> z+u%|bBoic7m|{p2M+lGja53gl>pMe(yuZM!wkGu6kz8-+Y4!)WqH|&B3oGojxX(J3 zK{n_vmrOC$ABds+|11BNu@8(=DGyg8C7V7t93v$srs;FKbgy4(t&r#OLc_wz@PSv< zQqZUq(S>p8w_R4)VQZ4TGM>XzkE0zUB`dV=k(^I00S86Y+O~O}+ zuNlmuIw2kf1NH4H!Z?ztH-0!OrcZ4e#N25QE?(s3R(|6*$h%xq+iKBPzp#Vz7X|2+-0tQFSXw8qhc<*|pi*JBaMT5blB$ z5D4&b!E3lj=4n4pq4ftJ-*z>{`p(ao2JjI1MMgvg$7`o$>}7N>Zmk;|upDjPJC7hQ zv#)DoYM3&#Od}<8W9zRokd1?0Y)6mFy15?exZUaySgI`8zM|Xa{cp9$P$e3Ph89QZ zx^{`-*uce+At{*E-9fH5m6vSDI$Ryhd#ce-CiWRSrtOWo!X>v1u*C-}?V=^?b|wX(3nw z!hu;uOoc-7@WsO(!tORNY)=@6x6?~?B?O9a1^~oHbyb2Jl|Ny$?KETc?~Kf+?YxdU zsZ}4w?2~$&44Z}>=odofIVMi-@;X9sK12+3#D_T97*Rxm@nb2o)(&}T zi)(P}pVD)!0pK!kv*e#fFSLszDmPqxkn;D3uFV7h)S1QQe0IikjDCl1=$$(WR2vue zQ})ou2*E4@p@9a>fo{VhNSQ1=Vb&a?V97-Q>f5(*KJNKMJx|<_JBbpgfgg#}o*WVH ziGDdI`Mh|#JIlzQOLYTN@zC=%lc7rp8{WY<&5R*U{=RqImEE`DneiFhg6AHW?d9ZV zv!l@?B!eXJP);tz%M#*+cU~)vx@A(}(mF|M+xvYC2F?0+<(X&|2fqv0NJDXBVW82> zTnyfF!kWV{;1~`biW@lc&3EQ!7#ypX>%%NK8jY!MNqv1-D7^(X%+Ij)vq56yM!(Gg zNiJ`u+;5TP;>80Fo;dm;{Dw3arLTWuRviZ!hjg4@ontY+@DlUA{w7RzRI7imEFr!m>zwei4sDlPacX@yXL%eeqoZsA=*IDF^^ad zs+>b4PvVJ0J?CD3Z))VOeTMS_5Idb)cEVf;7Q45~WBeXQi}>1EeJ*}W<`c7Hj#4b} z`u9XDE7*+^Lo3@eQfUL<(-gS&RnOr(6XI#q=y3M`!}E7t0;qw3hOAw}pSJ9iIW|O| z|4cVvJG3Wy4`(y-K44?UXD>b6W{uJX>7$cOxxc4x#X)XeI8ZASyti_Ezs3>Q&mA#B?0OC4?jDz7SB5} zFkus44=SqlVGdBzQLPADuo>V#0gdHg(4YoYq+LpcP(JJlLKOu;A~67m68TLAC7F0* zdV#jMBOwUMT&SXcdnHMmn}s7V+yTNJ`X}@KD>#3D>lz6{SW-1hR)J*{wlFlWmyh25 z@q5$Lxb)!fGv_RYr$}&AzEtM5YNHqtD*N=in+eq%3~dFa9{&rF-+q_^LI#@XY<8ig z4lv2LAon^w& zn{nyZ8FK=$LnA8LQYCuYKo99=WVV8Az2?0mCABj*ng3at&BKussD)Hjt%6&ZoCyvb zwi84sIo@E35nxOi1Z1s9D-{qZTyjt2U|l-H7#Z02oZesv#96_v@>2(=6A%ZMqJs%} zw<9G{64`24$jCIcg)N6o5e0*VD=#4>4_Tky zrD5ZEGHd>B{GjBYaPS>SLMU1k2GF`|X`S6}CwA+lLQNQi-*MrA*jl$)RSpN~FW5T4^|T+lh2? z(SWf*V=%C%EdOw&IS}F;5Mp$Y&D>ZfTLuW$Lhc3*b0q;5NU}^aE}PWuj$gs%-S- zAe>C6t4fQKN<9>-kmvyBc)70}k0$gFCl-f|dl1j{#bDEuGI{p~$pFB|%- z#L^l3T&y_K34#friP`2PtQ7;f^usGI*2B9G9BCe&l5V_f`^MkQ_J?K zCLor3Ke|g^=;9^^)^Q1JBL{ukoUyJ|2|jxyJ3e z_)y!MI!S}SSDbpmfpla!-=V4Anls#YgQmgK3^$Jj_{i;s6JG4nLn-?sB`S0$OdjZG zM`)Rh!x>`K$WzG$s=7R@Qts0M9tIxJY&P8shN@`|#Q^d@*>i+i|*RDM?su#8WwFKfLNK*4{4(-H+L@g}X zK*81B0|eGUp3PY6wMoh*{4tS2%24m9fSQ<(KU#^dR3A@^-b@TN?#b zN^Gm|?O!Qb0SN#yQv$}uCI+o7``|yYgCK%*M*>9%pcI+}MdKEbu$`Y58H07Aw55z` zV!&8RAUfT3sWz*YxkZac)0=j+(o|z;%~zgxRnmgghD&8AtzDMcskL0S@5-+j0Hz2+ zjAb(e21qCXWJ&VkhHSZ+a`Cf5kx`QUe9x9s;>pco%EFW{RZI0!xWn&7!%w>AB`f#e ze|gr2>~8C= z$`%<6ilarS6r*NUXwaHW!b&ohu||t--Pp*QOrvbr+d-|OnM1niO{+C>(D;WonJh)P zXEFWLl)5{1&oY)s5bCa6ktRm3EIdJ1&|U)w&hlrvIrd`ZPeRWjni0; zyK!4Zt3_ZYst%^d+b8mWfM@j!=Mj5{V8qOvN50rk^Bs62(XACOes@qg`b-5=5A*mDm*Ude$nw<08O6KcOf;e6Fd|RCGTjqM$KS!@ zQ-zP77QS3xz}>*%&CZHch9&)aDs znN$x&h~I5cgd&>6%n~MhT;*fEAjhj)OYGy%78o2UIbMFgQg6DC7(6LW1UTSW%)Pl{ zjU8>#5Jq52@ygT=@cNTH)&52GoKw78c-eN>MQpQf1(hZ+xJ00*dHB@iK19H}yLh6? zzV8?=2@->Osd;9vD?!x{CZP`O7el7sQ123v{s6AxOHSi*-FmntLlDGbJ=Bwo9fQg| zuj3Y$NSn!#y^(9UQi9}zL(`+0KUoK_ouME@C2cdo6)O_wYa~KwYb9fGyW!XIDFX9< zd+B}@2RIl)x`RAh@8H zs4Kb{tZl7!+EZey;JtKPc-gYVm6L)rBPGDW3_x5cSrQQwBPzv#E?`g$g~K5#i6#|6 zgH{0gu*VY;QekL|rWQ;XT*#%FB#KE=1x&i*m1}J^3x$dm1yM}0P@Hcprz0u`k6BQ$ZEL5MV{>M+Tt+NK69V7Jn>CFew8Dt7w5+38a&I(8*~lAb1EWLX~VS zOIAUIVHmAF;9OE5ThLFZvSa9I7_fXS^QcH3AscYu#whY6lVctyaBRB}-49y7EsG8{ zlPMDc2_q%mN8Ms}9o?c>fc_8^BozhdMGykTaIFA^#DD~EAgt{#FTwNbBPt^*p0y8* ze<#8E7)ndp!f4v(lI&CG$#*DX0?iu6;9poz?eRYujSQ z^zK{ZpX{gNJEm!D8KamxV(D57l6-D11zp%j&`qfun{w zVy5<=tBKXix`l6uLlQzE)o)4nfS#KKPAp1+Lse9wa)OensFEa)$|EY+;eZhH42Ycq zbU7C<%BmzTBFdz&;%~O=v=wv?|LHPHg6r^n9e<8N>C`1WgIi2OQvyXPf<_2!KQ5v6 zL4gSbge^c6F)D#6Ba>6_uO&>et>o3`b5sdeX6(g^O^Y17ZcE2^ZmW>2uN!#U@>glD zmP1-iiZ^RbYi?S#%I#FvOHq_Ic^Q=5iDqq52-YrZwrbe9ckOpt@ol`U($Rod1}?* zDBt!kkb;`;6g!-lKusXPx|#{p0$36t(hJoPkp>G8U-o#LgB1(B>)OQi0|z~yLC?pd zuBeI@gH!m;Wg$(#v9W-Ec@eSoe(xHfs9o2$SKn=|nX7FQDY0rx8(T>gy;|Rcb5wo{ zRW|xL)`YeIv|)`cmdYb4NF6%D#2}0(lAjD&Cj|+W<6w6aP*WwKimaBvv(bQY2|qKbSp%Bu zl@t_&DP^wPGVNOSO_f(wbjnG!0v*t4W0W*c-qe>6ejosAh(L)pe|7o4SWq~EC}IEw zK@vjXfp*y?JI~Si=0~=(H7mpnh1NX?fPzSfNvlCp)MYD6Wo((O)#wEP1+P9XaxvZ& z=1?5)0Wl1P2t`B*0ufj#xQP}C5bP}Qfh}wj3?Tp_uuwb`$UQ&R^WTt-5TivrVhEqX zBqJ1vj7UXn$P3LyPxnPDeO}L(EUlUz$N?od#3L#oO$-P77yPEA{$JZ=`$`s!D+L0j zn`PQ}qpbv@QB&WSZ9g2RnTN1#*!cW4*u{Wr1N5k2U|IDj9D8x-?=AuuabcNU@*^d= z&TxDZsPrICI{>EHGxhbpoPk@_HQlBB2OMZ|m`TT1F=sgbB}&*r3x=+CWH<1kro7Qk zBo52u2hEXPE|2#RBre?_?@W{+j_!4^+j6uuF`RT@a6qW4LggggvPB00G)z!LBo<1v zqyq$nLSjlWWVWndRt7RgW#c5VaXLoiFc=YHkXq4(UbdN;f|=h8n{MU6h{z}|C1D4Y zl_yfzKqDpPklpFze%0I7|7WY$igcT67EJC)cES)m9f;wE2W^;9xgXJ4q`8V=n;a)2 zC=~|6iJ@YJ&)_p{TbN}~z(BYKsUU-KDh!Jtumg;NHHOF&C|#vC+%c@0WV{BEQ}#SJ z;ABIvQ0LE@ZXBGBfoT^*L%#f=opB;thGs=Tr1#UpTuWUAYDZS*HoI1bB6INfOH%RM zrAurmR7P!-VX~GH$r=cE!vpAD%qZ_W8zry$zY%hX`>6pnBv*`#C}Ix2XFkJAs2LNW z0=lB0UWe4QAeaJ&H{%}|O=Ea)0mP1kURJlwg6Z7B)!r?uCk+`U8 zKN;Csr8P4)meRfS(K3ip5cF*2vH5do#6%3h839rIq9}Ucp&%d^Km?HlIwdHXggZiX zn6NmXNYLgUv+N)(-@Fe(FJ`lMwjO)!bgkRC4()yEy!^3u{_=O7LVaBmJ*QrN@)>yN z^|v!xJO=*-))*Gvzm_M5;-(o)X&`jYtId#wJ)M7U$QWC@SSF#9a?X>pGokUB2##8c1X7~@45B+v2zzuscn4Z@MzPzi(Xob z&)0J`SKS+?%0FzoA9=Hvw@J+jH>;eHu@24lc9XswKQ`WoR11rkOd}-*%@fyHA||CR ztx>?r6Bz~+1r<;xPM_azU}V%R)P|E9>0xk8Tbnyz^!ZAY#*Af*A{h3P)^k?+mB&ry zi=Y8^YWHUyz2&22lp6tIW_YISKJfbjTiKL&VVfDM6HQ7nCmwsLJ7Yfndh_;jZ^t}? z*+IKpxHZ1pSY>s*F=h_q`+Nzksce*cX$vfWu}^cS4?;b zl12jvu7o2cBa^pfTEr&q-Z+<%A@1+9ffzh|yHo5L zm3FoKCwe_+fgLAt zc%fBxu_~dIvvjmq_ZowU*2+uBxF($WvWOEPZdE*g&;1}`oIQ|=_924Z2p(mIN}~3W z!sEQREUky1QP`VEL&VKFgPb#x866ALWup`0RRo7=BRl@*IQnR=UUZsHd}`cBbIUh6aoXv2BPCG!#R5aI$eyVMcGMQiSyIGVOF*lGNsLn= zs1(K+WQOh5Qo|5wWoiXzl%+6Tw@eme zaOY4!fOzRr)>XdTcCGC66#OeKmp8cyw_52w;#?9k-Vq4p+U$Z8DP=~U7k5*KXJs7@ zd1QV9=MQ$JKB$r6y;`ZC!OP3z z60s#X^%{#-2!TNYAGdcSDrZhedO$w|=zPWU2}at--TTu*%#;f%z@@;XON7gk;^@HM)yy=6p@7rVI+4Xkcag1}?hymM~iO01r7RBqtZU2 z+K!1K2oV7CV67cg9*9YfAH!c%o8>}1SN9u339v*CY&^3zBPuJnquJ}Q0TIt$&Gr>r z%CazkP`5(k0pql5FA##%6mdW@WE(#ZAbr8MOzGx;q1;6iQG(Es8=!YUptv2|v0}l{ z=zgn#y#u;c1>^~(qInXq zCPW);Cz2aj@*nyo^kpkz^sBK3Ai4+XIjF_hvuGj$kILJNYR*2U4j@Qr6eLynAX#1tg|*I$ysVsWTw)Zs!D20 zGS&4*UX-r4bpl&jZ?{)GeSQJ*WFa9UT?9``UO_Vu)Rsy#X*QHYd$)Fz?ey))K*cdM ziA zFi9XoH|UoR4u|=k0bIc!FPXk8W=Bp&p_OgF3vJUOKWA;dmzAr4Z3 z1Yx6CC}ITTFk@hqkePvj6K4-I(!dlbCB3cwYfCF6j9nWB9eq0Kg+dxCN2qN)c%$=7 zGZ5pG&pDJ$BP!+;&RJEq{bO>^7$YTu2yBP9`t*2>J6DPfAlEW3qAWi|!P`=o;1Ff;RtZ1zNt*M z-ta7Q4(EnayUOJ_!yC-fi@KD}Ii=XOwk7K3T`2PR01K?s7uufQ=Q0f46j!AN`p?MmZ44X_a@Z>?5 zZdOl&+8n2TnrJ<}httSH8b5E(&8us0tjzP{F;!Jp$&BeGozM>{7=nhdDVI>|fk447 z*@&ZWXhU|vWHmFU!%fI!6qnO+5^ZTEL}d6bS(rbc0N18Y*gUX}SOyrK2{>V}mIeSC5LJT=g9CtBkia+VEt6nE@wgH^e5LX2+6HR)ruLLWZG0%!a^WuG!YW16Ycc)9ld{fQZQtZDricW$$Xg8mAILArX-Re_A=H!uvr>u>VFe4?j1NpE-=i!qN+W2LI9^zJaptlj-UZ3jX^S`W|ndpjQEAZn;P zhJ!m)HF%B&tY+E5n&XX5?s|12Dj%=vY%ZBSM^GP%KTo@!7ot8&ydxzJI>o?;2O8K) zDDhc1>)`->N)iPV&E;sjdgFzQLd<*C%Im<_ zbVPRdSH#P^>(V15C0p^(D!1c0f>SB%duYW7RA_^AKA4H@!q{d=MkGc+4!G83+Df7X z)7dgU%Et+?%@aZ2NkE+-ECmG-1Vi9q`^+i9@UDEWzbNy+9oAc7#Xo(qNU%^c)D|#O zebJpFI6A0&3qt&8YYXw_2BEDo)D~whuvsYTL#M+bg0fG84m)o$#A{y6OLNC9jl5fy ziW!CPY{n>5QX?v%SyCHI6oV+*G;CGk*r>NRO5NSfc{~u19bqO^AIB?;sN8jcKYwi%n3V+BA#-PkcXGb+aBJhbO}grL{+^Hjts+3 zdMEk80!TrTQ97;AZXa=jz&^K?G!joMajhGj$aY+ahBqpBcc=xGPvVOSB9byPK}i^~ zY*?~ZOCh#RWTu+Mu`w+SO|h#p7RqYI**4nAZDu1|SK6<{dOCSobDCnv8p2U-Wnoar zer(eTpqpii!!r!9s>gEcYD$u_RbY#@xbWs-s-arpBPwP~44KDtmQtvpPFQ1{%z}nm zRYYJ~g+~)pSZ^*ORJes<5jYGC86mh*g~(7fOpJ>FXn-tHDkuvGst`r6hd{Sf3{)2g zphgUqfKornf4k!9LP^A}QIVh{Dlk&PMSvik5TRJf0W)xgm?`N4b&$Ghl7SxB7$iwz z{&Gj9ets=}PNS^!SCz@n2uUL<2~tV9eL^GxL5cz1BygIn=tsOE$&kfKGHM8<#!!D5 z{jrwBt0F=%luWD2n}ESFwKikI^F6}wqm0moP{4K8lF@IGzkKmb)1lNMa<5eqL5iAD zrEFNcg)k8#DlA-sSs4&qDq2yyLga*~0?7a>Nh2!2h>)oOSS$=K0>G8IO$da;36BqR zIYRCpzD`2^<)j24{E@L|bT3@6#cEWB8=Ip`#;W%%XSa9kv@$EpxpkC$l){0%4-|x+ z10yI#_A3=wSmdN(Ymf7(gJt`&=6Qam?p#952!s5+7}tcC*Mu82#CE%olG_%-zT=5M zPLaAdtp?Z02_c|&)3LOVLosnCSf?t6c&;gljO#+N51eCD_RK+2;G%rwq}EIhiz^H7 zT%om+Bf2dwNu4o}L1f;jB!}vO;p1k|o4V2t6Lyz5W*Mp5CLCf!*@c6eu=5v=JuF&} zCyOsFtsN8EbSx9!t z9eAaMRYoo3WG%BJDhp`rC!&xZZq_|RH<06j`&Z?ICirzq5;ysWzLAW^RY5ZN6*|%iD?$wT1;8Ol0D(9|9dpz69cLfJwF}Rt; zmXO@5IuK;Z>!|5(SRK{*+4iuEJbXSxbR#9a?a*$bVIDWpRUIzI>#c5jW7gQ-NZ*C?X&8)HDIpK-Z9Xi(f z*Y#QZ)eo8S?)`k8GH<-LBptRFOpe;H_ip%ufu!HVZg=ujalUWDfbP?@Uc z(A!?bFs{vfr(}ZfxfIeikZ_q7Dd8lX)u0vQX1Mxzv%1$vB9)!6L_im4hE-{R=&+6S z@mFNf<&-4Ze6XmPnj`bL+NUr zd?%~eqvKB$IlesuCONlH7tc$B?NxL~HdedF{9ml&$HC*p_0#L#)k|(;o}H%S`8kW6 zV}84<<#U1GH3&nyW-HvhZ0QScIP!A-Gh*nQ9Zt5M;bx@VQA5>4(%E5bPNLkVe^8_W zu|3?YlWu6~j`qhK238xS*lFn4;5gG7=L8!M==X;v9yNa?D>|Pmx|@rIY8~8NxW4=H z-5*tWSKjYNw2I)<~*}{>I4;+}YTH%YE;qihFe)33D}IP44?%{B`fm zove}%NSD+ubskx$Vw#knOI2cTMb0QON9rhNMb;^WMjyn@;Jp;qpt7G!H$$y4wg>8+ zmSdPL89^1MeasUhC6v6VnPH`t8wB7p7cTY_AVGRkk9L}@%BiI4X+@TLwTZRywIpM&LwBsekn%*_x zDM&^faHKl9-XIRLLhiU-qP2w z2xycX;0EQO@W$lbu>2y8-zP&KPb@TDA%)u8Bc9YO{ikpok1a=E58o>XKQHZm@t zPe$b{H)Jq9S6JE|P%Nl*Ax{w2`rSp~dZo$Aa56yYBq%vA2?-=hQ|V}F;Na-!<_udk zhyiKWDUcFH03j75K(PXvibzPvoA|?CAT8))ZhQ4z--bIdq&2ZgZirE`0hA=Y-GI_2 z>nJr#fMJ#;a=?0Ifr>a;E=Ypr!kC4*%dGHu%%o0ErZWJL0vfu7sXQiurXwW?+HZls zJ+ANSnU10&X%i@nAmLORmyxbdvl(e+oxL`rPGtv<9hL|2?X4E|R%5}-UFF@qAX~$& zjL}x%TSaXX1!dY)CFc-pmpNP*Ql6#V$=dMQ>qI&wa`=wBY8i84I=(Tr8H;ryy78P& z6N#Wn+VpX%uP1$RT^y}sc(|R%5Zx3Dez$`tu3hX+-qbvo>nAt|*MQpO9Qw^ZeR09N zwjTNIRlkgMB*q((Z`^)LJS)OEzAi;bG2!8ZIImfk#-&i=i>S_CQRvAYqaBCu>V(YB zIX;=L3AWWa(QTC?Q#}WdY36!6bcEWo7V3iS3~?hRWP`@Y7~y#yY%hHL{qJ|a>JrY8 z6W)?FX18~3(NamX9*rI&wry+T?|~-|q9c8|(CC&vw>bAfBPx2QBPAmxH)|pcveV?f zhNpFCAe25whC+;WN1^u+!Ok4UNt2?IbfR*&b%L6f6QD@?yx_0jcQ6}*oHs)FvLh5bdp~>9wz98DB4 z;j&5C$jx?g4z4lS+RP&=3!R(-)%Wk1EQFFD*p(4*jdAJAYttM%BCim?tM*k1_xHbt zc|C)yHb|_@K9)r;Dd<#uVDQZzpn~4p|5~&>&ONX;qKn-9I4xOenPGf6Qkh(tPWs7I zk=l7jVyN#r>Uw-xyz1fn#C1W~3(>F_J|p-m6{BV6?PYbg<#ye^q1V=@j>neO;jfME zti5t0DvJmA*dr=JvM3*@1pP(|A|zrq)-eF6vY?j9MU<2+ zRGCF)H5F*lZ08isQd7+>y4zQR+wV2atum`ctXmq?DoCU_%n=s@f)j0fzCu@yc<(z=W2DO_wYL2vQC6UeI9jEm z8M-7bjM$Nw{n+|bhf~K>9H#d)DRNwg@!IQ9%W>_LI2W6CBPty{@@?fWa#Mw-wc}BE zlYH5u)uYRMb8Gu;PaZFQ3CLSqC{k;?Cgnn%n}FeL{(fd?hGcD-JJ7;Rj?3{N42q7~zlVR_3PcuABD_qH`l?Hx@dz5#sQ|5lCmXbMTr4m zEE{Ny7Ma^8In3~NdP+KU92EgcIJ1Puql4f&f$QMjiwsQ}x?D2W%rZA_?{q3-%*$}? zJ2K_wH3T@+$`nG{R^m50bh;idIn7OsD?hvKvnq0S$}&Wqiy+*mhf{jFGu7!#kZ$F3 z3(cXPxq@=~_0%xlQhLm@oGIdHXF%-bH%qPwhTYK+BPw-}y0Fw$sR3CY(pNGK`@r5Y=*r=h~7 zx%hI{q$PUK#OYEHgoz>~gG*f%KBXjLZ3wTUBz^i#zBe{+TaIXWOF-Mo^C5x1+MSOe zV@RTXX=cA!InEdCR~matkQ8y^GASDP9G=AhqL5M&3@FNTkBKS<(RU*yb*Gjs8{~bu zI2)dnI|qsDMFT8$)P|E*ct1Z!Q=IqdOWK5}Ef8{iXHNxjF@xMaTtLLUH}aFPEF7o= zgfY6A$l0{`{NhO?BE|-&6hNVMFpwk(5Ri~gG$v7Drwe%7yG(}rY;lzxn|s*$pcORr zU95Y~Yy%^Csv{-Nx+=$w$ZClT6}K5hN~&W*P2WbsC%oy|e1-=jNY6%E02lRv;CO8$ zN{QGK^TU{;V5dcws@W zd>#^aZv*l~859x{5)(3MGQ~#2DhSz2T9mUy)gnmCB}PpmWJpCc*&`)Ql7dSmA{tFt zteVnlHYlSM%NuQ)S}~|h%4jJW2_lH6d9%*s5%rrCZ5(dkxQ#~sRXU+}htc~?^u)`?^kBp+gm`H=vO5R58@uwyOqUAr=?O-ZXT03;YHLy(zvwFJS@q z9%a5XS2|q<^}~kV(_IYJ73MQcQ44LteUmqnRuLCh2$fOut5E3mW?|w7aVOLnhJp1m zJi0d&zG-JcGYq7vOBM?wJhI5dk=taIB_NTQ!%&!!Vv8eg;asXoG-M_u5dksk9qj=8 z)`!^D3~WSgg*bTcWV?K`gFM7E5rC{7+Xf=Ty*}&?*mj+?d+6QW5+T^9xL{)fV=1I; z1r)Qh)&fyUhJ9I@Pb1T*cUL}jsb;-7D0V^luE-`NQ(D0ELRMwKBPBo&j>&h$pH9dg zP~#*;L}0~A%RCTh99wz(^?SM6I7y_)7t&TcYRJVciS}?XM)3m8IE{k#KwknGAjn{N z5V9|Ddd3yUdcy-*WR)4{42B6BKtL2ZY9lJhK-Xg7ec6PJ_jrfHFe}Z1 ziEm~5OVGVjkbrgMnI?2Xs}wO1guoq~`TV{ic`tgc>ftV6btTJ#3)Q9T%{7d%U9)O4P`=E-JHLR*Mhlog=bLEk1iZa0? z1>VN!GAEKqm0)i<*<509roVgysmBPtIp z3uT6pLP-R>uH_8sfadou{vE-q%Sw5iP}o?teQE1T;k>-UXav0L?)5;SYA8d0K6shw z+uZ<&=oFB}BM1p=>L76&e(z+M-I6JVwDDnVvV`wJj(ElxH{=c=f*qz5m ze+!))4osSXQKCJc z5Pgp%pGPWX#SZRSo(nw1KaG!-H^BScvcQWX5t0x*OO%VnwwohP=fVG7r2FSe5^*rD z@G)CF8#AZS?)#y^uB&!yGdTI%@hvLJ7C7PZ&T!9W=%)l?oM>oRZ%UFPGJ@_SD!@{x zO><$7$h!czhG2yc`!uZugg})_)evUSCqtJWGW9iqoQs>|pi&9!rjuRQY}QX@+jW&j z%VZiw)Fq=NVJ3vT9iyq!Zn!|zO{ghhovn6GFqzsp#R6_{-it*tM__=`h9#1eCw38d z;&(CWbBE#Fcncz?L>M-f^hcNr>5Qx9_f`;^@J44hU59yupYOgck7FMrhXYOvErn#iqs*jVfa9 zR>pLJLIMGp!Q?22!5Rm`;2ITD*GvQ;Yk-7?YZ@OoBy$&%uSF(@mb0PiW-f=dpSyP| zs?_mdyVFe=zD0_A#$wgCzau4^X(-KBFgznAArOq}R3j=!sN4nychua*BP9cOLL?Fx zY=iB{6^9O3oaW9>2XFz%lt6P{y4{=+RiMgd(rYO$7iI@m=WGvQ*|LQ49NC)ZRv!ya zcauFe43#^(hP2aWPZP~IlG+DPyPNn!(?qF;L=g^Hs-J@5EnHxdMJo|_nkAGdPYH## zY;jp+D@+zxNp6BlmkAu2=Mg(&-dyy)p1VJDtCH8%&l{D&e*B}Jd9Lmv6RMh-WgQ+7 zWl?j9sb^SDghn95gRPvJnTHg_wb4V%(IF!x132dN)zOO^P0P=k7%Al}={_?&5;x7)sP-&ohLyjIFi7rW_ zTXvqvIMKr-n%kXJCe=GeaN7X}G^dbN*yMz>i=4IoCriSnZf{PS^3T$X5IUU1kEm+F z&7OW8duhC$e1a?QLT-nqHfIZBSEkU?;mMNfsr!2`QXQQ1N1$x>7pNCP$rx;e&xG?4 zJw$DtF=j?V2c!;DTU9yMeTYSm zZ{gAwa@o%AGR}lymLIh~ZI<@`{g?J1GM2<{jF` zUAhL)?WZK`(<3D-X<_;@^fyY*sA3r4`*zx_?Rb%0f|6^Ct;vLyJ3B2XM`Z23w=sgo ztt5r6kZgB_VY(VKSQR*KoDtJC{Vj_-1C7_38Hfdy@N-1rM@ug`; z6com((c&6tV3fmwXjp0yIfOAmmd8-wS*|FwsiTFpaU>Fvu+^r8;lkfDLYQIV1ITo6 zIS}Ing6!mI3nCaw0OPDAFt#3(M6tYqLs*oAVwwG8njG^TL5yhop3rby&JSL3`4Xqoy)O6ph!RzhC@g=%`Cz& z1rA_mEUrnd6JtgOxt@y`f+dDR2N1$qIwfVLG_gfOK)JEBLPt>uz^K$8f_++H-Btao zEc~xuozgv`h&Ck@MFu~Y!?V;qdl4vgiPN|^O!cMPCp{^bRnyuyLJ=rv?>xzW$37+( zQkt&w^n3>J;jAz_gNUd|NWmUJpqwDRm;Y_bo*CNV0PXFP={S{Mo+Tb=CuDpP9;0`A zA&d)7>SaShX8a>6YnW44Q3IpJk*IU^{|A89j%JbX;eg~p0l4A%rGI3hRZ@j&F0DpR zNGa~_c&OD}RT`T#AV7hX#GZ-p`V<(0A*WYdD2HC+ilF^*ZZ)-89udWvEm=hr7t2Y5 zzm3Mucd;cW36m?7D-NoNb!2UO$}H4aDi1TAv2z9MM48QvUD~a?LuU2D%?UAed=oMS z+W}W_hYqWK+=z#PV0N|)VI-lY9Equa1C!iItDC60eb7pj4-Rf1q?MOMuBIvFGj#pl zSF8b|Stvc#_VDth(B<5SKscVk+&9~+0C!OA2Q5rfP?>{!=#pkSU zYw#Ywrt`qr6#Z6lFizo2%aUsYT{XH6bu?+4K_s4$5k5=iAdXiEm8=h~P7Wm9Mw*gE zw5t}wjz(}fj;M&-KT0Di8!30J_|=p7L4c#g2%sC`CtOhX!sY=8Mo1vPTJtsr!Gde7 z!1ups%!9PGP+21-W$@4yFH3FJOwiF02u5gjU1rpf7 z($S(Bnb%W?W)d$@qNt+;A-L=V!nNr=yewy|HNd81#kp$igM@J8e z7PCqY9h77e>xSe~WvmR$zzjq}vLh-^zT-GVE=)@Jgc@KxP5R;&9&{SRfwKsq15>(k z((LHIwg;6|hpgsyi_gcf+OJcgpoww`lPL!Sr>~2jiKZa+5n#|Dy<=u+EO^f$r_Rt2 zNzcBJJ`=$Y<$5oSl@S`2O2UM|J~sBttYXB(gersS)F(8MhN4P4xMy~V2BukIAEHD7c4D-@rbu! zN|cdA!4pORL4dCiPauHy!D=WSv(tmO7$ia#>ZX_eci!kHq*YCpJ8Rh?yFGw;S14V+ zNiOORomJ5F}Xvbnxuja4%6FcYU6UbpStdq)4bK7zh{l8qcNk zEQsJO)!NCf;iH4_Wy)VbPCoqflIjOj1!O!z0ojKvQTHvhDo%vCD6(TNZWNMMLmbFu z3ziH?g@D{7$QVHsNh>I1fWss}G9qDyVPH}PFcAZY8g1lnuB0IdMH&2?e062|BNdS>(16{HC&8sS$5ZgZt z6q^tn6M0HGb_UKUFYFKUrd! z(S$V$)1JJHcZmO0?@*Mh9WpOZP9JEn6P-gnvG=KZDZBpno^R7+Db@M?4024 zWSs(U4pU#&9okt{!u`*j_)VCCLLx}bm?J6yJr0l38Oj|p7A3MpF)Uqpj4HcAt5}$HZ0T(1XJT)N_}-%D@wRQVc*0fG5O_!Gh-p z$EQA^(WT*Syeu#RL=%dq(f1!$)PJ`CNFPZD>`M4$6i9aBuqTUrpHG0a@b2oUO}-Zv zwWqZ4yr@rUSozm2eJYC+(~#TI?#qKgiIhJ+5tqDw-Bu{fA` zU?^*rdWqMD@pvKVobxHs)uo4dZ6b$ka-JEhv!LLeLxtNQd0|aYx_WLsQo!P}9$0uI zCEcjD(Y5Z_D-c^W*-*`lIfTqc&N*vpb2XucZt|JY&TNrDBM?$azzyZP2e;tUBP5Ixh=zJi~An|F2H?Ct5fG3&^?>R@wFz;D(Y z05y?CAVgshToeRIB5TGxzPdxR5347>DO|Ph9#N{2k)m#~z;uOLT8fP&Y~p%hyr{+m zfhts&9h`>;&7OBeiaEAXAtrbg-b5!rHi$vIq_D^JZ5_i=&{+`&KYt|arii!_1Hz?N z(|Evf=o!4JSSq%3|5A(AAAa5ZpjU3CFFG2f-0mYPNDiIF7dw3xuvn;KJ3kX64o;v? z*m~=4$Xwt7=s^d?6pH;P6k=OM4+)y3`~aPlVO0xl4~O+nTrWb*rug=U39WF35&qaPC0eC#sc8(jpLc55mV?;9tcAf77?KA6KlN|J82rd;%lDU5|0v39s9cLpg=r zSrhC*Vzie#tpdaF{4Bj)33}(N=~ix4#(%X)!>MhXv~P-FPNf4CweE{NB}uozLs0q0 z`1HFhi2GwMk$rHe5)Wl~b`l@KT3K+xp``b*Y=~+~Vn{Jeu16y!@Z9kFOECy-LZRl* zL?m?#jLrSSgow{n7g(dsAbOC8tw4YPP>p2ME8yzwD%{61t)^LQtY{%2f6 z8g+Lcjn28@yEOq5asJdqj08E15h+F~W6YBjd5{?rLZwuck_3cEQXRa_vpjlh_4`UQ zFh>&XI)mH$)ZqlP_+mQ95oS=-v5}lZ0kU9nQiaocLP*8ys-~vg=3lhdjT0nk3lc_h<7`rE5s<~BMMmFkUU_t9%Zi_2F~-cenG|2}uEl69NbYLkYL-pxFe%8hKWPbp6cF z*_1Iy6lAF(Qiv6S+X<;7C5S>Sfq1(_xT{b~AT+T@nJ~xFS!Z-5IEFa^Wawc{qyB$S zO@&BS0wwLFP*NQvhN8o6%!RD5Cyxc1gabuEjDifBBsj@0m#otZ+b`{_4@MY=5=rL_ zBP9vbKu-gHme;U6s)!Z7OXJh{4xx;Sj8z9@Cs5vK$Z8`9QiSXH(&(Sb{oOY}=*m_? zV+DeQ^%xn>vEgJ;^t3(_CKyph5Xw<8jRKKoOql?|V#vvoP{SiCq5+I)L_oQOqGUvh zF%}~#3}#$15~N{=co;@98E9KcTWBa&BPyY`N&?Gdpu;DK#$<*#kfcLKq>74*0LL&X z#*iHq+>)C>xn!{2+U%ufWSY#|UNyR!yluc^i-;D9h6{C1FwC#5FMlAyz#|^DT)#oD zKi<85=-`$hZ9ZAG(l<+po2`Bcha#PvL%LyinZervS%%BFSo=MX&_(yTX7{o9BD~8N z+u-nJ6NKR@smJz5WSK%XbJ2vDN|yTDZLdB)eqhZQqYDU59?^{%51%xcng_-LPPjD` zpK0v+6>iMTOs^Hxpsd`?LQ}giQ-iVF^OLcIk4u!7FQ@VJ;SbvQJ&Eb-=El@$#lbm- zWTMW^g<1MQBPHsYf+dGL!g2qr-R0tpxNw35!F%vMlZ_DS*k<0<0vAbX=*Fi=zS+PJ zj!oJKNOCh}u(N0&YCUB;uqZmnhS_K(!e%_*N2|q(g9eSi7Nfx3+T{a{VhDl~VTvLK z`iVeFYq_9%%d*R7srqN%A*cXvB0r0njz+T&J{9itYt|4XBf_jD%v?sQgtlbtvf+l8 zD+a_N5)2q12v;H@0Q}f-Mpncd-bn}IXAB&#NMtQnkGqQeRMCdgp2*(NDsjSK5QC3X z&*bA8N9|0-NiEAVBl7xelcJh|!}QJ_=DV(yAb9S<9ougXgim1rC|E*xo{O4 z9`o|Pw9A&`6OrS%h)N?EZ*jrE^&99`p9}MOYOa}mBg^o49~u4Kc5%Yv!IXTBNb(NW z_7r5Ow|=CgSMSFz)7^@5?K@qi+WGpnBPxex=4W76uI?EDQXK^FP~o(me5&cK#;2<- zE>50Y9SDO^G9UT>>G{9o{vY_?|F*v;{$GcZ&-Q<>`~Thkuc!Z?FZ;ju|Bs*kA7+0i z_w@gN`#HZ~{6FRXzwrN;{XgH`{u1c$cldJe|EK)_<^JBU`TKwV{_n5*?Eeq?Pv7zZ zlKhH@JctB8mFgoZwS)b?tpeFLFaEkeWyw*EN{lbPKXQORre>N2eWGH2u7!TWAUFTf zhX3-e;Qlt;%KW)sYd6@|zF>tFuadm^oBBV?OuwKykO?4q?|t%Cy049|ZKx0PxO78_ zBPDT?$Mhy!oZ4Y~*VmzF3w8b0Z~rHLmO=tNhyC01)Hoj@Cs2i}fx5Se-2lJ|0Q_uJ zB7`ZCVBvw2YYMOKr8bB^XgE?(K$pZT-LValxCZIw>L~ zJbUn0KPc9mX(K9W=$jq-`*+x|}GFk!NqBPYM@|IJj!9nSZ|BK1vg{E;?u z;v63*ZE}U2^t07p9J-eU*0$Es!%0RfRU#~yG?4=God?Ysv6Lb3(3;IDpn>5sL^4D( zace`Om9`&^dP3p2%c{ZV)@TtkJ9gUFC}cLFxKPqdCVi#UgO4fA-W`&QG|S6;UV&RJ z=t(S-sp1R$)nKQJ21XMH#T`2%VPNI%%3-*niel6?9ML6Of>SbzO>&xiUTW}s2Xg{~ zDK2r;HtXcI^lMYYOR~9AQ4;2{T7x0KqebGdNd)NRWpiL4a999miy<`F<1`$C_92Q$ znKTd%+7n2M3D%GxgaELxHGua)aR3rTTk$q}9X3NnLr{$~2a|cS55MQfS*EJ0ziZd@ zAhEo+u7^o6FXf8$zFt%`1l|!t`GJ6Mmb_hi=7-g)uxo`F{hwcFzOSK+ZKM@8WvM8T zNQNdNO35jWli|9efDpzfC<5;E=>wOhgv8@YpWy)iR7lCidPyy_;xL%VA4W~et*xK~ z0EO%ag!X6M?+_0^s6XX(Pw77eSB=idRrqZhO;y6I{0;Za@4Q|F6T#L5MgWeJcw6)M9hs(Fo2|OBZ`SR_)_kJ zdd{xTPG0lly8iKe{y(O|rj;)xRYyd~BP#lw_h4*SZ0oX+&t8Rk`nA$oXm)94$JfQ- z@n*XFy$3D@8zlz44`)RzQ0WCa#Rx>+B|%vcgd1X^P@N%F0Z0OiBq~TxXvyx&GQy-M zxShdMeq9qxp;i)0q2tfD0QVKiK!4JQAkh1WP_SStT#9sK95j~2N5BZ?C>BR61bh2> zl2~8}IeLbG%z`_M6b^LyW3VvogdyqM&gAK?gY3|G^w)fnNg)VG4)EIQPy2)h|H}T? z+J0GEb2p)j`(EdemH?Yma2!5oU?_j-h=c+tFn}7JNb55d?50sFid3jdL8V(wHIpsP z7P+xD-75G#=YLhE%1w3b+iy*(zZOL%V>O8Y6Cwh4o#(TCCy%c%(%*QW6%(jsY12dI z{CQqy!seONLTKY$H$PN)rK@n+PsD(3LT;z;`^o>y|A+_$q85tr&H>oa#|JonpG7v9V?J;-FZ)G8pz%T_g%CO(k~A7i z24UCd+2A@Em;S#0h;zY29H-ma+Ze)M0MdN9bfwe&-330=(iv1iP>-2F@(>TDQG9YB zz0otg`G&av+xoM{WNWLhmCEah@Q$fH{Eqed$M=u?AdE<0s$L#f{qADUQK3isSQG!{ z(RrQ4ga5W0CEiDR#o>>O?4wDGV-SCVRqjzD5<*waVXBh<&%=!=iCD%hYPbC^M;Lwe z?bfqyxo~1EBEm@cJ}h-Tb0Z~|H&%`}{#pj#Re_JqQAtVS9BrPrbzn}L^+&=Hq{J0 +#include +int main() { std::cout << BOOST_VERSION << std::endl; } +''' +boost_libpath=['/usr/lib','/usr/local/lib','/opt/local/lib','/sw/lib','/lib'] +boost_cpppath=['/usr/include','/usr/local/include','/opt/local/include','/sw/include'] +STATIC_NOSTATIC='nostatic' +STATIC_BOTH='both' +STATIC_ONLYSTATIC='onlystatic' +is_versiontag=re.compile('^\d+_\d+_?\d*$') +is_threadingtag=re.compile('^mt$') +is_abitag=re.compile('^[sgydpn]+$') +is_toolsettag=re.compile('^(acc|borland|como|cw|dmc|darwin|gcc|hp_cxx|intel|kylix|vc|mgw|qcc|sun|vacpp)\d*$') +is_pythontag=re.compile('^py[0-9]{2}$') +def set_options(opt): + opt.add_option('--boost-includes',type='string',default='',dest='boostincludes',help='path to the boost directory where the includes are e.g. /usr/local/include/boost-1_35') + opt.add_option('--boost-libs',type='string',default='',dest='boostlibs',help='path to the directory where the boost libs are e.g. /usr/local/lib') +def string_to_version(s): + version=s.split('.') + if len(version)<3:return 0 + return int(version[0])*100000+int(version[1])*100+int(version[2]) +def version_string(version): + major=version/100000 + minor=version/100%1000 + minor_minor=version%100 + if minor_minor==0: + return"%d_%d"%(major,minor) + else: + return"%d_%d_%d"%(major,minor,minor_minor) +def libfiles(lib,pattern,lib_paths): + result=[] + for lib_path in lib_paths: + libname=pattern%('boost_%s[!_]*'%lib) + result+=glob.glob(os.path.join(lib_path,libname)) + return result +def get_boost_version_number(self,dir): + try: + return self.run_c_code(compiler='cxx',code=boost_code,includes=dir,execute=1,env=self.env.copy(),type='cprogram',compile_mode='cxx',compile_filename='test.cpp') + except Configure.ConfigurationError,e: + return-1 +def set_default(kw,var,val): + if not var in kw: + kw[var]=val +def tags_score(tags,kw): + score=0 + needed_tags={'threading':kw['tag_threading'],'abi':kw['tag_abi'],'toolset':kw['tag_toolset'],'version':kw['tag_version'],'python':kw['tag_python']} + if kw['tag_toolset']is None: + v=kw['env'] + toolset=v['CXX_NAME'] + if v['CXX_VERSION']: + version_no=v['CXX_VERSION'].split('.') + toolset+=version_no[0] + if len(version_no)>1: + toolset+=version_no[1] + needed_tags['toolset']=toolset + found_tags={} + for tag in tags: + if is_versiontag.match(tag):found_tags['version']=tag + if is_threadingtag.match(tag):found_tags['threading']=tag + if is_abitag.match(tag):found_tags['abi']=tag + if is_toolsettag.match(tag):found_tags['toolset']=tag + if is_pythontag.match(tag):found_tags['python']=tag + for tagname in needed_tags.iterkeys(): + if needed_tags[tagname]is not None and tagname in found_tags: + if re.compile(needed_tags[tagname]).match(found_tags[tagname]): + score+=kw['score_'+tagname][0] + else: + score+=kw['score_'+tagname][1] + return score +def validate_boost(self,kw): + ver=kw.get('version','') + for x in'min_version max_version version'.split(): + set_default(kw,x,ver) + set_default(kw,'lib','') + kw['lib']=Utils.to_list(kw['lib']) + set_default(kw,'env',self.env) + set_default(kw,'libpath',boost_libpath) + set_default(kw,'cpppath',boost_cpppath) + for x in'tag_threading tag_version tag_toolset'.split(): + set_default(kw,x,None) + set_default(kw,'tag_abi','^[^d]*$') + set_default(kw,'python',str(sys.version_info[0])+str(sys.version_info[1])) + set_default(kw,'tag_python','^py'+kw['python']+'$') + set_default(kw,'score_threading',(10,-10)) + set_default(kw,'score_abi',(10,-10)) + set_default(kw,'score_python',(10,-10)) + set_default(kw,'score_toolset',(1,-1)) + set_default(kw,'score_version',(100,-100)) + set_default(kw,'score_min',0) + set_default(kw,'static',STATIC_NOSTATIC) + set_default(kw,'found_includes',False) + set_default(kw,'min_score',0) + set_default(kw,'errmsg','not found') + set_default(kw,'okmsg','ok') +def find_boost_includes(self,kw): + boostPath=getattr(Options.options,'boostincludes','') + if boostPath: + boostPath=[os.path.normpath(os.path.expandvars(os.path.expanduser(boostPath)))] + else: + boostPath=Utils.to_list(kw['cpppath']) + min_version=string_to_version(kw.get('min_version','')) + max_version=string_to_version(kw.get('max_version',''))or(sys.maxint-1) + version=0 + for include_path in boostPath: + boost_paths=[p for p in glob.glob(os.path.join(include_path,'boost*'))if os.path.isdir(p)] + debug('BOOST Paths: %r'%boost_paths) + for path in boost_paths: + pathname=os.path.split(path)[-1] + ret=-1 + if pathname=='boost': + path=include_path + ret=self.get_boost_version_number(path) + elif pathname.startswith('boost-'): + ret=self.get_boost_version_number(path) + ret=int(ret) + if ret!=-1 and ret>=min_version and ret<=max_version and ret>version: + boost_path=path + version=ret + if not version: + self.fatal('boost headers not found! (required version min: %s max: %s)'%(kw['min_version'],kw['max_version'])) + return False + found_version=version_string(version) + versiontag='^'+found_version+'$' + if kw['tag_version']is None: + kw['tag_version']=versiontag + elif kw['tag_version']!=versiontag: + warn('boost header version %r and tag_version %r do not match!'%(versiontag,kw['tag_version'])) + env=self.env + env['CPPPATH_BOOST']=boost_path + env['BOOST_VERSION']=found_version + self.found_includes=1 + ret='Version %s (%s)'%(found_version,boost_path) + return ret +def find_boost_library(self,lib,kw): + def find_library_from_list(lib,files): + lib_pattern=re.compile('.*boost_(.*?)\..*') + result=(None,None) + resultscore=kw['min_score']-1 + for file in files: + m=lib_pattern.search(file,1) + if m: + libname=m.group(1) + libtags=libname.split('-')[1:] + currentscore=tags_score(libtags,kw) + if currentscore>resultscore: + result=(libname,file) + resultscore=currentscore + return result + lib_paths=getattr(Options.options,'boostlibs','') + if lib_paths: + lib_paths=[os.path.normpath(os.path.expandvars(os.path.expanduser(lib_paths)))] + else: + lib_paths=Utils.to_list(kw['libpath']) + v=kw.get('env',self.env) + (libname,file)=(None,None) + if kw['static']in[STATIC_NOSTATIC,STATIC_BOTH]: + st_env_prefix='LIB' + files=libfiles(lib,v['shlib_PATTERN'],lib_paths) + (libname,file)=find_library_from_list(lib,files) + if libname is None and kw['static']in[STATIC_ONLYSTATIC,STATIC_BOTH]: + st_env_prefix='STATICLIB' + staticLibPattern=v['staticlib_PATTERN'] + if self.env['CC_NAME']=='msvc': + staticLibPattern='lib'+staticLibPattern + files=libfiles(lib,staticLibPattern,lib_paths) + (libname,file)=find_library_from_list(lib,files) + if libname is not None: + v['LIBPATH_BOOST_'+lib.upper()]=[os.path.split(file)[0]] + if self.env['CC_NAME']=='msvc'and os.path.splitext(file)[1]=='.lib': + v[st_env_prefix+'_BOOST_'+lib.upper()]=['libboost_'+libname] + else: + v[st_env_prefix+'_BOOST_'+lib.upper()]=['boost_'+libname] + return + self.fatal('lib boost_'+lib+' not found!') +def check_boost(self,*k,**kw): + if not self.env['CXX']: + self.fatal('load a c++ compiler tool first, for example conf.check_tool("g++")') + self.validate_boost(kw) + ret=None + try: + if not kw.get('found_includes',None): + self.check_message_1(kw.get('msg_includes','boost headers')) + ret=self.find_boost_includes(kw) + except Configure.ConfigurationError,e: + if'errmsg'in kw: + self.check_message_2(kw['errmsg'],'YELLOW') + if'mandatory'in kw: + if Logs.verbose>1: + raise + else: + self.fatal('the configuration failed (see %r)'%self.log.name) + else: + if'okmsg'in kw: + self.check_message_2(kw.get('okmsg_includes',ret)) + for lib in kw['lib']: + self.check_message_1('library boost_'+lib) + try: + self.find_boost_library(lib,kw) + except Configure.ConfigurationError,e: + ret=False + if'errmsg'in kw: + self.check_message_2(kw['errmsg'],'YELLOW') + if'mandatory'in kw: + if Logs.verbose>1: + raise + else: + self.fatal('the configuration failed (see %r)'%self.log.name) + else: + if'okmsg'in kw: + self.check_message_2(kw['okmsg']) + return ret + +conf(get_boost_version_number) +conf(validate_boost) +conf(find_boost_includes) +conf(find_boost_library) +conf(check_boost) diff --git a/waf-modules/wafadmin/3rdparty/fluid.py b/waf-modules/wafadmin/3rdparty/fluid.py new file mode 100644 index 00000000..e61f988b --- /dev/null +++ b/waf-modules/wafadmin/3rdparty/fluid.py @@ -0,0 +1,17 @@ +#! /usr/bin/env python +# encoding: utf-8 + +import Task +from TaskGen import extension +Task.simple_task_type('fluid','${FLUID} -c -o ${TGT[0].abspath(env)} -h ${TGT[1].abspath(env)} ${SRC}','BLUE',shell=False,ext_out='.cxx') +def fluid(self,node): + cpp=node.change_ext('.cpp') + hpp=node.change_ext('.hpp') + self.create_task('fluid',node,[cpp,hpp]) + if'cxx'in self.features: + self.allnodes.append(cpp) +def detect(conf): + fluid=conf.find_program('fluid',var='FLUID',mandatory=True) + conf.check_cfg(path='fltk-config',package='',args='--cxxflags --ldflags',uselib_store='FLTK',mandatory=True) + +extension('.fl')(fluid) diff --git a/waf-modules/wafadmin/Build.py b/waf-modules/wafadmin/Build.py new file mode 100644 index 00000000..281a71f1 --- /dev/null +++ b/waf-modules/wafadmin/Build.py @@ -0,0 +1,676 @@ +#! /usr/bin/env python +# encoding: utf-8 +import sys +if sys.hexversion < 0x020400f0: from sets import Set as set +import os,sys,errno,re,glob,gc,datetime,shutil +try:import cPickle +except:import pickle as cPickle +import Runner,TaskGen,Node,Scripting,Utils,Environment,Task,Logs,Options +from Logs import debug,error,info +from Constants import* +SAVED_ATTRS='root srcnode bldnode node_sigs node_deps raw_deps task_sigs id_nodes'.split() +bld=None +class BuildError(Utils.WafError): + def __init__(self,b=None,t=[]): + self.bld=b + self.tasks=t + self.ret=1 + Utils.WafError.__init__(self,self.format_error()) + def format_error(self): + lst=['Build failed:'] + for tsk in self.tasks: + txt=tsk.format_error() + if txt:lst.append(txt) + sep=' ' + if len(lst)>2: + sep='\n' + return sep.join(lst) +def group_method(fun): + def f(*k,**kw): + if not k[0].is_install: + return False + postpone=True + if'postpone'in kw: + postpone=kw['postpone'] + del kw['postpone'] + if postpone: + m=k[0].task_manager + if not m.groups:m.add_group() + m.groups[m.current_group].post_funs.append((fun,k,kw)) + if not'cwd'in kw: + kw['cwd']=k[0].path + else: + fun(*k,**kw) + return f +class BuildContext(Utils.Context): + def __init__(self): + global bld + bld=self + self.task_manager=Task.TaskManager() + self.id_nodes=0 + self.idx={} + self.all_envs={} + self.bdir='' + self.path=None + self.deps_man=Utils.DefaultDict(list) + self.cache_node_abspath={} + self.cache_scanned_folders={} + self.uninstall=[] + for v in'cache_node_abspath task_sigs node_deps raw_deps node_sigs'.split(): + var={} + setattr(self,v,var) + self.cache_dir_contents={} + self.all_task_gen=[] + self.task_gen_cache_names={} + self.cache_sig_vars={} + self.log=None + self.root=None + self.srcnode=None + self.bldnode=None + class node_class(Node.Node): + pass + self.node_class=node_class + self.node_class.__module__="Node" + self.node_class.__name__="Nodu" + self.node_class.bld=self + self.is_install=None + def __copy__(self): + raise Utils.WafError('build contexts are not supposed to be cloned') + def load(self): + try: + env=Environment.Environment(os.path.join(self.cachedir,'build.config.py')) + except(IOError,OSError): + pass + else: + if env['version']1:raise + if data: + for x in SAVED_ATTRS:setattr(self,x,data[x]) + else: + debug('build: Build cache loading failed') + finally: + if f:f.close() + gc.enable() + def save(self): + gc.disable() + self.root.__class__.bld=None + Node.Nodu=self.node_class + db=os.path.join(self.bdir,DBFILE) + file=open(db+'.tmp','wb') + data={} + for x in SAVED_ATTRS:data[x]=getattr(self,x) + cPickle.dump(data,file,-1) + file.close() + try:os.unlink(db) + except OSError:pass + os.rename(db+'.tmp',db) + self.root.__class__.bld=self + gc.enable() + def clean(self): + debug('build: clean called') + precious=set([]) + for env in self.all_envs.values(): + for x in env[CFG_FILES]: + node=self.srcnode.find_resource(x) + if node: + precious.add(node.id) + def clean_rec(node): + for x in list(node.childs.keys()): + nd=node.childs[x] + tp=nd.id&3 + if tp==Node.DIR: + clean_rec(nd) + elif tp==Node.BUILD: + if nd.id in precious:continue + for env in self.all_envs.values(): + try:os.remove(nd.abspath(env)) + except OSError:pass + node.childs.__delitem__(x) + clean_rec(self.srcnode) + for v in'node_sigs node_deps task_sigs raw_deps cache_node_abspath'.split(): + setattr(self,v,{}) + def compile(self): + debug('build: compile called') + self.flush() + self.generator=Runner.Parallel(self,Options.options.jobs) + def dw(on=True): + if Options.options.progress_bar: + if on:sys.stderr.write(Logs.colors.cursor_on) + else:sys.stderr.write(Logs.colors.cursor_off) + debug('build: executor starting') + back=os.getcwd() + os.chdir(self.bldnode.abspath()) + try: + try: + dw(on=False) + self.generator.start() + except KeyboardInterrupt: + dw() + self.save() + raise + except Exception: + dw() + raise + else: + dw() + self.save() + if self.generator.error: + raise BuildError(self,self.task_manager.tasks_done) + finally: + os.chdir(back) + def install(self): + debug('build: install called') + self.flush() + if self.is_install<0: + lst=[] + for x in self.uninstall: + dir=os.path.dirname(x) + if not dir in lst:lst.append(dir) + lst.sort() + lst.reverse() + nlst=[] + for y in lst: + x=y + while len(x)>4: + if not x in nlst:nlst.append(x) + x=os.path.dirname(x) + nlst.sort() + nlst.reverse() + for x in nlst: + try:os.rmdir(x) + except OSError:pass + def new_task_gen(self,*k,**kw): + if self.task_gen_cache_names: + self.task_gen_cache_names={} + kw['bld']=self + if len(k)==0: + ret=TaskGen.task_gen(*k,**kw) + else: + cls_name=k[0] + try:cls=TaskGen.task_gen.classes[cls_name] + except KeyError:raise Utils.WscriptError('%s is not a valid task generator -> %s'%(cls_name,[x for x in TaskGen.task_gen.classes])) + ret=cls(*k,**kw) + return ret + def __call__(self,*k,**kw): + if self.task_gen_cache_names: + self.task_gen_cache_names={} + kw['bld']=self + return TaskGen.task_gen(*k,**kw) + def load_envs(self): + try: + lst=Utils.listdir(self.cachedir) + except OSError,e: + if e.errno==errno.ENOENT: + raise Utils.WafError('The project was not configured: run "waf configure" first!') + else: + raise + if not lst: + raise Utils.WafError('The cache directory is empty: reconfigure the project') + for file in lst: + if file.endswith(CACHE_SUFFIX): + env=Environment.Environment(os.path.join(self.cachedir,file)) + name=file[:-len(CACHE_SUFFIX)] + self.all_envs[name]=env + self.init_variants() + for env in self.all_envs.values(): + for f in env[CFG_FILES]: + newnode=self.path.find_or_declare(f) + try: + hash=Utils.h_file(newnode.abspath(env)) + except(IOError,AttributeError): + error("cannot find "+f) + hash=SIG_NIL + self.node_sigs[env.variant()][newnode.id]=hash + self.bldnode=self.root.find_dir(self.bldnode.abspath()) + self.path=self.srcnode=self.root.find_dir(self.srcnode.abspath()) + self.cwd=self.bldnode.abspath() + def setup(self,tool,tooldir=None,funs=None): + if isinstance(tool,list): + for i in tool:self.setup(i,tooldir) + return + if not tooldir:tooldir=Options.tooldir + module=Utils.load_tool(tool,tooldir) + if hasattr(module,"setup"):module.setup(self) + def init_variants(self): + debug('build: init variants') + lstvariants=[] + for env in self.all_envs.values(): + if not env.variant()in lstvariants: + lstvariants.append(env.variant()) + self.lst_variants=lstvariants + debug('build: list of variants is %r',lstvariants) + for name in lstvariants+[0]: + for v in'node_sigs cache_node_abspath'.split(): + var=getattr(self,v) + if not name in var: + var[name]={} + def load_dirs(self,srcdir,blddir,load_cache=1): + assert(os.path.isabs(srcdir)) + assert(os.path.isabs(blddir)) + self.cachedir=os.path.join(blddir,CACHE_DIR) + if srcdir==blddir: + raise Utils.WafError("build dir must be different from srcdir: %s <-> %s "%(srcdir,blddir)) + self.bdir=blddir + self.load() + if not self.root: + Node.Nodu=self.node_class + self.root=Node.Nodu('',None,Node.DIR) + if not self.srcnode: + self.srcnode=self.root.ensure_dir_node_from_path(srcdir) + debug('build: srcnode is %s and srcdir %s',self.srcnode.name,srcdir) + self.path=self.srcnode + try:os.makedirs(blddir) + except OSError:pass + if not self.bldnode: + self.bldnode=self.root.ensure_dir_node_from_path(blddir) + self.init_variants() + def rescan(self,src_dir_node): + if self.cache_scanned_folders.get(src_dir_node.id,None):return + self.cache_scanned_folders[src_dir_node.id]=True + if hasattr(self,'repository'):self.repository(src_dir_node) + if not src_dir_node.name and sys.platform=='win32': + return + parent_path=src_dir_node.abspath() + try: + lst=set(Utils.listdir(parent_path)) + except OSError: + lst=set([]) + self.cache_dir_contents[src_dir_node.id]=lst + cache=self.node_sigs[0] + for x in src_dir_node.childs.values(): + if x.id&3!=Node.FILE:continue + if x.name in lst: + try: + cache[x.id]=Utils.h_file(x.abspath()) + except IOError: + raise Utils.WafError('The file %s is not readable or has become a dir'%x.abspath()) + else: + try:del cache[x.id] + except KeyError:pass + del src_dir_node.childs[x.name] + h1=self.srcnode.height() + h2=src_dir_node.height() + lst=[] + child=src_dir_node + while h2>h1: + lst.append(child.name) + child=child.parent + h2-=1 + lst.reverse() + try: + for variant in self.lst_variants: + sub_path=os.path.join(self.bldnode.abspath(),variant,*lst) + self.listdir_bld(src_dir_node,sub_path,variant) + except OSError: + for node in src_dir_node.childs.values(): + if node.id&3!=Node.BUILD: + continue + for dct in self.node_sigs.values(): + if node.id in dct: + dct.__delitem__(node.id) + src_dir_node.childs.__delitem__(node.name) + for variant in self.lst_variants: + sub_path=os.path.join(self.bldnode.abspath(),variant,*lst) + try: + os.makedirs(sub_path) + except OSError: + pass + def listdir_src(self,parent_node): + pass + def remove_node(self,node): + pass + def listdir_bld(self,parent_node,path,variant): + i_existing_nodes=[x for x in parent_node.childs.values()if x.id&3==Node.BUILD] + lst=set(Utils.listdir(path)) + node_names=set([x.name for x in i_existing_nodes]) + remove_names=node_names-lst + ids_to_remove=[x.id for x in i_existing_nodes if x.name in remove_names] + cache=self.node_sigs[variant] + for nid in ids_to_remove: + if nid in cache: + cache.__delitem__(nid) + def get_env(self): + return self.env_of_name('default') + def set_env(self,name,val): + self.all_envs[name]=val + env=property(get_env,set_env) + def add_manual_dependency(self,path,value): + if isinstance(path,Node.Node): + node=path + elif os.path.isabs(path): + node=self.root.find_resource(path) + else: + node=self.path.find_resource(path) + self.deps_man[node.id].append(value) + def launch_node(self): + try: + return self.p_ln + except AttributeError: + self.p_ln=self.root.find_dir(Options.launch_dir) + return self.p_ln + def glob(self,pattern,relative=True): + path=self.path.abspath() + files=[self.root.find_resource(x)for x in glob.glob(path+os.sep+pattern)] + if relative: + files=[x.path_to_parent(self.path)for x in files if x] + else: + files=[x.abspath()for x in files if x] + return files + def add_group(self,*k): + self.task_manager.add_group(*k) + def set_group(self,*k,**kw): + self.task_manager.set_group(*k,**kw) + def hash_env_vars(self,env,vars_lst): + idx=str(id(env))+str(vars_lst) + try:return self.cache_sig_vars[idx] + except KeyError:pass + lst=[str(env[a])for a in vars_lst] + ret=Utils.h_list(lst) + debug('envhash: %r %r',ret,lst) + self.cache_sig_vars[idx]=ret + return ret + def name_to_obj(self,name,env): + cache=self.task_gen_cache_names + if not cache: + for x in self.all_task_gen: + vt=x.env.variant()+'_' + if x.name: + cache[vt+x.name]=x + else: + if isinstance(x.target,str): + target=x.target + else: + target=' '.join(x.target) + v=vt+target + if not cache.get(v,None): + cache[v]=x + return cache.get(env.variant()+'_'+name,None) + def flush(self,all=1): + self.ini=datetime.datetime.now() + self.task_gen_cache_names={} + self.name_to_obj('',self.env) + debug('build: delayed operation TaskGen.flush() called') + if Options.options.compile_targets: + debug('task_gen: posting objects %r listed in compile_targets',Options.options.compile_targets) + mana=self.task_manager + to_post=[] + min_grp=0 + target_objects=Utils.DefaultDict(list) + for target_name in Options.options.compile_targets.split(','): + target_name=target_name.strip() + for env in self.all_envs.values(): + tg=self.name_to_obj(target_name,env) + if tg: + target_objects[target_name].append(tg) + m=mana.group_idx(tg) + if m>min_grp: + min_grp=m + to_post=[tg] + elif m==min_grp: + to_post.append(tg) + if not target_name in target_objects and all: + raise Utils.WafError("target '%s' does not exist"%target_name) + debug('group: Forcing up to group %s for target %s',mana.group_name(min_grp),Options.options.compile_targets) + for i in xrange(len(mana.groups)): + mana.current_group=i + if i==min_grp: + break + g=mana.groups[i] + debug('group: Forcing group %s',mana.group_name(g)) + for t in g.tasks_gen: + debug('group: Posting %s',t.name or t.target) + t.post() + for t in to_post: + t.post() + else: + debug('task_gen: posting objects (normal)') + ln=self.launch_node() + if ln.is_child_of(self.bldnode)or not ln.is_child_of(self.srcnode): + ln=self.srcnode + proj_node=self.root.find_dir(os.path.split(Utils.g_module.root_path)[0]) + if proj_node.id!=self.srcnode.id: + ln=self.srcnode + for i in xrange(len(self.task_manager.groups)): + g=self.task_manager.groups[i] + self.task_manager.current_group=i + if Logs.verbose: + groups=[x for x in self.task_manager.groups_names if id(self.task_manager.groups_names[x])==id(g)] + name=groups and groups[0]or'unnamed' + Logs.debug('group: group',name) + for tg in g.tasks_gen: + if not tg.path.is_child_of(ln): + continue + if Logs.verbose: + Logs.debug('group: %s'%tg) + tg.post() + def env_of_name(self,name): + try: + return self.all_envs[name] + except KeyError: + error('no such environment: '+name) + return None + def progress_line(self,state,total,col1,col2): + n=len(str(total)) + Utils.rot_idx+=1 + ind=Utils.rot_chr[Utils.rot_idx%4] + ini=self.ini + pc=(100.*state)/total + eta=Utils.get_elapsed_time(ini) + fs="[%%%dd/%%%dd][%%s%%2d%%%%%%s][%s]["%(n,n,ind) + left=fs%(state,total,col1,pc,col2) + right='][%s%s%s]'%(col1,eta,col2) + cols=Utils.get_term_cols()-len(left)-len(right)+2*len(col1)+2*len(col2) + if cols<7:cols=7 + ratio=int((cols*state)/total)-1 + bar=('='*ratio+'>').ljust(cols) + msg=Utils.indicator%(left,bar,right) + return msg + def do_install(self,src,tgt,chmod=O644): + if self.is_install>0: + if not Options.options.force: + try: + st1=os.stat(tgt) + st2=os.stat(src) + except OSError: + pass + else: + if st1.st_mtime>=st2.st_mtime and st1.st_size==st2.st_size: + return False + srclbl=src.replace(self.srcnode.abspath(None)+os.sep,'') + info("* installing %s as %s"%(srclbl,tgt)) + try:os.remove(tgt) + except OSError:pass + try: + shutil.copy2(src,tgt) + os.chmod(tgt,chmod) + except IOError: + try: + os.stat(src) + except(OSError,IOError): + error('File %r does not exist'%src) + raise Utils.WafError('Could not install the file %r'%tgt) + return True + elif self.is_install<0: + info("* uninstalling %s"%tgt) + self.uninstall.append(tgt) + try: + os.remove(tgt) + except OSError,e: + if e.errno!=errno.ENOENT: + if not getattr(self,'uninstall_error',None): + self.uninstall_error=True + Logs.warn('build: some files could not be uninstalled (retry with -vv to list them)') + if Logs.verbose>1: + Logs.warn('could not remove %s (error code %r)'%(e.filename,e.errno)) + return True + red=re.compile(r"^([A-Za-z]:)?[/\\\\]*") + def get_install_path(self,path,env=None): + if not env:env=self.env + destdir=env.get_destdir() + path=path.replace('/',os.sep) + destpath=Utils.subst_vars(path,env) + if destdir: + destpath=os.path.join(destdir,self.red.sub('',destpath)) + return destpath + def install_dir(self,path,env=None): + if env: + assert isinstance(env,Environment.Environment),"invalid parameter" + else: + env=self.env + if not path: + return[] + destpath=self.get_install_path(path,env) + if self.is_install>0: + info('* creating %s'%destpath) + Utils.check_dir(destpath) + elif self.is_install<0: + info('* removing %s'%destpath) + self.uninstall.append(destpath+'/xxx') + def install_files(self,path,files,env=None,chmod=O644,relative_trick=False,cwd=None): + if env: + assert isinstance(env,Environment.Environment),"invalid parameter" + else: + env=self.env + if not path:return[] + if not cwd: + cwd=self.path + if isinstance(files,str)and'*'in files: + gl=cwd.abspath()+os.sep+files + lst=glob.glob(gl) + else: + lst=Utils.to_list(files) + if not getattr(lst,'__iter__',False): + lst=[lst] + destpath=self.get_install_path(path,env) + Utils.check_dir(destpath) + installed_files=[] + for filename in lst: + if isinstance(filename,str)and os.path.isabs(filename): + alst=Utils.split_path(filename) + destfile=os.path.join(destpath,alst[-1]) + else: + if isinstance(filename,Node.Node): + nd=filename + else: + nd=cwd.find_resource(filename) + if not nd: + raise Utils.WafError("Unable to install the file %r (not found in %s)"%(filename,cwd)) + if relative_trick: + destfile=os.path.join(destpath,filename) + Utils.check_dir(os.path.dirname(destfile)) + else: + destfile=os.path.join(destpath,nd.name) + filename=nd.abspath(env) + if self.do_install(filename,destfile,chmod): + installed_files.append(destfile) + return installed_files + def install_as(self,path,srcfile,env=None,chmod=O644,cwd=None): + if env: + assert isinstance(env,Environment.Environment),"invalid parameter" + else: + env=self.env + if not path: + raise Utils.WafError("where do you want to install %r? (%r?)"%(srcfile,path)) + if not cwd: + cwd=self.path + destpath=self.get_install_path(path,env) + dir,name=os.path.split(destpath) + Utils.check_dir(dir) + if isinstance(srcfile,Node.Node): + src=srcfile.abspath(env) + else: + src=srcfile + if not os.path.isabs(srcfile): + node=cwd.find_resource(srcfile) + if not node: + raise Utils.WafError("Unable to install the file %r (not found in %s)"%(srcfile,cwd)) + src=node.abspath(env) + return self.do_install(src,destpath,chmod) + def symlink_as(self,path,src,env=None,cwd=None): + if sys.platform=='win32': + return + if not path: + raise Utils.WafError("where do you want to install %r? (%r?)"%(src,path)) + tgt=self.get_install_path(path,env) + dir,name=os.path.split(tgt) + Utils.check_dir(dir) + if self.is_install>0: + link=False + if not os.path.islink(tgt): + link=True + elif os.readlink(tgt)!=src: + link=True + if link: + try:os.remove(tgt) + except OSError:pass + info('* symlink %s (-> %s)'%(tgt,src)) + os.symlink(src,tgt) + return 0 + else: + try: + info('* removing %s'%(tgt)) + os.remove(tgt) + return 0 + except OSError: + return 1 + def exec_command(self,cmd,**kw): + debug('runner: system command -> %s',cmd) + if self.log: + self.log.write('%s\n'%cmd) + kw['log']=self.log + try: + if not kw.get('cwd',None): + kw['cwd']=self.cwd + except AttributeError: + self.cwd=kw['cwd']=self.bldnode.abspath() + return Utils.exec_command(cmd,**kw) + def printout(self,s): + f=self.log or sys.stderr + f.write(s) + f.flush() + def add_subdirs(self,dirs): + self.recurse(dirs,'build') + def pre_recurse(self,name_or_mod,path,nexdir): + if not hasattr(self,'oldpath'): + self.oldpath=[] + self.oldpath.append(self.path) + self.path=self.root.find_dir(nexdir) + return{'bld':self,'ctx':self} + def post_recurse(self,name_or_mod,path,nexdir): + self.path=self.oldpath.pop() + def pre_build(self): + if hasattr(self,'pre_funs'): + for m in self.pre_funs: + m(self) + def post_build(self): + if hasattr(self,'post_funs'): + for m in self.post_funs: + m(self) + def add_pre_fun(self,meth): + try:self.pre_funs.append(meth) + except AttributeError:self.pre_funs=[meth] + def add_post_fun(self,meth): + try:self.post_funs.append(meth) + except AttributeError:self.post_funs=[meth] + def use_the_magic(self): + Task.algotype=Task.MAXPARALLEL + Task.file_deps=Task.extract_deps + self.magic=True + install_as=group_method(install_as) + install_files=group_method(install_files) + symlink_as=group_method(symlink_as) + diff --git a/waf-modules/wafadmin/Configure.py b/waf-modules/wafadmin/Configure.py new file mode 100644 index 00000000..e2307a0f --- /dev/null +++ b/waf-modules/wafadmin/Configure.py @@ -0,0 +1,316 @@ +#! /usr/bin/env python +# encoding: utf-8 + +import os,shlex,sys,time +try:import cPickle +except ImportError:import pickle as cPickle +import Environment,Utils,Options,Logs +from Logs import warn +from Constants import* +try: + from urllib import request +except: + from urllib import urlopen +else: + urlopen=request.urlopen +conf_template='''# project %(app)s configured on %(now)s by +# waf %(wafver)s (abi %(abi)s, python %(pyver)x on %(systype)s) +# using %(args)s +# +''' +class ConfigurationError(Utils.WscriptError): + pass +autoconfig=False +def find_file(filename,path_list): + for directory in Utils.to_list(path_list): + if os.path.exists(os.path.join(directory,filename)): + return directory + return'' +def find_program_impl(env,filename,path_list=[],var=None,environ=None): + if not environ: + environ=os.environ + try:path_list=path_list.split() + except AttributeError:pass + if var: + if env[var]:return env[var] + if var in environ:env[var]=environ[var] + if not path_list:path_list=environ.get('PATH','').split(os.pathsep) + ext=(Options.platform=='win32')and'.exe,.com,.bat,.cmd'or'' + for y in[filename+x for x in ext.split(',')]: + for directory in path_list: + x=os.path.join(directory,y) + if os.path.isfile(x): + if var:env[var]=x + return x + return'' +class ConfigurationContext(Utils.Context): + tests={} + error_handlers=[] + def __init__(self,env=None,blddir='',srcdir=''): + self.env=None + self.envname='' + self.environ=dict(os.environ) + self.line_just=40 + self.blddir=blddir + self.srcdir=srcdir + self.all_envs={} + self.cwd=self.curdir=os.getcwd() + self.tools=[] + self.setenv(DEFAULT) + self.lastprog='' + self.hash=0 + self.files=[] + self.tool_cache=[] + if self.blddir: + self.post_init() + def post_init(self): + self.cachedir=os.path.join(self.blddir,CACHE_DIR) + path=os.path.join(self.blddir,WAF_CONFIG_LOG) + try:os.unlink(path) + except(OSError,IOError):pass + try: + self.log=open(path,'w') + except(OSError,IOError): + self.fatal('could not open %r for writing'%path) + app=Utils.g_module.APPNAME + if app: + ver=getattr(Utils.g_module,'VERSION','') + if ver: + app="%s (%s)"%(app,ver) + now=time.ctime() + pyver=sys.hexversion + systype=sys.platform + args=" ".join(sys.argv) + wafver=WAFVERSION + abi=ABI + self.log.write(conf_template%vars()) + def __del__(self): + if hasattr(self,'log')and self.log: + self.log.close() + def fatal(self,msg): + raise ConfigurationError(msg) + def check_tool(self,input,tooldir=None,funs=None): + tools=Utils.to_list(input) + if tooldir:tooldir=Utils.to_list(tooldir) + for tool in tools: + tool=tool.replace('++','xx') + if tool=='java':tool='javaw' + if tool.lower()=='unittest':tool='unittestw' + mag=(tool,id(self.env),funs) + if mag in self.tool_cache: + continue + self.tool_cache.append(mag) + module=None + try: + module=Utils.load_tool(tool,tooldir) + except Exception,e: + ex=e + if Options.options.download: + _3rdparty=os.path.normpath(Options.tooldir[0]+os.sep+'..'+os.sep+'3rdparty') + for x in Utils.to_list(Options.remote_repo): + for sub in['branches/waf-%s/wafadmin/3rdparty'%WAFVERSION,'trunk/wafadmin/3rdparty']: + url='/'.join((x,sub,tool+'.py')) + try: + web=urlopen(url) + if web.getcode()!=200: + continue + except Exception,e: + continue + else: + loc=None + try: + loc=open(_3rdparty+os.sep+tool+'.py','wb') + loc.write(web.read()) + web.close() + finally: + if loc: + loc.close() + Logs.warn('downloaded %s from %s'%(tool,url)) + try: + module=Utils.load_tool(tool,tooldir) + except: + Logs.warn('module %s from %s is unusable'%(tool,url)) + try: + os.unlink(_3rdparty+os.sep+tool+'.py') + except: + pass + continue + else: + break + if not module: + Logs.error('Could not load the tool %r or download a suitable replacement from the repository (sys.path %r)\n%s'%(tool,sys.path,e)) + raise ex + else: + Logs.error('Could not load the tool %r in %r (try the --download option?):\n%s'%(tool,sys.path,e)) + raise ex + if funs is not None: + self.eval_rules(funs) + else: + func=getattr(module,'detect',None) + if func: + if type(func)is type(find_file):func(self) + else:self.eval_rules(func) + self.tools.append({'tool':tool,'tooldir':tooldir,'funs':funs}) + def sub_config(self,k): + self.recurse(k,name='configure') + def pre_recurse(self,name_or_mod,path,nexdir): + return{'conf':self,'ctx':self} + def post_recurse(self,name_or_mod,path,nexdir): + if not autoconfig: + return + self.hash=hash((self.hash,getattr(name_or_mod,'waf_hash_val',name_or_mod))) + self.files.append(path) + def store(self,file=''): + if not os.path.isdir(self.cachedir): + os.makedirs(self.cachedir) + if not file: + file=open(os.path.join(self.cachedir,'build.config.py'),'w') + file.write('version = 0x%x\n'%HEXVERSION) + file.write('tools = %r\n'%self.tools) + file.close() + if not self.all_envs: + self.fatal('nothing to store in the configuration context!') + for key in self.all_envs: + tmpenv=self.all_envs[key] + tmpenv.store(os.path.join(self.cachedir,key+CACHE_SUFFIX)) + def set_env_name(self,name,env): + self.all_envs[name]=env + return env + def retrieve(self,name,fromenv=None): + try: + env=self.all_envs[name] + except KeyError: + env=Environment.Environment() + env['PREFIX']=os.path.abspath(os.path.expanduser(Options.options.prefix)) + self.all_envs[name]=env + else: + if fromenv:warn("The environment %s may have been configured already"%name) + return env + def setenv(self,name): + self.env=self.retrieve(name) + self.envname=name + def add_os_flags(self,var,dest=None): + try:self.env.append_value(dest or var,Utils.to_list(self.environ[var])) + except KeyError:pass + def check_message_1(self,sr): + self.line_just=max(self.line_just,len(sr)) + for x in('\n',self.line_just*'-','\n',sr,'\n'): + self.log.write(x) + Utils.pprint('NORMAL',"%s :"%sr.ljust(self.line_just),sep='') + def check_message_2(self,sr,color='GREEN'): + self.log.write(sr) + self.log.write('\n') + Utils.pprint(color,sr) + def check_message(self,th,msg,state,option=''): + sr='Checking for %s %s'%(th,msg) + self.check_message_1(sr) + p=self.check_message_2 + if state:p('ok '+str(option)) + else:p('not found','YELLOW') + def check_message_custom(self,th,msg,custom,option='',color='PINK'): + sr='Checking for %s %s'%(th,msg) + self.check_message_1(sr) + self.check_message_2(custom,color) + def msg(self,msg,result,color=None): + self.start_msg('Checking for '+msg) + if not isinstance(color,str): + color=result and'GREEN'or'YELLOW' + self.end_msg(result,color) + def start_msg(self,msg): + try: + if self.in_msg: + return + except: + self.in_msg=0 + self.in_msg+=1 + self.line_just=max(self.line_just,len(msg)) + for x in('\n',self.line_just*'-','\n',msg,'\n'): + self.log.write(x) + Utils.pprint('NORMAL',"%s :"%msg.ljust(self.line_just),sep='') + def end_msg(self,result,color): + self.in_msg-=1 + if self.in_msg: + return + if not color: + color='GREEN' + if result==True: + msg='ok' + elif result==False: + msg='not found' + color='YELLOW' + else: + msg=str(result) + self.log.write(msg) + self.log.write('\n') + Utils.pprint(color,msg) + def find_program(self,filename,path_list=[],var=None,mandatory=False): + ret=None + if var: + if self.env[var]: + ret=self.env[var] + elif var in os.environ: + ret=os.environ[var] + if not isinstance(filename,list):filename=[filename] + if not ret: + for x in filename: + ret=find_program_impl(self.env,x,path_list,var,environ=self.environ) + if ret:break + self.check_message_1('Checking for program %s'%' or '.join(filename)) + self.log.write(' find program=%r paths=%r var=%r\n -> %r\n'%(filename,path_list,var,ret)) + if ret: + Utils.pprint('GREEN',str(ret)) + else: + Utils.pprint('YELLOW','not found') + if mandatory: + self.fatal('The program %r is required'%filename) + if var: + self.env[var]=ret + return ret + def cmd_to_list(self,cmd): + if isinstance(cmd,str)and cmd.find(' '): + try: + os.stat(cmd) + except OSError: + return shlex.split(cmd) + else: + return[cmd] + return cmd + def __getattr__(self,name): + r=self.__class__.__dict__.get(name,None) + if r:return r + if name and name.startswith('require_'): + for k in['check_','find_']: + n=name.replace('require_',k) + ret=self.__class__.__dict__.get(n,None) + if ret: + def run(*k,**kw): + r=ret(self,*k,**kw) + if not r: + self.fatal('requirement failure') + return r + return run + self.fatal('No such method %r'%name) + def eval_rules(self,rules): + self.rules=Utils.to_list(rules) + for x in self.rules: + f=getattr(self,x) + if not f:self.fatal("No such method '%s'."%x) + try: + f() + except Exception,e: + ret=self.err_handler(x,e) + if ret==BREAK: + break + elif ret==CONTINUE: + continue + else: + self.fatal(e) + def err_handler(self,fun,error): + pass +def conf(f): + setattr(ConfigurationContext,f.__name__,f) + return f +def conftest(f): + ConfigurationContext.tests[f.__name__]=f + return conf(f) + diff --git a/waf-modules/wafadmin/Constants.py b/waf-modules/wafadmin/Constants.py new file mode 100644 index 00000000..add9349a --- /dev/null +++ b/waf-modules/wafadmin/Constants.py @@ -0,0 +1,47 @@ +#! /usr/bin/env python +# encoding: utf-8 + +HEXVERSION=0x105019 +WAFVERSION="1.5.19" +WAFREVISION="9709M" +ABI=7 +O644=420 +O755=493 +MAXJOBS=99999999 +CACHE_DIR='c4che' +CACHE_SUFFIX='.cache.py' +DBFILE='.wafpickle-%d'%ABI +WSCRIPT_FILE='wscript' +WSCRIPT_BUILD_FILE='wscript_build' +WAF_CONFIG_LOG='config.log' +WAF_CONFIG_H='config.h' +SIG_NIL='iluvcuteoverload' +VARIANT='_VARIANT_' +DEFAULT='default' +SRCDIR='srcdir' +BLDDIR='blddir' +APPNAME='APPNAME' +VERSION='VERSION' +DEFINES='defines' +UNDEFINED=() +BREAK="break" +CONTINUE="continue" +JOBCONTROL="JOBCONTROL" +MAXPARALLEL="MAXPARALLEL" +NORMAL="NORMAL" +NOT_RUN=0 +MISSING=1 +CRASHED=2 +EXCEPTION=3 +SKIPPED=8 +SUCCESS=9 +ASK_LATER=-1 +SKIP_ME=-2 +RUN_ME=-3 +LOG_FORMAT="%(asctime)s %(c1)s%(zone)s%(c2)s %(message)s" +HOUR_FORMAT="%H:%M:%S" +TEST_OK=True +CFG_FILES='cfg_files' +INSTALL=1337 +UNINSTALL=-1337 + diff --git a/waf-modules/wafadmin/Environment.py b/waf-modules/wafadmin/Environment.py new file mode 100644 index 00000000..7068644f --- /dev/null +++ b/waf-modules/wafadmin/Environment.py @@ -0,0 +1,158 @@ +#! /usr/bin/env python +# encoding: utf-8 +import sys +if sys.hexversion < 0x020400f0: from sets import Set as set +import os,copy,re +import Logs,Options,Utils +from Constants import* +re_imp=re.compile('^(#)*?([^#=]*?)\ =\ (.*?)$',re.M) +class Environment(object): + __slots__=("table","parent") + def __init__(self,filename=None): + self.table={} + if filename: + self.load(filename) + def __contains__(self,key): + if key in self.table:return True + try:return self.parent.__contains__(key) + except AttributeError:return False + def __str__(self): + keys=set() + cur=self + while cur: + keys.update(cur.table.keys()) + cur=getattr(cur,'parent',None) + keys=list(keys) + keys.sort() + return"\n".join(["%r %r"%(x,self.__getitem__(x))for x in keys]) + def __getitem__(self,key): + try: + while 1: + x=self.table.get(key,None) + if not x is None: + return x + self=self.parent + except AttributeError: + return[] + def __setitem__(self,key,value): + self.table[key]=value + def __delitem__(self,key): + del self.table[key] + def pop(self,key,*args): + if len(args): + return self.table.pop(key,*args) + return self.table.pop(key) + def set_variant(self,name): + self.table[VARIANT]=name + def variant(self): + try: + while 1: + x=self.table.get(VARIANT,None) + if not x is None: + return x + self=self.parent + except AttributeError: + return DEFAULT + def copy(self): + newenv=Environment() + newenv.parent=self + return newenv + def detach(self): + tbl=self.get_merged_dict() + try: + delattr(self,'parent') + except AttributeError: + pass + else: + keys=tbl.keys() + for x in keys: + tbl[x]=copy.deepcopy(tbl[x]) + self.table=tbl + def get_flat(self,key): + s=self[key] + if isinstance(s,str):return s + return' '.join(s) + def _get_list_value_for_modification(self,key): + try: + value=self.table[key] + except KeyError: + try:value=self.parent[key] + except AttributeError:value=[] + if isinstance(value,list): + value=value[:] + else: + value=[value] + else: + if not isinstance(value,list): + value=[value] + self.table[key]=value + return value + def append_value(self,var,value): + current_value=self._get_list_value_for_modification(var) + if isinstance(value,list): + current_value.extend(value) + else: + current_value.append(value) + def prepend_value(self,var,value): + current_value=self._get_list_value_for_modification(var) + if isinstance(value,list): + current_value=value+current_value + self.table[var]=current_value + else: + current_value.insert(0,value) + def append_unique(self,var,value): + current_value=self._get_list_value_for_modification(var) + if isinstance(value,list): + for value_item in value: + if value_item not in current_value: + current_value.append(value_item) + else: + if value not in current_value: + current_value.append(value) + def get_merged_dict(self): + table_list=[] + env=self + while 1: + table_list.insert(0,env.table) + try:env=env.parent + except AttributeError:break + merged_table={} + for table in table_list: + merged_table.update(table) + return merged_table + def store(self,filename): + file=open(filename,'w') + merged_table=self.get_merged_dict() + keys=list(merged_table.keys()) + keys.sort() + for k in keys:file.write('%s = %r\n'%(k,merged_table[k])) + file.close() + def load(self,filename): + tbl=self.table + code=Utils.readf(filename) + for m in re_imp.finditer(code): + g=m.group + tbl[g(2)]=eval(g(3)) + Logs.debug('env: %s',self.table) + def get_destdir(self): + if self.__getitem__('NOINSTALL'):return'' + return Options.options.destdir + def update(self,d): + for k,v in d.iteritems(): + self[k]=v + def __getattr__(self,name): + if name in self.__slots__: + return object.__getattr__(self,name) + else: + return self[name] + def __setattr__(self,name,value): + if name in self.__slots__: + object.__setattr__(self,name,value) + else: + self[name]=value + def __delattr__(self,name): + if name in self.__slots__: + object.__delattr__(self,name) + else: + del self[name] + diff --git a/waf-modules/wafadmin/Logs.py b/waf-modules/wafadmin/Logs.py new file mode 100644 index 00000000..666de6dc --- /dev/null +++ b/waf-modules/wafadmin/Logs.py @@ -0,0 +1,97 @@ +#! /usr/bin/env python +# encoding: utf-8 + +import ansiterm +import os,re,logging,traceback,sys +from Constants import* +zones='' +verbose=0 +colors_lst={'USE':True,'BOLD':'\x1b[01;1m','RED':'\x1b[01;31m','GREEN':'\x1b[32m','YELLOW':'\x1b[33m','PINK':'\x1b[35m','BLUE':'\x1b[01;34m','CYAN':'\x1b[36m','NORMAL':'\x1b[0m','cursor_on':'\x1b[?25h','cursor_off':'\x1b[?25l',} +got_tty=False +term=os.environ.get('TERM','dumb') +if not term in['dumb','emacs']: + try: + got_tty=sys.stderr.isatty()or(sys.platform=='win32'and term in['xterm','msys']) + except AttributeError: + pass +import Utils +if not got_tty or'NOCOLOR'in os.environ: + colors_lst['USE']=False +def get_color(cl): + if not colors_lst['USE']:return'' + return colors_lst.get(cl,'') +class foo(object): + def __getattr__(self,a): + return get_color(a) + def __call__(self,a): + return get_color(a) +colors=foo() +re_log=re.compile(r'(\w+): (.*)',re.M) +class log_filter(logging.Filter): + def __init__(self,name=None): + pass + def filter(self,rec): + rec.c1=colors.PINK + rec.c2=colors.NORMAL + rec.zone=rec.module + if rec.levelno>=logging.INFO: + if rec.levelno>=logging.ERROR: + rec.c1=colors.RED + elif rec.levelno>=logging.WARNING: + rec.c1=colors.YELLOW + else: + rec.c1=colors.GREEN + return True + zone='' + m=re_log.match(rec.msg) + if m: + zone=rec.zone=m.group(1) + rec.msg=m.group(2) + if zones: + return getattr(rec,'zone','')in zones or'*'in zones + elif not verbose>2: + return False + return True +class formatter(logging.Formatter): + def __init__(self): + logging.Formatter.__init__(self,LOG_FORMAT,HOUR_FORMAT) + def format(self,rec): + if rec.levelno>=logging.WARNING or rec.levelno==logging.INFO: + try: + return'%s%s%s'%(rec.c1,rec.msg.decode('utf-8'),rec.c2) + except: + return rec.c1+rec.msg+rec.c2 + return logging.Formatter.format(self,rec) +def debug(*k,**kw): + if verbose: + k=list(k) + k[0]=k[0].replace('\n',' ') + logging.debug(*k,**kw) +def error(*k,**kw): + logging.error(*k,**kw) + if verbose>1: + if isinstance(k[0],Utils.WafError): + st=k[0].stack + else: + st=traceback.extract_stack() + if st: + st=st[:-1] + buf=[] + for filename,lineno,name,line in st: + buf.append(' File "%s", line %d, in %s'%(filename,lineno,name)) + if line: + buf.append(' %s'%line.strip()) + if buf:logging.error("\n".join(buf)) +warn=logging.warn +info=logging.info +def init_log(): + log=logging.getLogger() + log.handlers=[] + log.filters=[] + hdlr=logging.StreamHandler() + hdlr.setFormatter(formatter()) + log.addHandler(hdlr) + log.addFilter(log_filter()) + log.setLevel(logging.DEBUG) +init_log() + diff --git a/waf-modules/wafadmin/Node.py b/waf-modules/wafadmin/Node.py new file mode 100644 index 00000000..2b846968 --- /dev/null +++ b/waf-modules/wafadmin/Node.py @@ -0,0 +1,496 @@ +#! /usr/bin/env python +# encoding: utf-8 +import sys +if sys.hexversion < 0x020400f0: from sets import Set as set +import os,sys,fnmatch,re,stat +import Utils,Constants +UNDEFINED=0 +DIR=1 +FILE=2 +BUILD=3 +type_to_string={UNDEFINED:"unk",DIR:"dir",FILE:"src",BUILD:"bld"} +prune_pats='.git .bzr .hg .svn _MTN _darcs CVS SCCS'.split() +exclude_pats=prune_pats+'*~ #*# .#* %*% ._* .gitignore .cvsignore vssver.scc .DS_Store'.split() +exclude_regs=''' +**/*~ +**/#*# +**/.#* +**/%*% +**/._* +**/CVS +**/CVS/** +**/.cvsignore +**/SCCS +**/SCCS/** +**/vssver.scc +**/.svn +**/.svn/** +**/.git +**/.git/** +**/.gitignore +**/.bzr +**/.bzr/** +**/.hg +**/.hg/** +**/_MTN +**/_MTN/** +**/_darcs +**/_darcs/** +**/.DS_Store''' +class Node(object): + __slots__=("name","parent","id","childs") + def __init__(self,name,parent,node_type=UNDEFINED): + self.name=name + self.parent=parent + self.__class__.bld.id_nodes+=4 + self.id=self.__class__.bld.id_nodes+node_type + if node_type==DIR:self.childs={} + if parent and name in parent.childs: + raise Utils.WafError('node %s exists in the parent files %r already'%(name,parent)) + if parent:parent.childs[name]=self + def __setstate__(self,data): + if len(data)==4: + (self.parent,self.name,self.id,self.childs)=data + else: + (self.parent,self.name,self.id)=data + def __getstate__(self): + if getattr(self,'childs',None)is None: + return(self.parent,self.name,self.id) + else: + return(self.parent,self.name,self.id,self.childs) + def __str__(self): + if not self.parent:return'' + return"%s://%s"%(type_to_string[self.id&3],self.abspath()) + def __repr__(self): + return self.__str__() + def __hash__(self): + raise Utils.WafError('nodes, you are doing it wrong') + def __copy__(self): + raise Utils.WafError('nodes are not supposed to be cloned') + def get_type(self): + return self.id&3 + def set_type(self,t): + self.id=self.id+t-self.id&3 + def dirs(self): + return[x for x in self.childs.values()if x.id&3==DIR] + def files(self): + return[x for x in self.childs.values()if x.id&3==FILE] + def get_dir(self,name,default=None): + node=self.childs.get(name,None) + if not node or node.id&3!=DIR:return default + return node + def get_file(self,name,default=None): + node=self.childs.get(name,None) + if not node or node.id&3!=FILE:return default + return node + def get_build(self,name,default=None): + node=self.childs.get(name,None) + if not node or node.id&3!=BUILD:return default + return node + def find_resource(self,lst): + if isinstance(lst,str): + lst=Utils.split_path(lst) + if len(lst)==1: + parent=self + else: + parent=self.find_dir(lst[:-1]) + if not parent:return None + self.__class__.bld.rescan(parent) + name=lst[-1] + node=parent.childs.get(name,None) + if node: + tp=node.id&3 + if tp==FILE or tp==BUILD: + return node + else: + return None + tree=self.__class__.bld + if not name in tree.cache_dir_contents[parent.id]: + return None + path=parent.abspath()+os.sep+name + try: + st=Utils.h_file(path) + except IOError: + return None + child=self.__class__(name,parent,FILE) + tree.node_sigs[0][child.id]=st + return child + def find_or_declare(self,lst): + if isinstance(lst,str): + lst=Utils.split_path(lst) + if len(lst)==1: + parent=self + else: + parent=self.find_dir(lst[:-1]) + if not parent:return None + self.__class__.bld.rescan(parent) + name=lst[-1] + node=parent.childs.get(name,None) + if node: + tp=node.id&3 + if tp!=BUILD: + raise Utils.WafError('find_or_declare found a source file where a build file was expected %r'%'/'.join(lst)) + return node + node=self.__class__(name,parent,BUILD) + return node + def find_dir(self,lst): + if isinstance(lst,str): + lst=Utils.split_path(lst) + current=self + for name in lst: + self.__class__.bld.rescan(current) + prev=current + if not current.parent and name==current.name: + continue + elif not name: + continue + elif name=='.': + continue + elif name=='..': + current=current.parent or current + else: + current=prev.childs.get(name,None) + if current is None: + dir_cont=self.__class__.bld.cache_dir_contents + if prev.id in dir_cont and name in dir_cont[prev.id]: + if not prev.name: + if os.sep=='/': + dirname=os.sep+name + else: + dirname=name + else: + dirname=prev.abspath()+os.sep+name + if not os.path.isdir(dirname): + return None + current=self.__class__(name,prev,DIR) + elif(not prev.name and len(name)==2 and name[1]==':')or name.startswith('\\\\'): + current=self.__class__(name,prev,DIR) + else: + return None + else: + if current.id&3!=DIR: + return None + return current + def ensure_dir_node_from_path(self,lst): + if isinstance(lst,str): + lst=Utils.split_path(lst) + current=self + for name in lst: + if not name: + continue + elif name=='.': + continue + elif name=='..': + current=current.parent or current + else: + prev=current + current=prev.childs.get(name,None) + if current is None: + current=self.__class__(name,prev,DIR) + return current + def exclusive_build_node(self,path): + lst=Utils.split_path(path) + name=lst[-1] + if len(lst)>1: + parent=None + try: + parent=self.find_dir(lst[:-1]) + except OSError: + pass + if not parent: + parent=self.ensure_dir_node_from_path(lst[:-1]) + self.__class__.bld.rescan(parent) + else: + try: + self.__class__.bld.rescan(parent) + except OSError: + pass + else: + parent=self + node=parent.childs.get(name,None) + if not node: + node=self.__class__(name,parent,BUILD) + return node + def path_to_parent(self,parent): + lst=[] + p=self + h1=parent.height() + h2=p.height() + while h2>h1: + h2-=1 + lst.append(p.name) + p=p.parent + if lst: + lst.reverse() + ret=os.path.join(*lst) + else: + ret='' + return ret + def find_ancestor(self,node): + dist=self.height()-node.height() + if dist<0:return node.find_ancestor(self) + cand=self + while dist>0: + cand=cand.parent + dist-=1 + if cand==node:return cand + cursor=node + while cand.parent: + cand=cand.parent + cursor=cursor.parent + if cand==cursor:return cand + def relpath_gen(self,from_node): + if self==from_node:return'.' + if from_node.parent==self:return'..' + ancestor=self.find_ancestor(from_node) + lst=[] + cand=self + while not cand.id==ancestor.id: + lst.append(cand.name) + cand=cand.parent + cand=from_node + while not cand.id==ancestor.id: + lst.append('..') + cand=cand.parent + lst.reverse() + return os.sep.join(lst) + def nice_path(self,env=None): + tree=self.__class__.bld + ln=tree.launch_node() + if self.id&3==FILE:return self.relpath_gen(ln) + else:return os.path.join(tree.bldnode.relpath_gen(ln),env.variant(),self.relpath_gen(tree.srcnode)) + def is_child_of(self,node): + p=self + diff=self.height()-node.height() + while diff>0: + diff-=1 + p=p.parent + return p.id==node.id + def variant(self,env): + if not env:return 0 + elif self.id&3==FILE:return 0 + else:return env.variant() + def height(self): + d=self + val=-1 + while d: + d=d.parent + val+=1 + return val + def abspath(self,env=None): + variant=(env and(self.id&3!=FILE)and env.variant())or 0 + ret=self.__class__.bld.cache_node_abspath[variant].get(self.id,None) + if ret:return ret + if not variant: + if not self.parent: + val=os.sep=='/'and os.sep or'' + elif not self.parent.name: + val=(os.sep=='/'and os.sep or'')+self.name + else: + val=self.parent.abspath()+os.sep+self.name + else: + val=os.sep.join((self.__class__.bld.bldnode.abspath(),variant,self.path_to_parent(self.__class__.bld.srcnode))) + self.__class__.bld.cache_node_abspath[variant][self.id]=val + return val + def change_ext(self,ext): + name=self.name + k=name.rfind('.') + if k>=0: + name=name[:k]+ext + else: + name=name+ext + return self.parent.find_or_declare([name]) + def src_dir(self,env): + return self.parent.srcpath(env) + def bld_dir(self,env): + return self.parent.bldpath(env) + def bld_base(self,env): + s=os.path.splitext(self.name)[0] + return os.path.join(self.bld_dir(env),s) + def bldpath(self,env=None): + if self.id&3==FILE: + return self.relpath_gen(self.__class__.bld.bldnode) + p=self.path_to_parent(self.__class__.bld.srcnode) + if p is not'': + return env.variant()+os.sep+p + return env.variant() + def srcpath(self,env=None): + if self.id&3==BUILD: + return self.bldpath(env) + return self.relpath_gen(self.__class__.bld.bldnode) + def read(self,env): + return Utils.readf(self.abspath(env)) + def dir(self,env): + return self.parent.abspath(env) + def file(self): + return self.name + def file_base(self): + return os.path.splitext(self.name)[0] + def suffix(self): + k=max(0,self.name.rfind('.')) + return self.name[k:] + def find_iter_impl(self,src=True,bld=True,dir=True,accept_name=None,is_prune=None,maxdepth=25): + bld_ctx=self.__class__.bld + bld_ctx.rescan(self) + for name in bld_ctx.cache_dir_contents[self.id]: + if accept_name(self,name): + node=self.find_resource(name) + if node: + if src and node.id&3==FILE: + yield node + else: + node=self.find_dir(name) + if node and node.id!=bld_ctx.bldnode.id: + if dir: + yield node + if not is_prune(self,name): + if maxdepth: + for k in node.find_iter_impl(src,bld,dir,accept_name,is_prune,maxdepth=maxdepth-1): + yield k + else: + if not is_prune(self,name): + node=self.find_resource(name) + if not node: + node=self.find_dir(name) + if node and node.id!=bld_ctx.bldnode.id: + if maxdepth: + for k in node.find_iter_impl(src,bld,dir,accept_name,is_prune,maxdepth=maxdepth-1): + yield k + if bld: + for node in self.childs.values(): + if node.id==bld_ctx.bldnode.id: + continue + if node.id&3==BUILD: + if accept_name(self,node.name): + yield node + raise StopIteration + def find_iter(self,in_pat=['*'],ex_pat=exclude_pats,prune_pat=prune_pats,src=True,bld=True,dir=False,maxdepth=25,flat=False): + if not(src or bld or dir): + raise StopIteration + if self.id&3!=DIR: + raise StopIteration + in_pat=Utils.to_list(in_pat) + ex_pat=Utils.to_list(ex_pat) + prune_pat=Utils.to_list(prune_pat) + def accept_name(node,name): + for pat in ex_pat: + if fnmatch.fnmatchcase(name,pat): + return False + for pat in in_pat: + if fnmatch.fnmatchcase(name,pat): + return True + return False + def is_prune(node,name): + for pat in prune_pat: + if fnmatch.fnmatchcase(name,pat): + return True + return False + ret=self.find_iter_impl(src,bld,dir,accept_name,is_prune,maxdepth=maxdepth) + if flat: + return" ".join([x.relpath_gen(self)for x in ret]) + return ret + def ant_glob(self,*k,**kw): + src=kw.get('src',1) + bld=kw.get('bld',0) + dir=kw.get('dir',0) + excl=kw.get('excl',exclude_regs) + incl=k and k[0]or kw.get('incl','**') + def to_pat(s): + lst=Utils.to_list(s) + ret=[] + for x in lst: + x=x.replace('//','/') + if x.endswith('/'): + x+='**' + lst2=x.split('/') + accu=[] + for k in lst2: + if k=='**': + accu.append(k) + else: + k=k.replace('.','[.]').replace('*','.*').replace('?','.') + k='^%s$'%k + accu.append(re.compile(k)) + ret.append(accu) + return ret + def filtre(name,nn): + ret=[] + for lst in nn: + if not lst: + pass + elif lst[0]=='**': + ret.append(lst) + if len(lst)>1: + if lst[1].match(name): + ret.append(lst[2:]) + else: + ret.append([]) + elif lst[0].match(name): + ret.append(lst[1:]) + return ret + def accept(name,pats): + nacc=filtre(name,pats[0]) + nrej=filtre(name,pats[1]) + if[]in nrej: + nacc=[] + return[nacc,nrej] + def ant_iter(nodi,maxdepth=25,pats=[]): + nodi.__class__.bld.rescan(nodi) + tmp=list(nodi.__class__.bld.cache_dir_contents[nodi.id]) + tmp.sort() + for name in tmp: + npats=accept(name,pats) + if npats and npats[0]: + accepted=[]in npats[0] + node=nodi.find_resource(name) + if node and accepted: + if src and node.id&3==FILE: + yield node + else: + node=nodi.find_dir(name) + if node and node.id!=nodi.__class__.bld.bldnode.id: + if accepted and dir: + yield node + if maxdepth: + for k in ant_iter(node,maxdepth=maxdepth-1,pats=npats): + yield k + if bld: + for node in nodi.childs.values(): + if node.id==nodi.__class__.bld.bldnode.id: + continue + if node.id&3==BUILD: + npats=accept(node.name,pats) + if npats and npats[0]and[]in npats[0]: + yield node + raise StopIteration + ret=[x for x in ant_iter(self,pats=[to_pat(incl),to_pat(excl)])] + if kw.get('flat',True): + return" ".join([x.relpath_gen(self)for x in ret]) + return ret + def update_build_dir(self,env=None): + if not env: + for env in bld.all_envs: + self.update_build_dir(env) + return + path=self.abspath(env) + lst=Utils.listdir(path) + try: + self.__class__.bld.cache_dir_contents[self.id].update(lst) + except KeyError: + self.__class__.bld.cache_dir_contents[self.id]=set(lst) + self.__class__.bld.cache_scanned_folders[self.id]=True + for k in lst: + npath=path+os.sep+k + st=os.stat(npath) + if stat.S_ISREG(st[stat.ST_MODE]): + ick=self.find_or_declare(k) + if not(ick.id in self.__class__.bld.node_sigs[env.variant()]): + self.__class__.bld.node_sigs[env.variant()][ick.id]=Constants.SIG_NIL + elif stat.S_ISDIR(st[stat.ST_MODE]): + child=self.find_dir(k) + if not child: + child=self.ensure_dir_node_from_path(k) + child.update_build_dir(env) +class Nodu(Node): + pass + diff --git a/waf-modules/wafadmin/Options.py b/waf-modules/wafadmin/Options.py new file mode 100644 index 00000000..8f46274f --- /dev/null +++ b/waf-modules/wafadmin/Options.py @@ -0,0 +1,158 @@ +#! /usr/bin/env python +# encoding: utf-8 + +import os,sys,imp,types,tempfile,optparse +import Logs,Utils +from Constants import* +cmds='distclean configure build install clean uninstall check dist distcheck'.split() +commands={} +is_install=False +options={} +arg_line=[] +launch_dir='' +tooldir='' +lockfile=os.environ.get('WAFLOCK','.lock-wscript') +try:cache_global=os.path.abspath(os.environ['WAFCACHE']) +except KeyError:cache_global='' +platform=Utils.unversioned_sys_platform() +conf_file='conf-runs-%s-%d.pickle'%(platform,ABI) +remote_repo=['http://waf.googlecode.com/svn/'] +default_prefix=os.environ.get('PREFIX') +if not default_prefix: + if platform=='win32': + d=tempfile.gettempdir() + default_prefix=d[0].upper()+d[1:] + else:default_prefix='/usr/local/' +default_jobs=os.environ.get('JOBS',-1) +if default_jobs<1: + try: + if'SC_NPROCESSORS_ONLN'in os.sysconf_names: + default_jobs=os.sysconf('SC_NPROCESSORS_ONLN') + else: + default_jobs=int(Utils.cmd_output(['sysctl','-n','hw.ncpu'])) + except: + if os.name=='java': + from java.lang import Runtime + default_jobs=Runtime.getRuntime().availableProcessors() + else: + default_jobs=int(os.environ.get('NUMBER_OF_PROCESSORS',1)) +default_destdir=os.environ.get('DESTDIR','') +def get_usage(self): + cmds_str=[] + module=Utils.g_module + if module: + tbl=module.__dict__ + keys=list(tbl.keys()) + keys.sort() + if'build'in tbl: + if not module.build.__doc__: + module.build.__doc__='builds the project' + if'configure'in tbl: + if not module.configure.__doc__: + module.configure.__doc__='configures the project' + ban=['set_options','init','shutdown'] + optlst=[x for x in keys if not x in ban and type(tbl[x])is type(parse_args_impl)and tbl[x].__doc__ and not x.startswith('_')] + just=max([len(x)for x in optlst]) + for x in optlst: + cmds_str.append(' %s: %s'%(x.ljust(just),tbl[x].__doc__)) + ret='\n'.join(cmds_str) + else: + ret=' '.join(cmds) + return'''waf [command] [options] + +Main commands (example: ./waf build -j4) +%s +'''%ret +setattr(optparse.OptionParser,'get_usage',get_usage) +def create_parser(module=None): + Logs.debug('options: create_parser is called') + parser=optparse.OptionParser(conflict_handler="resolve",version='waf %s (%s)'%(WAFVERSION,WAFREVISION)) + parser.formatter.width=Utils.get_term_cols() + p=parser.add_option + p('-j','--jobs',type='int',default=default_jobs,help='amount of parallel jobs (%r)'%default_jobs,dest='jobs') + p('-k','--keep',action='store_true',default=False,help='keep running happily on independent task groups',dest='keep') + p('-v','--verbose',action='count',default=0,help='verbosity level -v -vv or -vvv [default: 0]',dest='verbose') + p('--nocache',action='store_true',default=False,help='ignore the WAFCACHE (if set)',dest='nocache') + p('--zones',action='store',default='',help='debugging zones (task_gen, deps, tasks, etc)',dest='zones') + p('-p','--progress',action='count',default=0,help='-p: progress bar; -pp: ide output',dest='progress_bar') + p('--targets',action='store',default='',help='build given task generators, e.g. "target1,target2"',dest='compile_targets') + gr=optparse.OptionGroup(parser,'configuration options') + parser.add_option_group(gr) + gr.add_option('-b','--blddir',action='store',default='',help='out dir for the project (configuration)',dest='blddir') + gr.add_option('-s','--srcdir',action='store',default='',help='top dir for the project (configuration)',dest='srcdir') + gr.add_option('--prefix',help='installation prefix (configuration) [default: %r]'%default_prefix,default=default_prefix,dest='prefix') + gr.add_option('--download',action='store_true',default=False,help='try to download the tools if missing',dest='download') + gr=optparse.OptionGroup(parser,'installation options') + parser.add_option_group(gr) + gr.add_option('--destdir',help='installation root [default: %r]'%default_destdir,default=default_destdir,dest='destdir') + gr.add_option('-f','--force',action='store_true',default=False,help='force file installation',dest='force') + return parser +def parse_args_impl(parser,_args=None): + global options,commands,arg_line + (options,args)=parser.parse_args(args=_args) + arg_line=args + commands={} + for var in cmds:commands[var]=0 + if not args: + commands['build']=1 + args.append('build') + for arg in args: + commands[arg]=True + if'check'in args: + idx=args.index('check') + try: + bidx=args.index('build') + if bidx>idx: + raise ValueError('build before check') + except ValueError,e: + args.insert(idx,'build') + if args[0]!='init': + args.insert(0,'init') + if options.keep:options.jobs=1 + if options.jobs<1:options.jobs=1 + if'install'in sys.argv or'uninstall'in sys.argv: + options.destdir=options.destdir and os.path.abspath(os.path.expanduser(options.destdir)) + Logs.verbose=options.verbose + Logs.init_log() + if options.zones: + Logs.zones=options.zones.split(',') + if not Logs.verbose:Logs.verbose=1 + elif Logs.verbose>0: + Logs.zones=['runner'] + if Logs.verbose>2: + Logs.zones=['*'] +class Handler(Utils.Context): + parser=None + def __init__(self,module=None): + self.parser=create_parser(module) + self.cwd=os.getcwd() + Handler.parser=self + def add_option(self,*k,**kw): + self.parser.add_option(*k,**kw) + def add_option_group(self,*k,**kw): + return self.parser.add_option_group(*k,**kw) + def get_option_group(self,opt_str): + return self.parser.get_option_group(opt_str) + def sub_options(self,*k,**kw): + if not k:raise Utils.WscriptError('folder expected') + self.recurse(k[0],name='set_options') + def tool_options(self,*k,**kw): + + if not k[0]: + raise Utils.WscriptError('invalid tool_options call %r %r'%(k,kw)) + tools=Utils.to_list(k[0]) + path=Utils.to_list(kw.get('tdir',kw.get('tooldir',tooldir))) + for tool in tools: + tool=tool.replace('++','xx') + if tool=='java':tool='javaw' + if tool.lower()=='unittest':tool='unittestw' + module=Utils.load_tool(tool,path) + try: + fun=module.set_options + except AttributeError: + pass + else: + fun(kw.get('option_group',self)) + def parse_args(self,args=None): + parse_args_impl(self.parser,args) + diff --git a/waf-modules/wafadmin/Runner.py b/waf-modules/wafadmin/Runner.py new file mode 100644 index 00000000..7da98833 --- /dev/null +++ b/waf-modules/wafadmin/Runner.py @@ -0,0 +1,165 @@ +#! /usr/bin/env python +# encoding: utf-8 +import sys +if sys.hexversion < 0x020400f0: from sets import Set as set +import os,sys,random,time,threading,traceback +try:from Queue import Queue +except ImportError:from queue import Queue +import Build,Utils,Logs,Options +from Logs import debug,error +from Constants import* +GAP=15 +run_old=threading.Thread.run +def run(*args,**kwargs): + try: + run_old(*args,**kwargs) + except(KeyboardInterrupt,SystemExit): + raise + except: + sys.excepthook(*sys.exc_info()) +threading.Thread.run=run +def process_task(tsk): + m=tsk.master + if m.stop: + m.out.put(tsk) + return + try: + tsk.generator.bld.printout(tsk.display()) + if tsk.__class__.stat:ret=tsk.__class__.stat(tsk) + else:ret=tsk.call_run() + except Exception,e: + tsk.err_msg=Utils.ex_stack() + tsk.hasrun=EXCEPTION + m.error_handler(tsk) + m.out.put(tsk) + return + if ret: + tsk.err_code=ret + tsk.hasrun=CRASHED + else: + try: + tsk.post_run() + except Utils.WafError: + pass + except Exception: + tsk.err_msg=Utils.ex_stack() + tsk.hasrun=EXCEPTION + else: + tsk.hasrun=SUCCESS + if tsk.hasrun!=SUCCESS: + m.error_handler(tsk) + m.out.put(tsk) +class TaskConsumer(threading.Thread): + ready=Queue(0) + consumers=[] + def __init__(self): + threading.Thread.__init__(self) + self.setDaemon(1) + self.start() + def run(self): + try: + self.loop() + except: + pass + def loop(self): + while 1: + tsk=TaskConsumer.ready.get() + process_task(tsk) +class Parallel(object): + def __init__(self,bld,j=2): + self.numjobs=j + self.manager=bld.task_manager + self.manager.current_group=0 + self.total=self.manager.total() + self.outstanding=[] + self.maxjobs=MAXJOBS + self.frozen=[] + self.out=Queue(0) + self.count=0 + self.processed=1 + self.stop=False + self.error=False + def get_next(self): + if not self.outstanding: + return None + return self.outstanding.pop(0) + def postpone(self,tsk): + if random.randint(0,1): + self.frozen.insert(0,tsk) + else: + self.frozen.append(tsk) + def refill_task_list(self): + while self.count>self.numjobs+GAP or self.count>=self.maxjobs: + self.get_out() + while not self.outstanding: + if self.count: + self.get_out() + if self.frozen: + self.outstanding+=self.frozen + self.frozen=[] + elif not self.count: + (jobs,tmp)=self.manager.get_next_set() + if jobs!=None:self.maxjobs=jobs + if tmp:self.outstanding+=tmp + break + def get_out(self): + ret=self.out.get() + self.manager.add_finished(ret) + if not self.stop and getattr(ret,'more_tasks',None): + self.outstanding+=ret.more_tasks + self.total+=len(ret.more_tasks) + self.count-=1 + def error_handler(self,tsk): + if not Options.options.keep: + self.stop=True + self.error=True + def start(self): + if TaskConsumer.consumers: + while len(TaskConsumer.consumers)0: + self.set_order(keys[i],keys[j]) + elif val<0: + self.set_order(keys[j],keys[i]) + def tasks_in_parallel(self): + if not self.ready:self.prepare() + keys=self.cstr_groups.keys() + unconnected=[] + remainder=[] + for u in keys: + for k in self.cstr_order.values(): + if u in k: + remainder.append(u) + break + else: + unconnected.append(u) + toreturn=[] + for y in unconnected: + toreturn.extend(self.cstr_groups[y]) + for y in unconnected: + try:self.cstr_order.__delitem__(y) + except KeyError:pass + self.cstr_groups.__delitem__(y) + if not toreturn and remainder: + raise Utils.WafError("circular order constraint detected %r"%remainder) + return toreturn + def tasks_by_max_jobs(self): + if not self.ready:self.prepare() + if not self.temp_tasks:self.temp_tasks=self.tasks_in_parallel() + if not self.temp_tasks:return(None,None) + maxjobs=MAXJOBS + ret=[] + remaining=[] + for t in self.temp_tasks: + m=getattr(t,"maxjobs",getattr(self.__class__,"maxjobs",MAXJOBS)) + if m>maxjobs: + remaining.append(t) + elif m task failed (err #%d): %r"%(self.err_code,self) + except AttributeError: + return" -> task failed: %r"%self + elif self.hasrun==MISSING: + return" -> missing files: %r"%self + else: + return'' + def install(self): + bld=self.generator.bld + d=self.attr('install') + if self.attr('install_path'): + lst=[a.relpath_gen(bld.srcnode)for a in self.outputs] + perm=self.attr('chmod',O644) + if self.attr('src'): + lst+=[a.relpath_gen(bld.srcnode)for a in self.inputs] + if self.attr('filename'): + dir=self.install_path.rstrip(os.sep)+os.sep+self.attr('filename') + bld.install_as(dir,lst[0],self.env,perm) + else: + bld.install_files(self.install_path,lst,self.env,perm) +class Task(TaskBase): + vars=[] + def __init__(self,env,**kw): + TaskBase.__init__(self,**kw) + self.env=env + self.inputs=[] + self.outputs=[] + self.dep_nodes=[] + self.run_after=[] + def __str__(self): + env=self.env + src_str=' '.join([a.nice_path(env)for a in self.inputs]) + tgt_str=' '.join([a.nice_path(env)for a in self.outputs]) + if self.outputs:sep=' -> ' + else:sep='' + return'%s: %s%s%s\n'%(self.__class__.__name__.replace('_task',''),src_str,sep,tgt_str) + def __repr__(self): + return"".join(['\n\t{task: ',self.__class__.__name__," ",",".join([x.name for x in self.inputs])," -> ",",".join([x.name for x in self.outputs]),'}']) + def unique_id(self): + try: + return self.uid + except AttributeError: + m=md5() + up=m.update + up(self.__class__.__name__) + up(self.env.variant()) + p=None + for x in self.inputs+self.outputs: + if p!=x.parent.id: + p=x.parent.id + up(x.parent.abspath()) + up(x.name) + self.uid=m.digest() + return self.uid + def set_inputs(self,inp): + if isinstance(inp,list):self.inputs+=inp + else:self.inputs.append(inp) + def set_outputs(self,out): + if isinstance(out,list):self.outputs+=out + else:self.outputs.append(out) + def set_run_after(self,task): + assert isinstance(task,TaskBase) + self.run_after.append(task) + def add_file_dependency(self,filename): + node=self.generator.bld.path.find_resource(filename) + self.dep_nodes.append(node) + def signature(self): + try:return self.cache_sig[0] + except AttributeError:pass + self.m=md5() + exp_sig=self.sig_explicit_deps() + var_sig=self.sig_vars() + imp_sig=SIG_NIL + if self.scan: + try: + imp_sig=self.sig_implicit_deps() + except ValueError: + return self.signature() + ret=self.m.digest() + self.cache_sig=(ret,exp_sig,imp_sig,var_sig) + return ret + def runnable_status(self): + if self.inputs and(not self.outputs): + if not getattr(self.__class__,'quiet',None): + warn("invalid task (no inputs OR outputs): override in a Task subclass or set the attribute 'quiet' %r"%self) + for t in self.run_after: + if not t.hasrun: + return ASK_LATER + env=self.env + bld=self.generator.bld + new_sig=self.signature() + key=self.unique_id() + try: + prev_sig=bld.task_sigs[key][0] + except KeyError: + debug("task: task %r must run as it was never run before or the task code changed",self) + return RUN_ME + for node in self.outputs: + variant=node.variant(env) + try: + if bld.node_sigs[variant][node.id]!=new_sig: + return RUN_ME + except KeyError: + debug("task: task %r must run as the output nodes do not exist",self) + return RUN_ME + if Logs.verbose:self.debug_why(bld.task_sigs[key]) + if new_sig!=prev_sig: + return RUN_ME + return SKIP_ME + def post_run(self): + bld=self.generator.bld + env=self.env + sig=self.signature() + ssig=sig.encode('hex') + variant=env.variant() + for node in self.outputs: + try: + os.stat(node.abspath(env)) + except OSError: + self.hasrun=MISSING + self.err_msg='-> missing file: %r'%node.abspath(env) + raise Utils.WafError + bld.node_sigs[variant][node.id]=sig + bld.task_sigs[self.unique_id()]=self.cache_sig + if not Options.cache_global or Options.options.nocache or not self.outputs: + return None + if getattr(self,'cached',None): + return None + dname=os.path.join(Options.cache_global,ssig) + tmpdir=tempfile.mkdtemp(prefix=Options.cache_global+os.sep+'waf') + try: + shutil.rmtree(dname) + except: + pass + try: + i=0 + for node in self.outputs: + variant=node.variant(env) + dest=os.path.join(tmpdir,str(i)+node.name) + shutil.copy2(node.abspath(env),dest) + i+=1 + except(OSError,IOError): + try: + shutil.rmtree(tmpdir) + except: + pass + else: + try: + os.rename(tmpdir,dname) + except OSError: + try: + shutil.rmtree(tmpdir) + except: + pass + else: + try: + os.chmod(dname,O755) + except: + pass + def can_retrieve_cache(self): + if not Options.cache_global or Options.options.nocache or not self.outputs: + return None + env=self.env + sig=self.signature() + ssig=sig.encode('hex') + dname=os.path.join(Options.cache_global,ssig) + try: + t1=os.stat(dname).st_mtime + except OSError: + return None + i=0 + for node in self.outputs: + variant=node.variant(env) + orig=os.path.join(dname,str(i)+node.name) + try: + shutil.copy2(orig,node.abspath(env)) + os.utime(orig,None) + except(OSError,IOError): + debug('task: failed retrieving file') + return None + i+=1 + try: + t2=os.stat(dname).st_mtime + except OSError: + return None + if t1!=t2: + return None + for node in self.outputs: + self.generator.bld.node_sigs[variant][node.id]=sig + if Options.options.progress_bar<1: + self.generator.bld.printout('restoring from cache %r\n'%node.bldpath(env)) + self.cached=True + return 1 + def debug_why(self,old_sigs): + new_sigs=self.cache_sig + def v(x): + return x.encode('hex') + debug("Task %r",self) + msgs=['Task must run','* Source file or manual dependency','* Implicit dependency','* Environment variable'] + tmp='task: -> %s: %s %s' + for x in xrange(len(msgs)): + if(new_sigs[x]!=old_sigs[x]): + debug(tmp,msgs[x],v(old_sigs[x]),v(new_sigs[x])) + def sig_explicit_deps(self): + bld=self.generator.bld + up=self.m.update + for x in self.inputs+getattr(self,'dep_nodes',[]): + if not x.parent.id in bld.cache_scanned_folders: + bld.rescan(x.parent) + variant=x.variant(self.env) + try: + up(bld.node_sigs[variant][x.id]) + except KeyError: + raise Utils.WafError('Missing node signature for %r (required by %r)'%(x,self)) + if bld.deps_man: + additional_deps=bld.deps_man + for x in self.inputs+self.outputs: + try: + d=additional_deps[x.id] + except KeyError: + continue + for v in d: + if isinstance(v,Node.Node): + bld.rescan(v.parent) + variant=v.variant(self.env) + try: + v=bld.node_sigs[variant][v.id] + except KeyError: + raise Utils.WafError('Missing node signature for %r (required by %r)'%(v,self)) + elif hasattr(v,'__call__'): + v=v() + up(v) + for x in self.dep_nodes: + v=bld.node_sigs[x.variant(self.env)][x.id] + up(v) + return self.m.digest() + def sig_vars(self): + bld=self.generator.bld + env=self.env + act_sig=bld.hash_env_vars(env,self.__class__.vars) + self.m.update(act_sig) + dep_vars=getattr(self,'dep_vars',None) + if dep_vars: + self.m.update(bld.hash_env_vars(env,dep_vars)) + return self.m.digest() + scan=None + def sig_implicit_deps(self): + bld=self.generator.bld + key=self.unique_id() + prev_sigs=bld.task_sigs.get(key,()) + if prev_sigs: + try: + if prev_sigs[2]==self.compute_sig_implicit_deps(): + return prev_sigs[2] + except(KeyError,OSError): + pass + del bld.task_sigs[key] + raise ValueError('rescan') + (nodes,names)=self.scan() + if Logs.verbose: + debug('deps: scanner for %s returned %s %s',str(self),str(nodes),str(names)) + bld.node_deps[key]=nodes + bld.raw_deps[key]=names + try: + sig=self.compute_sig_implicit_deps() + except KeyError: + try: + nodes=[] + for k in bld.node_deps.get(self.unique_id(),[]): + if k.id&3==2: + if not k.id in bld.node_sigs[0]: + nodes.append(k) + else: + if not k.id in bld.node_sigs[self.env.variant()]: + nodes.append(k) + except: + nodes='?' + raise Utils.WafError('Missing node signature for %r (for implicit dependencies %r)'%(nodes,self)) + return sig + def compute_sig_implicit_deps(self): + upd=self.m.update + bld=self.generator.bld + tstamp=bld.node_sigs + env=self.env + for k in bld.node_deps.get(self.unique_id(),[]): + if not k.parent.id in bld.cache_scanned_folders: + bld.rescan(k.parent) + if k.id&3==2: + upd(tstamp[0][k.id]) + else: + upd(tstamp[env.variant()][k.id]) + return self.m.digest() +def funex(c): + dc={} + exec(c,dc) + return dc['f'] +reg_act=re.compile(r"(?P\\)|(?P\$\$)|(?P\$\{(?P\w+)(?P.*?)\})",re.M) +def compile_fun_shell(name,line): + extr=[] + def repl(match): + g=match.group + if g('dollar'):return"$" + elif g('backslash'):return'\\\\' + elif g('subst'):extr.append((g('var'),g('code')));return"%s" + return None + line=reg_act.sub(repl,line)or line + parm=[] + dvars=[] + app=parm.append + for(var,meth)in extr: + if var=='SRC': + if meth:app('task.inputs%s'%meth) + else:app('" ".join([a.srcpath(env) for a in task.inputs])') + elif var=='TGT': + if meth:app('task.outputs%s'%meth) + else:app('" ".join([a.bldpath(env) for a in task.outputs])') + else: + if not var in dvars:dvars.append(var) + app("p('%s')"%var) + if parm:parm="%% (%s) "%(',\n\t\t'.join(parm)) + else:parm='' + c=COMPILE_TEMPLATE_SHELL%(line,parm) + debug('action: %s',c) + return(funex(c),dvars) +def compile_fun_noshell(name,line): + extr=[] + def repl(match): + g=match.group + if g('dollar'):return"$" + elif g('subst'):extr.append((g('var'),g('code')));return"<<|@|>>" + return None + line2=reg_act.sub(repl,line) + params=line2.split('<<|@|>>') + buf=[] + dvars=[] + app=buf.append + for x in xrange(len(extr)): + params[x]=params[x].strip() + if params[x]: + app("lst.extend(%r)"%params[x].split()) + (var,meth)=extr[x] + if var=='SRC': + if meth:app('lst.append(task.inputs%s)'%meth) + else:app("lst.extend([a.srcpath(env) for a in task.inputs])") + elif var=='TGT': + if meth:app('lst.append(task.outputs%s)'%meth) + else:app("lst.extend([a.bldpath(env) for a in task.outputs])") + else: + app('lst.extend(to_list(env[%r]))'%var) + if not var in dvars:dvars.append(var) + if params[-1]: + app("lst.extend(%r)"%shlex.split(params[-1])) + fun=COMPILE_TEMPLATE_NOSHELL%"\n\t".join(buf) + debug('action: %s',fun) + return(funex(fun),dvars) +def compile_fun(name,line,shell=None): + if line.find('<')>0 or line.find('>')>0 or line.find('&&')>0: + shell=True + if shell is None: + if sys.platform=='win32': + shell=False + else: + shell=True + if shell: + return compile_fun_shell(name,line) + else: + return compile_fun_noshell(name,line) +def simple_task_type(name,line,color='GREEN',vars=[],ext_in=[],ext_out=[],before=[],after=[],shell=None): + (fun,dvars)=compile_fun(name,line,shell) + fun.code=line + return task_type_from_func(name,fun,vars or dvars,color,ext_in,ext_out,before,after) +def task_type_from_func(name,func,vars=[],color='GREEN',ext_in=[],ext_out=[],before=[],after=[]): + params={'run':func,'vars':vars,'color':color,'name':name,'ext_in':Utils.to_list(ext_in),'ext_out':Utils.to_list(ext_out),'before':Utils.to_list(before),'after':Utils.to_list(after),} + cls=type(Task)(name,(Task,),params) + TaskBase.classes[name]=cls + return cls +def always_run(cls): + old=cls.runnable_status + def always(self): + ret=old(self) + if ret==SKIP_ME: + return RUN_ME + return ret + cls.runnable_status=always +def update_outputs(cls): + old_post_run=cls.post_run + def post_run(self): + old_post_run(self) + bld=self.generator.bld + for output in self.outputs: + bld.node_sigs[self.env.variant()][output.id]=Utils.h_file(output.abspath(self.env)) + cls.post_run=post_run + old_runnable_status=cls.runnable_status + def runnable_status(self): + status=old_runnable_status(self) + if status!=RUN_ME: + return status + try: + bld=self.outputs[0].__class__.bld + new_sig=self.signature() + prev_sig=bld.task_sigs[self.unique_id()][0] + if prev_sig==new_sig: + for x in self.outputs: + if not x.id in bld.node_sigs[self.env.variant()]: + return RUN_ME + return SKIP_ME + except KeyError: + pass + except IndexError: + pass + return RUN_ME + cls.runnable_status=runnable_status +def extract_outputs(tasks): + v={} + for x in tasks: + try: + (ins,outs)=v[x.env.variant()] + except KeyError: + ins={} + outs={} + v[x.env.variant()]=(ins,outs) + for a in getattr(x,'inputs',[]): + try:ins[a.id].append(x) + except KeyError:ins[a.id]=[x] + for a in getattr(x,'outputs',[]): + try:outs[a.id].append(x) + except KeyError:outs[a.id]=[x] + for(ins,outs)in v.values(): + links=set(ins.iterkeys()).intersection(outs.iterkeys()) + for k in links: + for a in ins[k]: + for b in outs[k]: + a.set_run_after(b) +def extract_deps(tasks): + extract_outputs(tasks) + out_to_task={} + for x in tasks: + v=x.env.variant() + try: + lst=x.outputs + except AttributeError: + pass + else: + for node in lst: + out_to_task[(v,node.id)]=x + dep_to_task={} + for x in tasks: + try: + x.signature() + except: + pass + v=x.env.variant() + key=x.unique_id() + for k in x.generator.bld.node_deps.get(x.unique_id(),[]): + try:dep_to_task[(v,k.id)].append(x) + except KeyError:dep_to_task[(v,k.id)]=[x] + deps=set(dep_to_task.keys()).intersection(set(out_to_task.keys())) + for idx in deps: + for k in dep_to_task[idx]: + k.set_run_after(out_to_task[idx]) + for x in tasks: + try: + delattr(x,'cache_sig') + except AttributeError: + pass + diff --git a/waf-modules/wafadmin/TaskGen.py b/waf-modules/wafadmin/TaskGen.py new file mode 100644 index 00000000..6b22fdfb --- /dev/null +++ b/waf-modules/wafadmin/TaskGen.py @@ -0,0 +1,346 @@ +#! /usr/bin/env python +# encoding: utf-8 +import sys +if sys.hexversion < 0x020400f0: from sets import Set as set +import os,traceback,copy +import Build,Task,Utils,Logs,Options +from Logs import debug,error,warn +from Constants import* +typos={'sources':'source','targets':'target','include':'includes','define':'defines','importpath':'importpaths','install_var':'install_path','install_subdir':'install_path','inst_var':'install_path','inst_dir':'install_path','feature':'features',} +class register_obj(type): + def __init__(cls,name,bases,dict): + super(register_obj,cls).__init__(name,bases,dict) + name=cls.__name__ + suffix='_taskgen' + if name.endswith(suffix): + task_gen.classes[name.replace(suffix,'')]=cls +class task_gen(object): + __metaclass__=register_obj + mappings={} + mapped={} + prec=Utils.DefaultDict(list) + traits=Utils.DefaultDict(set) + classes={} + def __init__(self,*kw,**kwargs): + self.prec=Utils.DefaultDict(list) + self.source='' + self.target='' + self.meths=[] + self.mappings={} + self.features=list(kw) + self.tasks=[] + self.default_chmod=O644 + self.default_install_path=None + self.allnodes=[] + self.bld=kwargs.get('bld',Build.bld) + self.env=self.bld.env.copy() + self.path=self.bld.path + self.name='' + self.idx=self.bld.idx[self.path.id]=self.bld.idx.get(self.path.id,0)+1 + for key,val in kwargs.iteritems(): + setattr(self,key,val) + self.bld.task_manager.add_task_gen(self) + self.bld.all_task_gen.append(self) + def __str__(self): + return(""%(self.name or self.target,self.__class__.__name__,str(self.path))) + def __setattr__(self,name,attr): + real=typos.get(name,name) + if real!=name: + warn('typo %s -> %s'%(name,real)) + if Logs.verbose>0: + traceback.print_stack() + object.__setattr__(self,real,attr) + def to_list(self,value): + if isinstance(value,str):return value.split() + else:return value + def apply(self): + keys=set(self.meths) + self.features=Utils.to_list(self.features) + for x in self.features+['*']: + st=task_gen.traits[x] + if not st: + warn('feature %r does not exist - bind at least one method to it'%x) + keys.update(st) + prec={} + prec_tbl=self.prec or task_gen.prec + for x in prec_tbl: + if x in keys: + prec[x]=prec_tbl[x] + tmp=[] + for a in keys: + for x in prec.values(): + if a in x:break + else: + tmp.append(a) + out=[] + while tmp: + e=tmp.pop() + if e in keys:out.append(e) + try: + nlst=prec[e] + except KeyError: + pass + else: + del prec[e] + for x in nlst: + for y in prec: + if x in prec[y]: + break + else: + tmp.append(x) + if prec:raise Utils.WafError("graph has a cycle %s"%str(prec)) + out.reverse() + self.meths=out + debug('task_gen: posting %s %d',self,id(self)) + for x in out: + try: + v=getattr(self,x) + except AttributeError: + raise Utils.WafError("tried to retrieve %s which is not a valid method"%x) + debug('task_gen: -> %s (%d)',x,id(self)) + v() + def post(self): + if not self.name: + if isinstance(self.target,list): + self.name=' '.join(self.target) + else: + self.name=self.target + if getattr(self,'posted',None): + return + self.apply() + self.posted=True + debug('task_gen: posted %s',self.name) + def get_hook(self,ext): + try:return self.mappings[ext] + except KeyError: + try:return task_gen.mappings[ext] + except KeyError:return None + def create_task(self,name,src=None,tgt=None,env=None): + env=env or self.env + task=Task.TaskBase.classes[name](env.copy(),generator=self) + if src: + task.set_inputs(src) + if tgt: + task.set_outputs(tgt) + self.tasks.append(task) + return task + def name_to_obj(self,name): + return self.bld.name_to_obj(name,self.env) + def find_sources_in_dirs(self,dirnames,excludes=[],exts=[]): + err_msg="'%s' attribute must be a list" + if not isinstance(excludes,list): + raise Utils.WscriptError(err_msg%'excludes') + if not isinstance(exts,list): + raise Utils.WscriptError(err_msg%'exts') + lst=[] + dirnames=self.to_list(dirnames) + ext_lst=exts or list(self.mappings.keys())+list(task_gen.mappings.keys()) + for name in dirnames: + anode=self.path.find_dir(name) + if not anode or not anode.is_child_of(self.bld.srcnode): + raise Utils.WscriptError("Unable to use '%s' - either because it's not a relative path"", or it's not child of '%s'."%(name,self.bld.srcnode)) + self.bld.rescan(anode) + for name in self.bld.cache_dir_contents[anode.id]: + if name.startswith('.'): + continue + (base,ext)=os.path.splitext(name) + if ext in ext_lst and not name in lst and not name in excludes: + lst.append((anode.relpath_gen(self.path)or'.')+os.path.sep+name) + lst.sort() + self.source=self.to_list(self.source) + if not self.source:self.source=lst + else:self.source+=lst + def clone(self,env): + newobj=task_gen(bld=self.bld) + for x in self.__dict__: + if x in['env','bld']: + continue + elif x in["path","features"]: + setattr(newobj,x,getattr(self,x)) + else: + setattr(newobj,x,copy.copy(getattr(self,x))) + newobj.__class__=self.__class__ + if isinstance(env,str): + newobj.env=self.bld.all_envs[env].copy() + else: + newobj.env=env.copy() + return newobj + def get_inst_path(self): + return getattr(self,'_install_path',getattr(self,'default_install_path','')) + def set_inst_path(self,val): + self._install_path=val + install_path=property(get_inst_path,set_inst_path) + def get_chmod(self): + return getattr(self,'_chmod',getattr(self,'default_chmod',O644)) + def set_chmod(self,val): + self._chmod=val + chmod=property(get_chmod,set_chmod) +def declare_extension(var,func): + try: + for x in Utils.to_list(var): + task_gen.mappings[x]=func + except: + raise Utils.WscriptError('declare_extension takes either a list or a string %r'%var) + task_gen.mapped[func.__name__]=func +def declare_order(*k): + assert(len(k)>1) + n=len(k)-1 + for i in xrange(n): + f1=k[i] + f2=k[i+1] + if not f1 in task_gen.prec[f2]: + task_gen.prec[f2].append(f1) +def declare_chain(name='',action='',ext_in='',ext_out='',reentrant=True,color='BLUE',install=0,before=[],after=[],decider=None,rule=None,scan=None): + action=action or rule + if isinstance(action,str): + act=Task.simple_task_type(name,action,color=color) + else: + act=Task.task_type_from_func(name,action,color=color) + act.ext_in=tuple(Utils.to_list(ext_in)) + act.ext_out=tuple(Utils.to_list(ext_out)) + act.before=Utils.to_list(before) + act.after=Utils.to_list(after) + act.scan=scan + def x_file(self,node): + if decider: + ext=decider(self,node) + else: + ext=ext_out + if isinstance(ext,str): + out_source=node.change_ext(ext) + if reentrant: + self.allnodes.append(out_source) + elif isinstance(ext,list): + out_source=[node.change_ext(x)for x in ext] + if reentrant: + for i in xrange((reentrant is True)and len(out_source)or reentrant): + self.allnodes.append(out_source[i]) + else: + raise Utils.WafError("do not know how to process %s"%str(ext)) + tsk=self.create_task(name,node,out_source) + if node.__class__.bld.is_install: + tsk.install=install + declare_extension(act.ext_in,x_file) + return x_file +def bind_feature(name,methods): + lst=Utils.to_list(methods) + task_gen.traits[name].update(lst) +def taskgen(func): + setattr(task_gen,func.__name__,func) + return func +def feature(*k): + def deco(func): + setattr(task_gen,func.__name__,func) + for name in k: + task_gen.traits[name].update([func.__name__]) + return func + return deco +def before(*k): + def deco(func): + setattr(task_gen,func.__name__,func) + for fun_name in k: + if not func.__name__ in task_gen.prec[fun_name]: + task_gen.prec[fun_name].append(func.__name__) + return func + return deco +def after(*k): + def deco(func): + setattr(task_gen,func.__name__,func) + for fun_name in k: + if not fun_name in task_gen.prec[func.__name__]: + task_gen.prec[func.__name__].append(fun_name) + return func + return deco +def extension(var): + def deco(func): + setattr(task_gen,func.__name__,func) + try: + for x in Utils.to_list(var): + task_gen.mappings[x]=func + except: + raise Utils.WafError('extension takes either a list or a string %r'%var) + task_gen.mapped[func.__name__]=func + return func + return deco +def apply_core(self): + find_resource=self.path.find_resource + for filename in self.to_list(self.source): + x=self.get_hook(filename) + if x: + x(self,filename) + else: + node=find_resource(filename) + if not node:raise Utils.WafError("source not found: '%s' in '%s'"%(filename,str(self.path))) + self.allnodes.append(node) + for node in self.allnodes: + x=self.get_hook(node.suffix()) + if not x: + raise Utils.WafError("Cannot guess how to process %s (got mappings %r in %r) -> try conf.check_tool(..)?"%(str(node),self.__class__.mappings.keys(),self.__class__)) + x(self,node) +feature('*')(apply_core) +def exec_rule(self): + if not getattr(self,'rule',None): + return + try: + self.meths.remove('apply_core') + except ValueError: + pass + func=self.rule + vars2=[] + if isinstance(func,str): + (func,vars2)=Task.compile_fun('',self.rule,shell=getattr(self,'shell',True)) + func.code=self.rule + name=getattr(self,'name',None)or self.target or self.rule + if not isinstance(name,str): + name=str(self.idx) + cls=Task.task_type_from_func(name,func,getattr(self,'vars',vars2)) + cls.color=getattr(self,'color','BLUE') + tsk=self.create_task(name) + dep_vars=getattr(self,'dep_vars',['ruledeps']) + if dep_vars: + tsk.dep_vars=dep_vars + if isinstance(self.rule,str): + tsk.env.ruledeps=self.rule + else: + tsk.env.ruledeps=Utils.h_fun(self.rule) + if getattr(self,'target',None): + cls.quiet=True + tsk.outputs=[self.path.find_or_declare(x)for x in self.to_list(self.target)] + if getattr(self,'source',None): + cls.quiet=True + tsk.inputs=[] + for x in self.to_list(self.source): + y=self.path.find_resource(x) + if not y: + raise Utils.WafError('input file %r could not be found (%r)'%(x,self.path.abspath())) + tsk.inputs.append(y) + if self.allnodes: + tsk.inputs.extend(self.allnodes) + if getattr(self,'scan',None): + cls.scan=self.scan + if getattr(self,'install_path',None): + tsk.install_path=self.install_path + if getattr(self,'cwd',None): + tsk.cwd=self.cwd + if getattr(self,'on_results',None): + Task.update_outputs(cls) + if getattr(self,'always',None): + Task.always_run(cls) + for x in['after','before','ext_in','ext_out']: + setattr(cls,x,getattr(self,x,[])) +feature('*')(exec_rule) +before('apply_core')(exec_rule) +def sequence_order(self): + if self.meths and self.meths[-1]!='sequence_order': + self.meths.append('sequence_order') + return + if getattr(self,'seq_start',None): + return + if getattr(self.bld,'prev',None): + self.bld.prev.post() + for x in self.bld.prev.tasks: + for y in self.tasks: + y.set_run_after(x) + self.bld.prev=self +feature('seq')(sequence_order) + diff --git a/waf-modules/wafadmin/Tools/__init__.py b/waf-modules/wafadmin/Tools/__init__.py new file mode 100644 index 00000000..cbc8406e --- /dev/null +++ b/waf-modules/wafadmin/Tools/__init__.py @@ -0,0 +1,4 @@ +#! /usr/bin/env python +# encoding: utf-8 + + diff --git a/waf-modules/wafadmin/Tools/ar.py b/waf-modules/wafadmin/Tools/ar.py new file mode 100644 index 00000000..80617cc5 --- /dev/null +++ b/waf-modules/wafadmin/Tools/ar.py @@ -0,0 +1,26 @@ +#! /usr/bin/env python +# encoding: utf-8 + +import os,sys +import Task,Utils +from Configure import conftest +ar_str='${AR} ${ARFLAGS} ${AR_TGT_F}${TGT} ${AR_SRC_F}${SRC}' +cls=Task.simple_task_type('static_link',ar_str,color='YELLOW',ext_in='.o',ext_out='.bin',shell=False) +cls.maxjobs=1 +cls.install=Utils.nada +old=cls.run +def wrap(self): + try:os.remove(self.outputs[0].abspath(self.env)) + except OSError:pass + return old(self) +setattr(cls,'run',wrap) +def detect(conf): + conf.find_program('ar',var='AR') + conf.find_program('ranlib',var='RANLIB') + conf.env.ARFLAGS='rcs' +def find_ar(conf): + v=conf.env + conf.check_tool('ar') + if not v['AR']:conf.fatal('ar is required for static libraries - not found') + +conftest(find_ar) diff --git a/waf-modules/wafadmin/Tools/bison.py b/waf-modules/wafadmin/Tools/bison.py new file mode 100644 index 00000000..a7a16986 --- /dev/null +++ b/waf-modules/wafadmin/Tools/bison.py @@ -0,0 +1,26 @@ +#! /usr/bin/env python +# encoding: utf-8 + +import Task +from TaskGen import extension +bison='${BISON} ${BISONFLAGS} ${SRC[0].abspath()} -o ${TGT[0].name}' +cls=Task.simple_task_type('bison',bison,'GREEN',ext_in='.yc .y .yy',ext_out='.c .cxx .h .l',shell=False) +def big_bison(self,node): + has_h='-d'in self.env['BISONFLAGS'] + outs=[] + if node.name.endswith('.yc'): + outs.append(node.change_ext('.tab.cc')) + if has_h: + outs.append(node.change_ext('.tab.hh')) + else: + outs.append(node.change_ext('.tab.c')) + if has_h: + outs.append(node.change_ext('.tab.h')) + tsk=self.create_task('bison',node,outs) + tsk.cwd=node.bld_dir(tsk.env) + self.allnodes.append(outs[0]) +def detect(conf): + bison=conf.find_program('bison',var='BISON',mandatory=True) + conf.env['BISONFLAGS']='-d' + +extension(['.y','.yc','.yy'])(big_bison) diff --git a/waf-modules/wafadmin/Tools/cc.py b/waf-modules/wafadmin/Tools/cc.py new file mode 100644 index 00000000..c23bbd00 --- /dev/null +++ b/waf-modules/wafadmin/Tools/cc.py @@ -0,0 +1,70 @@ +#! /usr/bin/env python +# encoding: utf-8 +import sys +if sys.hexversion < 0x020400f0: from sets import Set as set +import os +import TaskGen,Build,Utils,Task +from Logs import debug +import ccroot +from TaskGen import feature,before,extension,after +g_cc_flag_vars=['CCDEPS','FRAMEWORK','FRAMEWORKPATH','STATICLIB','LIB','LIBPATH','LINKFLAGS','RPATH','CCFLAGS','CPPPATH','CPPFLAGS','CCDEFINES'] +EXT_CC=['.c'] +g_cc_type_vars=['CCFLAGS','LINKFLAGS'] +class cc_taskgen(ccroot.ccroot_abstract): + pass +def init_cc(self): + self.p_flag_vars=set(self.p_flag_vars).union(g_cc_flag_vars) + self.p_type_vars=set(self.p_type_vars).union(g_cc_type_vars) + if not self.env['CC_NAME']: + raise Utils.WafError("At least one compiler (gcc, ..) must be selected") +def apply_obj_vars_cc(self): + env=self.env + app=env.append_unique + cpppath_st=env['CPPPATH_ST'] + for i in env['INC_PATHS']: + app('_CCINCFLAGS',cpppath_st%i.bldpath(env)) + app('_CCINCFLAGS',cpppath_st%i.srcpath(env)) + for i in env['CPPPATH']: + app('_CCINCFLAGS',cpppath_st%i) +def apply_defines_cc(self): + self.defines=getattr(self,'defines',[]) + lst=self.to_list(self.defines)+self.to_list(self.env['CCDEFINES']) + milst=[] + for defi in lst: + if not defi in milst: + milst.append(defi) + libs=self.to_list(self.uselib) + for l in libs: + val=self.env['CCDEFINES_'+l] + if val:milst+=val + self.env['DEFLINES']=["%s %s"%(x[0],Utils.trimquotes('='.join(x[1:])))for x in[y.split('=')for y in milst]] + y=self.env['CCDEFINES_ST'] + self.env.append_unique('_CCDEFFLAGS',[y%x for x in milst]) +def c_hook(self,node): + if getattr(self,'obj_ext',None): + obj_ext=self.obj_ext + else: + obj_ext='_%d.o'%self.idx + task=self.create_task('cc',node,node.change_ext(obj_ext)) + try: + self.compiled_tasks.append(task) + except AttributeError: + raise Utils.WafError('Have you forgotten to set the feature "cc" on %s?'%str(self)) + return task +cc_str='${CC} ${CCFLAGS} ${CPPFLAGS} ${_CCINCFLAGS} ${_CCDEFFLAGS} ${CC_SRC_F}${SRC} ${CC_TGT_F}${TGT}' +cls=Task.simple_task_type('cc',cc_str,'GREEN',ext_out='.o',ext_in='.c',shell=False) +cls.scan=ccroot.scan +cls.vars.append('CCDEPS') +link_str='${LINK_CC} ${CCLNK_SRC_F}${SRC} ${CCLNK_TGT_F}${TGT[0].abspath(env)} ${LINKFLAGS}' +cls=Task.simple_task_type('cc_link',link_str,color='YELLOW',ext_in='.o',ext_out='.bin',shell=False) +cls.maxjobs=1 +cls.install=Utils.nada + +feature('cc')(init_cc) +before('apply_type_vars')(init_cc) +after('default_cc')(init_cc) +feature('cc')(apply_obj_vars_cc) +after('apply_incpaths')(apply_obj_vars_cc) +feature('cc')(apply_defines_cc) +after('apply_lib_vars')(apply_defines_cc) +extension(EXT_CC)(c_hook) diff --git a/waf-modules/wafadmin/Tools/ccroot.py b/waf-modules/wafadmin/Tools/ccroot.py new file mode 100644 index 00000000..c65499ab --- /dev/null +++ b/waf-modules/wafadmin/Tools/ccroot.py @@ -0,0 +1,397 @@ +#! /usr/bin/env python +# encoding: utf-8 +import sys +if sys.hexversion < 0x020400f0: from sets import Set as set +import os,sys,re +import TaskGen,Task,Utils,preproc,Logs,Build,Options +from Logs import error,debug,warn +from Utils import md5 +from TaskGen import taskgen,after,before,feature +from Constants import* +from Configure import conftest +try: + from cStringIO import StringIO +except ImportError: + from io import StringIO +import config_c +USE_TOP_LEVEL=False +def get_cc_version(conf,cc,gcc=False,icc=False): + cmd=cc+['-dM','-E','-'] + try: + p=Utils.pproc.Popen(cmd,stdin=Utils.pproc.PIPE,stdout=Utils.pproc.PIPE,stderr=Utils.pproc.PIPE) + p.stdin.write('\n') + out=p.communicate()[0] + except: + conf.fatal('could not determine the compiler version %r'%cmd) + out=str(out) + if gcc: + if out.find('__INTEL_COMPILER')>=0: + conf.fatal('The intel compiler pretends to be gcc') + if out.find('__GNUC__')<0: + conf.fatal('Could not determine the compiler type') + if icc and out.find('__INTEL_COMPILER')<0: + conf.fatal('Not icc/icpc') + k={} + if icc or gcc: + out=out.split('\n') + import shlex + for line in out: + lst=shlex.split(line) + if len(lst)>2: + key=lst[1] + val=lst[2] + k[key]=val + def isD(var): + return var in k + def isT(var): + return var in k and k[var]!='0' + mp1={'__linux__':'linux','__GNU__':'gnu','__FreeBSD__':'freebsd','__NetBSD__':'netbsd','__OpenBSD__':'openbsd','__sun':'sunos','__hpux':'hpux','__sgi':'irix','_AIX':'aix','__CYGWIN__':'cygwin','__MSYS__':'msys','_UWIN':'uwin','_WIN64':'win32','_WIN32':'win32','__POWERPC__':'powerpc',} + for i in mp1: + if isD(i): + conf.env.DEST_OS=mp1[i] + break + else: + if isD('__APPLE__')and isD('__MACH__'): + conf.env.DEST_OS='darwin' + elif isD('__unix__'): + conf.env.DEST_OS='generic' + if isD('__ELF__'): + conf.env.DEST_BINFMT='elf' + elif isD('__WINNT__')or isD('__CYGWIN__'): + conf.env.DEST_BINFMT='pe' + elif isD('__APPLE__'): + conf.env.DEST_BINFMT='mac-o' + mp2={'__x86_64__':'x86_64','__i386__':'x86','__ia64__':'ia','__mips__':'mips','__sparc__':'sparc','__alpha__':'alpha','__arm__':'arm','__hppa__':'hppa','__powerpc__':'powerpc',} + for i in mp2: + if isD(i): + conf.env.DEST_CPU=mp2[i] + break + debug('ccroot: dest platform: '+' '.join([conf.env[x]or'?'for x in('DEST_OS','DEST_BINFMT','DEST_CPU')])) + conf.env['CC_VERSION']=(k['__GNUC__'],k['__GNUC_MINOR__'],k['__GNUC_PATCHLEVEL__']) + return k +class DEBUG_LEVELS: + ULTRADEBUG="ultradebug" + DEBUG="debug" + RELEASE="release" + OPTIMIZED="optimized" + CUSTOM="custom" + ALL=[ULTRADEBUG,DEBUG,RELEASE,OPTIMIZED,CUSTOM] +def scan(self): + debug('ccroot: _scan_preprocessor(self, node, env, path_lst)') + if len(self.inputs)==1: + node=self.inputs[0] + (nodes,names)=preproc.get_deps(node,self.env,nodepaths=self.env['INC_PATHS']) + if Logs.verbose: + debug('deps: deps for %s: %r; unresolved %r',str(node),nodes,names) + return(nodes,names) + all_nodes=[] + all_names=[] + seen=set() + for node in self.inputs: + (nodes,names)=preproc.get_deps(node,self.env,nodepaths=self.env['INC_PATHS']) + if Logs.verbose: + debug('deps: deps for %s: %r; unresolved %r',str(node),nodes,names) + for x in nodes: + if id(x)in seen:continue + seen.add(id(x)) + all_nodes.append(x) + for x in names: + if not x in all_names: + all_names.append(x) + return(all_nodes,all_names) +class ccroot_abstract(TaskGen.task_gen): + def __init__(self,*k,**kw): + if len(k)>1: + k=list(k) + if k[1][0]!='c': + k[1]='c'+k[1] + TaskGen.task_gen.__init__(self,*k,**kw) +def get_target_name(self): + tp='program' + for x in self.features: + if x in['cshlib','cstaticlib']: + tp=x.lstrip('c') + pattern=self.env[tp+'_PATTERN'] + if not pattern:pattern='%s' + dir,name=os.path.split(self.target) + if self.env.DEST_BINFMT=='pe'and getattr(self,'vnum',None)and'cshlib'in self.features: + name=name+'-'+self.vnum.split('.')[0] + return os.path.join(dir,pattern%name) +def default_cc(self): + Utils.def_attrs(self,includes='',defines='',rpaths='',uselib='',uselib_local='',add_objects='',p_flag_vars=[],p_type_vars=[],compiled_tasks=[],link_task=None) + if not self.env.DEST_BINFMT: + self.env.DEST_BINFMT=Utils.unversioned_sys_platform_to_binary_format(self.env.DEST_OS or Utils.unversioned_sys_platform()) + if not self.env.BINDIR:self.env.BINDIR=Utils.subst_vars('${PREFIX}/bin',self.env) + if not self.env.LIBDIR:self.env.LIBDIR=Utils.subst_vars('${PREFIX}/lib${LIB_EXT}',self.env) +def apply_verif(self): + if not(self.source or getattr(self,'add_objects',None)or getattr(self,'uselib_local',None)or getattr(self,'obj_files',None)): + raise Utils.WafError('no source files specified for %s'%self) + if not self.target: + raise Utils.WafError('no target for %s'%self) +def vars_target_cprogram(self): + self.default_install_path=self.env.BINDIR + self.default_chmod=O755 +def vars_target_cshlib(self): + if self.env.DEST_BINFMT=='pe': + self.default_chmod=O755 + self.default_install_path=self.env.BINDIR + else: + self.default_install_path=self.env.LIBDIR +def default_link_install(self): + if self.install_path: + self.bld.install_files(self.install_path,self.link_task.outputs[0],env=self.env,chmod=self.chmod) +def apply_incpaths(self): + lst=[] + for lib in self.to_list(self.uselib): + for path in self.env['CPPPATH_'+lib]: + if not path in lst: + lst.append(path) + if preproc.go_absolute: + for path in preproc.standard_includes: + if not path in lst: + lst.append(path) + for path in self.to_list(self.includes): + if not path in lst: + if preproc.go_absolute or not os.path.isabs(path): + lst.append(path) + else: + self.env.prepend_value('CPPPATH',path) + for path in lst: + node=None + if os.path.isabs(path): + if preproc.go_absolute: + node=self.bld.root.find_dir(path) + elif path[0]=='#': + node=self.bld.srcnode + if len(path)>1: + node=node.find_dir(path[1:]) + else: + node=self.path.find_dir(path) + if node: + self.env.append_value('INC_PATHS',node) + if USE_TOP_LEVEL: + self.env.append_value('INC_PATHS',self.bld.srcnode) +def apply_type_vars(self): + for x in self.features: + if not x in['cprogram','cstaticlib','cshlib']: + continue + x=x.lstrip('c') + st=self.env[x+'_USELIB'] + if st:self.uselib=self.uselib+' '+st + for var in self.p_type_vars: + compvar='%s_%s'%(x,var) + value=self.env[compvar] + if value:self.env.append_value(var,value) +def apply_link(self): + link=getattr(self,'link',None) + if not link: + if'cstaticlib'in self.features:link='static_link' + elif'cxx'in self.features:link='cxx_link' + else:link='cc_link' + tsk=self.create_task(link) + outputs=[t.outputs[0]for t in self.compiled_tasks] + tsk.set_inputs(outputs) + tsk.set_outputs(self.path.find_or_declare(get_target_name(self))) + self.link_task=tsk +def apply_lib_vars(self): + env=self.env + self.uselib=self.to_list(self.uselib) + names=self.to_list(self.uselib_local) + seen=set([]) + tmp=Utils.deque(names) + while tmp: + lib_name=tmp.popleft() + if lib_name in seen: + continue + y=self.name_to_obj(lib_name) + if not y: + raise Utils.WafError('object %r was not found in uselib_local (required by %r)'%(lib_name,self.name)) + y.post() + seen.add(lib_name) + if getattr(y,'uselib_local',None): + lst=y.to_list(y.uselib_local) + if'cshlib'in y.features or'cprogram'in y.features: + lst=[x for x in lst if not'cstaticlib'in self.name_to_obj(x).features] + tmp.extend(lst) + if getattr(y,'link_task',None): + link_name=y.target[y.target.rfind(os.sep)+1:] + if'cstaticlib'in y.features: + env.append_value('STATICLIB',link_name) + elif'cshlib'in y.features or'cprogram'in y.features: + env.append_value('LIB',link_name) + self.link_task.set_run_after(y.link_task) + dep_nodes=getattr(self.link_task,'dep_nodes',[]) + self.link_task.dep_nodes=dep_nodes+y.link_task.outputs + tmp_path=y.link_task.outputs[0].parent.bldpath(self.env) + if not tmp_path in env['LIBPATH']:env.prepend_value('LIBPATH',tmp_path) + for v in self.to_list(y.uselib): + if not env['STATICLIB_'+v]: + if not v in self.uselib: + self.uselib.insert(0,v) + if getattr(y,'export_incdirs',None): + for x in self.to_list(y.export_incdirs): + node=y.path.find_dir(x) + if not node: + raise Utils.WafError('object %r: invalid folder %r in export_incdirs'%(y.target,x)) + self.env.append_unique('INC_PATHS',node) + for x in self.uselib: + for v in self.p_flag_vars: + val=self.env[v+'_'+x] + if val:self.env.append_value(v,val) +def apply_objdeps(self): + if not getattr(self,'add_objects',None):return + seen=[] + names=self.to_list(self.add_objects) + while names: + x=names[0] + if x in seen: + names=names[1:] + continue + y=self.name_to_obj(x) + if not y: + raise Utils.WafError('object %r was not found in uselib_local (required by add_objects %r)'%(x,self.name)) + if getattr(y,'add_objects',None): + added=0 + lst=y.to_list(y.add_objects) + lst.reverse() + for u in lst: + if u in seen:continue + added=1 + names=[u]+names + if added:continue + y.post() + seen.append(x) + for t in y.compiled_tasks: + self.link_task.inputs.extend(t.outputs) +def apply_obj_vars(self): + v=self.env + lib_st=v['LIB_ST'] + staticlib_st=v['STATICLIB_ST'] + libpath_st=v['LIBPATH_ST'] + staticlibpath_st=v['STATICLIBPATH_ST'] + rpath_st=v['RPATH_ST'] + app=v.append_unique + if v['FULLSTATIC']: + v.append_value('LINKFLAGS',v['FULLSTATIC_MARKER']) + for i in v['RPATH']: + if i and rpath_st: + app('LINKFLAGS',rpath_st%i) + for i in v['LIBPATH']: + app('LINKFLAGS',libpath_st%i) + app('LINKFLAGS',staticlibpath_st%i) + if v['STATICLIB']: + v.append_value('LINKFLAGS',v['STATICLIB_MARKER']) + k=[(staticlib_st%i)for i in v['STATICLIB']] + app('LINKFLAGS',k) + if not v['FULLSTATIC']: + if v['STATICLIB']or v['LIB']: + v.append_value('LINKFLAGS',v['SHLIB_MARKER']) + app('LINKFLAGS',[lib_st%i for i in v['LIB']]) +def process_obj_files(self): + if not hasattr(self,'obj_files'):return + for x in self.obj_files: + node=self.path.find_resource(x) + self.link_task.inputs.append(node) +def add_obj_file(self,file): + if not hasattr(self,'obj_files'):self.obj_files=[] + if not'process_obj_files'in self.meths:self.meths.append('process_obj_files') + self.obj_files.append(file) +c_attrs={'cxxflag':'CXXFLAGS','cflag':'CCFLAGS','ccflag':'CCFLAGS','linkflag':'LINKFLAGS','ldflag':'LINKFLAGS','lib':'LIB','libpath':'LIBPATH','staticlib':'STATICLIB','staticlibpath':'STATICLIBPATH','rpath':'RPATH','framework':'FRAMEWORK','frameworkpath':'FRAMEWORKPATH'} +def add_extra_flags(self): + for x in self.__dict__.keys(): + y=x.lower() + if y[-1]=='s': + y=y[:-1] + if c_attrs.get(y,None): + self.env.append_unique(c_attrs[y],getattr(self,x)) +def apply_implib(self): + if not self.env.DEST_BINFMT=='pe': + return + self.meths.remove('default_link_install') + bindir=self.install_path + if not bindir:return + dll=self.link_task.outputs[0] + self.bld.install_files(bindir,dll,self.env,self.chmod) + implib=self.env['implib_PATTERN']%os.path.split(self.target)[1] + implib=dll.parent.find_or_declare(implib) + self.link_task.outputs.append(implib) + self.bld.install_as('${LIBDIR}/%s'%implib.name,implib,self.env) + self.env.append_value('LINKFLAGS',(self.env['IMPLIB_ST']%implib.bldpath(self.env)).split()) +def apply_vnum(self): + if not getattr(self,'vnum','')or not'cshlib'in self.features or os.name!='posix'or self.env.DEST_BINFMT not in('elf','mac-o'): + return + self.meths.remove('default_link_install') + link=self.link_task + nums=self.vnum.split('.') + node=link.outputs[0] + libname=node.name + if libname.endswith('.dylib'): + name3=libname.replace('.dylib','.%s.dylib'%self.vnum) + name2=libname.replace('.dylib','.%s.dylib'%nums[0]) + else: + name3=libname+'.'+self.vnum + name2=libname+'.'+nums[0] + if self.env.SONAME_ST: + v=self.env.SONAME_ST%name2 + self.env.append_value('LINKFLAGS',v.split()) + bld=self.bld + nums=self.vnum.split('.') + path=self.install_path + if not path:return + bld.install_as(path+os.sep+name3,node,env=self.env) + bld.symlink_as(path+os.sep+name2,name3) + bld.symlink_as(path+os.sep+libname,name3) + self.create_task('vnum',node,[node.parent.find_or_declare(name2),node.parent.find_or_declare(name3)]) +def exec_vnum_link(self): + for x in self.outputs: + path=x.abspath(self.env) + try: + os.remove(path) + except OSError: + pass + try: + os.symlink(self.inputs[0].name,path) + except OSError: + return 1 +cls=Task.task_type_from_func('vnum',func=exec_vnum_link,ext_in='.bin',color='CYAN') +cls.quiet=1 +def add_as_needed(conf): + if conf.env.DEST_BINFMT=='elf'and'gcc'in(conf.env.CXX_NAME,conf.env.CC_NAME): + conf.env.append_unique('LINKFLAGS','--as-needed') + +feature('cc','cxx')(default_cc) +before('apply_core')(default_cc) +feature('cprogram','dprogram','cstaticlib','dstaticlib','cshlib','dshlib')(apply_verif) +feature('cprogram','dprogram')(vars_target_cprogram) +after('default_cc')(vars_target_cprogram) +before('apply_core')(vars_target_cprogram) +after('default_cc')(vars_target_cshlib) +feature('cshlib','dshlib')(vars_target_cshlib) +before('apply_core')(vars_target_cshlib) +feature('cprogram','dprogram','cstaticlib','dstaticlib','cshlib','dshlib')(default_link_install) +after('apply_link','vars_target_cprogram','vars_target_cshlib')(default_link_install) +feature('cc','cxx')(apply_incpaths) +after('apply_type_vars','apply_lib_vars','apply_core')(apply_incpaths) +feature('cc','cxx')(apply_type_vars) +after('init_cc','init_cxx')(apply_type_vars) +before('apply_lib_vars')(apply_type_vars) +feature('cprogram','cshlib','cstaticlib')(apply_link) +after('apply_core')(apply_link) +feature('cc','cxx')(apply_lib_vars) +after('apply_link','init_cc','init_cxx','apply_core')(apply_lib_vars) +feature('cprogram','cstaticlib','cshlib')(apply_objdeps) +after('init_cc','init_cxx','apply_link')(apply_objdeps) +feature('cprogram','cshlib','cstaticlib')(apply_obj_vars) +after('apply_lib_vars')(apply_obj_vars) +after('apply_link')(process_obj_files) +taskgen(add_obj_file) +feature('cc','cxx')(add_extra_flags) +before('init_cxx','init_cc')(add_extra_flags) +before('apply_lib_vars','apply_obj_vars','apply_incpaths','init_cc')(add_extra_flags) +feature('cshlib')(apply_implib) +after('apply_link','default_cc')(apply_implib) +before('apply_lib_vars','apply_objdeps','default_link_install')(apply_implib) +feature('cshlib')(apply_vnum) +after('apply_link')(apply_vnum) +before('apply_lib_vars','default_link_install')(apply_vnum) +conftest(add_as_needed) diff --git a/waf-modules/wafadmin/Tools/compiler_cc.py b/waf-modules/wafadmin/Tools/compiler_cc.py new file mode 100644 index 00000000..d8eb20ce --- /dev/null +++ b/waf-modules/wafadmin/Tools/compiler_cc.py @@ -0,0 +1,43 @@ +#! /usr/bin/env python +# encoding: utf-8 + +import os,sys,imp,types,ccroot +import optparse +import Utils,Configure,Options +from Logs import debug +c_compiler={'win32':['msvc','gcc'],'cygwin':['gcc'],'darwin':['gcc'],'aix':['xlc','gcc'],'linux':['gcc','icc','suncc'],'sunos':['gcc','suncc'],'irix':['gcc'],'hpux':['gcc'],'gnu':['gcc'],'default':['gcc']} +def __list_possible_compiler(platform): + try: + return c_compiler[platform] + except KeyError: + return c_compiler["default"] +def detect(conf): + try:test_for_compiler=Options.options.check_c_compiler + except AttributeError:conf.fatal("Add set_options(opt): opt.tool_options('compiler_cc')") + orig=conf.env + for compiler in test_for_compiler.split(): + conf.env=orig.copy() + try: + conf.check_tool(compiler) + except Configure.ConfigurationError,e: + debug('compiler_cc: %r'%e) + else: + if conf.env['CC']: + orig.table=conf.env.get_merged_dict() + conf.env=orig + conf.check_message(compiler,'',True) + conf.env['COMPILER_CC']=compiler + break + conf.check_message(compiler,'',False) + break + else: + conf.fatal('could not configure a c compiler!') +def set_options(opt): + build_platform=Utils.unversioned_sys_platform() + possible_compiler_list=__list_possible_compiler(build_platform) + test_for_compiler=' '.join(possible_compiler_list) + cc_compiler_opts=opt.add_option_group("C Compiler Options") + cc_compiler_opts.add_option('--check-c-compiler',default="%s"%test_for_compiler,help='On this platform (%s) the following C-Compiler will be checked by default: "%s"'%(build_platform,test_for_compiler),dest="check_c_compiler") + for c_compiler in test_for_compiler.split(): + opt.tool_options('%s'%c_compiler,option_group=cc_compiler_opts) + diff --git a/waf-modules/wafadmin/Tools/compiler_cxx.py b/waf-modules/wafadmin/Tools/compiler_cxx.py new file mode 100644 index 00000000..6f1fef6d --- /dev/null +++ b/waf-modules/wafadmin/Tools/compiler_cxx.py @@ -0,0 +1,43 @@ +#! /usr/bin/env python +# encoding: utf-8 + +import os,sys,imp,types,ccroot +import optparse +import Utils,Configure,Options +from Logs import debug +cxx_compiler={'win32':['msvc','g++'],'cygwin':['g++'],'darwin':['g++'],'aix':['xlc++','g++'],'linux':['g++','icpc','sunc++'],'sunos':['g++','sunc++'],'irix':['g++'],'hpux':['g++'],'gnu':['g++'],'default':['g++']} +def __list_possible_compiler(platform): + try: + return cxx_compiler[platform] + except KeyError: + return cxx_compiler["default"] +def detect(conf): + try:test_for_compiler=Options.options.check_cxx_compiler + except AttributeError:raise Configure.ConfigurationError("Add set_options(opt): opt.tool_options('compiler_cxx')") + orig=conf.env + for compiler in test_for_compiler.split(): + try: + conf.env=orig.copy() + conf.check_tool(compiler) + except Configure.ConfigurationError,e: + debug('compiler_cxx: %r'%e) + else: + if conf.env['CXX']: + orig.table=conf.env.get_merged_dict() + conf.env=orig + conf.check_message(compiler,'',True) + conf.env['COMPILER_CXX']=compiler + break + conf.check_message(compiler,'',False) + break + else: + conf.fatal('could not configure a cxx compiler!') +def set_options(opt): + build_platform=Utils.unversioned_sys_platform() + possible_compiler_list=__list_possible_compiler(build_platform) + test_for_compiler=' '.join(possible_compiler_list) + cxx_compiler_opts=opt.add_option_group('C++ Compiler Options') + cxx_compiler_opts.add_option('--check-cxx-compiler',default="%s"%test_for_compiler,help='On this platform (%s) the following C++ Compiler will be checked by default: "%s"'%(build_platform,test_for_compiler),dest="check_cxx_compiler") + for cxx_compiler in test_for_compiler.split(): + opt.tool_options('%s'%cxx_compiler,option_group=cxx_compiler_opts) + diff --git a/waf-modules/wafadmin/Tools/compiler_d.py b/waf-modules/wafadmin/Tools/compiler_d.py new file mode 100644 index 00000000..5f0a04f4 --- /dev/null +++ b/waf-modules/wafadmin/Tools/compiler_d.py @@ -0,0 +1,25 @@ +#! /usr/bin/env python +# encoding: utf-8 + +import os,sys,imp,types +import Utils,Configure,Options +def detect(conf): + if getattr(Options.options,'check_dmd_first',None): + test_for_compiler=['dmd','gdc'] + else: + test_for_compiler=['gdc','dmd'] + for d_compiler in test_for_compiler: + try: + conf.check_tool(d_compiler) + except: + pass + else: + break + else: + conf.fatal('no suitable d compiler was found') +def set_options(opt): + d_compiler_opts=opt.add_option_group('D Compiler Options') + d_compiler_opts.add_option('--check-dmd-first',action='store_true',help='checks for the gdc compiler before dmd (default is the other way round)',dest='check_dmd_first',default=False) + for d_compiler in['gdc','dmd']: + opt.tool_options('%s'%d_compiler,option_group=d_compiler_opts) + diff --git a/waf-modules/wafadmin/Tools/config_c.py b/waf-modules/wafadmin/Tools/config_c.py new file mode 100644 index 00000000..4aee3e3a --- /dev/null +++ b/waf-modules/wafadmin/Tools/config_c.py @@ -0,0 +1,532 @@ +#! /usr/bin/env python +# encoding: utf-8 +import sys +if sys.hexversion < 0x020400f0: from sets import Set as set +import os,imp,sys,shlex,shutil +from Utils import md5 +import Build,Utils,Configure,Task,Options,Logs,TaskGen +from Constants import* +from Configure import conf,conftest +cfg_ver={'atleast-version':'>=','exact-version':'==','max-version':'<=',} +SNIP1=''' + int main() { + void *p; + p=(void*)(%s); + return 0; +} +''' +SNIP2=''' +int main() { + if ((%(type_name)s *) 0) return 0; + if (sizeof (%(type_name)s)) return 0; +} +''' +SNIP3=''' +int main() { + return 0; +} +''' +def parse_flags(line,uselib,env): + lst=shlex.split(line) + while lst: + x=lst.pop(0) + st=x[:2] + ot=x[2:] + if st=='-I'or st=='/I': + if not ot:ot=lst.pop(0) + env.append_unique('CPPPATH_'+uselib,ot) + elif st=='-D': + if not ot:ot=lst.pop(0) + env.append_unique('CXXDEFINES_'+uselib,ot) + env.append_unique('CCDEFINES_'+uselib,ot) + elif st=='-l': + if not ot:ot=lst.pop(0) + env.append_unique('LIB_'+uselib,ot) + elif st=='-L': + if not ot:ot=lst.pop(0) + env.append_unique('LIBPATH_'+uselib,ot) + elif x=='-pthread'or x.startswith('+'): + env.append_unique('CCFLAGS_'+uselib,x) + env.append_unique('CXXFLAGS_'+uselib,x) + env.append_unique('LINKFLAGS_'+uselib,x) + elif x=='-framework': + env.append_unique('FRAMEWORK_'+uselib,lst.pop(0)) + elif x.startswith('-F'): + env.append_unique('FRAMEWORKPATH_'+uselib,x[2:]) + elif x.startswith('-std'): + env.append_unique('CCFLAGS_'+uselib,x) + env.append_unique('CXXFLAGS_'+uselib,x) + env.append_unique('LINKFLAGS_'+uselib,x) + elif x.startswith('-Wl'): + env.append_unique('LINKFLAGS_'+uselib,x) + elif x.startswith('-m')or x.startswith('-f'): + env.append_unique('CCFLAGS_'+uselib,x) + env.append_unique('CXXFLAGS_'+uselib,x) +def ret_msg(self,f,kw): + if isinstance(f,str): + return f + return f(kw) +def validate_cfg(self,kw): + if not'path'in kw: + kw['path']='pkg-config --errors-to-stdout --print-errors' + if'atleast_pkgconfig_version'in kw: + if not'msg'in kw: + kw['msg']='Checking for pkg-config version >= %s'%kw['atleast_pkgconfig_version'] + return + if'modversion'in kw: + return + if'variables'in kw: + if not'msg'in kw: + kw['msg']='Checking for %s variables'%kw['package'] + return + for x in cfg_ver.keys(): + y=x.replace('-','_') + if y in kw: + if not'package'in kw: + raise ValueError('%s requires a package'%x) + if not'msg'in kw: + kw['msg']='Checking for %s %s %s'%(kw['package'],cfg_ver[x],kw[y]) + return + if not'msg'in kw: + kw['msg']='Checking for %s'%(kw['package']or kw['path']) + if not'okmsg'in kw: + kw['okmsg']='yes' + if not'errmsg'in kw: + kw['errmsg']='not found' +def cmd_and_log(self,cmd,kw): + Logs.debug('runner: %s\n'%cmd) + if self.log: + self.log.write('%s\n'%cmd) + try: + p=Utils.pproc.Popen(cmd,stdout=Utils.pproc.PIPE,stderr=Utils.pproc.PIPE,shell=True) + (out,err)=p.communicate() + except OSError,e: + self.log.write('error %r'%e) + self.fatal(str(e)) + out=str(out) + err=str(err) + if self.log: + self.log.write(out) + self.log.write(err) + if p.returncode: + if not kw.get('errmsg',''): + if kw.get('mandatory',False): + kw['errmsg']=out.strip() + else: + kw['errmsg']='no' + self.fatal('fail') + return out +def exec_cfg(self,kw): + if'atleast_pkgconfig_version'in kw: + cmd='%s --atleast-pkgconfig-version=%s'%(kw['path'],kw['atleast_pkgconfig_version']) + self.cmd_and_log(cmd,kw) + if not'okmsg'in kw: + kw['okmsg']='yes' + return + for x in cfg_ver: + y=x.replace('-','_') + if y in kw: + self.cmd_and_log('%s --%s=%s %s'%(kw['path'],x,kw[y],kw['package']),kw) + if not'okmsg'in kw: + kw['okmsg']='yes' + self.define(self.have_define(kw.get('uselib_store',kw['package'])),1,0) + break + if'modversion'in kw: + version=self.cmd_and_log('%s --modversion %s'%(kw['path'],kw['modversion']),kw).strip() + self.define('%s_VERSION'%Utils.quote_define_name(kw.get('uselib_store',kw['modversion'])),version) + return version + if'variables'in kw: + env=kw.get('env',self.env) + uselib=kw.get('uselib_store',kw['package'].upper()) + vars=Utils.to_list(kw['variables']) + for v in vars: + val=self.cmd_and_log('%s --variable=%s %s'%(kw['path'],v,kw['package']),kw).strip() + var='%s_%s'%(uselib,v) + env[var]=val + if not'okmsg'in kw: + kw['okmsg']='yes' + return + lst=[kw['path']] + defi=kw.get('define_variable',None) + if not defi: + defi=self.env.PKG_CONFIG_DEFINES or{} + for key,val in defi.iteritems(): + lst.append('--define-variable=%s=%s'%(key,val)) + lst.append(kw.get('args','')) + lst.append(kw['package']) + cmd=' '.join(lst) + ret=self.cmd_and_log(cmd,kw) + if not'okmsg'in kw: + kw['okmsg']='yes' + self.define(self.have_define(kw.get('uselib_store',kw['package'])),1,0) + parse_flags(ret,kw.get('uselib_store',kw['package'].upper()),kw.get('env',self.env)) + return ret +def check_cfg(self,*k,**kw): + self.validate_cfg(kw) + if'msg'in kw: + self.check_message_1(kw['msg']) + ret=None + try: + ret=self.exec_cfg(kw) + except Configure.ConfigurationError,e: + if'errmsg'in kw: + self.check_message_2(kw['errmsg'],'YELLOW') + if'mandatory'in kw and kw['mandatory']: + if Logs.verbose>1: + raise + else: + self.fatal('the configuration failed (see %r)'%self.log.name) + else: + kw['success']=ret + if'okmsg'in kw: + self.check_message_2(self.ret_msg(kw['okmsg'],kw)) + return ret +def validate_c(self,kw): + if not'env'in kw: + kw['env']=self.env.copy() + env=kw['env'] + if not'compiler'in kw: + kw['compiler']='cc' + if env['CXX_NAME']and Task.TaskBase.classes.get('cxx',None): + kw['compiler']='cxx' + if not self.env['CXX']: + self.fatal('a c++ compiler is required') + else: + if not self.env['CC']: + self.fatal('a c compiler is required') + if not'type'in kw: + kw['type']='cprogram' + assert not(kw['type']!='cprogram'and kw.get('execute',0)),'can only execute programs' + def to_header(dct): + if'header_name'in dct: + dct=Utils.to_list(dct['header_name']) + return''.join(['#include <%s>\n'%x for x in dct]) + return'' + if not'compile_mode'in kw: + kw['compile_mode']=(kw['compiler']=='cxx')and'cxx'or'cc' + if not'compile_filename'in kw: + kw['compile_filename']='test.c'+((kw['compile_mode']=='cxx')and'pp'or'') + if'framework_name'in kw: + try:TaskGen.task_gen.create_task_macapp + except AttributeError:self.fatal('frameworks require the osx tool') + fwkname=kw['framework_name'] + if not'uselib_store'in kw: + kw['uselib_store']=fwkname.upper() + if not kw.get('no_header',False): + if not'header_name'in kw: + kw['header_name']=[] + fwk='%s/%s.h'%(fwkname,fwkname) + if kw.get('remove_dot_h',None): + fwk=fwk[:-2] + kw['header_name']=Utils.to_list(kw['header_name'])+[fwk] + kw['msg']='Checking for framework %s'%fwkname + kw['framework']=fwkname + if'function_name'in kw: + fu=kw['function_name'] + if not'msg'in kw: + kw['msg']='Checking for function %s'%fu + kw['code']=to_header(kw)+SNIP1%fu + if not'uselib_store'in kw: + kw['uselib_store']=fu.upper() + if not'define_name'in kw: + kw['define_name']=self.have_define(fu) + elif'type_name'in kw: + tu=kw['type_name'] + if not'msg'in kw: + kw['msg']='Checking for type %s'%tu + if not'header_name'in kw: + kw['header_name']='stdint.h' + kw['code']=to_header(kw)+SNIP2%{'type_name':tu} + if not'define_name'in kw: + kw['define_name']=self.have_define(tu.upper()) + elif'header_name'in kw: + if not'msg'in kw: + kw['msg']='Checking for header %s'%kw['header_name'] + l=Utils.to_list(kw['header_name']) + assert len(l)>0,'list of headers in header_name is empty' + kw['code']=to_header(kw)+SNIP3 + if not'uselib_store'in kw: + kw['uselib_store']=l[0].upper() + if not'define_name'in kw: + kw['define_name']=self.have_define(l[0]) + if'lib'in kw: + if not'msg'in kw: + kw['msg']='Checking for library %s'%kw['lib'] + if not'uselib_store'in kw: + kw['uselib_store']=kw['lib'].upper() + if'staticlib'in kw: + if not'msg'in kw: + kw['msg']='Checking for static library %s'%kw['staticlib'] + if not'uselib_store'in kw: + kw['uselib_store']=kw['staticlib'].upper() + if'fragment'in kw: + kw['code']=kw['fragment'] + if not'msg'in kw: + kw['msg']='Checking for custom code' + if not'errmsg'in kw: + kw['errmsg']='no' + for(flagsname,flagstype)in[('cxxflags','compiler'),('cflags','compiler'),('linkflags','linker')]: + if flagsname in kw: + if not'msg'in kw: + kw['msg']='Checking for %s flags %s'%(flagstype,kw[flagsname]) + if not'errmsg'in kw: + kw['errmsg']='no' + if not'execute'in kw: + kw['execute']=False + if not'errmsg'in kw: + kw['errmsg']='not found' + if not'okmsg'in kw: + kw['okmsg']='yes' + if not'code'in kw: + kw['code']=SNIP3 + if not kw.get('success'):kw['success']=None + assert'msg'in kw,'invalid parameters, read http://freehackers.org/~tnagy/wafbook/single.html#config_helpers_c' +def post_check(self,*k,**kw): + is_success=False + if kw['execute']: + if kw['success']is not None: + is_success=True + else: + is_success=(kw['success']==0) + if'define_name'in kw: + if'header_name'in kw or'function_name'in kw or'type_name'in kw or'fragment'in kw: + if kw['execute']: + key=kw['success'] + if isinstance(key,str): + if key: + self.define(kw['define_name'],key,quote=kw.get('quote',1)) + else: + self.define_cond(kw['define_name'],True) + else: + self.define_cond(kw['define_name'],False) + else: + self.define_cond(kw['define_name'],is_success) + if is_success and'uselib_store'in kw: + import cc,cxx + for k in set(cc.g_cc_flag_vars).union(cxx.g_cxx_flag_vars): + lk=k.lower() + if k=='CPPPATH':lk='includes' + if k=='CXXDEFINES':lk='defines' + if k=='CCDEFINES':lk='defines' + if lk in kw: + val=kw[lk] + if isinstance(val,str): + val=val.rstrip(os.path.sep) + self.env.append_unique(k+'_'+kw['uselib_store'],val) +def check(self,*k,**kw): + self.validate_c(kw) + self.check_message_1(kw['msg']) + ret=None + try: + ret=self.run_c_code(*k,**kw) + except Configure.ConfigurationError,e: + self.check_message_2(kw['errmsg'],'YELLOW') + if'mandatory'in kw and kw['mandatory']: + if Logs.verbose>1: + raise + else: + self.fatal('the configuration failed (see %r)'%self.log.name) + else: + kw['success']=ret + self.check_message_2(self.ret_msg(kw['okmsg'],kw)) + self.post_check(*k,**kw) + if not kw.get('execute',False): + return ret==0 + return ret +def run_c_code(self,*k,**kw): + test_f_name=kw['compile_filename'] + k=0 + while k<10000: + dir=os.path.join(self.blddir,'.conf_check_%d'%k) + try: + shutil.rmtree(dir) + except OSError: + pass + try: + os.stat(dir) + except OSError: + break + k+=1 + try: + os.makedirs(dir) + except: + self.fatal('cannot create a configuration test folder %r'%dir) + try: + os.stat(dir) + except: + self.fatal('cannot use the configuration test folder %r'%dir) + bdir=os.path.join(dir,'testbuild') + if not os.path.exists(bdir): + os.makedirs(bdir) + env=kw['env'] + dest=open(os.path.join(dir,test_f_name),'w') + dest.write(kw['code']) + dest.close() + back=os.path.abspath('.') + bld=Build.BuildContext() + bld.log=self.log + bld.all_envs.update(self.all_envs) + bld.all_envs['default']=env + bld.lst_variants=bld.all_envs.keys() + bld.load_dirs(dir,bdir) + os.chdir(dir) + bld.rescan(bld.srcnode) + if not'features'in kw: + kw['features']=[kw['compile_mode'],kw['type']] + o=bld(features=kw['features'],source=test_f_name,target='testprog') + for k,v in kw.iteritems(): + setattr(o,k,v) + self.log.write("==>\n%s\n<==\n"%kw['code']) + try: + bld.compile() + except Utils.WafError: + ret=Utils.ex_stack() + else: + ret=0 + os.chdir(back) + if ret: + self.log.write('command returned %r'%ret) + self.fatal(str(ret)) + if kw['execute']: + lastprog=o.link_task.outputs[0].abspath(env) + args=Utils.to_list(kw.get('exec_args',[])) + proc=Utils.pproc.Popen([lastprog]+args,stdout=Utils.pproc.PIPE,stderr=Utils.pproc.PIPE) + (out,err)=proc.communicate() + w=self.log.write + w(str(out)) + w('\n') + w(str(err)) + w('\n') + w('returncode %r'%proc.returncode) + w('\n') + if proc.returncode: + self.fatal(Utils.ex_stack()) + ret=out + return ret +def check_cxx(self,*k,**kw): + kw['compiler']='cxx' + return self.check(*k,**kw) +def check_cc(self,*k,**kw): + kw['compiler']='cc' + return self.check(*k,**kw) +def define(self,define,value,quote=1): + assert define and isinstance(define,str) + tbl=self.env[DEFINES]or Utils.ordered_dict() + if isinstance(value,str): + if quote: + tbl[define]='"%s"'%repr('"'+value)[2:-1].replace('"','\\"') + else: + tbl[define]=value + elif isinstance(value,int): + tbl[define]=value + else: + raise TypeError('define %r -> %r must be a string or an int'%(define,value)) + self.env[DEFINES]=tbl + self.env[define]=value +def undefine(self,define): + assert define and isinstance(define,str) + tbl=self.env[DEFINES]or Utils.ordered_dict() + value=UNDEFINED + tbl[define]=value + self.env[DEFINES]=tbl + self.env[define]=value +def define_cond(self,name,value): + if value: + self.define(name,1) + else: + self.undefine(name) +def is_defined(self,key): + defines=self.env[DEFINES] + if not defines: + return False + try: + value=defines[key] + except KeyError: + return False + else: + return value!=UNDEFINED +def get_define(self,define): + try:return self.env[DEFINES][define] + except KeyError:return None +def have_define(self,name): + return self.__dict__.get('HAVE_PAT','HAVE_%s')%Utils.quote_define_name(name) +def write_config_header(self,configfile='',env='',guard='',top=False): + if not configfile:configfile=WAF_CONFIG_H + waf_guard=guard or'_%s_WAF'%Utils.quote_define_name(configfile) + if not env:env=self.env + if top: + diff='' + else: + diff=Utils.diff_path(self.srcdir,self.curdir) + full=os.sep.join([self.blddir,env.variant(),diff,configfile]) + full=os.path.normpath(full) + (dir,base)=os.path.split(full) + try:os.makedirs(dir) + except:pass + dest=open(full,'w') + dest.write('/* Configuration header created by Waf - do not edit */\n') + dest.write('#ifndef %s\n#define %s\n\n'%(waf_guard,waf_guard)) + dest.write(self.get_config_header()) + env.append_unique(CFG_FILES,os.path.join(diff,configfile)) + dest.write('\n#endif /* %s */\n'%waf_guard) + dest.close() +def get_config_header(self): + config_header=[] + tbl=self.env[DEFINES]or Utils.ordered_dict() + for key in tbl.allkeys: + value=tbl[key] + if value is None: + config_header.append('#define %s'%key) + elif value is UNDEFINED: + config_header.append('/* #undef %s */'%key) + else: + config_header.append('#define %s %s'%(key,value)) + return"\n".join(config_header) +def find_cpp(conf): + v=conf.env + cpp=None + if v['CPP']:cpp=v['CPP'] + elif'CPP'in conf.environ:cpp=conf.environ['CPP'] + if not cpp:cpp=conf.find_program('cpp',var='CPP') + if not cpp:cpp=v['CC'] + if not cpp:cpp=v['CXX'] + v['CPP']=cpp +def cc_add_flags(conf): + conf.add_os_flags('CFLAGS','CCFLAGS') + conf.add_os_flags('CPPFLAGS') +def cxx_add_flags(conf): + conf.add_os_flags('CXXFLAGS') + conf.add_os_flags('CPPFLAGS') +def link_add_flags(conf): + conf.add_os_flags('LINKFLAGS') + conf.add_os_flags('LDFLAGS','LINKFLAGS') +def cc_load_tools(conf): + conf.check_tool('cc') +def cxx_load_tools(conf): + conf.check_tool('cxx') + +conf(ret_msg) +conf(validate_cfg) +conf(cmd_and_log) +conf(exec_cfg) +conf(check_cfg) +conf(validate_c) +conf(post_check) +conf(check) +conf(run_c_code) +conf(check_cxx) +conf(check_cc) +conf(define) +conf(undefine) +conf(define_cond) +conf(is_defined) +conf(get_define) +conf(have_define) +conf(write_config_header) +conf(get_config_header) +conftest(find_cpp) +conftest(cc_add_flags) +conftest(cxx_add_flags) +conftest(link_add_flags) +conftest(cc_load_tools) +conftest(cxx_load_tools) diff --git a/waf-modules/wafadmin/Tools/cs.py b/waf-modules/wafadmin/Tools/cs.py new file mode 100644 index 00000000..07731207 --- /dev/null +++ b/waf-modules/wafadmin/Tools/cs.py @@ -0,0 +1,44 @@ +#! /usr/bin/env python +# encoding: utf-8 + +import TaskGen,Utils,Task,Options +from Logs import error +from TaskGen import before,after,taskgen,feature +flag_vars=['FLAGS','ASSEMBLIES'] +def init_cs(self): + Utils.def_attrs(self,flags='',assemblies='',resources='',uselib='') +def apply_uselib_cs(self): + if not self.uselib: + return + global flag_vars + for var in self.to_list(self.uselib): + for v in self.flag_vars: + val=self.env[v+'_'+var] + if val:self.env.append_value(v,val) +def apply_cs(self): + try:self.meths.remove('apply_core') + except ValueError:pass + for i in self.to_list(self.assemblies)+self.env['ASSEMBLIES']: + self.env.append_unique('_ASSEMBLIES','/r:'+i) + for i in self.to_list(self.resources): + self.env.append_unique('_RESOURCES','/resource:'+i) + self.env['_TYPE']=getattr(self,'type','exe') + self.env.append_unique('_FLAGS',self.to_list(self.flags)) + self.env.append_unique('_FLAGS',self.env.FLAGS) + nodes=[self.path.find_resource(i)for i in self.to_list(self.source)] + self.create_task('mcs',nodes,self.path.find_or_declare(self.target)) +Task.simple_task_type('mcs','${MCS} ${SRC} /target:${_TYPE} /out:${TGT} ${_FLAGS} ${_ASSEMBLIES} ${_RESOURCES}',color='YELLOW') +def detect(conf): + csc=getattr(Options.options,'cscbinary',None) + if csc: + conf.env.MCS=csc + conf.find_program(['gmcs','mcs'],var='MCS') +def set_options(opt): + opt.add_option('--with-csc-binary',type='string',dest='cscbinary') + +feature('cs')(init_cs) +feature('cs')(apply_uselib_cs) +after('init_cs')(apply_uselib_cs) +feature('cs')(apply_cs) +after('apply_uselib_cs')(apply_cs) +before('apply_core')(apply_cs) diff --git a/waf-modules/wafadmin/Tools/cxx.py b/waf-modules/wafadmin/Tools/cxx.py new file mode 100644 index 00000000..c2b49f38 --- /dev/null +++ b/waf-modules/wafadmin/Tools/cxx.py @@ -0,0 +1,71 @@ +#! /usr/bin/env python +# encoding: utf-8 +import sys +if sys.hexversion < 0x020400f0: from sets import Set as set +import TaskGen,Task,Utils +from Logs import debug +import ccroot +from TaskGen import feature,before,extension,after +g_cxx_flag_vars=['CXXDEPS','FRAMEWORK','FRAMEWORKPATH','STATICLIB','LIB','LIBPATH','LINKFLAGS','RPATH','CXXFLAGS','CCFLAGS','CPPPATH','CPPFLAGS','CXXDEFINES'] +EXT_CXX=['.cpp','.cc','.cxx','.C','.c++'] +g_cxx_type_vars=['CXXFLAGS','LINKFLAGS'] +class cxx_taskgen(ccroot.ccroot_abstract): + pass +def init_cxx(self): + if not'cc'in self.features: + self.mappings['.c']=TaskGen.task_gen.mappings['.cxx'] + self.p_flag_vars=set(self.p_flag_vars).union(g_cxx_flag_vars) + self.p_type_vars=set(self.p_type_vars).union(g_cxx_type_vars) + if not self.env['CXX_NAME']: + raise Utils.WafError("At least one compiler (g++, ..) must be selected") +def apply_obj_vars_cxx(self): + env=self.env + app=env.append_unique + cxxpath_st=env['CPPPATH_ST'] + for i in env['INC_PATHS']: + app('_CXXINCFLAGS',cxxpath_st%i.bldpath(env)) + app('_CXXINCFLAGS',cxxpath_st%i.srcpath(env)) + for i in env['CPPPATH']: + app('_CXXINCFLAGS',cxxpath_st%i) +def apply_defines_cxx(self): + self.defines=getattr(self,'defines',[]) + lst=self.to_list(self.defines)+self.to_list(self.env['CXXDEFINES']) + milst=[] + for defi in lst: + if not defi in milst: + milst.append(defi) + libs=self.to_list(self.uselib) + for l in libs: + val=self.env['CXXDEFINES_'+l] + if val:milst+=self.to_list(val) + self.env['DEFLINES']=["%s %s"%(x[0],Utils.trimquotes('='.join(x[1:])))for x in[y.split('=')for y in milst]] + y=self.env['CXXDEFINES_ST'] + self.env.append_unique('_CXXDEFFLAGS',[y%x for x in milst]) +def cxx_hook(self,node): + if getattr(self,'obj_ext',None): + obj_ext=self.obj_ext + else: + obj_ext='_%d.o'%self.idx + task=self.create_task('cxx',node,node.change_ext(obj_ext)) + try: + self.compiled_tasks.append(task) + except AttributeError: + raise Utils.WafError('Have you forgotten to set the feature "cxx" on %s?'%str(self)) + return task +cxx_str='${CXX} ${CXXFLAGS} ${CPPFLAGS} ${_CXXINCFLAGS} ${_CXXDEFFLAGS} ${CXX_SRC_F}${SRC} ${CXX_TGT_F}${TGT}' +cls=Task.simple_task_type('cxx',cxx_str,color='GREEN',ext_out='.o',ext_in='.cxx',shell=False) +cls.scan=ccroot.scan +cls.vars.append('CXXDEPS') +link_str='${LINK_CXX} ${CXXLNK_SRC_F}${SRC} ${CXXLNK_TGT_F}${TGT[0].abspath(env)} ${LINKFLAGS}' +cls=Task.simple_task_type('cxx_link',link_str,color='YELLOW',ext_in='.o',ext_out='.bin',shell=False) +cls.maxjobs=1 +cls.install=Utils.nada + +feature('cxx')(init_cxx) +before('apply_type_vars')(init_cxx) +after('default_cc')(init_cxx) +feature('cxx')(apply_obj_vars_cxx) +after('apply_incpaths')(apply_obj_vars_cxx) +feature('cxx')(apply_defines_cxx) +after('apply_lib_vars')(apply_defines_cxx) +extension(EXT_CXX)(cxx_hook) diff --git a/waf-modules/wafadmin/Tools/d.py b/waf-modules/wafadmin/Tools/d.py new file mode 100644 index 00000000..36250ab7 --- /dev/null +++ b/waf-modules/wafadmin/Tools/d.py @@ -0,0 +1,368 @@ +#! /usr/bin/env python +# encoding: utf-8 +import sys +if sys.hexversion < 0x020400f0: from sets import Set as set +import os,sys,re,optparse +import ccroot +import TaskGen,Utils,Task,Configure,Logs,Build +from Logs import debug,error +from TaskGen import taskgen,feature,after,before,extension +from Configure import conftest +EXT_D=['.d','.di','.D'] +D_METHS=['apply_core','apply_vnum','apply_objdeps'] +DLIB=""" +version(D_Version2) { + import std.stdio; + int main() { + writefln("phobos2"); + return 0; + } +} else { + version(Tango) { + import tango.stdc.stdio; + int main() { + printf("tango"); + return 0; + } + } else { + import std.stdio; + int main() { + writefln("phobos1"); + return 0; + } + } +} +""" +def filter_comments(filename): + txt=Utils.readf(filename) + i=0 + buf=[] + max=len(txt) + begin=0 + while i1: + self.features.append('d'+k[1]) +TaskGen.bind_feature('d',D_METHS) +def init_d(self): + Utils.def_attrs(self,dflags='',importpaths='',libs='',libpaths='',uselib='',uselib_local='',generate_headers=False,compiled_tasks=[],add_objects=[],link_task=None) +def apply_d_libs(self): + env=self.env + self.uselib=self.to_list(self.uselib) + names=self.to_list(self.uselib_local) + seen=set([]) + tmp=Utils.deque(names) + while tmp: + lib_name=tmp.popleft() + if lib_name in seen: + continue + y=self.name_to_obj(lib_name) + if not y: + raise Utils.WafError('object %r was not found in uselib_local (required by %r)'%(lib_name,self.name)) + y.post() + seen.add(lib_name) + if getattr(y,'uselib_local',None): + lst=y.to_list(y.uselib_local) + if'dshlib'in y.features or'dprogram'in y.features: + lst=[x for x in lst if not'dstaticlib'in self.name_to_obj(x).features] + tmp.extend(lst) + if getattr(y,'link_task',None): + link_name=y.target[y.target.rfind(os.sep)+1:] + if'dstaticlib'in y.features or'dshlib'in y.features: + env.append_unique('DLINKFLAGS',env.DLIB_ST%link_name) + env.append_unique('DLINKFLAGS',env.DLIBPATH_ST%y.link_task.outputs[0].parent.bldpath(env)) + self.link_task.set_run_after(y.link_task) + dep_nodes=getattr(self.link_task,'dep_nodes',[]) + self.link_task.dep_nodes=dep_nodes+y.link_task.outputs + for v in self.to_list(y.uselib): + if not v in self.uselib: + self.uselib.insert(0,v) + if getattr(y,'export_incdirs',None): + for x in self.to_list(y.export_incdirs): + node=y.path.find_dir(x) + if not node: + raise Utils.WafError('object %r: invalid folder %r in export_incdirs'%(y.target,x)) + self.env.append_unique('INC_PATHS',node) +def apply_d_link(self): + link=getattr(self,'link',None) + if not link: + if'dstaticlib'in self.features:link='static_link' + else:link='d_link' + outputs=[t.outputs[0]for t in self.compiled_tasks] + self.link_task=self.create_task(link,outputs,self.path.find_or_declare(get_target_name(self))) +def apply_d_vars(self): + env=self.env + dpath_st=env['DPATH_ST'] + lib_st=env['DLIB_ST'] + libpath_st=env['DLIBPATH_ST'] + importpaths=self.to_list(self.importpaths) + libpaths=[] + libs=[] + uselib=self.to_list(self.uselib) + for i in uselib: + if env['DFLAGS_'+i]: + env.append_unique('DFLAGS',env['DFLAGS_'+i]) + for x in self.features: + if not x in['dprogram','dstaticlib','dshlib']: + continue + x.lstrip('d') + d_shlib_dflags=env['D_'+x+'_DFLAGS'] + if d_shlib_dflags: + env.append_unique('DFLAGS',d_shlib_dflags) + for i in uselib: + if env['DPATH_'+i]: + for entry in self.to_list(env['DPATH_'+i]): + if not entry in importpaths: + importpaths.append(entry) + for path in importpaths: + if os.path.isabs(path): + env.append_unique('_DIMPORTFLAGS',dpath_st%path) + else: + node=self.path.find_dir(path) + self.env.append_unique('INC_PATHS',node) + env.append_unique('_DIMPORTFLAGS',dpath_st%node.srcpath(env)) + env.append_unique('_DIMPORTFLAGS',dpath_st%node.bldpath(env)) + for i in uselib: + if env['LIBPATH_'+i]: + for entry in self.to_list(env['LIBPATH_'+i]): + if not entry in libpaths: + libpaths.append(entry) + libpaths=self.to_list(self.libpaths)+libpaths + for path in libpaths: + if not os.path.isabs(path): + node=self.path.find_resource(path) + if not node: + raise Utils.WafError('could not find libpath %r from %r'%(path,self)) + path=node.abspath(self.env) + env.append_unique('DLINKFLAGS',libpath_st%path) + for i in uselib: + if env['LIB_'+i]: + for entry in self.to_list(env['LIB_'+i]): + if not entry in libs: + libs.append(entry) + libs.extend(self.to_list(self.libs)) + for flag in self.to_list(self.dflags): + env.append_unique('DFLAGS',flag) + for lib in libs: + env.append_unique('DLINKFLAGS',lib_st%lib) + for i in uselib: + dlinkflags=env['DLINKFLAGS_'+i] + if dlinkflags: + for linkflag in dlinkflags: + env.append_unique('DLINKFLAGS',linkflag) +def add_shlib_d_flags(self): + for linkflag in self.env['D_shlib_LINKFLAGS']: + self.env.append_unique('DLINKFLAGS',linkflag) +def d_hook(self,node): + task=self.create_task(self.generate_headers and'd_with_header'or'd') + try:obj_ext=self.obj_ext + except AttributeError:obj_ext='_%d.o'%self.idx + task.inputs=[node] + task.outputs=[node.change_ext(obj_ext)] + self.compiled_tasks.append(task) + if self.generate_headers: + header_node=node.change_ext(self.env['DHEADER_ext']) + task.outputs+=[header_node] +d_str='${D_COMPILER} ${DFLAGS} ${_DIMPORTFLAGS} ${D_SRC_F}${SRC} ${D_TGT_F}${TGT}' +d_with_header_str='${D_COMPILER} ${DFLAGS} ${_DIMPORTFLAGS} \ +${D_HDR_F}${TGT[1].bldpath(env)} \ +${D_SRC_F}${SRC} \ +${D_TGT_F}${TGT[0].bldpath(env)}' +link_str='${D_LINKER} ${DLNK_SRC_F}${SRC} ${DLNK_TGT_F}${TGT} ${DLINKFLAGS}' +def override_exec(cls): + old_exec=cls.exec_command + def exec_command(self,*k,**kw): + if isinstance(k[0],list): + lst=k[0] + for i in xrange(len(lst)): + if lst[i]=='-of': + del lst[i] + lst[i]='-of'+lst[i] + break + return old_exec(self,*k,**kw) + cls.exec_command=exec_command +cls=Task.simple_task_type('d',d_str,'GREEN',before='static_link d_link',shell=False) +cls.scan=scan +override_exec(cls) +cls=Task.simple_task_type('d_with_header',d_with_header_str,'GREEN',before='static_link d_link',shell=False) +override_exec(cls) +cls=Task.simple_task_type('d_link',link_str,color='YELLOW',shell=False) +override_exec(cls) +def generate_header(self,filename,install_path): + if not hasattr(self,'header_lst'):self.header_lst=[] + self.meths.append('process_header') + self.header_lst.append([filename,install_path]) +def process_header(self): + env=self.env + for i in getattr(self,'header_lst',[]): + node=self.path.find_resource(i[0]) + if not node: + raise Utils.WafError('file not found on d obj '+i[0]) + task=self.create_task('d_header') + task.set_inputs(node) + task.set_outputs(node.change_ext('.di')) +d_header_str='${D_COMPILER} ${D_HEADER} ${SRC}' +Task.simple_task_type('d_header',d_header_str,color='BLUE',shell=False) +def d_platform_flags(conf): + v=conf.env + binfmt=v.DEST_BINFMT or Utils.unversioned_sys_platform_to_binary_format(v.DEST_OS or Utils.unversioned_sys_platform()) + if binfmt=='pe': + v['D_program_PATTERN']='%s.exe' + v['D_shlib_PATTERN']='lib%s.dll' + v['D_staticlib_PATTERN']='lib%s.a' + else: + v['D_program_PATTERN']='%s' + v['D_shlib_PATTERN']='lib%s.so' + v['D_staticlib_PATTERN']='lib%s.a' +def check_dlibrary(conf): + ret=conf.check_cc(features='d dprogram',fragment=DLIB,mandatory=True,compile_filename='test.d',execute=True) + conf.env.DLIBRARY=ret.strip() + +feature('d')(init_d) +before('apply_type_vars')(init_d) +feature('d')(init_d) +before('apply_d_libs')(init_d) +feature('d')(apply_d_libs) +after('apply_d_link','init_d')(apply_d_libs) +before('apply_vnum','apply_d_vars')(apply_d_libs) +feature('dprogram','dshlib','dstaticlib')(apply_d_link) +after('apply_core')(apply_d_link) +feature('d')(apply_d_vars) +after('apply_core')(apply_d_vars) +feature('dshlib')(add_shlib_d_flags) +after('apply_d_vars')(add_shlib_d_flags) +extension(EXT_D)(d_hook) +taskgen(generate_header) +before('apply_core')(process_header) +conftest(d_platform_flags) +conftest(check_dlibrary) diff --git a/waf-modules/wafadmin/Tools/dbus.py b/waf-modules/wafadmin/Tools/dbus.py new file mode 100644 index 00000000..449bdc06 --- /dev/null +++ b/waf-modules/wafadmin/Tools/dbus.py @@ -0,0 +1,24 @@ +#! /usr/bin/env python +# encoding: utf-8 + +import Task,Utils +from TaskGen import taskgen,before,after,feature +def add_dbus_file(self,filename,prefix,mode): + if not hasattr(self,'dbus_lst'): + self.dbus_lst=[] + self.meths.append('process_dbus') + self.dbus_lst.append([filename,prefix,mode]) +def process_dbus(self): + for filename,prefix,mode in getattr(self,'dbus_lst',[]): + node=self.path.find_resource(filename) + if not node: + raise Utils.WafError('file not found '+filename) + tsk=self.create_task('dbus_binding_tool',node,node.change_ext('.h')) + tsk.env.DBUS_BINDING_TOOL_PREFIX=prefix + tsk.env.DBUS_BINDING_TOOL_MODE=mode +Task.simple_task_type('dbus_binding_tool','${DBUS_BINDING_TOOL} --prefix=${DBUS_BINDING_TOOL_PREFIX} --mode=${DBUS_BINDING_TOOL_MODE} --output=${TGT} ${SRC}',color='BLUE',before='cc') +def detect(conf): + dbus_binding_tool=conf.find_program('dbus-binding-tool',var='DBUS_BINDING_TOOL') + +taskgen(add_dbus_file) +before('apply_core')(process_dbus) diff --git a/waf-modules/wafadmin/Tools/dmd.py b/waf-modules/wafadmin/Tools/dmd.py new file mode 100644 index 00000000..69cb8f4a --- /dev/null +++ b/waf-modules/wafadmin/Tools/dmd.py @@ -0,0 +1,44 @@ +#! /usr/bin/env python +# encoding: utf-8 + +import sys +import Utils,ar +from Configure import conftest +def find_dmd(conf): + conf.find_program(['dmd','ldc'],var='D_COMPILER',mandatory=True) +def common_flags_ldc(conf): + v=conf.env + v['DFLAGS']=['-d-version=Posix'] + v['DLINKFLAGS']=[] + v['D_shlib_DFLAGS']=['-relocation-model=pic'] +def common_flags_dmd(conf): + v=conf.env + v['DFLAGS']=['-version=Posix'] + v['D_SRC_F']='' + v['D_TGT_F']=['-c','-of'] + v['DPATH_ST']='-I%s' + v['D_LINKER']=v['D_COMPILER'] + v['DLNK_SRC_F']='' + v['DLNK_TGT_F']='-of' + v['DLIB_ST']='-L-l%s' + v['DLIBPATH_ST']='-L-L%s' + v['DFLAGS_OPTIMIZED']=['-O'] + v['DFLAGS_DEBUG']=['-g','-debug'] + v['DFLAGS_ULTRADEBUG']=['-g','-debug'] + v['DLINKFLAGS']=['-quiet'] + v['D_shlib_DFLAGS']=['-fPIC'] + v['D_shlib_LINKFLAGS']=['-L-shared'] + v['DHEADER_ext']='.di' + v['D_HDR_F']=['-H','-Hf'] +def detect(conf): + conf.find_dmd() + conf.check_tool('ar') + conf.check_tool('d') + conf.common_flags_dmd() + conf.d_platform_flags() + if conf.env.D_COMPILER.find('ldc')>-1: + conf.common_flags_ldc() + +conftest(find_dmd) +conftest(common_flags_ldc) +conftest(common_flags_dmd) diff --git a/waf-modules/wafadmin/Tools/flex.py b/waf-modules/wafadmin/Tools/flex.py new file mode 100644 index 00000000..0a1600b3 --- /dev/null +++ b/waf-modules/wafadmin/Tools/flex.py @@ -0,0 +1,12 @@ +#! /usr/bin/env python +# encoding: utf-8 + +import TaskGen +def decide_ext(self,node): + if'cxx'in self.features:return'.lex.cc' + else:return'.lex.c' +TaskGen.declare_chain(name='flex',rule='${FLEX} -o${TGT} ${FLEXFLAGS} ${SRC}',ext_in='.l',ext_out='.c .cxx',decider=decide_ext) +def detect(conf): + conf.find_program('flex',var='FLEX',mandatory=True) + conf.env['FLEXFLAGS']='' + diff --git a/waf-modules/wafadmin/Tools/gas.py b/waf-modules/wafadmin/Tools/gas.py new file mode 100644 index 00000000..c977beed --- /dev/null +++ b/waf-modules/wafadmin/Tools/gas.py @@ -0,0 +1,27 @@ +#! /usr/bin/env python +# encoding: utf-8 + +import os,sys +import Task +from TaskGen import extension,taskgen,after,before +EXT_ASM=['.s','.S','.asm','.ASM','.spp','.SPP'] +as_str='${AS} ${ASFLAGS} ${_ASINCFLAGS} ${SRC} -o ${TGT}' +Task.simple_task_type('asm',as_str,'PINK',ext_out='.o',shell=False) +def asm_hook(self,node): + try:obj_ext=self.obj_ext + except AttributeError:obj_ext='_%d.o'%self.idx + task=self.create_task('asm',node,node.change_ext(obj_ext)) + self.compiled_tasks.append(task) + self.meths.append('asm_incflags') +def asm_incflags(self): + self.env.append_value('_ASINCFLAGS',self.env.ASINCFLAGS) + var=('cxx'in self.features)and'CXX'or'CC' + self.env.append_value('_ASINCFLAGS',self.env['_%sINCFLAGS'%var]) +def detect(conf): + conf.find_program(['gas','as'],var='AS') + if not conf.env.AS:conf.env.AS=conf.env.CC + +extension(EXT_ASM)(asm_hook) +after('apply_obj_vars_cc')(asm_incflags) +after('apply_obj_vars_cxx')(asm_incflags) +before('apply_link')(asm_incflags) diff --git a/waf-modules/wafadmin/Tools/gcc.py b/waf-modules/wafadmin/Tools/gcc.py new file mode 100644 index 00000000..2a685f79 --- /dev/null +++ b/waf-modules/wafadmin/Tools/gcc.py @@ -0,0 +1,93 @@ +#! /usr/bin/env python +# encoding: utf-8 + +import os,sys +import Configure,Options,Utils +import ccroot,ar +from Configure import conftest +def find_gcc(conf): + cc=conf.find_program(['gcc','cc'],var='CC',mandatory=True) + cc=conf.cmd_to_list(cc) + ccroot.get_cc_version(conf,cc,gcc=True) + conf.env.CC_NAME='gcc' + conf.env.CC=cc +def gcc_common_flags(conf): + v=conf.env + v['CCFLAGS_DEBUG']=['-g'] + v['CCFLAGS_RELEASE']=['-O2'] + v['CC_SRC_F']='' + v['CC_TGT_F']=['-c','-o',''] + v['CPPPATH_ST']='-I%s' + if not v['LINK_CC']:v['LINK_CC']=v['CC'] + v['CCLNK_SRC_F']='' + v['CCLNK_TGT_F']=['-o',''] + v['LIB_ST']='-l%s' + v['LIBPATH_ST']='-L%s' + v['STATICLIB_ST']='-l%s' + v['STATICLIBPATH_ST']='-L%s' + v['RPATH_ST']='-Wl,-rpath,%s' + v['CCDEFINES_ST']='-D%s' + v['SONAME_ST']='-Wl,-h,%s' + v['SHLIB_MARKER']='-Wl,-Bdynamic' + v['STATICLIB_MARKER']='-Wl,-Bstatic' + v['FULLSTATIC_MARKER']='-static' + v['program_PATTERN']='%s' + v['shlib_CCFLAGS']=['-fPIC','-DPIC'] + v['shlib_LINKFLAGS']=['-shared'] + v['shlib_PATTERN']='lib%s.so' + v['staticlib_LINKFLAGS']=['-Wl,-Bstatic'] + v['staticlib_PATTERN']='lib%s.a' + v['LINKFLAGS_MACBUNDLE']=['-bundle','-undefined','dynamic_lookup'] + v['CCFLAGS_MACBUNDLE']=['-fPIC'] + v['macbundle_PATTERN']='%s.bundle' +def gcc_modifier_win32(conf): + v=conf.env + v['program_PATTERN']='%s.exe' + v['shlib_PATTERN']='%s.dll' + v['implib_PATTERN']='lib%s.dll.a' + v['IMPLIB_ST']='-Wl,--out-implib,%s' + dest_arch=v['DEST_CPU'] + v['shlib_CCFLAGS']=['-DPIC'] + v.append_value('shlib_CCFLAGS','-DDLL_EXPORT') + v.append_value('LINKFLAGS','-Wl,--enable-auto-import') +def gcc_modifier_cygwin(conf): + gcc_modifier_win32(conf) + v=conf.env + v['shlib_PATTERN']='cyg%s.dll' + v.append_value('shlib_LINKFLAGS','-Wl,--enable-auto-image-base') +def gcc_modifier_darwin(conf): + v=conf.env + v['shlib_CCFLAGS']=['-fPIC','-compatibility_version','1','-current_version','1'] + v['shlib_LINKFLAGS']=['-dynamiclib'] + v['shlib_PATTERN']='lib%s.dylib' + v['staticlib_LINKFLAGS']=[] + v['SHLIB_MARKER']='' + v['STATICLIB_MARKER']='' + v['SONAME_ST']='' +def gcc_modifier_aix(conf): + v=conf.env + v['program_LINKFLAGS']=['-Wl,-brtl'] + v['shlib_LINKFLAGS']=['-shared','-Wl,-brtl,-bexpfull'] + v['SHLIB_MARKER']='' +def gcc_modifier_platform(conf): + dest_os=conf.env['DEST_OS']or Utils.unversioned_sys_platform() + gcc_modifier_func=globals().get('gcc_modifier_'+dest_os) + if gcc_modifier_func: + gcc_modifier_func(conf) +def detect(conf): + conf.find_gcc() + conf.find_cpp() + conf.find_ar() + conf.gcc_common_flags() + conf.gcc_modifier_platform() + conf.cc_load_tools() + conf.cc_add_flags() + conf.link_add_flags() + +conftest(find_gcc) +conftest(gcc_common_flags) +conftest(gcc_modifier_win32) +conftest(gcc_modifier_cygwin) +conftest(gcc_modifier_darwin) +conftest(gcc_modifier_aix) +conftest(gcc_modifier_platform) diff --git a/waf-modules/wafadmin/Tools/gdc.py b/waf-modules/wafadmin/Tools/gdc.py new file mode 100644 index 00000000..72ed66cc --- /dev/null +++ b/waf-modules/wafadmin/Tools/gdc.py @@ -0,0 +1,36 @@ +#! /usr/bin/env python +# encoding: utf-8 + +import sys +import Utils,ar +from Configure import conftest +def find_gdc(conf): + conf.find_program('gdc',var='D_COMPILER',mandatory=True) +def common_flags_gdc(conf): + v=conf.env + v['DFLAGS']=[] + v['D_SRC_F']='' + v['D_TGT_F']=['-c','-o',''] + v['DPATH_ST']='-I%s' + v['D_LINKER']=v['D_COMPILER'] + v['DLNK_SRC_F']='' + v['DLNK_TGT_F']=['-o',''] + v['DLIB_ST']='-l%s' + v['DLIBPATH_ST']='-L%s' + v['DLINKFLAGS']=[] + v['DFLAGS_OPTIMIZED']=['-O3'] + v['DFLAGS_DEBUG']=['-O0'] + v['DFLAGS_ULTRADEBUG']=['-O0'] + v['D_shlib_DFLAGS']=[] + v['D_shlib_LINKFLAGS']=['-shared'] + v['DHEADER_ext']='.di' + v['D_HDR_F']='-fintfc -fintfc-file=' +def detect(conf): + conf.find_gdc() + conf.check_tool('ar') + conf.check_tool('d') + conf.common_flags_gdc() + conf.d_platform_flags() + +conftest(find_gdc) +conftest(common_flags_gdc) diff --git a/waf-modules/wafadmin/Tools/glib2.py b/waf-modules/wafadmin/Tools/glib2.py new file mode 100644 index 00000000..d9574c8a --- /dev/null +++ b/waf-modules/wafadmin/Tools/glib2.py @@ -0,0 +1,83 @@ +#! /usr/bin/env python +# encoding: utf-8 + +import Task,Utils +from TaskGen import taskgen,before,after,feature +def add_marshal_file(self,filename,prefix): + if not hasattr(self,'marshal_list'): + self.marshal_list=[] + self.meths.append('process_marshal') + self.marshal_list.append((filename,prefix)) +def process_marshal(self): + for f,prefix in getattr(self,'marshal_list',[]): + node=self.path.find_resource(f) + if not node: + raise Utils.WafError('file not found %r'%f) + h_node=node.change_ext('.h') + c_node=node.change_ext('.c') + task=self.create_task('glib_genmarshal',node,[h_node,c_node]) + task.env.GLIB_GENMARSHAL_PREFIX=prefix + self.allnodes.append(c_node) +def genmarshal_func(self): + bld=self.inputs[0].__class__.bld + get=self.env.get_flat + cmd1="%s %s --prefix=%s --header > %s"%(get('GLIB_GENMARSHAL'),self.inputs[0].srcpath(self.env),get('GLIB_GENMARSHAL_PREFIX'),self.outputs[0].abspath(self.env)) + ret=bld.exec_command(cmd1) + if ret:return ret + f=open(self.outputs[1].abspath(self.env),'wb') + c='''#include "%s"\n'''%self.outputs[0].name + f.write(c) + f.close() + cmd2="%s %s --prefix=%s --body >> %s"%(get('GLIB_GENMARSHAL'),self.inputs[0].srcpath(self.env),get('GLIB_GENMARSHAL_PREFIX'),self.outputs[1].abspath(self.env)) + ret=Utils.exec_command(cmd2) + if ret:return ret +def add_enums_from_template(self,source='',target='',template='',comments=''): + if not hasattr(self,'enums_list'): + self.enums_list=[] + self.meths.append('process_enums') + self.enums_list.append({'source':source,'target':target,'template':template,'file-head':'','file-prod':'','file-tail':'','enum-prod':'','value-head':'','value-prod':'','value-tail':'','comments':comments}) +def add_enums(self,source='',target='',file_head='',file_prod='',file_tail='',enum_prod='',value_head='',value_prod='',value_tail='',comments=''): + if not hasattr(self,'enums_list'): + self.enums_list=[] + self.meths.append('process_enums') + self.enums_list.append({'source':source,'template':'','target':target,'file-head':file_head,'file-prod':file_prod,'file-tail':file_tail,'enum-prod':enum_prod,'value-head':value_head,'value-prod':value_prod,'value-tail':value_tail,'comments':comments}) +def process_enums(self): + for enum in getattr(self,'enums_list',[]): + task=self.create_task('glib_mkenums') + env=task.env + inputs=[] + source_list=self.to_list(enum['source']) + if not source_list: + raise Utils.WafError('missing source '+str(enum)) + source_list=[self.path.find_resource(k)for k in source_list] + inputs+=source_list + env['GLIB_MKENUMS_SOURCE']=[k.srcpath(env)for k in source_list] + if not enum['target']: + raise Utils.WafError('missing target '+str(enum)) + tgt_node=self.path.find_or_declare(enum['target']) + if tgt_node.name.endswith('.c'): + self.allnodes.append(tgt_node) + env['GLIB_MKENUMS_TARGET']=tgt_node.abspath(env) + options=[] + if enum['template']: + template_node=self.path.find_resource(enum['template']) + options.append('--template %s'%(template_node.abspath(env))) + inputs.append(template_node) + params={'file-head':'--fhead','file-prod':'--fprod','file-tail':'--ftail','enum-prod':'--eprod','value-head':'--vhead','value-prod':'--vprod','value-tail':'--vtail','comments':'--comments'} + for param,option in params.iteritems(): + if enum[param]: + options.append('%s %r'%(option,enum[param])) + env['GLIB_MKENUMS_OPTIONS']=' '.join(options) + task.set_inputs(inputs) + task.set_outputs(tgt_node) +Task.task_type_from_func('glib_genmarshal',func=genmarshal_func,vars=['GLIB_GENMARSHAL_PREFIX','GLIB_GENMARSHAL'],color='BLUE',before='cc cxx') +Task.simple_task_type('glib_mkenums','${GLIB_MKENUMS} ${GLIB_MKENUMS_OPTIONS} ${GLIB_MKENUMS_SOURCE} > ${GLIB_MKENUMS_TARGET}',color='PINK',before='cc cxx') +def detect(conf): + glib_genmarshal=conf.find_program('glib-genmarshal',var='GLIB_GENMARSHAL') + mk_enums_tool=conf.find_program('glib-mkenums',var='GLIB_MKENUMS') + +taskgen(add_marshal_file) +before('apply_core')(process_marshal) +taskgen(add_enums_from_template) +taskgen(add_enums) +before('apply_core')(process_enums) diff --git a/waf-modules/wafadmin/Tools/gnome.py b/waf-modules/wafadmin/Tools/gnome.py new file mode 100644 index 00000000..7b6c94ed --- /dev/null +++ b/waf-modules/wafadmin/Tools/gnome.py @@ -0,0 +1,163 @@ +#! /usr/bin/env python +# encoding: utf-8 + +import os,re +import TaskGen,Utils,Runner,Task,Build,Options,Logs +import cc +from Logs import error +from TaskGen import taskgen,before,after,feature +n1_regexp=re.compile('(.*)',re.M) +n2_regexp=re.compile('(.*)',re.M) +def postinstall_schemas(prog_name): + if Build.bld.is_install: + dir=Build.bld.get_install_path('${PREFIX}/etc/gconf/schemas/%s.schemas'%prog_name) + if not Options.options.destdir: + Utils.pprint('YELLOW','Installing GConf schema') + command='gconftool-2 --install-schema-file=%s 1> /dev/null'%dir + ret=Utils.exec_command(command) + else: + Utils.pprint('YELLOW','GConf schema not installed. After install, run this:') + Utils.pprint('YELLOW','gconftool-2 --install-schema-file=%s'%dir) +def postinstall_icons(): + dir=Build.bld.get_install_path('${DATADIR}/icons/hicolor') + if Build.bld.is_install: + if not Options.options.destdir: + Utils.pprint('YELLOW',"Updating Gtk icon cache.") + command='gtk-update-icon-cache -q -f -t %s'%dir + ret=Utils.exec_command(command) + else: + Utils.pprint('YELLOW','Icon cache not updated. After install, run this:') + Utils.pprint('YELLOW','gtk-update-icon-cache -q -f -t %s'%dir) +def postinstall_scrollkeeper(prog_name): + if Build.bld.is_install: + if os.access('/var/log/scrollkeeper.log',os.W_OK): + dir1=Build.bld.get_install_path('${PREFIX}/var/scrollkeeper') + dir2=Build.bld.get_install_path('${DATADIR}/omf/%s'%prog_name) + command='scrollkeeper-update -q -p %s -o %s'%(dir1,dir2) + ret=Utils.exec_command(command) +def postinstall(prog_name='myapp',schemas=1,icons=1,scrollkeeper=1): + if schemas:postinstall_schemas(prog_name) + if icons:postinstall_icons() + if scrollkeeper:postinstall_scrollkeeper(prog_name) +class gnome_doc_taskgen(TaskGen.task_gen): + def __init__(self,*k,**kw): + TaskGen.task_gen.__init__(self,*k,**kw) +def init_gnome_doc(self): + self.default_install_path='${PREFIX}/share' +def apply_gnome_doc(self): + self.env['APPNAME']=self.doc_module + lst=self.to_list(self.doc_linguas) + bld=self.bld + lst.append('C') + for x in lst: + if not x=='C': + tsk=self.create_task('xml2po') + node=self.path.find_resource(x+'/'+x+'.po') + src=self.path.find_resource('C/%s.xml'%self.doc_module) + out=self.path.find_or_declare('%s/%s.xml'%(x,self.doc_module)) + tsk.set_inputs([node,src]) + tsk.set_outputs(out) + else: + out=self.path.find_resource('%s/%s.xml'%(x,self.doc_module)) + tsk2=self.create_task('xsltproc2po') + out2=self.path.find_or_declare('%s/%s-%s.omf'%(x,self.doc_module,x)) + tsk2.set_outputs(out2) + node=self.path.find_resource(self.doc_module+".omf.in") + tsk2.inputs=[node,out] + tsk2.run_after.append(tsk) + if bld.is_install: + path=self.install_path+'/gnome/help/%s/%s'%(self.doc_module,x) + bld.install_files(self.install_path+'/omf',out2,env=self.env) + for y in self.to_list(self.doc_figures): + try: + os.stat(self.path.abspath()+'/'+x+'/'+y) + bld.install_as(path+'/'+y,self.path.abspath()+'/'+x+'/'+y) + except: + bld.install_as(path+'/'+y,self.path.abspath()+'/C/'+y) + bld.install_as(path+'/%s.xml'%self.doc_module,out.abspath(self.env)) + if x=='C': + xmls=self.to_list(self.doc_includes) + xmls.append(self.doc_entities) + for z in xmls: + out=self.path.find_resource('%s/%s'%(x,z)) + bld.install_as(path+'/%s'%z,out.abspath(self.env)) +class xml_to_taskgen(TaskGen.task_gen): + def __init__(self,*k,**kw): + TaskGen.task_gen.__init__(self,*k,**kw) +def init_xml_to(self): + Utils.def_attrs(self,source='xmlfile',xslt='xlsltfile',target='hey',default_install_path='${PREFIX}',task_created=None) +def apply_xml_to(self): + xmlfile=self.path.find_resource(self.source) + xsltfile=self.path.find_resource(self.xslt) + tsk=self.create_task('xmlto',[xmlfile,xsltfile],xmlfile.change_ext('html')) + tsk.install_path=self.install_path +def sgml_scan(self): + node=self.inputs[0] + env=self.env + variant=node.variant(env) + fi=open(node.abspath(env),'r') + content=fi.read() + fi.close() + name=n1_regexp.findall(content)[0] + num=n2_regexp.findall(content)[0] + doc_name=name+'.'+num + if not self.outputs: + self.outputs=[self.generator.path.find_or_declare(doc_name)] + return([],[doc_name]) +class gnome_sgml2man_taskgen(TaskGen.task_gen): + def __init__(self,*k,**kw): + TaskGen.task_gen.__init__(self,*k,**kw) +def apply_gnome_sgml2man(self): + assert(getattr(self,'appname',None)) + def install_result(task): + out=task.outputs[0] + name=out.name + ext=name[-1] + env=task.env + self.bld.install_files('${DATADIR}/man/man%s/'%ext,out,env) + self.bld.rescan(self.path) + for name in self.bld.cache_dir_contents[self.path.id]: + base,ext=os.path.splitext(name) + if ext!='.sgml':continue + task=self.create_task('sgml2man') + task.set_inputs(self.path.find_resource(name)) + task.task_generator=self + if self.bld.is_install:task.install=install_result + task.scan() +cls=Task.simple_task_type('sgml2man','${SGML2MAN} -o ${TGT[0].bld_dir(env)} ${SRC} > /dev/null',color='BLUE') +cls.scan=sgml_scan +cls.quiet=1 +Task.simple_task_type('xmlto','${XMLTO} html -m ${SRC[1].abspath(env)} ${SRC[0].abspath(env)}') +Task.simple_task_type('xml2po','${XML2PO} ${XML2POFLAGS} ${SRC} > ${TGT}',color='BLUE') +xslt_magic="""${XSLTPROC2PO} -o ${TGT[0].abspath(env)} \ +--stringparam db2omf.basename ${APPNAME} \ +--stringparam db2omf.format docbook \ +--stringparam db2omf.lang ${TGT[0].abspath(env)[:-4].split('-')[-1]} \ +--stringparam db2omf.dtd '-//OASIS//DTD DocBook XML V4.3//EN' \ +--stringparam db2omf.omf_dir ${PREFIX}/share/omf \ +--stringparam db2omf.help_dir ${PREFIX}/share/gnome/help \ +--stringparam db2omf.omf_in ${SRC[0].abspath(env)} \ +--stringparam db2omf.scrollkeeper_cl ${SCROLLKEEPER_DATADIR}/Templates/C/scrollkeeper_cl.xml \ +${DB2OMF} ${SRC[1].abspath(env)}""" +Task.simple_task_type('xsltproc2po',xslt_magic,color='BLUE') +def detect(conf): + conf.check_tool('gnu_dirs glib2 dbus') + sgml2man=conf.find_program('docbook2man',var='SGML2MAN') + def getstr(varname): + return getattr(Options.options,varname,'') + conf.define('GNOMELOCALEDIR',os.path.join(conf.env['DATADIR'],'locale')) + xml2po=conf.find_program('xml2po',var='XML2PO') + xsltproc2po=conf.find_program('xsltproc',var='XSLTPROC2PO') + conf.env['XML2POFLAGS']='-e -p' + conf.env['SCROLLKEEPER_DATADIR']=Utils.cmd_output("scrollkeeper-config --pkgdatadir",silent=1).strip() + conf.env['DB2OMF']=Utils.cmd_output("/usr/bin/pkg-config --variable db2omf gnome-doc-utils",silent=1).strip() +def set_options(opt): + opt.add_option('--want-rpath',type='int',default=1,dest='want_rpath',help='set rpath to 1 or 0 [Default 1]') + +feature('gnome_doc')(init_gnome_doc) +feature('gnome_doc')(apply_gnome_doc) +after('init_gnome_doc')(apply_gnome_doc) +feature('xml_to')(init_xml_to) +feature('xml_to')(apply_xml_to) +after('init_xml_to')(apply_xml_to) +feature('gnome_sgml2man')(apply_gnome_sgml2man) diff --git a/waf-modules/wafadmin/Tools/gnu_dirs.py b/waf-modules/wafadmin/Tools/gnu_dirs.py new file mode 100644 index 00000000..daa94159 --- /dev/null +++ b/waf-modules/wafadmin/Tools/gnu_dirs.py @@ -0,0 +1,63 @@ +#! /usr/bin/env python +# encoding: utf-8 + +import Utils,Options +_options=[x.split(', ')for x in''' +bindir, user executables, ${EXEC_PREFIX}/bin +sbindir, system admin executables, ${EXEC_PREFIX}/sbin +libexecdir, program executables, ${EXEC_PREFIX}/libexec +sysconfdir, read-only single-machine data, ${PREFIX}/etc +sharedstatedir, modifiable architecture-independent data, ${PREFIX}/com +localstatedir, modifiable single-machine data, ${PREFIX}/var +libdir, object code libraries, ${EXEC_PREFIX}/lib +includedir, C header files, ${PREFIX}/include +oldincludedir, C header files for non-gcc, /usr/include +datarootdir, read-only arch.-independent data root, ${PREFIX}/share +datadir, read-only architecture-independent data, ${DATAROOTDIR} +infodir, info documentation, ${DATAROOTDIR}/info +localedir, locale-dependent data, ${DATAROOTDIR}/locale +mandir, man documentation, ${DATAROOTDIR}/man +docdir, documentation root, ${DATAROOTDIR}/doc/${PACKAGE} +htmldir, html documentation, ${DOCDIR} +dvidir, dvi documentation, ${DOCDIR} +pdfdir, pdf documentation, ${DOCDIR} +psdir, ps documentation, ${DOCDIR} +'''.split('\n')if x] +def detect(conf): + def get_param(varname,default): + return getattr(Options.options,varname,'')or default + env=conf.env + env['EXEC_PREFIX']=get_param('EXEC_PREFIX',env['PREFIX']) + env['PACKAGE']=Utils.g_module.APPNAME + complete=False + iter=0 + while not complete and iter=0: + inner_class_node=k.find_or_declare(u) + inner[inner_class_node.id]=inner_class_node + to_add=set(inner.keys())-set([x.id for x in self.outputs]) + for x in to_add: + self.outputs.append(inner[x]) + self.cached=True + return Task.Task.post_run(self) +cls.post_run=post_run_javac +def detect(conf): + java_path=conf.environ['PATH'].split(os.pathsep) + v=conf.env + if'JAVA_HOME'in conf.environ: + java_path=[os.path.join(conf.environ['JAVA_HOME'],'bin')]+java_path + conf.env['JAVA_HOME']=[conf.environ['JAVA_HOME']] + for x in'javac java jar'.split(): + conf.find_program(x,var=x.upper(),path_list=java_path) + conf.env[x.upper()]=conf.cmd_to_list(conf.env[x.upper()]) + v['JAVA_EXT']=['.java'] + if'CLASSPATH'in conf.environ: + v['CLASSPATH']=conf.environ['CLASSPATH'] + if not v['JAR']:conf.fatal('jar is required for making java packages') + if not v['JAVAC']:conf.fatal('javac is required for compiling java classes') + v['JARCREATE']='cf' +def check_java_class(self,classname,with_classpath=None): + import shutil + javatestdir='.waf-javatest' + classpath=javatestdir + if self.env['CLASSPATH']: + classpath+=os.pathsep+self.env['CLASSPATH'] + if isinstance(with_classpath,str): + classpath+=os.pathsep+with_classpath + shutil.rmtree(javatestdir,True) + os.mkdir(javatestdir) + java_file=open(os.path.join(javatestdir,'Test.java'),'w') + java_file.write(class_check_source) + java_file.close() + Utils.exec_command(self.env['JAVAC']+[os.path.join(javatestdir,'Test.java')],shell=False) + cmd=self.env['JAVA']+['-cp',classpath,'Test',classname] + self.log.write("%s\n"%str(cmd)) + found=Utils.exec_command(cmd,shell=False,log=self.log) + self.check_message('Java class %s'%classname,"",not found) + shutil.rmtree(javatestdir,True) + return found +def check_jni_headers(conf): + if not conf.env.CC_NAME and not conf.env.CXX_NAME: + conf.fatal('load a compiler first (gcc, g++, ..)') + if not conf.env.JAVA_HOME: + conf.fatal('set JAVA_HOME in the system environment') + javaHome=conf.env['JAVA_HOME'][0] + b=Build.BuildContext() + b.load_dirs(conf.srcdir,conf.blddir) + dir=b.root.find_dir(conf.env.JAVA_HOME[0]+'/include') + f=dir.ant_glob('**/(jni|jni_md).h',flat=False) + incDirs=[x.parent.abspath()for x in f] + dir=b.root.find_dir(conf.env.JAVA_HOME[0]) + f=dir.ant_glob('**/*jvm.(so|dll)',flat=False) + libDirs=[x.parent.abspath()for x in f]or[javaHome] + for i,d in enumerate(libDirs): + if conf.check(header_name='jni.h',define_name='HAVE_JNI_H',lib='jvm',libpath=d,includes=incDirs,uselib_store='JAVA',uselib='JAVA'): + break + else: + conf.fatal('could not find lib jvm in %r (see config.log)'%libDirs) + +feature('jar')(jar_files) +before('apply_core')(jar_files) +feature('javac')(apply_java) +before('apply_core')(apply_java) +conf(check_java_class) +conf(check_jni_headers) diff --git a/waf-modules/wafadmin/Tools/kde4.py b/waf-modules/wafadmin/Tools/kde4.py new file mode 100644 index 00000000..5993f8e9 --- /dev/null +++ b/waf-modules/wafadmin/Tools/kde4.py @@ -0,0 +1,57 @@ +#! /usr/bin/env python +# encoding: utf-8 + +import os,sys,re +import Options,TaskGen,Task,Utils +from TaskGen import taskgen,feature,after +class msgfmt_taskgen(TaskGen.task_gen): + def __init__(self,*k,**kw): + TaskGen.task_gen.__init__(self,*k,**kw) +def init_msgfmt(self): + self.default_install_path='${KDE4_LOCALE_INSTALL_DIR}' +def apply_msgfmt(self): + for lang in self.to_list(self.langs): + node=self.path.find_resource(lang+'.po') + task=self.create_task('msgfmt',node,node.change_ext('.mo')) + if not self.bld.is_install:continue + langname=lang.split('/') + langname=langname[-1] + task.install_path=self.install_path+os.sep+langname+os.sep+'LC_MESSAGES' + task.filename=getattr(self,'appname','set_your_appname')+'.mo' + task.chmod=self.chmod +def detect(conf): + kdeconfig=conf.find_program('kde4-config') + if not kdeconfig: + conf.fatal('we need kde4-config') + prefix=Utils.cmd_output('%s --prefix'%kdeconfig,silent=True).strip() + file='%s/share/apps/cmake/modules/KDELibsDependencies.cmake'%prefix + try:os.stat(file) + except OSError: + file='%s/share/kde4/apps/cmake/modules/KDELibsDependencies.cmake'%prefix + try:os.stat(file) + except OSError:conf.fatal('could not open %s'%file) + try: + txt=Utils.readf(file) + except(OSError,IOError): + conf.fatal('could not read %s'%file) + txt=txt.replace('\\\n','\n') + fu=re.compile('#(.*)\n') + txt=fu.sub('',txt) + setregexp=re.compile('([sS][eE][tT]\s*\()\s*([^\s]+)\s+\"([^"]+)\"\)') + found=setregexp.findall(txt) + for(_,key,val)in found: + conf.env[key]=val + conf.env['LIB_KDECORE']='kdecore' + conf.env['LIB_KDEUI']='kdeui' + conf.env['LIB_KIO']='kio' + conf.env['LIB_KHTML']='khtml' + conf.env['LIB_KPARTS']='kparts' + conf.env['LIBPATH_KDECORE']=conf.env['KDE4_LIB_INSTALL_DIR'] + conf.env['CPPPATH_KDECORE']=conf.env['KDE4_INCLUDE_INSTALL_DIR'] + conf.env.append_value('CPPPATH_KDECORE',conf.env['KDE4_INCLUDE_INSTALL_DIR']+"/KDE") + conf.env['MSGFMT']=conf.find_program('msgfmt') +Task.simple_task_type('msgfmt','${MSGFMT} ${SRC} -o ${TGT}',color='BLUE',shell=False) + +feature('msgfmt')(init_msgfmt) +feature('msgfmt')(apply_msgfmt) +after('init_msgfmt')(apply_msgfmt) diff --git a/waf-modules/wafadmin/Tools/libtool.py b/waf-modules/wafadmin/Tools/libtool.py new file mode 100644 index 00000000..50b28ce3 --- /dev/null +++ b/waf-modules/wafadmin/Tools/libtool.py @@ -0,0 +1,239 @@ +#! /usr/bin/env python +# encoding: utf-8 + +import sys,re,os,optparse +import TaskGen,Task,Utils,preproc +from Logs import error,debug,warn +from TaskGen import taskgen,after,before,feature +REVISION="0.1.3" +fakelibtool_vardeps=['CXX','PREFIX'] +def fakelibtool_build(task): + env=task.env + dest=open(task.outputs[0].abspath(env),'w') + sname=task.inputs[0].name + fu=dest.write + fu("# Generated by ltmain.sh - GNU libtool 1.5.18 - (pwn3d by BKsys II code name WAF)\n") + if env['vnum']: + nums=env['vnum'].split('.') + libname=task.inputs[0].name + name3=libname+'.'+env['vnum'] + name2=libname+'.'+nums[0] + name1=libname + fu("dlname='%s'\n"%name2) + strn=" ".join([name3,name2,name1]) + fu("library_names='%s'\n"%(strn)) + else: + fu("dlname='%s'\n"%sname) + fu("library_names='%s %s %s'\n"%(sname,sname,sname)) + fu("old_library=''\n") + vars=' '.join(env['libtoolvars']+env['LINKFLAGS']) + fu("dependency_libs='%s'\n"%vars) + fu("current=0\n") + fu("age=0\nrevision=0\ninstalled=yes\nshouldnotlink=no\n") + fu("dlopen=''\ndlpreopen=''\n") + fu("libdir='%s/lib'\n"%env['PREFIX']) + dest.close() + return 0 +def read_la_file(path): + sp=re.compile(r'^([^=]+)=\'(.*)\'$') + dc={} + file=open(path,"r") + for line in file.readlines(): + try: + _,left,right,_=sp.split(line.strip()) + dc[left]=right + except ValueError: + pass + file.close() + return dc +def apply_link_libtool(self): + if self.type!='program': + linktask=self.link_task + self.latask=self.create_task('fakelibtool',linktask.outputs,linktask.outputs[0].change_ext('.la')) + if self.bld.is_install: + self.bld.install_files('${PREFIX}/lib',linktask.outputs[0],self.env) +def apply_libtool(self): + self.env['vnum']=self.vnum + paths=[] + libs=[] + libtool_files=[] + libtool_vars=[] + for l in self.env['LINKFLAGS']: + if l[:2]=='-L': + paths.append(l[2:]) + elif l[:2]=='-l': + libs.append(l[2:]) + for l in libs: + for p in paths: + dict=read_la_file(p+'/lib'+l+'.la') + linkflags2=dict.get('dependency_libs','') + for v in linkflags2.split(): + if v.endswith('.la'): + libtool_files.append(v) + libtool_vars.append(v) + continue + self.env.append_unique('LINKFLAGS',v) + break + self.env['libtoolvars']=libtool_vars + while libtool_files: + file=libtool_files.pop() + dict=read_la_file(file) + for v in dict['dependency_libs'].split(): + if v[-3:]=='.la': + libtool_files.append(v) + continue + self.env.append_unique('LINKFLAGS',v) +Task.task_type_from_func('fakelibtool',vars=fakelibtool_vardeps,func=fakelibtool_build,color='BLUE',after="cc_link cxx_link static_link") +class libtool_la_file: + def __init__(self,la_filename): + self.__la_filename=la_filename + self.linkname=str(os.path.split(la_filename)[-1])[:-3] + if self.linkname.startswith("lib"): + self.linkname=self.linkname[3:] + self.dlname=None + self.library_names=None + self.old_library=None + self.dependency_libs=None + self.current=None + self.age=None + self.revision=None + self.installed=None + self.shouldnotlink=None + self.dlopen=None + self.dlpreopen=None + self.libdir='/usr/lib' + if not self.__parse(): + raise ValueError("file %s not found!!"%(la_filename)) + def __parse(self): + if not os.path.isfile(self.__la_filename):return 0 + la_file=open(self.__la_filename,'r') + for line in la_file: + ln=line.strip() + if not ln:continue + if ln[0]=='#':continue + (key,value)=str(ln).split('=',1) + key=key.strip() + value=value.strip() + if value=="no":value=False + elif value=="yes":value=True + else: + try:value=int(value) + except ValueError:value=value.strip("'") + setattr(self,key,value) + la_file.close() + return 1 + def get_libs(self): + libs=[] + if self.dependency_libs: + libs=str(self.dependency_libs).strip().split() + if libs==None: + libs=[] + libs.insert(0,"-l%s"%self.linkname.strip()) + libs.insert(0,"-L%s"%self.libdir.strip()) + return libs + def __str__(self): + return'''\ +dlname = "%(dlname)s" +library_names = "%(library_names)s" +old_library = "%(old_library)s" +dependency_libs = "%(dependency_libs)s" +version = %(current)s.%(age)s.%(revision)s +installed = "%(installed)s" +shouldnotlink = "%(shouldnotlink)s" +dlopen = "%(dlopen)s" +dlpreopen = "%(dlpreopen)s" +libdir = "%(libdir)s"'''%self.__dict__ +class libtool_config: + def __init__(self,la_filename): + self.__libtool_la_file=libtool_la_file(la_filename) + tmp=self.__libtool_la_file + self.__version=[int(tmp.current),int(tmp.age),int(tmp.revision)] + self.__sub_la_files=[] + self.__sub_la_files.append(la_filename) + self.__libs=None + def __cmp__(self,other): + if not other: + return 1 + othervers=[int(s)for s in str(other).split(".")] + selfvers=self.__version + return cmp(selfvers,othervers) + def __str__(self): + return"\n".join([str(self.__libtool_la_file),' '.join(self.__libtool_la_file.get_libs()),'* New getlibs:',' '.join(self.get_libs())]) + def __get_la_libs(self,la_filename): + return libtool_la_file(la_filename).get_libs() + def get_libs(self): + libs_list=list(self.__libtool_la_file.get_libs()) + libs_map={} + while len(libs_list)>0: + entry=libs_list.pop(0) + if entry: + if str(entry).endswith(".la"): + if entry not in self.__sub_la_files: + self.__sub_la_files.append(entry) + libs_list.extend(self.__get_la_libs(entry)) + else: + libs_map[entry]=1 + self.__libs=libs_map.keys() + return self.__libs + def get_libs_only_L(self): + if not self.__libs:self.get_libs() + libs=self.__libs + libs=[s for s in libs if str(s).startswith('-L')] + return libs + def get_libs_only_l(self): + if not self.__libs:self.get_libs() + libs=self.__libs + libs=[s for s in libs if str(s).startswith('-l')] + return libs + def get_libs_only_other(self): + if not self.__libs:self.get_libs() + libs=self.__libs + libs=[s for s in libs if not(str(s).startswith('-L')or str(s).startswith('-l'))] + return libs +def useCmdLine(): + usage='''Usage: %prog [options] PathToFile.la +example: %prog --atleast-version=2.0.0 /usr/lib/libIlmImf.la +nor: %prog --libs /usr/lib/libamarok.la''' + parser=optparse.OptionParser(usage) + a=parser.add_option + a("--version",dest="versionNumber",action="store_true",default=False,help="output version of libtool-config") + a("--debug",dest="debug",action="store_true",default=False,help="enable debug") + a("--libs",dest="libs",action="store_true",default=False,help="output all linker flags") + a("--libs-only-l",dest="libs_only_l",action="store_true",default=False,help="output -l flags") + a("--libs-only-L",dest="libs_only_L",action="store_true",default=False,help="output -L flags") + a("--libs-only-other",dest="libs_only_other",action="store_true",default=False,help="output other libs (e.g. -pthread)") + a("--atleast-version",dest="atleast_version",default=None,help="return 0 if the module is at least version ATLEAST_VERSION") + a("--exact-version",dest="exact_version",default=None,help="return 0 if the module is exactly version EXACT_VERSION") + a("--max-version",dest="max_version",default=None,help="return 0 if the module is at no newer than version MAX_VERSION") + (options,args)=parser.parse_args() + if len(args)!=1 and not options.versionNumber: + parser.error("incorrect number of arguments") + if options.versionNumber: + print("libtool-config version %s"%REVISION) + return 0 + ltf=libtool_config(args[0]) + if options.debug: + print(ltf) + if options.atleast_version: + if ltf>=options.atleast_version:return 0 + sys.exit(1) + if options.exact_version: + if ltf==options.exact_version:return 0 + sys.exit(1) + if options.max_version: + if ltf<=options.max_version:return 0 + sys.exit(1) + def p(x): + print(" ".join(x)) + if options.libs:p(ltf.get_libs()) + elif options.libs_only_l:p(ltf.get_libs_only_l()) + elif options.libs_only_L:p(ltf.get_libs_only_L()) + elif options.libs_only_other:p(ltf.get_libs_only_other()) + return 0 +if __name__=='__main__': + useCmdLine() + +feature("libtool")(apply_link_libtool) +after('apply_link')(apply_link_libtool) +feature("libtool")(apply_libtool) +before('apply_core')(apply_libtool) diff --git a/waf-modules/wafadmin/Tools/lua.py b/waf-modules/wafadmin/Tools/lua.py new file mode 100644 index 00000000..459dc76c --- /dev/null +++ b/waf-modules/wafadmin/Tools/lua.py @@ -0,0 +1,13 @@ +#! /usr/bin/env python +# encoding: utf-8 + +import TaskGen +from TaskGen import taskgen,feature +from Constants import* +TaskGen.declare_chain(name='luac',rule='${LUAC} -s -o ${TGT} ${SRC}',ext_in='.lua',ext_out='.luac',reentrant=False,install='LUADIR',) +def init_lua(self): + self.default_chmod=O755 +def detect(conf): + conf.find_program('luac',var='LUAC',mandatory=True) + +feature('lua')(init_lua) diff --git a/waf-modules/wafadmin/Tools/misc.py b/waf-modules/wafadmin/Tools/misc.py new file mode 100644 index 00000000..8851fb80 --- /dev/null +++ b/waf-modules/wafadmin/Tools/misc.py @@ -0,0 +1,302 @@ +#! /usr/bin/env python +# encoding: utf-8 + +import shutil,re,os +import TaskGen,Node,Task,Utils,Build,Constants +from TaskGen import feature,taskgen,after,before +from Logs import debug +def copy_func(tsk): + env=tsk.env + infile=tsk.inputs[0].abspath(env) + outfile=tsk.outputs[0].abspath(env) + try: + shutil.copy2(infile,outfile) + except(OSError,IOError): + return 1 + else: + if tsk.chmod:os.chmod(outfile,tsk.chmod) + return 0 +def action_process_file_func(tsk): + if not tsk.fun:raise Utils.WafError('task must have a function attached to it for copy_func to work!') + return tsk.fun(tsk) +class cmd_taskgen(TaskGen.task_gen): + def __init__(self,*k,**kw): + TaskGen.task_gen.__init__(self,*k,**kw) +def apply_cmd(self): + if not self.fun:raise Utils.WafError('cmdobj needs a function!') + tsk=Task.TaskBase() + tsk.fun=self.fun + tsk.env=self.env + self.tasks.append(tsk) + tsk.install_path=self.install_path +class copy_taskgen(TaskGen.task_gen): + def __init__(self,*k,**kw): + TaskGen.task_gen.__init__(self,*k,**kw) +def apply_copy(self): + Utils.def_attrs(self,fun=copy_func) + self.default_install_path=0 + lst=self.to_list(self.source) + self.meths.remove('apply_core') + for filename in lst: + node=self.path.find_resource(filename) + if not node:raise Utils.WafError('cannot find input file %s for processing'%filename) + target=self.target + if not target or len(lst)>1:target=node.name + newnode=self.path.find_or_declare(target) + tsk=self.create_task('copy',node,newnode) + tsk.fun=self.fun + tsk.chmod=self.chmod + tsk.install_path=self.install_path + if not tsk.env: + tsk.debug() + raise Utils.WafError('task without an environment') +def subst_func(tsk): + m4_re=re.compile('@(\w+)@',re.M) + env=tsk.env + infile=tsk.inputs[0].abspath(env) + outfile=tsk.outputs[0].abspath(env) + code=Utils.readf(infile) + code=code.replace('%','%%') + s=m4_re.sub(r'%(\1)s',code) + di=tsk.dict or{} + if not di: + names=m4_re.findall(code) + for i in names: + di[i]=env.get_flat(i)or env.get_flat(i.upper()) + file=open(outfile,'w') + file.write(s%di) + file.close() + if tsk.chmod:os.chmod(outfile,tsk.chmod) +class subst_taskgen(TaskGen.task_gen): + def __init__(self,*k,**kw): + TaskGen.task_gen.__init__(self,*k,**kw) +def apply_subst(self): + Utils.def_attrs(self,fun=subst_func) + self.default_install_path=0 + lst=self.to_list(self.source) + self.meths.remove('apply_core') + self.dict=getattr(self,'dict',{}) + for filename in lst: + node=self.path.find_resource(filename) + if not node:raise Utils.WafError('cannot find input file %s for processing'%filename) + if self.target: + newnode=self.path.find_or_declare(self.target) + else: + newnode=node.change_ext('') + try: + self.dict=self.dict.get_merged_dict() + except AttributeError: + pass + if self.dict and not self.env['DICT_HASH']: + self.env=self.env.copy() + keys=list(self.dict.keys()) + keys.sort() + lst=[self.dict[x]for x in keys] + self.env['DICT_HASH']=str(Utils.h_list(lst)) + tsk=self.create_task('copy',node,newnode) + tsk.fun=self.fun + tsk.dict=self.dict + tsk.dep_vars=['DICT_HASH'] + tsk.install_path=self.install_path + tsk.chmod=self.chmod + if not tsk.env: + tsk.debug() + raise Utils.WafError('task without an environment') +class cmd_arg(object): + def __init__(self,name,template='%s'): + self.name=name + self.template=template + self.node=None +class input_file(cmd_arg): + def find_node(self,base_path): + assert isinstance(base_path,Node.Node) + self.node=base_path.find_resource(self.name) + if self.node is None: + raise Utils.WafError("Input file %s not found in "%(self.name,base_path)) + def get_path(self,env,absolute): + if absolute: + return self.template%self.node.abspath(env) + else: + return self.template%self.node.srcpath(env) +class output_file(cmd_arg): + def find_node(self,base_path): + assert isinstance(base_path,Node.Node) + self.node=base_path.find_or_declare(self.name) + if self.node is None: + raise Utils.WafError("Output file %s not found in "%(self.name,base_path)) + def get_path(self,env,absolute): + if absolute: + return self.template%self.node.abspath(env) + else: + return self.template%self.node.bldpath(env) +class cmd_dir_arg(cmd_arg): + def find_node(self,base_path): + assert isinstance(base_path,Node.Node) + self.node=base_path.find_dir(self.name) + if self.node is None: + raise Utils.WafError("Directory %s not found in "%(self.name,base_path)) +class input_dir(cmd_dir_arg): + def get_path(self,dummy_env,dummy_absolute): + return self.template%self.node.abspath() +class output_dir(cmd_dir_arg): + def get_path(self,env,dummy_absolute): + return self.template%self.node.abspath(env) +class command_output(Task.Task): + color="BLUE" + def __init__(self,env,command,command_node,command_args,stdin,stdout,cwd,os_env,stderr): + Task.Task.__init__(self,env,normal=1) + assert isinstance(command,(str,Node.Node)) + self.command=command + self.command_args=command_args + self.stdin=stdin + self.stdout=stdout + self.cwd=cwd + self.os_env=os_env + self.stderr=stderr + if command_node is not None:self.dep_nodes=[command_node] + self.dep_vars=[] + def run(self): + task=self + def input_path(node,template): + if task.cwd is None: + return template%node.bldpath(task.env) + else: + return template%node.abspath() + def output_path(node,template): + fun=node.abspath + if task.cwd is None:fun=node.bldpath + return template%fun(task.env) + if isinstance(task.command,Node.Node): + argv=[input_path(task.command,'%s')] + else: + argv=[task.command] + for arg in task.command_args: + if isinstance(arg,str): + argv.append(arg) + else: + assert isinstance(arg,cmd_arg) + argv.append(arg.get_path(task.env,(task.cwd is not None))) + if task.stdin: + stdin=open(input_path(task.stdin,'%s')) + else: + stdin=None + if task.stdout: + stdout=open(output_path(task.stdout,'%s'),"w") + else: + stdout=None + if task.stderr: + stderr=open(output_path(task.stderr,'%s'),"w") + else: + stderr=None + if task.cwd is None: + cwd=('None (actually %r)'%os.getcwd()) + else: + cwd=repr(task.cwd) + debug("command-output: cwd=%s, stdin=%r, stdout=%r, argv=%r"%(cwd,stdin,stdout,argv)) + if task.os_env is None: + os_env=os.environ + else: + os_env=task.os_env + command=Utils.pproc.Popen(argv,stdin=stdin,stdout=stdout,stderr=stderr,cwd=task.cwd,env=os_env) + return command.wait() +class cmd_output_taskgen(TaskGen.task_gen): + def __init__(self,*k,**kw): + TaskGen.task_gen.__init__(self,*k,**kw) +def init_cmd_output(self): + Utils.def_attrs(self,stdin=None,stdout=None,stderr=None,command=None,command_is_external=False,argv=[],dependencies=[],dep_vars=[],hidden_inputs=[],hidden_outputs=[],cwd=None,os_env=None) +def apply_cmd_output(self): + if self.command is None: + raise Utils.WafError("command-output missing command") + if self.command_is_external: + cmd=self.command + cmd_node=None + else: + cmd_node=self.path.find_resource(self.command) + assert cmd_node is not None,('''Could not find command '%s' in source tree. +Hint: if this is an external command, +use command_is_external=True''')%(self.command,) + cmd=cmd_node + if self.cwd is None: + cwd=None + else: + assert isinstance(cwd,CmdDirArg) + self.cwd.find_node(self.path) + args=[] + inputs=[] + outputs=[] + for arg in self.argv: + if isinstance(arg,cmd_arg): + arg.find_node(self.path) + if isinstance(arg,input_file): + inputs.append(arg.node) + if isinstance(arg,output_file): + outputs.append(arg.node) + if self.stdout is None: + stdout=None + else: + assert isinstance(self.stdout,str) + stdout=self.path.find_or_declare(self.stdout) + if stdout is None: + raise Utils.WafError("File %s not found"%(self.stdout,)) + outputs.append(stdout) + if self.stderr is None: + stderr=None + else: + assert isinstance(self.stderr,str) + stderr=self.path.find_or_declare(self.stderr) + if stderr is None: + raise Utils.WafError("File %s not found"%(self.stderr,)) + outputs.append(stderr) + if self.stdin is None: + stdin=None + else: + assert isinstance(self.stdin,str) + stdin=self.path.find_resource(self.stdin) + if stdin is None: + raise Utils.WafError("File %s not found"%(self.stdin,)) + inputs.append(stdin) + for hidden_input in self.to_list(self.hidden_inputs): + node=self.path.find_resource(hidden_input) + if node is None: + raise Utils.WafError("File %s not found in dir %s"%(hidden_input,self.path)) + inputs.append(node) + for hidden_output in self.to_list(self.hidden_outputs): + node=self.path.find_or_declare(hidden_output) + if node is None: + raise Utils.WafError("File %s not found in dir %s"%(hidden_output,self.path)) + outputs.append(node) + if not(inputs or getattr(self,'no_inputs',None)): + raise Utils.WafError('command-output objects must have at least one input file or give self.no_inputs') + if not(outputs or getattr(self,'no_outputs',None)): + raise Utils.WafError('command-output objects must have at least one output file or give self.no_outputs') + task=command_output(self.env,cmd,cmd_node,self.argv,stdin,stdout,cwd,self.os_env,stderr) + Utils.copy_attrs(self,task,'before after ext_in ext_out',only_if_set=True) + self.tasks.append(task) + task.inputs=inputs + task.outputs=outputs + task.dep_vars=self.to_list(self.dep_vars) + for dep in self.dependencies: + assert dep is not self + dep.post() + for dep_task in dep.tasks: + task.set_run_after(dep_task) + if not task.inputs: + task.runnable_status=type(Task.TaskBase.run)(runnable_status,task,task.__class__) + task.post_run=type(Task.TaskBase.run)(post_run,task,task.__class__) +def post_run(self): + for x in self.outputs: + h=Utils.h_file(x.abspath(self.env)) + self.generator.bld.node_sigs[self.env.variant()][x.id]=h +def runnable_status(self): + return Constants.RUN_ME +Task.task_type_from_func('copy',vars=[],func=action_process_file_func) +TaskGen.task_gen.classes['command-output']=cmd_output_taskgen + +feature('cmd')(apply_cmd) +feature('copy')(apply_copy) +before('apply_core')(apply_copy) +feature('subst')(apply_subst) +before('apply_core')(apply_subst) +feature('command-output')(init_cmd_output) +feature('command-output')(apply_cmd_output) +after('init_cmd_output')(apply_cmd_output) diff --git a/waf-modules/wafadmin/Tools/msvc.py b/waf-modules/wafadmin/Tools/msvc.py new file mode 100644 index 00000000..67cd9395 --- /dev/null +++ b/waf-modules/wafadmin/Tools/msvc.py @@ -0,0 +1,586 @@ +#! /usr/bin/env python +# encoding: utf-8 + +import os,sys,re,string,optparse +import Utils,TaskGen,Runner,Configure,Task,Options +from Logs import debug,info,warn,error +from TaskGen import after,before,feature +from Configure import conftest,conf +import ccroot,cc,cxx,ar,winres +from libtool import read_la_file +try: + import _winreg +except: + import winreg as _winreg +pproc=Utils.pproc +g_msvc_systemlibs=""" +aclui activeds ad1 adptif adsiid advapi32 asycfilt authz bhsupp bits bufferoverflowu cabinet +cap certadm certidl ciuuid clusapi comctl32 comdlg32 comsupp comsuppd comsuppw comsuppwd comsvcs +credui crypt32 cryptnet cryptui d3d8thk daouuid dbgeng dbghelp dciman32 ddao35 ddao35d +ddao35u ddao35ud delayimp dhcpcsvc dhcpsapi dlcapi dnsapi dsprop dsuiext dtchelp +faultrep fcachdll fci fdi framedyd framedyn gdi32 gdiplus glauxglu32 gpedit gpmuuid +gtrts32w gtrtst32hlink htmlhelp httpapi icm32 icmui imagehlp imm32 iphlpapi iprop +kernel32 ksguid ksproxy ksuser libcmt libcmtd libcpmt libcpmtd loadperf lz32 mapi +mapi32 mgmtapi minidump mmc mobsync mpr mprapi mqoa mqrt msacm32 mscms mscoree +msdasc msimg32 msrating mstask msvcmrt msvcurt msvcurtd mswsock msxml2 mtx mtxdm +netapi32 nmapinmsupp npptools ntdsapi ntdsbcli ntmsapi ntquery odbc32 odbcbcp +odbccp32 oldnames ole32 oleacc oleaut32 oledb oledlgolepro32 opends60 opengl32 +osptk parser pdh penter pgobootrun pgort powrprof psapi ptrustm ptrustmd ptrustu +ptrustud qosname rasapi32 rasdlg rassapi resutils riched20 rpcndr rpcns4 rpcrt4 rtm +rtutils runtmchk scarddlg scrnsave scrnsavw secur32 sensapi setupapi sfc shell32 +shfolder shlwapi sisbkup snmpapi sporder srclient sti strsafe svcguid tapi32 thunk32 +traffic unicows url urlmon user32 userenv usp10 uuid uxtheme vcomp vcompd vdmdbg +version vfw32 wbemuuid webpost wiaguid wininet winmm winscard winspool winstrm +wintrust wldap32 wmiutils wow32 ws2_32 wsnmp32 wsock32 wst wtsapi32 xaswitch xolehlp +""".split() +all_msvc_platforms=[('x64','amd64'),('x86','x86'),('ia64','ia64'),('x86_amd64','amd64'),('x86_ia64','ia64')] +all_wince_platforms=[('armv4','arm'),('armv4i','arm'),('mipsii','mips'),('mipsii_fp','mips'),('mipsiv','mips'),('mipsiv_fp','mips'),('sh4','sh'),('x86','cex86')] +all_icl_platforms=[('intel64','amd64'),('em64t','amd64'),('ia32','x86'),('Itanium','ia64')] +def setup_msvc(conf,versions): + platforms=Utils.to_list(conf.env['MSVC_TARGETS'])or[i for i,j in all_msvc_platforms+all_icl_platforms+all_wince_platforms] + desired_versions=conf.env['MSVC_VERSIONS']or[v for v,_ in versions][::-1] + versiondict=dict(versions) + for version in desired_versions: + try: + targets=dict(versiondict[version]) + for target in platforms: + try: + arch,(p1,p2,p3)=targets[target] + compiler,revision=version.split() + return compiler,revision,p1,p2,p3 + except KeyError:continue + except KeyError:continue + conf.fatal('msvc: Impossible to find a valid architecture for building (in setup_msvc)') +def get_msvc_version(conf,compiler,version,target,vcvars): + debug('msvc: get_msvc_version: %r %r %r',compiler,version,target) + batfile=os.path.join(conf.blddir,'waf-print-msvc.bat') + f=open(batfile,'w') + f.write("""@echo off +set INCLUDE= +set LIB= +call "%s" %s +echo PATH=%%PATH%% +echo INCLUDE=%%INCLUDE%% +echo LIB=%%LIB%% +"""%(vcvars,target)) + f.close() + sout=Utils.cmd_output(['cmd','/E:on','/V:on','/C',batfile]) + lines=sout.splitlines() + for x in('Setting environment','Setting SDK environment','Intel(R) C++ Compiler'): + if lines[0].find(x)!=-1: + break + else: + debug('msvc: get_msvc_version: %r %r %r -> not found',compiler,version,target) + conf.fatal('msvc: Impossible to find a valid architecture for building (in get_msvc_version)') + for line in lines[1:]: + if line.startswith('PATH='): + path=line[5:] + MSVC_PATH=path.split(';') + elif line.startswith('INCLUDE='): + MSVC_INCDIR=[i for i in line[8:].split(';')if i] + elif line.startswith('LIB='): + MSVC_LIBDIR=[i for i in line[4:].split(';')if i] + env={} + env.update(os.environ) + env.update(PATH=path) + compiler_name,linker_name,lib_name=_get_prog_names(conf,compiler) + cxx=conf.find_program(compiler_name,path_list=MSVC_PATH) + if env.has_key('CL'): + del(env['CL']) + try: + p=pproc.Popen([cxx,'/help'],env=env,stdout=pproc.PIPE,stderr=pproc.PIPE) + out,err=p.communicate() + if p.returncode!=0: + raise Exception('return code: %r: %r'%(p.returncode,err)) + except Exception,e: + debug('msvc: get_msvc_version: %r %r %r -> failure',compiler,version,target) + debug(str(e)) + conf.fatal('msvc: cannot run the compiler (in get_msvc_version)') + else: + debug('msvc: get_msvc_version: %r %r %r -> OK',compiler,version,target) + return(MSVC_PATH,MSVC_INCDIR,MSVC_LIBDIR) +def gather_wsdk_versions(conf,versions): + version_pattern=re.compile('^v..?.?\...?.?') + try: + all_versions=_winreg.OpenKey(_winreg.HKEY_LOCAL_MACHINE,'SOFTWARE\\Wow6432node\\Microsoft\\Microsoft SDKs\\Windows') + except WindowsError: + try: + all_versions=_winreg.OpenKey(_winreg.HKEY_LOCAL_MACHINE,'SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows') + except WindowsError: + return + index=0 + while 1: + try: + version=_winreg.EnumKey(all_versions,index) + except WindowsError: + break + index=index+1 + if not version_pattern.match(version): + continue + try: + msvc_version=_winreg.OpenKey(all_versions,version) + path,type=_winreg.QueryValueEx(msvc_version,'InstallationFolder') + except WindowsError: + continue + if os.path.isfile(os.path.join(path,'bin','SetEnv.cmd')): + targets=[] + for target,arch in all_msvc_platforms: + try: + targets.append((target,(arch,conf.get_msvc_version('wsdk',version,'/'+target,os.path.join(path,'bin','SetEnv.cmd'))))) + except Configure.ConfigurationError: + pass + versions.append(('wsdk '+version[1:],targets)) +def gather_msvc_versions(conf,versions): + try: + ce_sdk=_winreg.OpenKey(_winreg.HKEY_LOCAL_MACHINE,'SOFTWARE\\Wow6432node\\Microsoft\\Windows CE Tools\\SDKs') + except WindowsError: + try: + ce_sdk=_winreg.OpenKey(_winreg.HKEY_LOCAL_MACHINE,'SOFTWARE\\Microsoft\\Windows CE Tools\\SDKs') + except WindowsError: + ce_sdk='' + if ce_sdk: + supported_wince_platforms=[] + ce_index=0 + while 1: + try: + sdk_device=_winreg.EnumKey(ce_sdk,ce_index) + except WindowsError: + break + ce_index=ce_index+1 + sdk=_winreg.OpenKey(ce_sdk,sdk_device) + path,type=_winreg.QueryValueEx(sdk,'SDKRootDir') + path=str(path) + path,device=os.path.split(path) + if not device: + path,device=os.path.split(path) + for arch,compiler in all_wince_platforms: + platforms=[] + if os.path.isdir(os.path.join(path,device,'Lib',arch)): + platforms.append((arch,compiler,os.path.join(path,device,'Include',arch),os.path.join(path,device,'Lib',arch))) + if platforms: + supported_wince_platforms.append((device,platforms)) + version_pattern=re.compile('^..?\...?') + for vcver,vcvar in[('VCExpress','exp'),('VisualStudio','')]: + try: + all_versions=_winreg.OpenKey(_winreg.HKEY_LOCAL_MACHINE,'SOFTWARE\\Wow6432node\\Microsoft\\'+vcver) + except WindowsError: + try: + all_versions=_winreg.OpenKey(_winreg.HKEY_LOCAL_MACHINE,'SOFTWARE\\Microsoft\\'+vcver) + except WindowsError: + continue + index=0 + while 1: + try: + version=_winreg.EnumKey(all_versions,index) + except WindowsError: + break + index=index+1 + if not version_pattern.match(version): + continue + try: + msvc_version=_winreg.OpenKey(all_versions,version+"\\Setup\\VS") + path,type=_winreg.QueryValueEx(msvc_version,'ProductDir') + path=str(path) + targets=[] + if ce_sdk: + for device,platforms in supported_wince_platforms: + cetargets=[] + for platform,compiler,include,lib in platforms: + winCEpath=os.path.join(path,'VC','ce') + if os.path.isdir(winCEpath): + common_bindirs,_1,_2=conf.get_msvc_version('msvc',version,'x86',os.path.join(path,'Common7','Tools','vsvars32.bat')) + if os.path.isdir(os.path.join(winCEpath,'lib',platform)): + bindirs=[os.path.join(winCEpath,'bin',compiler),os.path.join(winCEpath,'bin','x86_'+compiler)]+common_bindirs + incdirs=[include,os.path.join(winCEpath,'include'),os.path.join(winCEpath,'atlmfc','include')] + libdirs=[lib,os.path.join(winCEpath,'lib',platform),os.path.join(winCEpath,'atlmfc','lib',platform)] + cetargets.append((platform,(platform,(bindirs,incdirs,libdirs)))) + versions.append((device+' '+version,cetargets)) + if os.path.isfile(os.path.join(path,'VC','vcvarsall.bat')): + for target,realtarget in all_msvc_platforms[::-1]: + try: + targets.append((target,(realtarget,conf.get_msvc_version('msvc',version,target,os.path.join(path,'VC','vcvarsall.bat'))))) + except: + pass + elif os.path.isfile(os.path.join(path,'Common7','Tools','vsvars32.bat')): + try: + targets.append(('x86',('x86',conf.get_msvc_version('msvc',version,'x86',os.path.join(path,'Common7','Tools','vsvars32.bat'))))) + except Configure.ConfigurationError: + pass + versions.append(('msvc '+version,targets)) + except WindowsError: + continue +def gather_icl_versions(conf,versions): + version_pattern=re.compile('^...?.?\....?.?') + try: + all_versions=_winreg.OpenKey(_winreg.HKEY_LOCAL_MACHINE,'SOFTWARE\\Wow6432node\\Intel\\Compilers\\C++') + except WindowsError: + try: + all_versions=_winreg.OpenKey(_winreg.HKEY_LOCAL_MACHINE,'SOFTWARE\\Intel\\Compilers\\C++') + except WindowsError: + return + index=0 + while 1: + try: + version=_winreg.EnumKey(all_versions,index) + except WindowsError: + break + index=index+1 + if not version_pattern.match(version): + continue + targets=[] + for target,arch in all_icl_platforms: + try: + icl_version=_winreg.OpenKey(all_versions,version+'\\'+target) + path,type=_winreg.QueryValueEx(icl_version,'ProductDir') + if os.path.isfile(os.path.join(path,'bin','iclvars.bat')): + try: + targets.append((target,(arch,conf.get_msvc_version('intel',version,target,os.path.join(path,'bin','iclvars.bat'))))) + except Configure.ConfigurationError: + pass + except WindowsError: + continue + major=version[0:2] + versions.append(('intel '+major,targets)) +def get_msvc_versions(conf): + if not conf.env.MSVC_INSTALLED_VERSIONS: + lst=[] + conf.gather_msvc_versions(lst) + conf.gather_wsdk_versions(lst) + conf.gather_icl_versions(lst) + conf.env.MSVC_INSTALLED_VERSIONS=lst + return conf.env.MSVC_INSTALLED_VERSIONS +def print_all_msvc_detected(conf): + for version,targets in conf.env['MSVC_INSTALLED_VERSIONS']: + info(version) + for target,l in targets: + info("\t"+target) +def detect_msvc(conf): + versions=get_msvc_versions(conf) + return setup_msvc(conf,versions) +def find_lt_names_msvc(self,libname,is_static=False): + lt_names=['lib%s.la'%libname,'%s.la'%libname,] + for path in self.env['LIBPATH']: + for la in lt_names: + laf=os.path.join(path,la) + dll=None + if os.path.exists(laf): + ltdict=read_la_file(laf) + lt_libdir=None + if ltdict.get('libdir',''): + lt_libdir=ltdict['libdir'] + if not is_static and ltdict.get('library_names',''): + dllnames=ltdict['library_names'].split() + dll=dllnames[0].lower() + dll=re.sub('\.dll$','',dll) + return(lt_libdir,dll,False) + elif ltdict.get('old_library',''): + olib=ltdict['old_library'] + if os.path.exists(os.path.join(path,olib)): + return(path,olib,True) + elif lt_libdir!=''and os.path.exists(os.path.join(lt_libdir,olib)): + return(lt_libdir,olib,True) + else: + return(None,olib,True) + else: + raise Utils.WafError('invalid libtool object file: %s'%laf) + return(None,None,None) +def libname_msvc(self,libname,is_static=False,mandatory=False): + lib=libname.lower() + lib=re.sub('\.lib$','',lib) + if lib in g_msvc_systemlibs: + return lib + lib=re.sub('^lib','',lib) + if lib=='m': + return None + (lt_path,lt_libname,lt_static)=self.find_lt_names_msvc(lib,is_static) + if lt_path!=None and lt_libname!=None: + if lt_static==True: + return os.path.join(lt_path,lt_libname) + if lt_path!=None: + _libpaths=[lt_path]+self.env['LIBPATH'] + else: + _libpaths=self.env['LIBPATH'] + static_libs=['lib%ss.lib'%lib,'lib%s.lib'%lib,'%ss.lib'%lib,'%s.lib'%lib,] + dynamic_libs=['lib%s.dll.lib'%lib,'lib%s.dll.a'%lib,'%s.dll.lib'%lib,'%s.dll.a'%lib,'lib%s_d.lib'%lib,'%s_d.lib'%lib,'%s.lib'%lib,] + libnames=static_libs + if not is_static: + libnames=dynamic_libs+static_libs + for path in _libpaths: + for libn in libnames: + if os.path.exists(os.path.join(path,libn)): + debug('msvc: lib found: %s',os.path.join(path,libn)) + return re.sub('\.lib$','',libn) + if mandatory: + self.fatal("The library %r could not be found"%libname) + return re.sub('\.lib$','',libname) +def check_lib_msvc(self,libname,is_static=False,uselib_store=None,mandatory=False): + libn=self.libname_msvc(libname,is_static,mandatory) + if not uselib_store: + uselib_store=libname.upper() + if False and is_static: + self.env['STATICLIB_'+uselib_store]=[libn] + else: + self.env['LIB_'+uselib_store]=[libn] +def check_libs_msvc(self,libnames,is_static=False,mandatory=False): + for libname in Utils.to_list(libnames): + self.check_lib_msvc(libname,is_static,mandatory=mandatory) +def no_autodetect(conf): + conf.eval_rules(detect.replace('autodetect','')) +detect=''' +autodetect +find_msvc +msvc_common_flags +cc_load_tools +cxx_load_tools +cc_add_flags +cxx_add_flags +link_add_flags +''' +def autodetect(conf): + v=conf.env + compiler,version,path,includes,libdirs=detect_msvc(conf) + v['PATH']=path + v['CPPPATH']=includes + v['LIBPATH']=libdirs + v['MSVC_COMPILER']=compiler +def _get_prog_names(conf,compiler): + if compiler=='intel': + compiler_name='ICL' + linker_name='XILINK' + lib_name='XILIB' + else: + compiler_name='CL' + linker_name='LINK' + lib_name='LIB' + return compiler_name,linker_name,lib_name +def find_msvc(conf): + if sys.platform!='win32': + conf.fatal('MSVC module only works under native Win32 Python! cygwin is not supported yet') + v=conf.env + compiler,version,path,includes,libdirs=detect_msvc(conf) + compiler_name,linker_name,lib_name=_get_prog_names(conf,compiler) + has_msvc_manifest=(compiler=='msvc'and float(version)>=8)or(compiler=='wsdk'and float(version)>=6)or(compiler=='intel'and float(version)>=11) + cxx=None + if v.CXX:cxx=v.CXX + elif'CXX'in conf.environ:cxx=conf.environ['CXX'] + if not cxx:cxx=conf.find_program(compiler_name,var='CXX',path_list=path,mandatory=True) + cxx=conf.cmd_to_list(cxx) + env=dict(conf.environ) + env.update(PATH=';'.join(path)) + if not Utils.cmd_output([cxx,'/nologo','/?'],silent=True,env=env): + conf.fatal('the msvc compiler could not be identified') + link=v.LINK_CXX + if not link: + link=conf.find_program(linker_name,path_list=path,mandatory=True) + ar=v.AR + if not ar: + ar=conf.find_program(lib_name,path_list=path,mandatory=True) + mt=v.MT + if has_msvc_manifest: + mt=conf.find_program('MT',path_list=path,mandatory=True) + v.MSVC_MANIFEST=has_msvc_manifest + v.PATH=path + v.CPPPATH=includes + v.LIBPATH=libdirs + v.CC=v.CXX=cxx + v.CC_NAME=v.CXX_NAME='msvc' + v.LINK=v.LINK_CXX=link + if not v.LINK_CC: + v.LINK_CC=v.LINK_CXX + v.AR=ar + v.MT=mt + v.MTFLAGS=v.ARFLAGS=['/NOLOGO'] + conf.check_tool('winres') + if not conf.env.WINRC: + warn('Resource compiler not found. Compiling resource file is disabled') + try:v.prepend_value('CPPPATH',conf.environ['INCLUDE']) + except KeyError:pass + try:v.prepend_value('LIBPATH',conf.environ['LIB']) + except KeyError:pass +def msvc_common_flags(conf): + v=conf.env + v['CPPFLAGS']=['/W3','/nologo'] + v['CCDEFINES_ST']='/D%s' + v['CXXDEFINES_ST']='/D%s' + v['CCDEFINES']=['WIN32'] + v['CXXDEFINES']=['WIN32'] + v['_CCINCFLAGS']=[] + v['_CCDEFFLAGS']=[] + v['_CXXINCFLAGS']=[] + v['_CXXDEFFLAGS']=[] + v['CC_SRC_F']='' + v['CC_TGT_F']=['/c','/Fo'] + v['CXX_SRC_F']='' + v['CXX_TGT_F']=['/c','/Fo'] + v['CPPPATH_ST']='/I%s' + v['AR_TGT_F']=v['CCLNK_TGT_F']=v['CXXLNK_TGT_F']='/OUT:' + v['CPPFLAGS_CONSOLE']=['/SUBSYSTEM:CONSOLE'] + v['CPPFLAGS_NATIVE']=['/SUBSYSTEM:NATIVE'] + v['CPPFLAGS_POSIX']=['/SUBSYSTEM:POSIX'] + v['CPPFLAGS_WINDOWS']=['/SUBSYSTEM:WINDOWS'] + v['CPPFLAGS_WINDOWSCE']=['/SUBSYSTEM:WINDOWSCE'] + v['CPPFLAGS_CRT_MULTITHREADED']=['/MT'] + v['CPPFLAGS_CRT_MULTITHREADED_DLL']=['/MD'] + v['CPPDEFINES_CRT_MULTITHREADED']=['_MT'] + v['CPPDEFINES_CRT_MULTITHREADED_DLL']=['_MT','_DLL'] + v['CPPFLAGS_CRT_MULTITHREADED_DBG']=['/MTd'] + v['CPPFLAGS_CRT_MULTITHREADED_DLL_DBG']=['/MDd'] + v['CPPDEFINES_CRT_MULTITHREADED_DBG']=['_DEBUG','_MT'] + v['CPPDEFINES_CRT_MULTITHREADED_DLL_DBG']=['_DEBUG','_MT','_DLL'] + v['CCFLAGS']=['/TC'] + v['CCFLAGS_OPTIMIZED']=['/O2','/DNDEBUG'] + v['CCFLAGS_RELEASE']=['/O2','/DNDEBUG'] + v['CCFLAGS_DEBUG']=['/Od','/RTC1','/ZI'] + v['CCFLAGS_ULTRADEBUG']=['/Od','/RTC1','/ZI'] + v['CXXFLAGS']=['/TP','/EHsc'] + v['CXXFLAGS_OPTIMIZED']=['/O2','/DNDEBUG'] + v['CXXFLAGS_RELEASE']=['/O2','/DNDEBUG'] + v['CXXFLAGS_DEBUG']=['/Od','/RTC1','/ZI'] + v['CXXFLAGS_ULTRADEBUG']=['/Od','/RTC1','/ZI'] + v['LIB']=[] + v['LIB_ST']='%s.lib' + v['LIBPATH_ST']='/LIBPATH:%s' + v['STATICLIB_ST']='lib%s.lib' + v['STATICLIBPATH_ST']='/LIBPATH:%s' + v['LINKFLAGS']=['/NOLOGO'] + if v['MSVC_MANIFEST']: + v.append_value('LINKFLAGS','/MANIFEST') + v['LINKFLAGS_DEBUG']=['/DEBUG'] + v['LINKFLAGS_ULTRADEBUG']=['/DEBUG'] + v['shlib_CCFLAGS']=[''] + v['shlib_CXXFLAGS']=[''] + v['shlib_LINKFLAGS']=['/DLL'] + v['shlib_PATTERN']='%s.dll' + v['implib_PATTERN']='%s.lib' + v['IMPLIB_ST']='/IMPLIB:%s' + v['staticlib_LINKFLAGS']=[''] + v['staticlib_PATTERN']='lib%s.lib' + v['program_PATTERN']='%s.exe' +def apply_flags_msvc(self): + if self.env.CC_NAME!='msvc'or not self.link_task: + return + subsystem=getattr(self,'subsystem','') + if subsystem: + subsystem='/subsystem:%s'%subsystem + flags='cstaticlib'in self.features and'ARFLAGS'or'LINKFLAGS' + self.env.append_value(flags,subsystem) + if getattr(self,'link_task',None)and not'cstaticlib'in self.features: + for f in self.env.LINKFLAGS: + d=f.lower() + if d[1:]=='debug': + pdbnode=self.link_task.outputs[0].change_ext('.pdb') + pdbfile=pdbnode.bldpath(self.env) + self.link_task.outputs.append(pdbnode) + self.bld.install_files(self.install_path,[pdbnode],env=self.env) + break +def apply_obj_vars_msvc(self): + if self.env['CC_NAME']!='msvc': + return + try: + self.meths.remove('apply_obj_vars') + except ValueError: + pass + libpaths=getattr(self,'libpaths',[]) + if not libpaths:self.libpaths=libpaths + env=self.env + app=env.append_unique + cpppath_st=env['CPPPATH_ST'] + lib_st=env['LIB_ST'] + staticlib_st=env['STATICLIB_ST'] + libpath_st=env['LIBPATH_ST'] + staticlibpath_st=env['STATICLIBPATH_ST'] + for i in env['LIBPATH']: + app('LINKFLAGS',libpath_st%i) + if not libpaths.count(i): + libpaths.append(i) + for i in env['LIBPATH']: + app('LINKFLAGS',staticlibpath_st%i) + if not libpaths.count(i): + libpaths.append(i) + if not env['FULLSTATIC']: + if env['STATICLIB']or env['LIB']: + app('LINKFLAGS',env['SHLIB_MARKER']) + for i in env['STATICLIB']: + app('LINKFLAGS',staticlib_st%i) + for i in env['LIB']: + app('LINKFLAGS',lib_st%i) +def apply_manifest(self): + if self.env.CC_NAME=='msvc'and self.env.MSVC_MANIFEST: + out_node=self.link_task.outputs[0] + man_node=out_node.parent.find_or_declare(out_node.name+'.manifest') + self.link_task.outputs.append(man_node) + self.link_task.do_manifest=True +def exec_mf(self): + env=self.env + mtool=env['MT'] + if not mtool: + return 0 + self.do_manifest=False + outfile=self.outputs[0].bldpath(env) + manifest=None + for out_node in self.outputs: + if out_node.name.endswith('.manifest'): + manifest=out_node.bldpath(env) + break + if manifest is None: + return 0 + mode='' + if'cprogram'in self.generator.features: + mode='1' + elif'cshlib'in self.generator.features: + mode='2' + debug('msvc: embedding manifest') + lst=[] + lst.extend([env['MT']]) + lst.extend(Utils.to_list(env['MTFLAGS'])) + lst.extend(Utils.to_list("-manifest")) + lst.extend(Utils.to_list(manifest)) + lst.extend(Utils.to_list("-outputresource:%s;%s"%(outfile,mode))) + lst=[lst] + return self.exec_command(*lst) +def exec_command_msvc(self,*k,**kw): + if self.env['CC_NAME']=='msvc': + if isinstance(k[0],list): + lst=[] + carry='' + for a in k[0]: + if len(a)==3 and a.startswith('/F')or a=='/doc'or a[-1]==':': + carry=a + else: + lst.append(carry+a) + carry='' + k=[lst] + env=dict(os.environ) + env.update(PATH=';'.join(self.env['PATH'])) + kw['env']=env + ret=self.generator.bld.exec_command(*k,**kw) + if ret:return ret + if getattr(self,'do_manifest',None): + ret=exec_mf(self) + return ret +for k in'cc cxx winrc cc_link cxx_link static_link qxx'.split(): + cls=Task.TaskBase.classes.get(k,None) + if cls: + cls.exec_command=exec_command_msvc + +conf(get_msvc_version) +conf(gather_wsdk_versions) +conf(gather_msvc_versions) +conf(gather_icl_versions) +conf(get_msvc_versions) +conf(print_all_msvc_detected) +conf(find_lt_names_msvc) +conf(libname_msvc) +conf(check_lib_msvc) +conf(check_libs_msvc) +conftest(no_autodetect) +conftest(autodetect) +conftest(find_msvc) +conftest(msvc_common_flags) +after('apply_link')(apply_flags_msvc) +feature('cc','cxx')(apply_flags_msvc) +feature('cprogram','cshlib','cstaticlib')(apply_obj_vars_msvc) +after('apply_lib_vars')(apply_obj_vars_msvc) +before('apply_obj_vars')(apply_obj_vars_msvc) +feature('cprogram','cshlib')(apply_manifest) +after('apply_link')(apply_manifest) diff --git a/waf-modules/wafadmin/Tools/nasm.py b/waf-modules/wafadmin/Tools/nasm.py new file mode 100644 index 00000000..04dd345f --- /dev/null +++ b/waf-modules/wafadmin/Tools/nasm.py @@ -0,0 +1,31 @@ +#! /usr/bin/env python +# encoding: utf-8 + +import os +import TaskGen,Task,Utils +from TaskGen import taskgen,before,extension +nasm_str='${NASM} ${NASM_FLAGS} ${NASM_INCLUDES} ${SRC} -o ${TGT}' +EXT_NASM=['.s','.S','.asm','.ASM','.spp','.SPP'] +def apply_nasm_vars(self): + if hasattr(self,'nasm_flags'): + for flag in self.to_list(self.nasm_flags): + self.env.append_value('NASM_FLAGS',flag) + if hasattr(self,'includes'): + for inc in self.to_list(self.includes): + node=self.path.find_dir(inc) + if not node: + raise Utils.WafError('cannot find the dir'+inc) + self.env.append_value('NASM_INCLUDES','-I%s'%node.srcpath(self.env)) + self.env.append_value('NASM_INCLUDES','-I%s'%node.bldpath(self.env)) +def nasm_file(self,node): + try:obj_ext=self.obj_ext + except AttributeError:obj_ext='_%d.o'%self.idx + task=self.create_task('nasm',node,node.change_ext(obj_ext)) + self.compiled_tasks.append(task) + self.meths.append('apply_nasm_vars') +Task.simple_task_type('nasm',nasm_str,color='BLUE',ext_out='.o',shell=False) +def detect(conf): + nasm=conf.find_program(['nasm','yasm'],var='NASM',mandatory=True) + +before('apply_link')(apply_nasm_vars) +extension(EXT_NASM)(nasm_file) diff --git a/waf-modules/wafadmin/Tools/ocaml.py b/waf-modules/wafadmin/Tools/ocaml.py new file mode 100644 index 00000000..b3dcd3a1 --- /dev/null +++ b/waf-modules/wafadmin/Tools/ocaml.py @@ -0,0 +1,225 @@ +#! /usr/bin/env python +# encoding: utf-8 + +import os,re +import TaskGen,Utils,Task,Build +from Logs import error +from TaskGen import taskgen,feature,before,after,extension +EXT_MLL=['.mll'] +EXT_MLY=['.mly'] +EXT_MLI=['.mli'] +EXT_MLC=['.c'] +EXT_ML=['.ml'] +open_re=re.compile('^\s*open\s+([a-zA-Z]+)(;;){0,1}$',re.M) +foo=re.compile(r"""(\(\*)|(\*\))|("(\\.|[^"\\])*"|'(\\.|[^'\\])*'|.[^()*"'\\]*)""",re.M) +def filter_comments(txt): + meh=[0] + def repl(m): + if m.group(1):meh[0]+=1 + elif m.group(2):meh[0]-=1 + elif not meh[0]:return m.group(0) + return'' + return foo.sub(repl,txt) +def scan(self): + node=self.inputs[0] + code=filter_comments(node.read(self.env)) + global open_re + names=[] + import_iterator=open_re.finditer(code) + if import_iterator: + for import_match in import_iterator: + names.append(import_match.group(1)) + found_lst=[] + raw_lst=[] + for name in names: + nd=None + for x in self.incpaths: + nd=x.find_resource(name.lower()+'.ml') + if not nd:nd=x.find_resource(name+'.ml') + if nd: + found_lst.append(nd) + break + else: + raw_lst.append(name) + return(found_lst,raw_lst) +native_lst=['native','all','c_object'] +bytecode_lst=['bytecode','all'] +class ocaml_taskgen(TaskGen.task_gen): + def __init__(self,*k,**kw): + TaskGen.task_gen.__init__(self,*k,**kw) +def init_ml(self): + Utils.def_attrs(self,type='all',incpaths_lst=[],bld_incpaths_lst=[],mlltasks=[],mlytasks=[],mlitasks=[],native_tasks=[],bytecode_tasks=[],linktasks=[],bytecode_env=None,native_env=None,compiled_tasks=[],includes='',uselib='',are_deps_set=0) +def init_envs_ml(self): + self.islibrary=getattr(self,'islibrary',False) + global native_lst,bytecode_lst + self.native_env=None + if self.type in native_lst: + self.native_env=self.env.copy() + if self.islibrary:self.native_env['OCALINKFLAGS']='-a' + self.bytecode_env=None + if self.type in bytecode_lst: + self.bytecode_env=self.env.copy() + if self.islibrary:self.bytecode_env['OCALINKFLAGS']='-a' + if self.type=='c_object': + self.native_env.append_unique('OCALINKFLAGS_OPT','-output-obj') +def apply_incpaths_ml(self): + inc_lst=self.includes.split() + lst=self.incpaths_lst + for dir in inc_lst: + node=self.path.find_dir(dir) + if not node: + error("node not found: "+str(dir)) + continue + self.bld.rescan(node) + if not node in lst:lst.append(node) + self.bld_incpaths_lst.append(node) +def apply_vars_ml(self): + for i in self.incpaths_lst: + if self.bytecode_env: + app=self.bytecode_env.append_value + app('OCAMLPATH','-I') + app('OCAMLPATH',i.srcpath(self.env)) + app('OCAMLPATH','-I') + app('OCAMLPATH',i.bldpath(self.env)) + if self.native_env: + app=self.native_env.append_value + app('OCAMLPATH','-I') + app('OCAMLPATH',i.bldpath(self.env)) + app('OCAMLPATH','-I') + app('OCAMLPATH',i.srcpath(self.env)) + varnames=['INCLUDES','OCAMLFLAGS','OCALINKFLAGS','OCALINKFLAGS_OPT'] + for name in self.uselib.split(): + for vname in varnames: + cnt=self.env[vname+'_'+name] + if cnt: + if self.bytecode_env:self.bytecode_env.append_value(vname,cnt) + if self.native_env:self.native_env.append_value(vname,cnt) +def apply_link_ml(self): + if self.bytecode_env: + ext=self.islibrary and'.cma'or'.run' + linktask=self.create_task('ocalink') + linktask.bytecode=1 + linktask.set_outputs(self.path.find_or_declare(self.target+ext)) + linktask.obj=self + linktask.env=self.bytecode_env + self.linktasks.append(linktask) + if self.native_env: + if self.type=='c_object':ext='.o' + elif self.islibrary:ext='.cmxa' + else:ext='' + linktask=self.create_task('ocalinkx') + linktask.set_outputs(self.path.find_or_declare(self.target+ext)) + linktask.obj=self + linktask.env=self.native_env + self.linktasks.append(linktask) + self.compiled_tasks.append(linktask) +def mll_hook(self,node): + mll_task=self.create_task('ocamllex',node,node.change_ext('.ml'),env=self.native_env) + self.mlltasks.append(mll_task) + self.allnodes.append(mll_task.outputs[0]) +def mly_hook(self,node): + mly_task=self.create_task('ocamlyacc',node,[node.change_ext('.ml'),node.change_ext('.mli')],env=self.native_env) + self.mlytasks.append(mly_task) + self.allnodes.append(mly_task.outputs[0]) + task=self.create_task('ocamlcmi',mly_task.outputs[1],mly_task.outputs[1].change_ext('.cmi'),env=self.native_env) +def mli_hook(self,node): + task=self.create_task('ocamlcmi',node,node.change_ext('.cmi'),env=self.native_env) + self.mlitasks.append(task) +def mlc_hook(self,node): + task=self.create_task('ocamlcc',node,node.change_ext('.o'),env=self.native_env) + self.compiled_tasks.append(task) +def ml_hook(self,node): + if self.native_env: + task=self.create_task('ocamlx',node,node.change_ext('.cmx'),env=self.native_env) + task.obj=self + task.incpaths=self.bld_incpaths_lst + self.native_tasks.append(task) + if self.bytecode_env: + task=self.create_task('ocaml',node,node.change_ext('.cmo'),env=self.bytecode_env) + task.obj=self + task.bytecode=1 + task.incpaths=self.bld_incpaths_lst + self.bytecode_tasks.append(task) +def compile_may_start(self): + if not getattr(self,'flag_deps',''): + self.flag_deps=1 + if getattr(self,'bytecode',''):alltasks=self.obj.bytecode_tasks + else:alltasks=self.obj.native_tasks + self.signature() + tree=self.generator.bld + env=self.env + for node in self.inputs: + lst=tree.node_deps[self.unique_id()] + for depnode in lst: + for t in alltasks: + if t==self:continue + if depnode in t.inputs: + self.set_run_after(t) + delattr(self,'cache_sig') + self.signature() + return Task.Task.runnable_status(self) +b=Task.simple_task_type +cls=b('ocamlx','${OCAMLOPT} ${OCAMLPATH} ${OCAMLFLAGS} ${INCLUDES} -c -o ${TGT} ${SRC}',color='GREEN',shell=False) +cls.runnable_status=compile_may_start +cls.scan=scan +b=Task.simple_task_type +cls=b('ocaml','${OCAMLC} ${OCAMLPATH} ${OCAMLFLAGS} ${INCLUDES} -c -o ${TGT} ${SRC}',color='GREEN',shell=False) +cls.runnable_status=compile_may_start +cls.scan=scan +b('ocamlcmi','${OCAMLC} ${OCAMLPATH} ${INCLUDES} -o ${TGT} -c ${SRC}',color='BLUE',before="ocaml ocamlcc ocamlx") +b('ocamlcc','cd ${TGT[0].bld_dir(env)} && ${OCAMLOPT} ${OCAMLFLAGS} ${OCAMLPATH} ${INCLUDES} -c ${SRC[0].abspath(env)}',color='GREEN') +b('ocamllex','${OCAMLLEX} ${SRC} -o ${TGT}',color='BLUE',before="ocamlcmi ocaml ocamlcc") +b('ocamlyacc','${OCAMLYACC} -b ${TGT[0].bld_base(env)} ${SRC}',color='BLUE',before="ocamlcmi ocaml ocamlcc") +def link_may_start(self): + if not getattr(self,'order',''): + if getattr(self,'bytecode',0):alltasks=self.obj.bytecode_tasks + else:alltasks=self.obj.native_tasks + seen=[] + pendant=[]+alltasks + while pendant: + task=pendant.pop(0) + if task in seen:continue + for x in task.run_after: + if not x in seen: + pendant.append(task) + break + else: + seen.append(task) + self.inputs=[x.outputs[0]for x in seen] + self.order=1 + return Task.Task.runnable_status(self) +act=b('ocalink','${OCAMLC} -o ${TGT} ${INCLUDES} ${OCALINKFLAGS} ${SRC}',color='YELLOW',after="ocaml ocamlcc") +act.runnable_status=link_may_start +act=b('ocalinkx','${OCAMLOPT} -o ${TGT} ${INCLUDES} ${OCALINKFLAGS_OPT} ${SRC}',color='YELLOW',after="ocamlx ocamlcc") +act.runnable_status=link_may_start +def detect(conf): + opt=conf.find_program('ocamlopt',var='OCAMLOPT') + occ=conf.find_program('ocamlc',var='OCAMLC') + if(not opt)or(not occ): + conf.fatal('The objective caml compiler was not found:\ninstall it or make it available in your PATH') + v=conf.env + v['OCAMLC']=occ + v['OCAMLOPT']=opt + v['OCAMLLEX']=conf.find_program('ocamllex',var='OCAMLLEX') + v['OCAMLYACC']=conf.find_program('ocamlyacc',var='OCAMLYACC') + v['OCAMLFLAGS']='' + v['OCAMLLIB']=Utils.cmd_output(conf.env['OCAMLC']+' -where').strip()+os.sep + v['LIBPATH_OCAML']=Utils.cmd_output(conf.env['OCAMLC']+' -where').strip()+os.sep + v['CPPPATH_OCAML']=Utils.cmd_output(conf.env['OCAMLC']+' -where').strip()+os.sep + v['LIB_OCAML']='camlrun' + +feature('ocaml')(init_ml) +feature('ocaml')(init_envs_ml) +after('init_ml')(init_envs_ml) +feature('ocaml')(apply_incpaths_ml) +before('apply_vars_ml')(apply_incpaths_ml) +after('init_envs_ml')(apply_incpaths_ml) +feature('ocaml')(apply_vars_ml) +before('apply_core')(apply_vars_ml) +feature('ocaml')(apply_link_ml) +after('apply_core')(apply_link_ml) +extension(EXT_MLL)(mll_hook) +extension(EXT_MLY)(mly_hook) +extension(EXT_MLI)(mli_hook) +extension(EXT_MLC)(mlc_hook) +extension(EXT_ML)(ml_hook) diff --git a/waf-modules/wafadmin/Tools/osx.py b/waf-modules/wafadmin/Tools/osx.py new file mode 100644 index 00000000..37cbaf64 --- /dev/null +++ b/waf-modules/wafadmin/Tools/osx.py @@ -0,0 +1,138 @@ +#! /usr/bin/env python +# encoding: utf-8 + +import os,shutil,sys,platform +import TaskGen,Task,Build,Options,Utils +from TaskGen import taskgen,feature,after,before +from Logs import error,debug +app_info=''' + + + + + CFBundlePackageType + APPL + CFBundleGetInfoString + Created by Waf + CFBundleSignature + ???? + NOTE + THIS IS A GENERATED FILE, DO NOT MODIFY + CFBundleExecutable + %s + + +''' +def set_macosx_deployment_target(self): + if self.env['MACOSX_DEPLOYMENT_TARGET']: + os.environ['MACOSX_DEPLOYMENT_TARGET']=self.env['MACOSX_DEPLOYMENT_TARGET'] + elif'MACOSX_DEPLOYMENT_TARGET'not in os.environ: + if sys.platform=='darwin': + os.environ['MACOSX_DEPLOYMENT_TARGET']='.'.join(platform.mac_ver()[0].split('.')[:2]) +def apply_framework(self): + for x in self.to_list(self.env['FRAMEWORKPATH']): + frameworkpath_st='-F%s' + self.env.append_unique('CXXFLAGS',frameworkpath_st%x) + self.env.append_unique('CCFLAGS',frameworkpath_st%x) + self.env.append_unique('LINKFLAGS',frameworkpath_st%x) + for x in self.to_list(self.env['FRAMEWORK']): + self.env.append_value('LINKFLAGS',['-framework',x]) +def create_bundle_dirs(self,name,out): + bld=self.bld + dir=out.parent.get_dir(name) + if not dir: + dir=out.__class__(name,out.parent,1) + bld.rescan(dir) + contents=out.__class__('Contents',dir,1) + bld.rescan(contents) + macos=out.__class__('MacOS',contents,1) + bld.rescan(macos) + return dir +def bundle_name_for_output(out): + name=out.name + k=name.rfind('.') + if k>=0: + name=name[:k]+'.app' + else: + name=name+'.app' + return name +def create_task_macapp(self): + if self.env['MACAPP']or getattr(self,'mac_app',False): + apptask=self.create_task('macapp') + apptask.set_inputs(self.link_task.outputs) + out=self.link_task.outputs[0] + name=bundle_name_for_output(out) + dir=self.create_bundle_dirs(name,out) + n1=dir.find_or_declare(['Contents','MacOS',out.name]) + apptask.set_outputs([n1]) + apptask.chmod=0755 + apptask.install_path=os.path.join(self.install_path,name,'Contents','MacOS') + self.apptask=apptask +def create_task_macplist(self): + if self.env['MACAPP']or getattr(self,'mac_app',False): + if not getattr(self,'mac_plist',False): + self.mac_plist=app_info + plisttask=self.create_task('macplist') + plisttask.set_inputs(self.link_task.outputs) + out=self.link_task.outputs[0] + self.mac_plist=self.mac_plist%(out.name) + name=bundle_name_for_output(out) + dir=self.create_bundle_dirs(name,out) + n1=dir.find_or_declare(['Contents','Info.plist']) + plisttask.set_outputs([n1]) + plisttask.mac_plist=self.mac_plist + plisttask.install_path=os.path.join(self.install_path,name,'Contents') + self.plisttask=plisttask +def apply_link_osx(self): + name=self.link_task.outputs[0].name + if not self.install_path: + return + if getattr(self,'vnum',None): + name=name.replace('.dylib','.%s.dylib'%self.vnum) + path=os.path.join(Utils.subst_vars(self.install_path,self.env),name) + if'-dynamiclib'in self.env['LINKFLAGS']: + self.env.append_value('LINKFLAGS','-install_name') + self.env.append_value('LINKFLAGS',path) +def apply_bundle(self): + if not('cshlib'in self.features or'shlib'in self.features):return + if self.env['MACBUNDLE']or getattr(self,'mac_bundle',False): + self.env['shlib_PATTERN']=self.env['macbundle_PATTERN'] + uselib=self.uselib=self.to_list(self.uselib) + if not'MACBUNDLE'in uselib:uselib.append('MACBUNDLE') +def apply_bundle_remove_dynamiclib(self): + if self.env['MACBUNDLE']or getattr(self,'mac_bundle',False): + if not getattr(self,'vnum',None): + try: + self.env['LINKFLAGS'].remove('-dynamiclib') + except ValueError: + pass +app_dirs=['Contents','Contents/MacOS','Contents/Resources'] +def app_build(task): + env=task.env + shutil.copy2(task.inputs[0].srcpath(env),task.outputs[0].abspath(env)) + return 0 +def plist_build(task): + env=task.env + f=open(task.outputs[0].abspath(env),"w") + f.write(task.mac_plist) + f.close() + return 0 +Task.task_type_from_func('macapp',vars=[],func=app_build,after="cxx_link cc_link static_link") +Task.task_type_from_func('macplist',vars=[],func=plist_build,after="cxx_link cc_link static_link") + +feature('cc','cxx')(set_macosx_deployment_target) +before('apply_lib_vars')(set_macosx_deployment_target) +feature('cc','cxx')(apply_framework) +after('apply_lib_vars')(apply_framework) +taskgen(create_bundle_dirs) +taskgen(create_task_macapp) +after('apply_link')(create_task_macapp) +feature('cprogram')(create_task_macapp) +after('apply_link')(create_task_macplist) +feature('cprogram')(create_task_macplist) +after('apply_link')(apply_link_osx) +feature('cshlib')(apply_link_osx) +before('apply_link','apply_lib_vars')(apply_bundle) +feature('cc','cxx')(apply_bundle) +after('apply_link')(apply_bundle_remove_dynamiclib) +feature('cshlib')(apply_bundle_remove_dynamiclib) diff --git a/waf-modules/wafadmin/Tools/perl.py b/waf-modules/wafadmin/Tools/perl.py new file mode 100644 index 00000000..f9223368 --- /dev/null +++ b/waf-modules/wafadmin/Tools/perl.py @@ -0,0 +1,69 @@ +#! /usr/bin/env python +# encoding: utf-8 + +import os +import Task,Options,Utils +from Configure import conf +from TaskGen import extension,taskgen,feature,before +xsubpp_str='${PERL} ${XSUBPP} -noprototypes -typemap ${EXTUTILS_TYPEMAP} ${SRC} > ${TGT}' +EXT_XS=['.xs'] +def init_perlext(self): + self.uselib=self.to_list(getattr(self,'uselib','')) + if not'PERL'in self.uselib:self.uselib.append('PERL') + if not'PERLEXT'in self.uselib:self.uselib.append('PERLEXT') + self.env['shlib_PATTERN']=self.env['perlext_PATTERN'] +def xsubpp_file(self,node): + outnode=node.change_ext('.c') + self.create_task('xsubpp',node,outnode) + self.allnodes.append(outnode) +Task.simple_task_type('xsubpp',xsubpp_str,color='BLUE',before='cc cxx',shell=False) +def check_perl_version(conf,minver=None): + if getattr(Options.options,'perlbinary',None): + conf.env.PERL=Options.options.perlbinary + else: + conf.find_program('perl',var='PERL',mandatory=True) + try: + version=Utils.cmd_output([conf.env.PERL,'-e','printf "%vd",$^V']) + except: + conf.fatal('could not determine the perl version') + conf.env.PERL_VERSION=version + cver='' + if minver: + try: + ver=tuple(map(int,version.split('.'))) + except: + conf.fatal('unsupported perl version %r'%version) + if ver",r'#~\|^[]{}')] +chr_esc={'0':0,'a':7,'b':8,'t':9,'n':10,'f':11,'v':12,'r':13,'\\':92,"'":39} +NUM='i' +OP='O' +IDENT='T' +STR='s' +CHAR='c' +tok_types=[NUM,STR,IDENT,OP] +exp_types=[r"""0[xX](?P[a-fA-F0-9]+)(?P[uUlL]*)|L*?'(?P(\\.|[^\\'])+)'|(?P\d+)[Ee](?P[+-]*?\d+)(?P[fFlL]*)|(?P\d*\.\d+)([Ee](?P[+-]*?\d+))?(?P[fFlL]*)|(?P\d+\.\d*)([Ee](?P[+-]*?\d+))?(?P[fFlL]*)|(?P0*)(?P\d+)(?P[uUlL]*)""",r'L?"([^"\\]|\\.)*"',r'[a-zA-Z_]\w*',r'%:%:|<<=|>>=|\.\.\.|<<|<%|<:|<=|>>|>=|\+\+|\+=|--|->|-=|\*=|/=|%:|%=|%>|==|&&|&=|\|\||\|=|\^=|:>|!=|##|[\(\)\{\}\[\]<>\?\|\^\*\+&=:!#;,%/\-\?\~\.]',] +re_clexer=re.compile('|'.join(["(?P<%s>%s)"%(name,part)for name,part in zip(tok_types,exp_types)]),re.M) +accepted='a' +ignored='i' +undefined='u' +skipped='s' +def repl(m): + if m.group(1): + return' ' + s=m.group(2) + if s is None: + return'' + return s +def filter_comments(filename): + code=Utils.readf(filename) + if use_trigraphs: + for(a,b)in trig_def:code=code.split(a).join(b) + code=re_nl.sub('',code) + code=re_cpp.sub(repl,code) + return[(m.group(2),m.group(3))for m in re.finditer(re_lines,code)] +prec={} +ops=['* / %','+ -','<< >>','< <= >= >','== !=','& | ^','&& ||',','] +for x in range(len(ops)): + syms=ops[x] + for u in syms.split(): + prec[u]=x +def reduce_nums(val_1,val_2,val_op): + try:a=0+val_1 + except TypeError:a=int(val_1) + try:b=0+val_2 + except TypeError:b=int(val_2) + d=val_op + if d=='%':c=a%b + elif d=='+':c=a+b + elif d=='-':c=a-b + elif d=='*':c=a*b + elif d=='/':c=a/b + elif d=='^':c=a^b + elif d=='|':c=a|b + elif d=='||':c=int(a or b) + elif d=='&':c=a&b + elif d=='&&':c=int(a and b) + elif d=='==':c=int(a==b) + elif d=='!=':c=int(a!=b) + elif d=='<=':c=int(a<=b) + elif d=='<':c=int(a':c=int(a>b) + elif d=='>=':c=int(a>=b) + elif d=='^':c=int(a^b) + elif d=='<<':c=a<>':c=a>>b + else:c=0 + return c +def get_num(lst): + if not lst:raise PreprocError("empty list for get_num") + (p,v)=lst[0] + if p==OP: + if v=='(': + count_par=1 + i=1 + while i=prec[v]: + num2=reduce_nums(num,num2,v) + return get_term([(NUM,num2)]+lst) + else: + num3,lst=get_num(lst[1:]) + num3=reduce_nums(num2,num3,v2) + return get_term([(NUM,num),(p,v),(NUM,num3)]+lst) + raise PreprocError("cannot reduce %r"%lst) +def reduce_eval(lst): + num,lst=get_term(lst) + return(NUM,num) +def stringize(lst): + lst=[str(v2)for(p2,v2)in lst] + return"".join(lst) +def paste_tokens(t1,t2): + p1=None + if t1[0]==OP and t2[0]==OP: + p1=OP + elif t1[0]==IDENT and(t2[0]==IDENT or t2[0]==NUM): + p1=IDENT + elif t1[0]==NUM and t2[0]==NUM: + p1=NUM + if not p1: + raise PreprocError('tokens do not make a valid paste %r and %r'%(t1,t2)) + return(p1,t1[1]+t2[1]) +def reduce_tokens(lst,defs,ban=[]): + i=0 + while i=len(lst): + raise PreprocError("expected '(' after %r (got nothing)"%v) + (p2,v2)=lst[i] + if p2!=OP or v2!='(': + raise PreprocError("expected '(' after %r"%v) + del lst[i] + one_param=[] + count_paren=0 + while i1: + (p3,v3)=accu[-1] + (p4,v4)=accu[-2] + if v3=='##': + accu.pop() + if v4==','and pt.*)>|"(?P.*)")') +def extract_include(txt,defs): + m=re_include.search(txt) + if m: + if m.group('a'):return'<',m.group('a') + if m.group('b'):return'"',m.group('b') + toks=tokenize(txt) + reduce_tokens(toks,defs,['waf_include']) + if not toks: + raise PreprocError("could not parse include %s"%txt) + if len(toks)==1: + if toks[0][0]==STR: + return'"',toks[0][1] + else: + if toks[0][1]=='<'and toks[-1][1]=='>': + return stringize(toks).lstrip('<').rstrip('>') + raise PreprocError("could not parse include %s."%txt) +def parse_char(txt): + if not txt:raise PreprocError("attempted to parse a null char") + if txt[0]!='\\': + return ord(txt) + c=txt[1] + if c=='x': + if len(txt)==4 and txt[3]in string.hexdigits:return int(txt[2:],16) + return int(txt[2:],16) + elif c.isdigit(): + if c=='0'and len(txt)==2:return 0 + for i in 3,2,1: + if len(txt)>i and txt[1:1+i].isdigit(): + return(1+i,int(txt[1:1+i],8)) + else: + try:return chr_esc[c] + except KeyError:raise PreprocError("could not parse char literal '%s'"%txt) +def tokenize(s): + ret=[] + for match in re_clexer.finditer(s): + m=match.group + for name in tok_types: + v=m(name) + if v: + if name==IDENT: + try:v=g_optrans[v];name=OP + except KeyError: + if v.lower()=="true": + v=1 + name=NUM + elif v.lower()=="false": + v=0 + name=NUM + elif name==NUM: + if m('oct'):v=int(v,8) + elif m('hex'):v=int(m('hex'),16) + elif m('n0'):v=m('n0') + else: + v=m('char') + if v:v=parse_char(v) + else:v=m('n2')or m('n4') + elif name==OP: + if v=='%:':v='#' + elif v=='%:%:':v='##' + elif name==STR: + v=v[1:-1] + ret.append((name,v)) + break + return ret +def define_name(line): + return re_mac.match(line).group(0) +class c_parser(object): + def __init__(self,nodepaths=None,defines=None): + self.lines=[] + if defines is None: + self.defs={} + else: + self.defs=dict(defines) + self.state=[] + self.env=None + self.count_files=0 + self.currentnode_stack=[] + self.nodepaths=nodepaths or[] + self.nodes=[] + self.names=[] + self.curfile='' + self.ban_includes=set([]) + def cached_find_resource(self,node,filename): + try: + nd=node.bld.cache_nd + except: + nd=node.bld.cache_nd={} + tup=(node.id,filename) + try: + return nd[tup] + except KeyError: + ret=node.find_resource(filename) + nd[tup]=ret + return ret + def tryfind(self,filename): + self.curfile=filename + found=self.cached_find_resource(self.currentnode_stack[-1],filename) + for n in self.nodepaths: + if found: + break + found=self.cached_find_resource(n,filename) + if found: + self.nodes.append(found) + if filename[-4:]!='.moc': + self.addlines(found) + else: + if not filename in self.names: + self.names.append(filename) + return found + def addlines(self,node): + self.currentnode_stack.append(node.parent) + filepath=node.abspath(self.env) + self.count_files+=1 + if self.count_files>recursion_limit:raise PreprocError("recursion limit exceeded") + pc=self.parse_cache + debug('preproc: reading file %r',filepath) + try: + lns=pc[filepath] + except KeyError: + pass + else: + self.lines.extend(lns) + return + try: + lines=filter_comments(filepath) + lines.append((POPFILE,'')) + lines.reverse() + pc[filepath]=lines + self.lines.extend(lines) + except IOError: + raise PreprocError("could not read the file %s"%filepath) + except Exception: + if Logs.verbose>0: + error("parsing %s failed"%filepath) + traceback.print_exc() + def start(self,node,env): + debug('preproc: scanning %s (in %s)',node.name,node.parent.name) + self.env=env + variant=node.variant(env) + bld=node.__class__.bld + try: + self.parse_cache=bld.parse_cache + except AttributeError: + bld.parse_cache={} + self.parse_cache=bld.parse_cache + self.addlines(node) + if env['DEFLINES']: + lst=[('define',x)for x in env['DEFLINES']] + lst.reverse() + self.lines.extend(lst) + while self.lines: + (kind,line)=self.lines.pop() + if kind==POPFILE: + self.currentnode_stack.pop() + continue + try: + self.process_line(kind,line) + except Exception,e: + if Logs.verbose: + debug('preproc: line parsing failed (%s): %s %s',e,line,Utils.ex_stack()) + def process_line(self,token,line): + ve=Logs.verbose + if ve:debug('preproc: line is %s - %s state is %s',token,line,self.state) + state=self.state + if token in['ifdef','ifndef','if']: + state.append(undefined) + elif token=='endif': + state.pop() + if not token in['else','elif','endif']: + if skipped in self.state or ignored in self.state: + return + if token=='if': + ret=eval_macro(tokenize(line),self.defs) + if ret:state[-1]=accepted + else:state[-1]=ignored + elif token=='ifdef': + m=re_mac.match(line) + if m and m.group(0)in self.defs:state[-1]=accepted + else:state[-1]=ignored + elif token=='ifndef': + m=re_mac.match(line) + if m and m.group(0)in self.defs:state[-1]=ignored + else:state[-1]=accepted + elif token=='include'or token=='import': + (kind,inc)=extract_include(line,self.defs) + if inc in self.ban_includes:return + if token=='import':self.ban_includes.add(inc) + if ve:debug('preproc: include found %s (%s) ',inc,kind) + if kind=='"'or not strict_quotes: + self.tryfind(inc) + elif token=='elif': + if state[-1]==accepted: + state[-1]=skipped + elif state[-1]==ignored: + if eval_macro(tokenize(line),self.defs): + state[-1]=accepted + elif token=='else': + if state[-1]==accepted:state[-1]=skipped + elif state[-1]==ignored:state[-1]=accepted + elif token=='define': + try: + self.defs[define_name(line)]=line + except: + raise PreprocError("invalid define line %s"%line) + elif token=='undef': + m=re_mac.match(line) + if m and m.group(0)in self.defs: + self.defs.__delitem__(m.group(0)) + elif token=='pragma': + if re_pragma_once.match(line.lower()): + self.ban_includes.add(self.curfile) +def get_deps(node,env,nodepaths=[]): + gruik=c_parser(nodepaths) + gruik.start(node,env) + return(gruik.nodes,gruik.names) +re_inc=re.compile('^[ \t]*(#|%:)[ \t]*(include)[ \t]*(.*)\r*$',re.IGNORECASE|re.MULTILINE) +def lines_includes(filename): + code=Utils.readf(filename) + if use_trigraphs: + for(a,b)in trig_def:code=code.split(a).join(b) + code=re_nl.sub('',code) + code=re_cpp.sub(repl,code) + return[(m.group(2),m.group(3))for m in re.finditer(re_inc,code)] +def get_deps_simple(node,env,nodepaths=[],defines={}): + nodes=[] + names=[] + def find_deps(node): + lst=lines_includes(node.abspath(env)) + for(_,line)in lst: + (t,filename)=extract_include(line,defines) + if filename in names: + continue + if filename.endswith('.moc'): + names.append(filename) + found=None + for n in nodepaths: + if found: + break + found=n.find_resource(filename) + if not found: + if not filename in names: + names.append(filename) + elif not found in nodes: + nodes.append(found) + find_deps(node) + find_deps(node) + return(nodes,names) + +Utils.run_once(tokenize) +Utils.run_once(define_name) diff --git a/waf-modules/wafadmin/Tools/python.py b/waf-modules/wafadmin/Tools/python.py new file mode 100644 index 00000000..3ec444b2 --- /dev/null +++ b/waf-modules/wafadmin/Tools/python.py @@ -0,0 +1,278 @@ +#! /usr/bin/env python +# encoding: utf-8 + +import os,sys +import TaskGen,Utils,Utils,Runner,Options,Build +from Logs import debug,warn,info +from TaskGen import extension,taskgen,before,after,feature +from Configure import conf +EXT_PY=['.py'] +FRAG_2=''' +#include "Python.h" +#ifdef __cplusplus +extern "C" { +#endif + void Py_Initialize(void); + void Py_Finalize(void); +#ifdef __cplusplus +} +#endif +int main() +{ + Py_Initialize(); + Py_Finalize(); + return 0; +} +''' +def init_pyext(self): + self.default_install_path='${PYTHONDIR}' + self.uselib=self.to_list(getattr(self,'uselib','')) + if not'PYEXT'in self.uselib: + self.uselib.append('PYEXT') + self.env['MACBUNDLE']=True +def pyext_shlib_ext(self): + self.env['shlib_PATTERN']=self.env['pyext_PATTERN'] +def init_pyembed(self): + self.uselib=self.to_list(getattr(self,'uselib','')) + if not'PYEMBED'in self.uselib: + self.uselib.append('PYEMBED') +def process_py(self,node): + if not(self.bld.is_install and self.install_path): + return + def inst_py(ctx): + install_pyfile(self,node) + self.bld.add_post_fun(inst_py) +def install_pyfile(self,node): + path=self.bld.get_install_path(self.install_path+os.sep+node.name,self.env) + self.bld.install_files(self.install_path,[node],self.env,self.chmod,postpone=False) + if self.bld.is_install<0: + info("* removing byte compiled python files") + for x in'co': + try: + os.remove(path+x) + except OSError: + pass + if self.bld.is_install>0: + if self.env['PYC']or self.env['PYO']: + info("* byte compiling %r"%path) + if self.env['PYC']: + program=(""" +import sys, py_compile +for pyfile in sys.argv[1:]: + py_compile.compile(pyfile, pyfile + 'c') +""") + argv=[self.env['PYTHON'],'-c',program,path] + ret=Utils.pproc.Popen(argv).wait() + if ret: + raise Utils.WafError('bytecode compilation failed %r'%path) + if self.env['PYO']: + program=(""" +import sys, py_compile +for pyfile in sys.argv[1:]: + py_compile.compile(pyfile, pyfile + 'o') +""") + argv=[self.env['PYTHON'],self.env['PYFLAGS_OPT'],'-c',program,path] + ret=Utils.pproc.Popen(argv).wait() + if ret: + raise Utils.WafError('bytecode compilation failed %r'%path) +class py_taskgen(TaskGen.task_gen): + def __init__(self,*k,**kw): + TaskGen.task_gen.__init__(self,*k,**kw) +def init_py(self): + self.default_install_path='${PYTHONDIR}' +def _get_python_variables(python_exe,variables,imports=['import sys']): + program=list(imports) + program.append('') + for v in variables: + program.append("print(repr(%s))"%v) + os_env=dict(os.environ) + try: + del os_env['MACOSX_DEPLOYMENT_TARGET'] + except KeyError: + pass + proc=Utils.pproc.Popen([python_exe,"-c",'\n'.join(program)],stdout=Utils.pproc.PIPE,env=os_env) + output=proc.communicate()[0].split("\n") + if proc.returncode: + if Options.options.verbose: + warn("Python program to extract python configuration variables failed:\n%s"%'\n'.join(["line %03i: %s"%(lineno+1,line)for lineno,line in enumerate(program)])) + raise RuntimeError + return_values=[] + for s in output: + s=s.strip() + if not s: + continue + if s=='None': + return_values.append(None) + elif s[0]=="'"and s[-1]=="'": + return_values.append(s[1:-1]) + elif s[0].isdigit(): + return_values.append(int(s)) + else:break + return return_values +def check_python_headers(conf,mandatory=True): + if not conf.env['CC_NAME']and not conf.env['CXX_NAME']: + conf.fatal('load a compiler first (gcc, g++, ..)') + if not conf.env['PYTHON_VERSION']: + conf.check_python_version() + env=conf.env + python=env['PYTHON'] + if not python: + conf.fatal('could not find the python executable') + if Options.platform=='darwin': + conf.check_tool('osx') + try: + v='prefix SO SYSLIBS LDFLAGS SHLIBS LIBDIR LIBPL INCLUDEPY Py_ENABLE_SHARED MACOSX_DEPLOYMENT_TARGET'.split() + (python_prefix,python_SO,python_SYSLIBS,python_LDFLAGS,python_SHLIBS,python_LIBDIR,python_LIBPL,INCLUDEPY,Py_ENABLE_SHARED,python_MACOSX_DEPLOYMENT_TARGET)=_get_python_variables(python,["get_config_var('%s')"%x for x in v],['from distutils.sysconfig import get_config_var']) + except RuntimeError: + conf.fatal("Python development headers not found (-v for details).") + conf.log.write("""Configuration returned from %r: +python_prefix = %r +python_SO = %r +python_SYSLIBS = %r +python_LDFLAGS = %r +python_SHLIBS = %r +python_LIBDIR = %r +python_LIBPL = %r +INCLUDEPY = %r +Py_ENABLE_SHARED = %r +MACOSX_DEPLOYMENT_TARGET = %r +"""%(python,python_prefix,python_SO,python_SYSLIBS,python_LDFLAGS,python_SHLIBS,python_LIBDIR,python_LIBPL,INCLUDEPY,Py_ENABLE_SHARED,python_MACOSX_DEPLOYMENT_TARGET)) + if python_MACOSX_DEPLOYMENT_TARGET: + conf.env['MACOSX_DEPLOYMENT_TARGET']=python_MACOSX_DEPLOYMENT_TARGET + conf.environ['MACOSX_DEPLOYMENT_TARGET']=python_MACOSX_DEPLOYMENT_TARGET + env['pyext_PATTERN']='%s'+python_SO + if python_SYSLIBS is not None: + for lib in python_SYSLIBS.split(): + if lib.startswith('-l'): + lib=lib[2:] + env.append_value('LIB_PYEMBED',lib) + if python_SHLIBS is not None: + for lib in python_SHLIBS.split(): + if lib.startswith('-l'): + env.append_value('LIB_PYEMBED',lib[2:]) + else: + env.append_value('LINKFLAGS_PYEMBED',lib) + if Options.platform!='darwin'and python_LDFLAGS: + env.append_value('LINKFLAGS_PYEMBED',python_LDFLAGS.split()) + result=False + name='python'+env['PYTHON_VERSION'] + if python_LIBDIR is not None: + path=[python_LIBDIR] + conf.log.write("\n\n# Trying LIBDIR: %r\n"%path) + result=conf.check(lib=name,uselib='PYEMBED',libpath=path) + if not result and python_LIBPL is not None: + conf.log.write("\n\n# try again with -L$python_LIBPL (some systems don't install the python library in $prefix/lib)\n") + path=[python_LIBPL] + result=conf.check(lib=name,uselib='PYEMBED',libpath=path) + if not result: + conf.log.write("\n\n# try again with -L$prefix/libs, and pythonXY name rather than pythonX.Y (win32)\n") + path=[os.path.join(python_prefix,"libs")] + name='python'+env['PYTHON_VERSION'].replace('.','') + result=conf.check(lib=name,uselib='PYEMBED',libpath=path) + if result: + env['LIBPATH_PYEMBED']=path + env.append_value('LIB_PYEMBED',name) + else: + conf.log.write("\n\n### LIB NOT FOUND\n") + if(sys.platform=='win32'or sys.platform.startswith('os2')or sys.platform=='darwin'or Py_ENABLE_SHARED): + env['LIBPATH_PYEXT']=env['LIBPATH_PYEMBED'] + env['LIB_PYEXT']=env['LIB_PYEMBED'] + python_config=conf.find_program('python%s-config'%('.'.join(env['PYTHON_VERSION'].split('.')[:2])),var='PYTHON_CONFIG') + if not python_config: + python_config=conf.find_program('python-config-%s'%('.'.join(env['PYTHON_VERSION'].split('.')[:2])),var='PYTHON_CONFIG') + includes=[] + if python_config: + for incstr in Utils.cmd_output("%s %s --includes"%(python,python_config)).strip().split(): + if(incstr.startswith('-I')or incstr.startswith('/I')): + incstr=incstr[2:] + if incstr not in includes: + includes.append(incstr) + conf.log.write("Include path for Python extensions ""(found via python-config --includes): %r\n"%(includes,)) + env['CPPPATH_PYEXT']=includes + env['CPPPATH_PYEMBED']=includes + else: + conf.log.write("Include path for Python extensions ""(found via distutils module): %r\n"%(INCLUDEPY,)) + env['CPPPATH_PYEXT']=[INCLUDEPY] + env['CPPPATH_PYEMBED']=[INCLUDEPY] + if env['CC_NAME']=='gcc': + env.append_value('CCFLAGS_PYEMBED','-fno-strict-aliasing') + env.append_value('CCFLAGS_PYEXT','-fno-strict-aliasing') + if env['CXX_NAME']=='gcc': + env.append_value('CXXFLAGS_PYEMBED','-fno-strict-aliasing') + env.append_value('CXXFLAGS_PYEXT','-fno-strict-aliasing') + conf.check(define_name='HAVE_PYTHON_H',uselib='PYEMBED',fragment=FRAG_2,errmsg='Could not find the python development headers',mandatory=mandatory) +def check_python_version(conf,minver=None): + assert minver is None or isinstance(minver,tuple) + python=conf.env['PYTHON'] + if not python: + conf.fatal('could not find the python executable') + cmd=[python,"-c","import sys\nfor x in sys.version_info: print(str(x))"] + debug('python: Running python command %r'%cmd) + proc=Utils.pproc.Popen(cmd,stdout=Utils.pproc.PIPE) + lines=proc.communicate()[0].split() + assert len(lines)==5,"found %i lines, expected 5: %r"%(len(lines),lines) + pyver_tuple=(int(lines[0]),int(lines[1]),int(lines[2]),lines[3],int(lines[4])) + result=(minver is None)or(pyver_tuple>=minver) + if result: + pyver='.'.join([str(x)for x in pyver_tuple[:2]]) + conf.env['PYTHON_VERSION']=pyver + if'PYTHONDIR'in conf.environ: + pydir=conf.environ['PYTHONDIR'] + else: + if sys.platform=='win32': + (python_LIBDEST,pydir)=_get_python_variables(python,["get_config_var('LIBDEST')","get_python_lib(standard_lib=0, prefix=%r)"%conf.env['PREFIX']],['from distutils.sysconfig import get_config_var, get_python_lib']) + else: + python_LIBDEST=None + (pydir,)=_get_python_variables(python,["get_python_lib(standard_lib=0, prefix=%r)"%conf.env['PREFIX']],['from distutils.sysconfig import get_config_var, get_python_lib']) + if python_LIBDEST is None: + if conf.env['LIBDIR']: + python_LIBDEST=os.path.join(conf.env['LIBDIR'],"python"+pyver) + else: + python_LIBDEST=os.path.join(conf.env['PREFIX'],"lib","python"+pyver) + if hasattr(conf,'define'): + conf.define('PYTHONDIR',pydir) + conf.env['PYTHONDIR']=pydir + pyver_full='.'.join(map(str,pyver_tuple[:3])) + if minver is None: + conf.check_message_custom('Python version','',pyver_full) + else: + minver_str='.'.join(map(str,minver)) + conf.check_message('Python version',">= %s"%minver_str,result,option=pyver_full) + if not result: + conf.fatal('The python version is too old (%r)'%pyver_full) +def check_python_module(conf,module_name): + result=not Utils.pproc.Popen([conf.env['PYTHON'],"-c","import %s"%module_name],stderr=Utils.pproc.PIPE,stdout=Utils.pproc.PIPE).wait() + conf.check_message('Python module',module_name,result) + if not result: + conf.fatal('Could not find the python module %r'%module_name) +def detect(conf): + if not conf.env.PYTHON: + conf.env.PYTHON=sys.executable + python=conf.find_program('python',var='PYTHON') + if not python: + conf.fatal('Could not find the path of the python executable') + v=conf.env + v['PYCMD']='"import sys, py_compile;py_compile.compile(sys.argv[1], sys.argv[2])"' + v['PYFLAGS']='' + v['PYFLAGS_OPT']='-O' + v['PYC']=getattr(Options.options,'pyc',1) + v['PYO']=getattr(Options.options,'pyo',1) +def set_options(opt): + opt.add_option('--nopyc',action='store_false',default=1,help='Do not install bytecode compiled .pyc files (configuration) [Default:install]',dest='pyc') + opt.add_option('--nopyo',action='store_false',default=1,help='Do not install optimised compiled .pyo files (configuration) [Default:install]',dest='pyo') + +before('apply_incpaths','apply_lib_vars','apply_type_vars')(init_pyext) +feature('pyext')(init_pyext) +before('apply_bundle')(init_pyext) +before('apply_link','apply_lib_vars','apply_type_vars')(pyext_shlib_ext) +after('apply_bundle')(pyext_shlib_ext) +feature('pyext')(pyext_shlib_ext) +before('apply_incpaths','apply_lib_vars','apply_type_vars')(init_pyembed) +feature('pyembed')(init_pyembed) +extension(EXT_PY)(process_py) +before('apply_core')(init_py) +after('vars_target_cprogram','vars_target_cshlib')(init_py) +feature('py')(init_py) +conf(check_python_headers) +conf(check_python_version) +conf(check_python_module) diff --git a/waf-modules/wafadmin/Tools/qt4.py b/waf-modules/wafadmin/Tools/qt4.py new file mode 100644 index 00000000..4ebe0e0b --- /dev/null +++ b/waf-modules/wafadmin/Tools/qt4.py @@ -0,0 +1,376 @@ +#! /usr/bin/env python +# encoding: utf-8 + +try: + from xml.sax import make_parser + from xml.sax.handler import ContentHandler +except ImportError: + has_xml=False + ContentHandler=object +else: + has_xml=True +import os,sys +import ccroot,cxx +import TaskGen,Task,Utils,Runner,Options,Node,Configure +from TaskGen import taskgen,feature,after,extension +from Logs import error +from Constants import* +MOC_H=['.h','.hpp','.hxx','.hh'] +EXT_RCC=['.qrc'] +EXT_UI=['.ui'] +EXT_QT4=['.cpp','.cc','.cxx','.C'] +class qxx_task(Task.Task): + before=['cxx_link','static_link'] + def __init__(self,*k,**kw): + Task.Task.__init__(self,*k,**kw) + self.moc_done=0 + def scan(self): + (nodes,names)=ccroot.scan(self) + for x in nodes: + if x.name.endswith('.moc'): + nodes.remove(x) + names.append(x.relpath_gen(self.inputs[0].parent)) + return(nodes,names) + def runnable_status(self): + if self.moc_done: + for t in self.run_after: + if not t.hasrun: + return ASK_LATER + self.signature() + return Task.Task.runnable_status(self) + else: + for t in self.run_after: + if not t.hasrun: + return ASK_LATER + self.add_moc_tasks() + return ASK_LATER + def add_moc_tasks(self): + node=self.inputs[0] + tree=node.__class__.bld + try: + self.signature() + except KeyError: + pass + else: + delattr(self,'cache_sig') + moctasks=[] + mocfiles=[] + variant=node.variant(self.env) + try: + tmp_lst=tree.raw_deps[self.unique_id()] + tree.raw_deps[self.unique_id()]=[] + except KeyError: + tmp_lst=[] + for d in tmp_lst: + if not d.endswith('.moc'):continue + if d in mocfiles: + error("paranoia owns") + continue + mocfiles.append(d) + base2=d[:-4] + for path in[node.parent]+self.generator.env['INC_PATHS']: + tree.rescan(path) + vals=getattr(Options.options,'qt_header_ext','')or MOC_H + for ex in vals: + h_node=path.find_resource(base2+ex) + if h_node: + break + else: + continue + break + else: + raise Utils.WafError("no header found for %s which is a moc file"%str(d)) + m_node=h_node.change_ext('.moc') + tree.node_deps[(self.inputs[0].parent.id,self.env.variant(),m_node.name)]=h_node + task=Task.TaskBase.classes['moc'](self.env,normal=0) + task.set_inputs(h_node) + task.set_outputs(m_node) + generator=tree.generator + generator.outstanding.insert(0,task) + generator.total+=1 + moctasks.append(task) + tmp_lst=tree.raw_deps[self.unique_id()]=mocfiles + lst=tree.node_deps.get(self.unique_id(),()) + for d in lst: + name=d.name + if name.endswith('.moc'): + task=Task.TaskBase.classes['moc'](self.env,normal=0) + task.set_inputs(tree.node_deps[(self.inputs[0].parent.id,self.env.variant(),name)]) + task.set_outputs(d) + generator=tree.generator + generator.outstanding.insert(0,task) + generator.total+=1 + moctasks.append(task) + self.run_after=moctasks + self.moc_done=1 + run=Task.TaskBase.classes['cxx'].__dict__['run'] +def translation_update(task): + outs=[a.abspath(task.env)for a in task.outputs] + outs=" ".join(outs) + lupdate=task.env['QT_LUPDATE'] + for x in task.inputs: + file=x.abspath(task.env) + cmd="%s %s -ts %s"%(lupdate,file,outs) + Utils.pprint('BLUE',cmd) + task.generator.bld.exec_command(cmd) +class XMLHandler(ContentHandler): + def __init__(self): + self.buf=[] + self.files=[] + def startElement(self,name,attrs): + if name=='file': + self.buf=[] + def endElement(self,name): + if name=='file': + self.files.append(''.join(self.buf)) + def characters(self,cars): + self.buf.append(cars) +def scan(self): + node=self.inputs[0] + parser=make_parser() + curHandler=XMLHandler() + parser.setContentHandler(curHandler) + fi=open(self.inputs[0].abspath(self.env)) + parser.parse(fi) + fi.close() + nodes=[] + names=[] + root=self.inputs[0].parent + for x in curHandler.files: + nd=root.find_resource(x) + if nd:nodes.append(nd) + else:names.append(x) + return(nodes,names) +def create_rcc_task(self,node): + rcnode=node.change_ext('_rc.cpp') + rcctask=self.create_task('rcc',node,rcnode) + cpptask=self.create_task('cxx',rcnode,rcnode.change_ext('.o')) + self.compiled_tasks.append(cpptask) + return cpptask +def create_uic_task(self,node): + uictask=self.create_task('ui4',node) + uictask.outputs=[self.path.find_or_declare(self.env['ui_PATTERN']%node.name[:-3])] + return uictask +class qt4_taskgen(cxx.cxx_taskgen): + def __init__(self,*k,**kw): + cxx.cxx_taskgen.__init__(self,*k,**kw) + self.features.append('qt4') +def add_lang(self,node): + self.lang=self.to_list(getattr(self,'lang',[]))+[node] +def apply_qt4(self): + if getattr(self,'lang',None): + update=getattr(self,'update',None) + lst=[] + trans=[] + for l in self.to_list(self.lang): + if not isinstance(l,Node.Node): + l=self.path.find_resource(l+'.ts') + t=self.create_task('ts2qm',l,l.change_ext('.qm')) + lst.append(t.outputs[0]) + if update: + trans.append(t.inputs[0]) + trans_qt4=getattr(Options.options,'trans_qt4',False) + if update and trans_qt4: + u=Task.TaskCmd(translation_update,self.env,2) + u.inputs=[a.inputs[0]for a in self.compiled_tasks] + u.outputs=trans + if getattr(self,'langname',None): + t=Task.TaskBase.classes['qm2rcc'](self.env) + t.set_inputs(lst) + t.set_outputs(self.path.find_or_declare(self.langname+'.qrc')) + t.path=self.path + k=create_rcc_task(self,t.outputs[0]) + self.link_task.inputs.append(k.outputs[0]) + self.env.append_value('MOC_FLAGS',self.env._CXXDEFFLAGS) + self.env.append_value('MOC_FLAGS',self.env._CXXINCFLAGS) +def cxx_hook(self,node): + try:obj_ext=self.obj_ext + except AttributeError:obj_ext='_%d.o'%self.idx + task=self.create_task('qxx',node,node.change_ext(obj_ext)) + self.compiled_tasks.append(task) + return task +def process_qm2rcc(task): + outfile=task.outputs[0].abspath(task.env) + f=open(outfile,'w') + f.write('\n\n') + for k in task.inputs: + f.write(' ') + f.write(k.path_to_parent(task.path)) + f.write('\n') + f.write('\n') + f.close() +b=Task.simple_task_type +b('moc','${QT_MOC} ${MOC_FLAGS} ${SRC} ${MOC_ST} ${TGT}',color='BLUE',vars=['QT_MOC','MOC_FLAGS'],shell=False) +cls=b('rcc','${QT_RCC} -name ${SRC[0].name} ${SRC[0].abspath(env)} ${RCC_ST} -o ${TGT}',color='BLUE',before='cxx moc qxx_task',after="qm2rcc",shell=False) +cls.scan=scan +b('ui4','${QT_UIC} ${SRC} -o ${TGT}',color='BLUE',before='cxx moc qxx_task',shell=False) +b('ts2qm','${QT_LRELEASE} ${QT_LRELEASE_FLAGS} ${SRC} -qm ${TGT}',color='BLUE',before='qm2rcc',shell=False) +Task.task_type_from_func('qm2rcc',vars=[],func=process_qm2rcc,color='BLUE',before='rcc',after='ts2qm') +def detect_qt4(conf): + env=conf.env + opt=Options.options + qtdir=getattr(opt,'qtdir','') + qtbin=getattr(opt,'qtbin','') + qtlibs=getattr(opt,'qtlibs','') + useframework=getattr(opt,'use_qt4_osxframework',True) + paths=[] + if qtbin: + paths=[qtbin] + if not qtdir: + qtdir=conf.environ.get('QT4_ROOT','') + qtbin=os.path.join(qtdir,'bin') + paths=[qtbin] + if not qtdir: + paths=os.environ.get('PATH','').split(os.pathsep) + paths.append('/usr/share/qt4/bin/') + try: + lst=os.listdir('/usr/local/Trolltech/') + except OSError: + pass + else: + if lst: + lst.sort() + lst.reverse() + qtdir='/usr/local/Trolltech/%s/'%lst[0] + qtbin=os.path.join(qtdir,'bin') + paths.append(qtbin) + cand=None + prev_ver=['4','0','0'] + for qmk in['qmake-qt4','qmake4','qmake']: + qmake=conf.find_program(qmk,path_list=paths) + if qmake: + try: + version=Utils.cmd_output([qmake,'-query','QT_VERSION']).strip() + except ValueError: + pass + else: + if version: + new_ver=version.split('.') + if new_ver>prev_ver: + cand=qmake + prev_ver=new_ver + if cand: + qmake=cand + else: + conf.fatal('could not find qmake for qt4') + conf.env.QMAKE=qmake + qtincludes=Utils.cmd_output([qmake,'-query','QT_INSTALL_HEADERS']).strip() + qtdir=Utils.cmd_output([qmake,'-query','QT_INSTALL_PREFIX']).strip()+os.sep + qtbin=Utils.cmd_output([qmake,'-query','QT_INSTALL_BINS']).strip()+os.sep + if not qtlibs: + try: + qtlibs=Utils.cmd_output([qmake,'-query','QT_INSTALL_LIBS']).strip()+os.sep + except ValueError: + qtlibs=os.path.join(qtdir,'lib') + def find_bin(lst,var): + for f in lst: + ret=conf.find_program(f,path_list=paths) + if ret: + env[var]=ret + break + vars="QtCore QtGui QtUiTools QtNetwork QtOpenGL QtSql QtSvg QtTest QtXml QtWebKit Qt3Support".split() + find_bin(['uic-qt3','uic3'],'QT_UIC3') + find_bin(['uic-qt4','uic'],'QT_UIC') + if not env['QT_UIC']: + conf.fatal('cannot find the uic compiler for qt4') + try: + version=Utils.cmd_output(env['QT_UIC']+" -version 2>&1").strip() + except ValueError: + conf.fatal('your uic compiler is for qt3, add uic for qt4 to your path') + version=version.replace('Qt User Interface Compiler ','') + version=version.replace('User Interface Compiler for Qt','') + if version.find(" 3.")!=-1: + conf.check_message('uic version','(too old)',0,option='(%s)'%version) + sys.exit(1) + conf.check_message('uic version','',1,option='(%s)'%version) + find_bin(['moc-qt4','moc'],'QT_MOC') + find_bin(['rcc'],'QT_RCC') + find_bin(['lrelease-qt4','lrelease'],'QT_LRELEASE') + find_bin(['lupdate-qt4','lupdate'],'QT_LUPDATE') + env['UIC3_ST']='%s -o %s' + env['UIC_ST']='%s -o %s' + env['MOC_ST']='-o' + env['ui_PATTERN']='ui_%s.h' + env['QT_LRELEASE_FLAGS']=['-silent'] + vars_debug=[a+'_debug'for a in vars] + try: + conf.find_program('pkg-config',var='pkgconfig',path_list=paths,mandatory=True) + except Configure.ConfigurationError: + for lib in vars_debug+vars: + uselib=lib.upper() + d=(lib.find('_debug')>0)and'd'or'' + for(pat,kind)in((conf.env.staticlib_PATTERN,'STATIC'),(conf.env.shlib_PATTERN,'')): + conf.check_message_1('Checking for %s %s'%(lib,kind)) + for ext in['','4']: + path=os.path.join(qtlibs,pat%(lib+d+ext)) + if os.path.exists(path): + env.append_unique(kind+'LIB_'+uselib,lib+d+ext) + conf.check_message_2('ok '+path,'GREEN') + break + path=os.path.join(qtbin,pat%(lib+d+ext)) + if os.path.exists(path): + env.append_unique(kind+'LIB_'+uselib,lib+d+ext) + conf.check_message_2('ok '+path,'GREEN') + break + else: + conf.check_message_2('not found','YELLOW') + continue + break + env.append_unique('LIBPATH_'+uselib,qtlibs) + env.append_unique('CPPPATH_'+uselib,qtincludes) + env.append_unique('CPPPATH_'+uselib,qtincludes+os.sep+lib) + else: + for i in vars_debug+vars: + try: + conf.check_cfg(package=i,args='--cflags --libs --silence-errors',path=conf.env.pkgconfig) + except ValueError: + pass + def process_lib(vars_,coreval): + for d in vars_: + var=d.upper() + if var=='QTCORE':continue + value=env['LIBPATH_'+var] + if value: + core=env[coreval] + accu=[] + for lib in value: + if lib in core:continue + accu.append(lib) + env['LIBPATH_'+var]=accu + process_lib(vars,'LIBPATH_QTCORE') + process_lib(vars_debug,'LIBPATH_QTCORE_DEBUG') + want_rpath=getattr(Options.options,'want_rpath',1) + if want_rpath: + def process_rpath(vars_,coreval): + for d in vars_: + var=d.upper() + value=env['LIBPATH_'+var] + if value: + core=env[coreval] + accu=[] + for lib in value: + if var!='QTCORE': + if lib in core: + continue + accu.append('-Wl,--rpath='+lib) + env['RPATH_'+var]=accu + process_rpath(vars,'LIBPATH_QTCORE') + process_rpath(vars_debug,'LIBPATH_QTCORE_DEBUG') + env['QTLOCALE']=str(env['PREFIX'])+'/share/locale' +def detect(conf): + detect_qt4(conf) +def set_options(opt): + opt.add_option('--want-rpath',type='int',default=1,dest='want_rpath',help='set rpath to 1 or 0 [Default 1]') + opt.add_option('--header-ext',type='string',default='',help='header extension for moc files',dest='qt_header_ext') + for i in'qtdir qtbin qtlibs'.split(): + opt.add_option('--'+i,type='string',default='',dest=i) + if sys.platform=="darwin": + opt.add_option('--no-qt4-framework',action="store_false",help='do not use the framework version of Qt4 in OS X',dest='use_qt4_osxframework',default=True) + opt.add_option('--translate',action="store_true",help="collect translation strings",dest="trans_qt4",default=False) + +extension(EXT_RCC)(create_rcc_task) +extension(EXT_UI)(create_uic_task) +extension('.ts')(add_lang) +feature('qt4')(apply_qt4) +after('apply_link')(apply_qt4) +extension(EXT_QT4)(cxx_hook) diff --git a/waf-modules/wafadmin/Tools/ruby.py b/waf-modules/wafadmin/Tools/ruby.py new file mode 100644 index 00000000..56fd0880 --- /dev/null +++ b/waf-modules/wafadmin/Tools/ruby.py @@ -0,0 +1,88 @@ +#! /usr/bin/env python +# encoding: utf-8 + +import os +import Task,Options,Utils +from TaskGen import before,feature,after +from Configure import conf +def init_rubyext(self): + self.default_install_path='${ARCHDIR_RUBY}' + self.uselib=self.to_list(getattr(self,'uselib','')) + if not'RUBY'in self.uselib: + self.uselib.append('RUBY') + if not'RUBYEXT'in self.uselib: + self.uselib.append('RUBYEXT') +def apply_ruby_so_name(self): + self.env['shlib_PATTERN']=self.env['rubyext_PATTERN'] +def check_ruby_version(conf,minver=()): + if Options.options.rubybinary: + conf.env.RUBY=Options.options.rubybinary + else: + conf.find_program("ruby",var="RUBY",mandatory=True) + ruby=conf.env.RUBY + try: + version=Utils.cmd_output([ruby,'-e','puts defined?(VERSION) ? VERSION : RUBY_VERSION']).strip() + except: + conf.fatal('could not determine ruby version') + conf.env.RUBY_VERSION=version + try: + ver=tuple(map(int,version.split("."))) + except: + conf.fatal('unsupported ruby version %r'%version) + cver='' + if minver: + if ver=(1,9,0): + ruby_hdrdir=read_config('rubyhdrdir') + cpppath+=ruby_hdrdir + cpppath+=[os.path.join(ruby_hdrdir[0],read_config('arch')[0])] + conf.check(header_name='ruby.h',includes=cpppath,mandatory=True,errmsg='could not find ruby header file') + conf.env.LIBPATH_RUBYEXT=read_config('libdir') + conf.env.LIBPATH_RUBYEXT+=archdir + conf.env.CPPPATH_RUBYEXT=cpppath + conf.env.CCFLAGS_RUBYEXT=read_config("CCDLFLAGS") + conf.env.rubyext_PATTERN='%s.'+read_config('DLEXT')[0] + flags=read_config('LDSHARED') + while flags and flags[0][0]!='-': + flags=flags[1:] + if len(flags)>1 and flags[1]=="ppc": + flags=flags[2:] + conf.env.LINKFLAGS_RUBYEXT=flags + conf.env.LINKFLAGS_RUBYEXT+=read_config("LIBS") + conf.env.LINKFLAGS_RUBYEXT+=read_config("LIBRUBYARG_SHARED") + if Options.options.rubyarchdir: + conf.env.ARCHDIR_RUBY=Options.options.rubyarchdir + else: + conf.env.ARCHDIR_RUBY=read_config('sitearchdir')[0] + if Options.options.rubylibdir: + conf.env.LIBDIR_RUBY=Options.options.rubylibdir + else: + conf.env.LIBDIR_RUBY=read_config('sitelibdir')[0] +def set_options(opt): + opt.add_option('--with-ruby-archdir',type='string',dest='rubyarchdir',help='Specify directory where to install arch specific files') + opt.add_option('--with-ruby-libdir',type='string',dest='rubylibdir',help='Specify alternate ruby library path') + opt.add_option('--with-ruby-binary',type='string',dest='rubybinary',help='Specify alternate ruby binary') + +feature('rubyext')(init_rubyext) +before('apply_incpaths','apply_type_vars','apply_lib_vars','apply_bundle')(init_rubyext) +after('default_cc','vars_target_cshlib')(init_rubyext) +feature('rubyext')(apply_ruby_so_name) +before('apply_link')(apply_ruby_so_name) +conf(check_ruby_version) +conf(check_ruby_ext_devel) diff --git a/waf-modules/wafadmin/Tools/suncc.py b/waf-modules/wafadmin/Tools/suncc.py new file mode 100644 index 00000000..ef043480 --- /dev/null +++ b/waf-modules/wafadmin/Tools/suncc.py @@ -0,0 +1,56 @@ +#! /usr/bin/env python +# encoding: utf-8 + +import os,optparse +import Utils,Options,Configure +import ccroot,ar +from Configure import conftest +def find_scc(conf): + v=conf.env + cc=None + if v['CC']:cc=v['CC'] + elif'CC'in conf.environ:cc=conf.environ['CC'] + if not cc:cc=conf.find_program('cc',var='CC') + if not cc:conf.fatal('suncc was not found') + cc=conf.cmd_to_list(cc) + try: + if not Utils.cmd_output(cc+['-flags']): + conf.fatal('suncc %r was not found'%cc) + except ValueError: + conf.fatal('suncc -flags could not be executed') + v['CC']=cc + v['CC_NAME']='sun' +def scc_common_flags(conf): + v=conf.env + v['CC_SRC_F']='' + v['CC_TGT_F']=['-c','-o',''] + v['CPPPATH_ST']='-I%s' + if not v['LINK_CC']:v['LINK_CC']=v['CC'] + v['CCLNK_SRC_F']='' + v['CCLNK_TGT_F']=['-o',''] + v['LIB_ST']='-l%s' + v['LIBPATH_ST']='-L%s' + v['STATICLIB_ST']='-l%s' + v['STATICLIBPATH_ST']='-L%s' + v['CCDEFINES_ST']='-D%s' + v['SONAME_ST']='-Wl,-h -Wl,%s' + v['SHLIB_MARKER']='-Bdynamic' + v['STATICLIB_MARKER']='-Bstatic' + v['program_PATTERN']='%s' + v['shlib_CCFLAGS']=['-Kpic','-DPIC'] + v['shlib_LINKFLAGS']=['-G'] + v['shlib_PATTERN']='lib%s.so' + v['staticlib_LINKFLAGS']=['-Bstatic'] + v['staticlib_PATTERN']='lib%s.a' +detect=''' +find_scc +find_cpp +find_ar +scc_common_flags +cc_load_tools +cc_add_flags +link_add_flags +''' + +conftest(find_scc) +conftest(scc_common_flags) diff --git a/waf-modules/wafadmin/Tools/suncxx.py b/waf-modules/wafadmin/Tools/suncxx.py new file mode 100644 index 00000000..b520bf9f --- /dev/null +++ b/waf-modules/wafadmin/Tools/suncxx.py @@ -0,0 +1,56 @@ +#! /usr/bin/env python +# encoding: utf-8 + +import os,optparse +import Utils,Options,Configure +import ccroot,ar +from Configure import conftest +def find_sxx(conf): + v=conf.env + cc=None + if v['CXX']:cc=v['CXX'] + elif'CXX'in conf.environ:cc=conf.environ['CXX'] + if not cc:cc=conf.find_program('c++',var='CXX') + if not cc:conf.fatal('sunc++ was not found') + cc=conf.cmd_to_list(cc) + try: + if not Utils.cmd_output(cc+['-flags']): + conf.fatal('sunc++ %r was not found'%cc) + except ValueError: + conf.fatal('sunc++ -flags could not be executed') + v['CXX']=cc + v['CXX_NAME']='sun' +def sxx_common_flags(conf): + v=conf.env + v['CXX_SRC_F']='' + v['CXX_TGT_F']=['-c','-o',''] + v['CPPPATH_ST']='-I%s' + if not v['LINK_CXX']:v['LINK_CXX']=v['CXX'] + v['CXXLNK_SRC_F']='' + v['CXXLNK_TGT_F']=['-o',''] + v['LIB_ST']='-l%s' + v['LIBPATH_ST']='-L%s' + v['STATICLIB_ST']='-l%s' + v['STATICLIBPATH_ST']='-L%s' + v['CXXDEFINES_ST']='-D%s' + v['SONAME_ST']='-Wl,-h -Wl,%s' + v['SHLIB_MARKER']='-Bdynamic' + v['STATICLIB_MARKER']='-Bstatic' + v['program_PATTERN']='%s' + v['shlib_CXXFLAGS']=['-Kpic','-DPIC'] + v['shlib_LINKFLAGS']=['-G'] + v['shlib_PATTERN']='lib%s.so' + v['staticlib_LINKFLAGS']=['-Bstatic'] + v['staticlib_PATTERN']='lib%s.a' +detect=''' +find_sxx +find_cpp +find_ar +sxx_common_flags +cxx_load_tools +cxx_add_flags +link_add_flags +''' + +conftest(find_sxx) +conftest(sxx_common_flags) diff --git a/waf-modules/wafadmin/Tools/tex.py b/waf-modules/wafadmin/Tools/tex.py new file mode 100644 index 00000000..68d8047a --- /dev/null +++ b/waf-modules/wafadmin/Tools/tex.py @@ -0,0 +1,183 @@ +#! /usr/bin/env python +# encoding: utf-8 + +import os,re +import Utils,TaskGen,Task,Runner,Build +from TaskGen import feature,before +from Logs import error,warn,debug +re_tex=re.compile(r'\\(?Pinclude|input|import|bringin|lstinputlisting){(?P[^{}]*)}',re.M) +def scan(self): + node=self.inputs[0] + env=self.env + nodes=[] + names=[] + if not node:return(nodes,names) + code=Utils.readf(node.abspath(env)) + curdirnode=self.curdirnode + abs=curdirnode.abspath() + for match in re_tex.finditer(code): + path=match.group('file') + if path: + for k in['','.tex','.ltx']: + debug('tex: trying %s%s'%(path,k)) + try: + os.stat(abs+os.sep+path+k) + except OSError: + continue + found=path+k + node=curdirnode.find_resource(found) + if node: + nodes.append(node) + else: + debug('tex: could not find %s'%path) + names.append(path) + debug("tex: found the following : %s and names %s"%(nodes,names)) + return(nodes,names) +latex_fun,_=Task.compile_fun('latex','${LATEX} ${LATEXFLAGS} ${SRCFILE}',shell=False) +pdflatex_fun,_=Task.compile_fun('pdflatex','${PDFLATEX} ${PDFLATEXFLAGS} ${SRCFILE}',shell=False) +bibtex_fun,_=Task.compile_fun('bibtex','${BIBTEX} ${BIBTEXFLAGS} ${SRCFILE}',shell=False) +makeindex_fun,_=Task.compile_fun('bibtex','${MAKEINDEX} ${MAKEINDEXFLAGS} ${SRCFILE}',shell=False) +g_bibtex_re=re.compile('bibdata',re.M) +def tex_build(task,command='LATEX'): + env=task.env + bld=task.generator.bld + if not env['PROMPT_LATEX']: + env.append_value('LATEXFLAGS','-interaction=batchmode') + env.append_value('PDFLATEXFLAGS','-interaction=batchmode') + fun=latex_fun + if command=='PDFLATEX': + fun=pdflatex_fun + node=task.inputs[0] + reldir=node.bld_dir(env) + srcfile=node.abspath(env) + sr2=node.parent.abspath()+os.pathsep+node.parent.abspath(env)+os.pathsep + aux_node=node.change_ext('.aux') + idx_node=node.change_ext('.idx') + nm=aux_node.name + docuname=nm[:len(nm)-4] + task.cwd=task.inputs[0].parent.abspath(task.env) + warn('first pass on %s'%command) + task.env.env={'TEXINPUTS':sr2} + task.env.SRCFILE=srcfile + ret=fun(task) + if ret: + return ret + try: + ct=Utils.readf(aux_node.abspath(env)) + except(OSError,IOError): + error('error bibtex scan') + else: + fo=g_bibtex_re.findall(ct) + if fo: + warn('calling bibtex') + task.env.env={'BIBINPUTS':sr2,'BSTINPUTS':sr2} + task.env.SRCFILE=docuname + ret=bibtex_fun(task) + if ret: + error('error when calling bibtex %s'%docuname) + return ret + try: + idx_path=idx_node.abspath(env) + os.stat(idx_path) + except OSError: + error('error file.idx scan') + else: + warn('calling makeindex') + task.env.SRCFILE=idx_node.name + task.env.env={} + ret=makeindex_fun(task) + if ret: + error('error when calling makeindex %s'%idx_path) + return ret + hash='' + i=0 + while i<10: + i+=1 + prev_hash=hash + try: + hash=Utils.h_file(aux_node.abspath(env)) + except KeyError: + error('could not read aux.h -> %s'%aux_node.abspath(env)) + pass + if hash and hash==prev_hash: + break + warn('calling %s'%command) + task.env.env={'TEXINPUTS':sr2+os.pathsep} + task.env.SRCFILE=srcfile + ret=fun(task) + if ret: + error('error when calling %s %s'%(command,latex_compile_cmd)) + return ret + return None +latex_vardeps=['LATEX','LATEXFLAGS'] +def latex_build(task): + return tex_build(task,'LATEX') +pdflatex_vardeps=['PDFLATEX','PDFLATEXFLAGS'] +def pdflatex_build(task): + return tex_build(task,'PDFLATEX') +class tex_taskgen(TaskGen.task_gen): + def __init__(self,*k,**kw): + TaskGen.task_gen.__init__(self,*k,**kw) +def apply_tex(self): + if not getattr(self,'type',None)in['latex','pdflatex']: + self.type='pdflatex' + tree=self.bld + outs=Utils.to_list(getattr(self,'outs',[])) + self.env['PROMPT_LATEX']=getattr(self,'prompt',1) + deps_lst=[] + if getattr(self,'deps',None): + deps=self.to_list(self.deps) + for filename in deps: + n=self.path.find_resource(filename) + if not n in deps_lst:deps_lst.append(n) + self.source=self.to_list(self.source) + for filename in self.source: + base,ext=os.path.splitext(filename) + node=self.path.find_resource(filename) + if not node:raise Utils.WafError('cannot find %s'%filename) + if self.type=='latex': + task=self.create_task('latex',node,node.change_ext('.dvi')) + elif self.type=='pdflatex': + task=self.create_task('pdflatex',node,node.change_ext('.pdf')) + task.env=self.env + task.curdirnode=self.path + if deps_lst: + variant=node.variant(self.env) + try: + lst=tree.node_deps[task.unique_id()] + for n in deps_lst: + if not n in lst: + lst.append(n) + except KeyError: + tree.node_deps[task.unique_id()]=deps_lst + if self.type=='latex': + if'ps'in outs: + tsk=self.create_task('dvips',task.outputs,node.change_ext('.ps')) + tsk.env.env={'TEXINPUTS':node.parent.abspath()+os.pathsep+self.path.abspath()+os.pathsep+self.path.abspath(self.env)} + if'pdf'in outs: + tsk=self.create_task('dvipdf',task.outputs,node.change_ext('.pdf')) + tsk.env.env={'TEXINPUTS':node.parent.abspath()+os.pathsep+self.path.abspath()+os.pathsep+self.path.abspath(self.env)} + elif self.type=='pdflatex': + if'ps'in outs: + self.create_task('pdf2ps',task.outputs,node.change_ext('.ps')) + self.source=[] +def detect(conf): + v=conf.env + for p in'tex latex pdflatex bibtex dvips dvipdf ps2pdf makeindex pdf2ps'.split(): + conf.find_program(p,var=p.upper()) + v[p.upper()+'FLAGS']='' + v['DVIPSFLAGS']='-Ppdf' +b=Task.simple_task_type +b('tex','${TEX} ${TEXFLAGS} ${SRC}',color='BLUE',shell=False) +b('bibtex','${BIBTEX} ${BIBTEXFLAGS} ${SRC}',color='BLUE',shell=False) +b('dvips','${DVIPS} ${DVIPSFLAGS} ${SRC} -o ${TGT}',color='BLUE',after="latex pdflatex tex bibtex",shell=False) +b('dvipdf','${DVIPDF} ${DVIPDFFLAGS} ${SRC} ${TGT}',color='BLUE',after="latex pdflatex tex bibtex",shell=False) +b('pdf2ps','${PDF2PS} ${PDF2PSFLAGS} ${SRC} ${TGT}',color='BLUE',after="dvipdf pdflatex",shell=False) +b=Task.task_type_from_func +cls=b('latex',latex_build,vars=latex_vardeps) +cls.scan=scan +cls=b('pdflatex',pdflatex_build,vars=pdflatex_vardeps) +cls.scan=scan + +feature('tex')(apply_tex) +before('apply_core')(apply_tex) diff --git a/waf-modules/wafadmin/Tools/unittestw.py b/waf-modules/wafadmin/Tools/unittestw.py new file mode 100644 index 00000000..a53e311a --- /dev/null +++ b/waf-modules/wafadmin/Tools/unittestw.py @@ -0,0 +1,211 @@ +#! /usr/bin/env python +# encoding: utf-8 + +import os,sys +import Build,TaskGen,Utils,Options,Logs,Task +from TaskGen import before,after,feature +from Constants import* +class unit_test(object): + def __init__(self): + self.returncode_ok=0 + self.num_tests_ok=0 + self.num_tests_failed=0 + self.num_tests_err=0 + self.total_num_tests=0 + self.max_label_length=0 + self.unit_tests=Utils.ordered_dict() + self.unit_test_results={} + self.unit_test_erroneous={} + self.change_to_testfile_dir=False + self.want_to_see_test_output=False + self.want_to_see_test_error=False + self.run_if_waf_does='check' + def run(self): + self.num_tests_ok=0 + self.num_tests_failed=0 + self.num_tests_err=0 + self.total_num_tests=0 + self.max_label_length=0 + self.unit_tests=Utils.ordered_dict() + self.unit_test_results={} + self.unit_test_erroneous={} + ld_library_path=[] + if not Options.commands[self.run_if_waf_does]:return + for obj in Build.bld.all_task_gen: + try: + link_task=obj.link_task + except AttributeError: + pass + else: + lib_path=link_task.outputs[0].parent.abspath(obj.env) + if lib_path not in ld_library_path: + ld_library_path.append(lib_path) + unit_test=getattr(obj,'unit_test','') + if unit_test and'cprogram'in obj.features: + try: + output=obj.path + filename=os.path.join(output.abspath(obj.env),obj.target) + srcdir=output.abspath() + label=os.path.join(output.bldpath(obj.env),obj.target) + self.max_label_length=max(self.max_label_length,len(label)) + self.unit_tests[label]=(filename,srcdir) + except KeyError: + pass + self.total_num_tests=len(self.unit_tests) + Utils.pprint('GREEN','Running the unit tests') + count=0 + result=1 + for label in self.unit_tests.allkeys: + file_and_src=self.unit_tests[label] + filename=file_and_src[0] + srcdir=file_and_src[1] + count+=1 + line=Build.bld.progress_line(count,self.total_num_tests,Logs.colors.GREEN,Logs.colors.NORMAL) + if Options.options.progress_bar and line: + sys.stderr.write(line) + sys.stderr.flush() + try: + kwargs={} + kwargs['env']=os.environ.copy() + if self.change_to_testfile_dir: + kwargs['cwd']=srcdir + if not self.want_to_see_test_output: + kwargs['stdout']=Utils.pproc.PIPE + if not self.want_to_see_test_error: + kwargs['stderr']=Utils.pproc.PIPE + if ld_library_path: + v=kwargs['env'] + def add_path(dct,path,var): + dct[var]=os.pathsep.join(Utils.to_list(path)+[os.environ.get(var,'')]) + if sys.platform=='win32': + add_path(v,ld_library_path,'PATH') + elif sys.platform=='darwin': + add_path(v,ld_library_path,'DYLD_LIBRARY_PATH') + add_path(v,ld_library_path,'LD_LIBRARY_PATH') + else: + add_path(v,ld_library_path,'LD_LIBRARY_PATH') + pp=Utils.pproc.Popen(filename,**kwargs) + (out,err)=pp.communicate() + result=int(pp.returncode==self.returncode_ok) + if result: + self.num_tests_ok+=1 + else: + self.num_tests_failed+=1 + self.unit_test_results[label]=result + self.unit_test_erroneous[label]=0 + except OSError: + self.unit_test_erroneous[label]=1 + self.num_tests_err+=1 + except KeyboardInterrupt: + pass + if Options.options.progress_bar:sys.stdout.write(Logs.colors.cursor_on) + def print_results(self): + if not Options.commands[self.run_if_waf_does]:return + p=Utils.pprint + if self.total_num_tests==0: + p('YELLOW','No unit tests present') + return + for label in self.unit_tests.allkeys: + filename=self.unit_tests[label] + err=0 + result=0 + try:err=self.unit_test_erroneous[label] + except KeyError:pass + try:result=self.unit_test_results[label] + except KeyError:pass + n=self.max_label_length-len(label) + if err:n+=4 + elif result:n+=7 + else:n+=3 + line='%s %s'%(label,'.'*n) + if err:p('RED','%sERROR'%line) + elif result:p('GREEN','%sOK'%line) + else:p('YELLOW','%sFAILED'%line) + percentage_ok=float(self.num_tests_ok)/float(self.total_num_tests)*100.0 + percentage_failed=float(self.num_tests_failed)/float(self.total_num_tests)*100.0 + percentage_erroneous=float(self.num_tests_err)/float(self.total_num_tests)*100.0 + p('NORMAL',''' +Successful tests: %i (%.1f%%) +Failed tests: %i (%.1f%%) +Erroneous tests: %i (%.1f%%) + +Total number of tests: %i +'''%(self.num_tests_ok,percentage_ok,self.num_tests_failed,percentage_failed,self.num_tests_err,percentage_erroneous,self.total_num_tests)) + p('GREEN','Unit tests finished') +import threading +testlock=threading.Lock() +def set_options(opt): + opt.add_option('--alltests',action='store_true',default=True,help='Exec all unit tests',dest='all_tests') +def make_test(self): + if not'cprogram'in self.features: + Logs.error('test cannot be executed %s'%self) + return + self.default_install_path=None + self.create_task('utest',self.link_task.outputs) +def exec_test(self): + status=0 + variant=self.env.variant() + filename=self.inputs[0].abspath(self.env) + self.ut_exec=getattr(self,'ut_exec',[filename]) + if getattr(self.generator,'ut_fun',None): + self.generator.ut_fun(self) + try: + fu=getattr(self.generator.bld,'all_test_paths') + except AttributeError: + fu=os.environ.copy() + self.generator.bld.all_test_paths=fu + lst=[] + for obj in self.generator.bld.all_task_gen: + link_task=getattr(obj,'link_task',None) + if link_task and link_task.env.variant()==variant: + lst.append(link_task.outputs[0].parent.abspath(obj.env)) + def add_path(dct,path,var): + dct[var]=os.pathsep.join(Utils.to_list(path)+[os.environ.get(var,'')]) + if sys.platform=='win32': + add_path(fu,lst,'PATH') + elif sys.platform=='darwin': + add_path(fu,lst,'DYLD_LIBRARY_PATH') + add_path(fu,lst,'LD_LIBRARY_PATH') + else: + add_path(fu,lst,'LD_LIBRARY_PATH') + cwd=getattr(self.generator,'ut_cwd','')or self.inputs[0].parent.abspath(self.env) + proc=Utils.pproc.Popen(self.ut_exec,cwd=cwd,env=fu,stderr=Utils.pproc.PIPE,stdout=Utils.pproc.PIPE) + (stdout,stderr)=proc.communicate() + tup=(filename,proc.returncode,stdout,stderr) + self.generator.utest_result=tup + testlock.acquire() + try: + bld=self.generator.bld + Logs.debug("ut: %r",tup) + try: + bld.utest_results.append(tup) + except AttributeError: + bld.utest_results=[tup] + finally: + testlock.release() +cls=Task.task_type_from_func('utest',func=exec_test,color='PINK',ext_in='.bin') +old=cls.runnable_status +def test_status(self): + ret=old(self) + if ret==SKIP_ME and getattr(Options.options,'all_tests',False): + return RUN_ME + return ret +cls.runnable_status=test_status +cls.quiet=1 +def summary(bld): + lst=getattr(bld,'utest_results',[]) + if lst: + Utils.pprint('CYAN','execution summary') + total=len(lst) + tfail=len([x for x in lst if x[1]]) + Utils.pprint('CYAN',' tests that pass %d/%d'%(total-tfail,total)) + for(f,code,out,err)in lst: + if not code: + Utils.pprint('CYAN',' %s'%f) + Utils.pprint('CYAN',' tests that fail %d/%d'%(tfail,total)) + for(f,code,out,err)in lst: + if code: + Utils.pprint('CYAN',' %s'%f) + +feature('test')(make_test) +after('apply_link','vars_target_cprogram')(make_test) diff --git a/waf-modules/wafadmin/Tools/vala.py b/waf-modules/wafadmin/Tools/vala.py new file mode 100644 index 00000000..d9d5c150 --- /dev/null +++ b/waf-modules/wafadmin/Tools/vala.py @@ -0,0 +1,235 @@ +#! /usr/bin/env python +# encoding: utf-8 + +import os.path,shutil +import Task,Runner,Utils,Logs,Build,Node,Options +from TaskGen import extension,after,before +EXT_VALA=['.vala','.gs'] +class valac_task(Task.Task): + vars=("VALAC","VALAC_VERSION","VALAFLAGS") + before=("cc","cxx") + def run(self): + env=self.env + inputs=[a.srcpath(env)for a in self.inputs] + valac=env['VALAC'] + vala_flags=env.get_flat('VALAFLAGS') + top_src=self.generator.bld.srcnode.abspath() + top_bld=self.generator.bld.srcnode.abspath(env) + if env['VALAC_VERSION']>(0,1,6): + cmd=[valac,'-C','--quiet',vala_flags] + else: + cmd=[valac,'-C',vala_flags] + if self.threading: + cmd.append('--thread') + if self.profile: + cmd.append('--profile=%s'%self.profile) + if self.target_glib: + cmd.append('--target-glib=%s'%self.target_glib) + features=self.generator.features + if'cshlib'in features or'cstaticlib'in features: + output_dir=self.outputs[0].bld_dir(env) + cmd.append('--library '+self.target) + if env['VALAC_VERSION']>=(0,7,0): + for x in self.outputs: + if x.name.endswith('.h'): + cmd.append('--header '+x.bldpath(self.env)) + cmd.append('--basedir '+top_src) + cmd.append('-d '+top_bld) + if env['VALAC_VERSION']>(0,7,2)and hasattr(self,'gir'): + cmd.append('--gir=%s.gir'%self.gir) + else: + output_dir=self.outputs[0].bld_dir(env) + cmd.append('-d %s'%output_dir) + for vapi_dir in self.vapi_dirs: + cmd.append('--vapidir=%s'%vapi_dir) + for package in self.packages: + cmd.append('--pkg %s'%package) + for package in self.packages_private: + cmd.append('--pkg %s'%package) + cmd.append(" ".join(inputs)) + result=self.generator.bld.exec_command(" ".join(cmd)) + if not'cprogram'in features: + if self.packages: + filename=os.path.join(self.generator.path.abspath(env),"%s.deps"%self.target) + deps=open(filename,'w') + for package in self.packages: + deps.write(package+'\n') + deps.close() + self._fix_output("../%s.vapi"%self.target) + self._fix_output("%s.vapi"%self.target) + self._fix_output("%s.gidl"%self.target) + self._fix_output("%s.gir"%self.target) + if hasattr(self,'gir'): + self._fix_output("%s.gir"%self.gir) + first=None + for node in self.outputs: + if not first: + first=node + else: + if first.parent.id!=node.parent.id: + if env['VALAC_VERSION']<(0,7,0): + shutil.move(first.parent.abspath(self.env)+os.sep+node.name,node.abspath(self.env)) + return result + def install(self): + bld=self.generator.bld + features=self.generator.features + if self.attr("install_path")and("cshlib"in features or"cstaticlib"in features): + headers_list=[o for o in self.outputs if o.suffix()==".h"] + vapi_list=[o for o in self.outputs if(o.suffix()in(".vapi",".deps"))] + gir_list=[o for o in self.outputs if o.suffix()==".gir"] + for header in headers_list: + top_src=self.generator.bld.srcnode + package=self.env['PACKAGE'] + try: + api_version=Utils.g_module.API_VERSION + except AttributeError: + version=Utils.g_module.VERSION.split(".") + if version[0]=="0": + api_version="0."+version[1] + else: + api_version=version[0]+".0" + install_path='${INCLUDEDIR}/%s-%s/%s'%(package,api_version,header.relpath_gen(top_src)) + bld.install_as(install_path,header,self.env) + bld.install_files('${DATAROOTDIR}/vala/vapi',vapi_list,self.env) + bld.install_files('${DATAROOTDIR}/gir-1.0',gir_list,self.env) + def _fix_output(self,output): + top_bld=self.generator.bld.srcnode.abspath(self.env) + try: + src=os.path.join(top_bld,output) + dst=self.generator.path.abspath(self.env) + shutil.move(src,dst) + except: + pass +def vala_file(self,node): + valatask=getattr(self,"valatask",None) + if not valatask: + valatask=self.create_task('valac') + self.valatask=valatask + self.includes=Utils.to_list(getattr(self,'includes',[])) + self.uselib=self.to_list(self.uselib) + valatask.packages=[] + valatask.packages_private=Utils.to_list(getattr(self,'packages_private',[])) + valatask.vapi_dirs=[] + valatask.target=self.target + valatask.threading=False + valatask.install_path=self.install_path + valatask.profile=getattr(self,'profile','gobject') + valatask.target_glib=None + packages=Utils.to_list(getattr(self,'packages',[])) + vapi_dirs=Utils.to_list(getattr(self,'vapi_dirs',[])) + includes=[] + if hasattr(self,'uselib_local'): + local_packages=Utils.to_list(self.uselib_local) + seen=[] + while len(local_packages)>0: + package=local_packages.pop() + if package in seen: + continue + seen.append(package) + package_obj=self.name_to_obj(package) + if not package_obj: + raise Utils.WafError("object '%s' was not found in uselib_local (required by '%s')"%(package,self.name)) + package_name=package_obj.target + package_node=package_obj.path + package_dir=package_node.relpath_gen(self.path) + for task in package_obj.tasks: + for output in task.outputs: + if output.name==package_name+".vapi": + valatask.set_run_after(task) + if package_name not in packages: + packages.append(package_name) + if package_dir not in vapi_dirs: + vapi_dirs.append(package_dir) + if package_dir not in includes: + includes.append(package_dir) + if hasattr(package_obj,'uselib_local'): + lst=self.to_list(package_obj.uselib_local) + lst.reverse() + local_packages=[pkg for pkg in lst if pkg not in seen]+local_packages + valatask.packages=packages + for vapi_dir in vapi_dirs: + try: + valatask.vapi_dirs.append(self.path.find_dir(vapi_dir).abspath()) + valatask.vapi_dirs.append(self.path.find_dir(vapi_dir).abspath(self.env)) + except AttributeError: + Logs.warn("Unable to locate Vala API directory: '%s'"%vapi_dir) + self.includes.append(node.bld.srcnode.abspath()) + self.includes.append(node.bld.srcnode.abspath(self.env)) + for include in includes: + try: + self.includes.append(self.path.find_dir(include).abspath()) + self.includes.append(self.path.find_dir(include).abspath(self.env)) + except AttributeError: + Logs.warn("Unable to locate include directory: '%s'"%include) + if valatask.profile=='gobject': + if hasattr(self,'target_glib'): + Logs.warn('target_glib on vala tasks is deprecated --vala-target-glib=MAJOR.MINOR from the vala tool options') + if getattr(Options.options,'vala_target_glib',None): + valatask.target_glib=Options.options.vala_target_glib + if not'GOBJECT'in self.uselib: + self.uselib.append('GOBJECT') + if hasattr(self,'threading'): + if valatask.profile=='gobject': + valatask.threading=self.threading + if not'GTHREAD'in self.uselib: + self.uselib.append('GTHREAD') + else: + Logs.warn("Profile %s does not have threading support"%valatask.profile) + if hasattr(self,'gir'): + valatask.gir=self.gir + env=valatask.env + output_nodes=[] + c_node=node.change_ext('.c') + output_nodes.append(c_node) + self.allnodes.append(c_node) + if env['VALAC_VERSION']<(0,7,0): + output_nodes.append(node.change_ext('.h')) + else: + if not'cprogram'in self.features: + output_nodes.append(self.path.find_or_declare('%s.h'%self.target)) + if not'cprogram'in self.features: + output_nodes.append(self.path.find_or_declare('%s.vapi'%self.target)) + if env['VALAC_VERSION']>(0,7,2): + if hasattr(self,'gir'): + output_nodes.append(self.path.find_or_declare('%s.gir'%self.gir)) + elif env['VALAC_VERSION']>(0,3,5): + output_nodes.append(self.path.find_or_declare('%s.gir'%self.target)) + elif env['VALAC_VERSION']>(0,1,7): + output_nodes.append(self.path.find_or_declare('%s.gidl'%self.target)) + if valatask.packages: + output_nodes.append(self.path.find_or_declare('%s.deps'%self.target)) + valatask.inputs.append(node) + valatask.outputs.extend(output_nodes) +def detect(conf): + min_version=(0,1,6) + min_version_str="%d.%d.%d"%min_version + valac=conf.find_program('valac',var='VALAC',mandatory=True) + if not conf.env["HAVE_GOBJECT"]: + pkg_args={'package':'gobject-2.0','uselib_store':'GOBJECT','args':'--cflags --libs'} + if getattr(Options.options,'vala_target_glib',None): + pkg_args['atleast_version']=Options.options.vala_target_glib + conf.check_cfg(**pkg_args) + if not conf.env["HAVE_GTHREAD"]: + pkg_args={'package':'gthread-2.0','uselib_store':'GTHREAD','args':'--cflags --libs'} + if getattr(Options.options,'vala_target_glib',None): + pkg_args['atleast_version']=Options.options.vala_target_glib + conf.check_cfg(**pkg_args) + try: + output=Utils.cmd_output(valac+" --version",silent=True) + version=output.split(' ',1)[-1].strip().split(".")[0:3] + version=[int(x)for x in version] + valac_version=tuple(version) + except Exception: + valac_version=(0,0,0) + conf.check_message('program version','valac >= '+min_version_str,valac_version>=min_version,"%d.%d.%d"%valac_version) + conf.check_tool('gnu_dirs') + if valac_version=0x2060000 or os.name=='java': + import subprocess as pproc +else: + import pproc +import Logs +from Constants import* +try: + from collections import deque +except ImportError: + class deque(list): + def popleft(self): + return self.pop(0) +is_win32=sys.platform=='win32' +try: + from collections import defaultdict as DefaultDict +except ImportError: + class DefaultDict(dict): + def __init__(self,default_factory): + super(DefaultDict,self).__init__() + self.default_factory=default_factory + def __getitem__(self,key): + try: + return super(DefaultDict,self).__getitem__(key) + except KeyError: + value=self.default_factory() + self[key]=value + return value +class WafError(Exception): + def __init__(self,*args): + self.args=args + try: + self.stack=traceback.extract_stack() + except: + pass + Exception.__init__(self,*args) + def __str__(self): + return str(len(self.args)==1 and self.args[0]or self.args) +class WscriptError(WafError): + def __init__(self,message,wscript_file=None): + if wscript_file: + self.wscript_file=wscript_file + self.wscript_line=None + else: + try: + (self.wscript_file,self.wscript_line)=self.locate_error() + except: + (self.wscript_file,self.wscript_line)=(None,None) + msg_file_line='' + if self.wscript_file: + msg_file_line="%s:"%self.wscript_file + if self.wscript_line: + msg_file_line+="%s:"%self.wscript_line + err_message="%s error: %s"%(msg_file_line,message) + WafError.__init__(self,err_message) + def locate_error(self): + stack=traceback.extract_stack() + stack.reverse() + for frame in stack: + file_name=os.path.basename(frame[0]) + is_wscript=(file_name==WSCRIPT_FILE or file_name==WSCRIPT_BUILD_FILE) + if is_wscript: + return(frame[0],frame[1]) + return(None,None) +indicator=is_win32 and'\x1b[A\x1b[K%s%s%s\r'or'\x1b[K%s%s%s\r' +try: + from fnv import new as md5 + import Constants + Constants.SIG_NIL='signofnv' + def h_file(filename): + m=md5() + try: + m.hfile(filename) + x=m.digest() + if x is None:raise OSError("not a file") + return x + except SystemError: + raise OSError("not a file"+filename) +except ImportError: + try: + try: + from hashlib import md5 + except ImportError: + from md5 import md5 + def h_file(filename): + f=open(filename,'rb') + m=md5() + while(filename): + filename=f.read(100000) + m.update(filename) + f.close() + return m.digest() + except ImportError: + md5=None +class ordered_dict(UserDict): + def __init__(self,dict=None): + self.allkeys=[] + UserDict.__init__(self,dict) + def __delitem__(self,key): + self.allkeys.remove(key) + UserDict.__delitem__(self,key) + def __setitem__(self,key,item): + if key not in self.allkeys:self.allkeys.append(key) + UserDict.__setitem__(self,key,item) +def exec_command(s,**kw): + if'log'in kw: + kw['stdout']=kw['stderr']=kw['log'] + del(kw['log']) + kw['shell']=isinstance(s,str) + try: + proc=pproc.Popen(s,**kw) + return proc.wait() + except OSError: + return-1 +if is_win32: + def exec_command(s,**kw): + if'log'in kw: + kw['stdout']=kw['stderr']=kw['log'] + del(kw['log']) + kw['shell']=isinstance(s,str) + if len(s)>2000: + startupinfo=pproc.STARTUPINFO() + startupinfo.dwFlags|=pproc.STARTF_USESHOWWINDOW + kw['startupinfo']=startupinfo + try: + if'stdout'not in kw: + kw['stdout']=pproc.PIPE + kw['stderr']=pproc.PIPE + kw['universal_newlines']=True + proc=pproc.Popen(s,**kw) + (stdout,stderr)=proc.communicate() + Logs.info(stdout) + if stderr: + Logs.error(stderr) + return proc.returncode + else: + proc=pproc.Popen(s,**kw) + return proc.wait() + except OSError: + return-1 +listdir=os.listdir +if is_win32: + def listdir_win32(s): + if re.match('^[A-Za-z]:$',s): + s+=os.sep + if not os.path.isdir(s): + e=OSError() + e.errno=errno.ENOENT + raise e + return os.listdir(s) + listdir=listdir_win32 +def waf_version(mini=0x010000,maxi=0x100000): + ver=HEXVERSION + try:min_val=mini+0 + except TypeError:min_val=int(mini.replace('.','0'),16) + if min_val>ver: + Logs.error("waf version should be at least %s (%s found)"%(mini,ver)) + sys.exit(1) + try:max_val=maxi+0 + except TypeError:max_val=int(maxi.replace('.','0'),16) + if max_val=0x3000000: + raise ImportError("Waf requires Python >= 2.3 but the raw source requires Python 2.4, 2.5 or 2.6") +def ex_stack(): + exc_type,exc_value,tb=sys.exc_info() + if Logs.verbose>1: + exc_lines=traceback.format_exception(exc_type,exc_value,tb) + return''.join(exc_lines) + return str(exc_value) +def to_list(sth): + if isinstance(sth,str): + return sth.split() + else: + return sth +g_loaded_modules={} +g_module=None +def load_module(file_path,name=WSCRIPT_FILE): + try: + return g_loaded_modules[file_path] + except KeyError: + pass + module=imp.new_module(name) + try: + code=readf(file_path,m='rU') + except(IOError,OSError): + raise WscriptError('Could not read the file %r'%file_path) + module.waf_hash_val=code + dt=os.path.dirname(file_path) + sys.path.insert(0,dt) + try: + exec(compile(code,file_path,'exec'),module.__dict__) + except Exception: + exc_type,exc_value,tb=sys.exc_info() + raise WscriptError("".join(traceback.format_exception(exc_type,exc_value,tb)),file_path) + sys.path.remove(dt) + g_loaded_modules[file_path]=module + return module +def set_main_module(file_path): + global g_module + g_module=load_module(file_path,'wscript_main') + g_module.root_path=file_path + try: + g_module.APPNAME + except: + g_module.APPNAME='noname' + try: + g_module.VERSION + except: + g_module.VERSION='1.0' +def to_hashtable(s): + tbl={} + lst=s.split('\n') + for line in lst: + if not line:continue + mems=line.split('=') + tbl[mems[0]]=mems[1] + return tbl +def get_term_cols(): + return 80 +try: + import struct,fcntl,termios +except ImportError: + pass +else: + if Logs.got_tty: + def myfun(): + dummy_lines,cols=struct.unpack("HHHH",fcntl.ioctl(sys.stderr.fileno(),termios.TIOCGWINSZ,struct.pack("HHHH",0,0,0,0)))[:2] + return cols + try: + myfun() + except: + pass + else: + get_term_cols=myfun +rot_idx=0 +rot_chr=['\\','|','/','-'] +def split_path(path): + return path.split('/') +def split_path_cygwin(path): + if path.startswith('//'): + ret=path.split('/')[2:] + ret[0]='/'+ret[0] + return ret + return path.split('/') +re_sp=re.compile('[/\\\\]') +def split_path_win32(path): + if path.startswith('\\\\'): + ret=re.split(re_sp,path)[2:] + ret[0]='\\'+ret[0] + return ret + return re.split(re_sp,path) +if sys.platform=='cygwin': + split_path=split_path_cygwin +elif is_win32: + split_path=split_path_win32 +def copy_attrs(orig,dest,names,only_if_set=False): + for a in to_list(names): + u=getattr(orig,a,()) + if u or not only_if_set: + setattr(dest,a,u) +def def_attrs(cls,**kw): + ''' + set attributes for class. + @param cls [any class]: the class to update the given attributes in. + @param kw [dictionary]: dictionary of attributes names and values. + + if the given class hasn't one (or more) of these attributes, add the attribute with its value to the class. + ''' + for k,v in kw.iteritems(): + if not hasattr(cls,k): + setattr(cls,k,v) +def quote_define_name(path): + fu=re.compile("[^a-zA-Z0-9]").sub("_",path) + fu=fu.upper() + return fu +def quote_whitespace(path): + return(path.strip().find(' ')>0 and'"%s"'%path or path).replace('""','"') +def trimquotes(s): + if not s:return'' + s=s.rstrip() + if s[0]=="'"and s[-1]=="'":return s[1:-1] + return s +def h_list(lst): + m=md5() + m.update(str(lst)) + return m.digest() +def h_fun(fun): + try: + return fun.code + except AttributeError: + try: + h=inspect.getsource(fun) + except IOError: + h="nocode" + try: + fun.code=h + except AttributeError: + pass + return h +def pprint(col,str,label='',sep='\n'): + sys.stderr.write("%s%s%s %s%s"%(Logs.colors(col),str,Logs.colors.NORMAL,label,sep)) +def check_dir(dir): + try: + os.stat(dir) + except OSError: + try: + os.makedirs(dir) + except OSError,e: + raise WafError("Cannot create folder '%s' (original error: %s)"%(dir,e)) +def cmd_output(cmd,**kw): + silent=False + if'silent'in kw: + silent=kw['silent'] + del(kw['silent']) + if'e'in kw: + tmp=kw['e'] + del(kw['e']) + kw['env']=tmp + kw['shell']=isinstance(cmd,str) + kw['stdout']=pproc.PIPE + if silent: + kw['stderr']=pproc.PIPE + try: + p=pproc.Popen(cmd,**kw) + output=p.communicate()[0] + except OSError,e: + raise ValueError(str(e)) + if p.returncode: + if not silent: + msg="command execution failed: %s -> %r"%(cmd,str(output)) + raise ValueError(msg) + output='' + return output +reg_subst=re.compile(r"(\\\\)|(\$\$)|\$\{([^}]+)\}") +def subst_vars(expr,params): + def repl_var(m): + if m.group(1): + return'\\' + if m.group(2): + return'$' + try: + return params.get_flat(m.group(3)) + except AttributeError: + return params[m.group(3)] + return reg_subst.sub(repl_var,expr) +def unversioned_sys_platform_to_binary_format(unversioned_sys_platform): + if unversioned_sys_platform in('linux','freebsd','netbsd','openbsd','sunos','gnu'): + return'elf' + elif unversioned_sys_platform=='darwin': + return'mac-o' + elif unversioned_sys_platform in('win32','cygwin','uwin','msys'): + return'pe' + return'elf' +def unversioned_sys_platform(): + s=sys.platform + if s=='java': + from java.lang import System + s=System.getProperty('os.name') + if s=='Mac OS X': + return'darwin' + elif s.startswith('Windows '): + return'win32' + elif s=='OS/2': + return'os2' + elif s=='HP-UX': + return'hpux' + elif s in('SunOS','Solaris'): + return'sunos' + else:s=s.lower() + if s=='win32'or s.endswith('os2')and s!='sunos2':return s + return re.split('\d+$',s)[0] +def detect_platform(): + s=sys.platform + for x in'cygwin linux irix sunos hpux aix darwin gnu'.split(): + if s.find(x)>=0: + return x + if os.name in'posix java os2'.split(): + return os.name + return s +def load_tool(tool,tooldir=None): + ''' + load_tool: import a Python module, optionally using several directories. + @param tool [string]: name of tool to import. + @param tooldir [list]: directories to look for the tool. + @return: the loaded module. + + Warning: this function is not thread-safe: plays with sys.path, + so must run in sequence. + ''' + if tooldir: + assert isinstance(tooldir,list) + sys.path=tooldir+sys.path + else: + tooldir=[] + try: + return __import__(tool) + finally: + for dt in tooldir: + sys.path.remove(dt) +def readf(fname,m='r'): + f=open(fname,m) + try: + txt=f.read() + finally: + f.close() + return txt +def nada(*k,**kw): + pass +def diff_path(top,subdir): + top=os.path.normpath(top).replace('\\','/').split('/') + subdir=os.path.normpath(subdir).replace('\\','/').split('/') + if len(top)==len(subdir):return'' + diff=subdir[len(top)-len(subdir):] + return os.path.join(*diff) +class Context(object): + def set_curdir(self,dir): + self.curdir_=dir + def get_curdir(self): + try: + return self.curdir_ + except AttributeError: + self.curdir_=os.getcwd() + return self.get_curdir() + curdir=property(get_curdir,set_curdir) + def recurse(self,dirs,name=''): + if not name: + name=inspect.stack()[1][3] + if isinstance(dirs,str): + dirs=to_list(dirs) + for x in dirs: + if os.path.isabs(x): + nexdir=x + else: + nexdir=os.path.join(self.curdir,x) + base=os.path.join(nexdir,WSCRIPT_FILE) + file_path=base+'_'+name + try: + txt=readf(file_path,m='rU') + except(OSError,IOError): + try: + module=load_module(base) + except OSError: + raise WscriptError('No such script %s'%base) + try: + f=module.__dict__[name] + except KeyError: + raise WscriptError('No function %s defined in %s'%(name,base)) + if getattr(self.__class__,'pre_recurse',None): + self.pre_recurse(f,base,nexdir) + old=self.curdir + self.curdir=nexdir + try: + f(self) + finally: + self.curdir=old + if getattr(self.__class__,'post_recurse',None): + self.post_recurse(module,base,nexdir) + else: + dc={'ctx':self} + if getattr(self.__class__,'pre_recurse',None): + dc=self.pre_recurse(txt,file_path,nexdir) + old=self.curdir + self.curdir=nexdir + try: + try: + exec(compile(txt,file_path,'exec'),dc) + except Exception: + exc_type,exc_value,tb=sys.exc_info() + raise WscriptError("".join(traceback.format_exception(exc_type,exc_value,tb)),base) + finally: + self.curdir=old + if getattr(self.__class__,'post_recurse',None): + self.post_recurse(txt,file_path,nexdir) +if is_win32: + old=shutil.copy2 + def copy2(src,dst): + old(src,dst) + shutil.copystat(src,src) + setattr(shutil,'copy2',copy2) +def zip_folder(dir,zip_file_name,prefix): + import zipfile + zip=zipfile.ZipFile(zip_file_name,'w',compression=zipfile.ZIP_DEFLATED) + base=os.path.abspath(dir) + if prefix: + if prefix[-1]!=os.sep: + prefix+=os.sep + n=len(base) + for root,dirs,files in os.walk(base): + for f in files: + archive_name=prefix+root[n:]+os.sep+f + zip.write(root+os.sep+f,archive_name,zipfile.ZIP_DEFLATED) + zip.close() +def get_elapsed_time(start): + delta=datetime.datetime.now()-start + days=int(delta.days) + hours=int(delta.seconds/3600) + minutes=int((delta.seconds-hours*3600)/60) + seconds=delta.seconds-hours*3600-minutes*60+float(delta.microseconds)/1000/1000 + result='' + if days: + result+='%dd'%days + if days or hours: + result+='%dh'%hours + if days or hours or minutes: + result+='%dm'%minutes + return'%s%.3fs'%(result,seconds) +if os.name=='java': + try: + gc.disable() + gc.enable() + except NotImplementedError: + gc.disable=gc.enable +def run_once(fun): + cache={} + def wrap(k): + try: + return cache[k] + except KeyError: + ret=fun(k) + cache[k]=ret + return ret + wrap.__cache__=cache + return wrap + diff --git a/waf-modules/wafadmin/__init__.py b/waf-modules/wafadmin/__init__.py new file mode 100644 index 00000000..cbc8406e --- /dev/null +++ b/waf-modules/wafadmin/__init__.py @@ -0,0 +1,4 @@ +#! /usr/bin/env python +# encoding: utf-8 + + diff --git a/waf-modules/wafadmin/ansiterm.py b/waf-modules/wafadmin/ansiterm.py new file mode 100644 index 00000000..bf865acc --- /dev/null +++ b/waf-modules/wafadmin/ansiterm.py @@ -0,0 +1,158 @@ +#! /usr/bin/env python +# encoding: utf-8 + +import sys,os +try: + if(not sys.stderr.isatty())or(not sys.stdout.isatty()): + raise ValueError('not a tty') + from ctypes import* + class COORD(Structure): + _fields_=[("X",c_short),("Y",c_short)] + class SMALL_RECT(Structure): + _fields_=[("Left",c_short),("Top",c_short),("Right",c_short),("Bottom",c_short)] + class CONSOLE_SCREEN_BUFFER_INFO(Structure): + _fields_=[("Size",COORD),("CursorPosition",COORD),("Attributes",c_short),("Window",SMALL_RECT),("MaximumWindowSize",COORD)] + class CONSOLE_CURSOR_INFO(Structure): + _fields_=[('dwSize',c_ulong),('bVisible',c_int)] + sbinfo=CONSOLE_SCREEN_BUFFER_INFO() + csinfo=CONSOLE_CURSOR_INFO() + hconsole=windll.kernel32.GetStdHandle(-11) + windll.kernel32.GetConsoleScreenBufferInfo(hconsole,byref(sbinfo)) + if sbinfo.Size.X<10 or sbinfo.Size.Y<10:raise Exception('small console') + windll.kernel32.GetConsoleCursorInfo(hconsole,byref(csinfo)) +except Exception: + pass +else: + import re,threading + to_int=lambda number,default:number and int(number)or default + wlock=threading.Lock() + STD_OUTPUT_HANDLE=-11 + STD_ERROR_HANDLE=-12 + class AnsiTerm(object): + def __init__(self): + self.hconsole=windll.kernel32.GetStdHandle(STD_OUTPUT_HANDLE) + self.cursor_history=[] + self.orig_sbinfo=CONSOLE_SCREEN_BUFFER_INFO() + self.orig_csinfo=CONSOLE_CURSOR_INFO() + windll.kernel32.GetConsoleScreenBufferInfo(self.hconsole,byref(self.orig_sbinfo)) + windll.kernel32.GetConsoleCursorInfo(hconsole,byref(self.orig_csinfo)) + def screen_buffer_info(self): + sbinfo=CONSOLE_SCREEN_BUFFER_INFO() + windll.kernel32.GetConsoleScreenBufferInfo(self.hconsole,byref(sbinfo)) + return sbinfo + def clear_line(self,param): + mode=param and int(param)or 0 + sbinfo=self.screen_buffer_info() + if mode==1: + line_start=COORD(0,sbinfo.CursorPosition.Y) + line_length=sbinfo.Size.X + elif mode==2: + line_start=COORD(sbinfo.CursorPosition.X,sbinfo.CursorPosition.Y) + line_length=sbinfo.Size.X-sbinfo.CursorPosition.X + else: + line_start=sbinfo.CursorPosition + line_length=sbinfo.Size.X-sbinfo.CursorPosition.X + chars_written=c_int() + windll.kernel32.FillConsoleOutputCharacterA(self.hconsole,c_char(' '),line_length,line_start,byref(chars_written)) + windll.kernel32.FillConsoleOutputAttribute(self.hconsole,sbinfo.Attributes,line_length,line_start,byref(chars_written)) + def clear_screen(self,param): + mode=to_int(param,0) + sbinfo=self.screen_buffer_info() + if mode==1: + clear_start=COORD(0,0) + clear_length=sbinfo.CursorPosition.X*sbinfo.CursorPosition.Y + elif mode==2: + clear_start=COORD(0,0) + clear_length=sbinfo.Size.X*sbinfo.Size.Y + windll.kernel32.SetConsoleCursorPosition(self.hconsole,clear_start) + else: + clear_start=sbinfo.CursorPosition + clear_length=((sbinfo.Size.X-sbinfo.CursorPosition.X)+sbinfo.Size.X*(sbinfo.Size.Y-sbinfo.CursorPosition.Y)) + chars_written=c_int() + windll.kernel32.FillConsoleOutputCharacterA(self.hconsole,c_char(' '),clear_length,clear_start,byref(chars_written)) + windll.kernel32.FillConsoleOutputAttribute(self.hconsole,sbinfo.Attributes,clear_length,clear_start,byref(chars_written)) + def push_cursor(self,param): + sbinfo=self.screen_buffer_info() + self.cursor_history.push(sbinfo.CursorPosition) + def pop_cursor(self,param): + if self.cursor_history: + old_pos=self.cursor_history.pop() + windll.kernel32.SetConsoleCursorPosition(self.hconsole,old_pos) + def set_cursor(self,param): + x,sep,y=param.partition(';') + x=to_int(x,1)-1 + y=to_int(y,1)-1 + sbinfo=self.screen_buffer_info() + new_pos=COORD(min(max(0,x),sbinfo.Size.X),min(max(0,y),sbinfo.Size.Y)) + windll.kernel32.SetConsoleCursorPosition(self.hconsole,new_pos) + def set_column(self,param): + x=to_int(param,1)-1 + sbinfo=self.screen_buffer_info() + new_pos=COORD(min(max(0,x),sbinfo.Size.X),sbinfo.CursorPosition.Y) + windll.kernel32.SetConsoleCursorPosition(self.hconsole,new_pos) + def move_cursor(self,x_offset=0,y_offset=0): + sbinfo=self.screen_buffer_info() + new_pos=COORD(min(max(0,sbinfo.CursorPosition.X+x_offset),sbinfo.Size.X),min(max(0,sbinfo.CursorPosition.Y+y_offset),sbinfo.Size.Y)) + windll.kernel32.SetConsoleCursorPosition(self.hconsole,new_pos) + def move_up(self,param): + self.move_cursor(y_offset=-to_int(param,1)) + def move_down(self,param): + self.move_cursor(y_offset=to_int(param,1)) + def move_left(self,param): + self.move_cursor(x_offset=-to_int(param,1)) + def move_right(self,param): + self.move_cursor(x_offset=to_int(param,1)) + def next_line(self,param): + sbinfo=self.screen_buffer_info() + self.move_cursor(x_offset=-sbinfo.CursorPosition.X,y_offset=to_int(param,1)) + def prev_line(self,param): + sbinfo=self.screen_buffer_info() + self.move_cursor(x_offset=-sbinfo.CursorPosition.X,y_offset=-to_int(param,1)) + escape_to_color={(0,30):0x0,(0,31):0x4,(0,32):0x2,(0,33):0x4+0x2,(0,34):0x1,(0,35):0x1+0x4,(0,36):0x2+0x4,(0,37):0x1+0x2+0x4,(1,30):0x1+0x2+0x4,(1,31):0x4+0x8,(1,32):0x2+0x8,(1,33):0x4+0x2+0x8,(1,34):0x1+0x8,(1,35):0x1+0x4+0x8,(1,36):0x1+0x2+0x8,(1,37):0x1+0x2+0x4+0x8,} + def set_color(self,param): + cols=param.split(';') + attr=self.orig_sbinfo.Attributes + for c in cols: + c=to_int(c,0) + if c in range(30,38): + attr=(attr&0xf0)|(self.escape_to_color.get((0,c),0x7)) + elif c in range(40,48): + attr=(attr&0x0f)|(self.escape_to_color.get((0,c),0x7)<<8) + elif c in range(90,98): + attr=(attr&0xf0)|(self.escape_to_color.get((1,c-60),0x7)) + elif c in range(100,108): + attr=(attr&0x0f)|(self.escape_to_color.get((1,c-60),0x7)<<8) + elif c==1: + attr|=0x08 + windll.kernel32.SetConsoleTextAttribute(self.hconsole,attr) + def show_cursor(self,param): + csinfo.bVisible=1 + windll.kernel32.SetConsoleCursorInfo(self.hconsole,byref(csinfo)) + def hide_cursor(self,param): + csinfo.bVisible=0 + windll.kernel32.SetConsoleCursorInfo(self.hconsole,byref(csinfo)) + ansi_command_table={'A':move_up,'B':move_down,'C':move_right,'D':move_left,'E':next_line,'F':prev_line,'G':set_column,'H':set_cursor,'f':set_cursor,'J':clear_screen,'K':clear_line,'h':show_cursor,'l':hide_cursor,'m':set_color,'s':push_cursor,'u':pop_cursor,} + ansi_tokans=re.compile('(?:\x1b\[([0-9?;]*)([a-zA-Z])|([^\x1b]+))') + def write(self,text): + try: + wlock.acquire() + for param,cmd,txt in self.ansi_tokans.findall(text): + if cmd: + cmd_func=self.ansi_command_table.get(cmd) + if cmd_func: + cmd_func(self,param) + else: + chars_written=c_int() + if isinstance(txt,unicode): + windll.kernel32.WriteConsoleW(self.hconsole,txt,len(txt),byref(chars_written),None) + else: + windll.kernel32.WriteConsoleA(self.hconsole,txt,len(txt),byref(chars_written),None) + finally: + wlock.release() + def flush(self): + pass + def isatty(self): + return True + sys.stderr=sys.stdout=AnsiTerm() + os.environ['TERM']='vt100' + diff --git a/waf-modules/wafadmin/pproc.py b/waf-modules/wafadmin/pproc.py new file mode 100644 index 00000000..67b39f93 --- /dev/null +++ b/waf-modules/wafadmin/pproc.py @@ -0,0 +1,496 @@ +#! /usr/bin/env python +# encoding: utf-8 + +import sys +mswindows=(sys.platform=="win32") +import os +import types +import traceback +import gc +class CalledProcessError(Exception): + def __init__(self,returncode,cmd): + self.returncode=returncode + self.cmd=cmd + def __str__(self): + return"Command '%s' returned non-zero exit status %d"%(self.cmd,self.returncode) +if mswindows: + import threading + import msvcrt + if 0: + import pywintypes + from win32api import GetStdHandle,STD_INPUT_HANDLE,STD_OUTPUT_HANDLE,STD_ERROR_HANDLE + from win32api import GetCurrentProcess,DuplicateHandle,GetModuleFileName,GetVersion + from win32con import DUPLICATE_SAME_ACCESS,SW_HIDE + from win32pipe import CreatePipe + from win32process import CreateProcess,STARTUPINFO,GetExitCodeProcess,STARTF_USESTDHANDLES,STARTF_USESHOWWINDOW,CREATE_NEW_CONSOLE + from win32event import WaitForSingleObject,INFINITE,WAIT_OBJECT_0 + else: + from _subprocess import* + class STARTUPINFO: + dwFlags=0 + hStdInput=None + hStdOutput=None + hStdError=None + wShowWindow=0 + class pywintypes: + error=IOError +else: + import select + import errno + import fcntl + import pickle +__all__=["Popen","PIPE","STDOUT","call","check_call","CalledProcessError"] +try: + MAXFD=os.sysconf("SC_OPEN_MAX") +except: + MAXFD=256 +try: + False +except NameError: + False=0 + True=1 +_active=[] +def _cleanup(): + for inst in _active[:]: + if inst.poll(_deadstate=sys.maxint)>=0: + try: + _active.remove(inst) + except ValueError: + pass +PIPE=-1 +STDOUT=-2 +def call(*popenargs,**kwargs): + return Popen(*popenargs,**kwargs).wait() +def check_call(*popenargs,**kwargs): + retcode=call(*popenargs,**kwargs) + cmd=kwargs.get("args") + if cmd is None: + cmd=popenargs[0] + if retcode: + raise CalledProcessError(retcode,cmd) + return retcode +def list2cmdline(seq): + result=[] + needquote=False + for arg in seq: + bs_buf=[] + if result: + result.append(' ') + needquote=(" "in arg)or("\t"in arg)or arg=="" + if needquote: + result.append('"') + for c in arg: + if c=='\\': + bs_buf.append(c) + elif c=='"': + result.append('\\'*len(bs_buf)*2) + bs_buf=[] + result.append('\\"') + else: + if bs_buf: + result.extend(bs_buf) + bs_buf=[] + result.append(c) + if bs_buf: + result.extend(bs_buf) + if needquote: + result.extend(bs_buf) + result.append('"') + return''.join(result) +class Popen(object): + def __init__(self,args,bufsize=0,executable=None,stdin=None,stdout=None,stderr=None,preexec_fn=None,close_fds=False,shell=False,cwd=None,env=None,universal_newlines=False,startupinfo=None,creationflags=0): + _cleanup() + self._child_created=False + if not isinstance(bufsize,(int,long)): + raise TypeError("bufsize must be an integer") + if mswindows: + if preexec_fn is not None: + raise ValueError("preexec_fn is not supported on Windows platforms") + if close_fds: + raise ValueError("close_fds is not supported on Windows platforms") + else: + if startupinfo is not None: + raise ValueError("startupinfo is only supported on Windows platforms") + if creationflags!=0: + raise ValueError("creationflags is only supported on Windows platforms") + self.stdin=None + self.stdout=None + self.stderr=None + self.pid=None + self.returncode=None + self.universal_newlines=universal_newlines + (p2cread,p2cwrite,c2pread,c2pwrite,errread,errwrite)=self._get_handles(stdin,stdout,stderr) + self._execute_child(args,executable,preexec_fn,close_fds,cwd,env,universal_newlines,startupinfo,creationflags,shell,p2cread,p2cwrite,c2pread,c2pwrite,errread,errwrite) + if mswindows: + if stdin is None and p2cwrite is not None: + os.close(p2cwrite) + p2cwrite=None + if stdout is None and c2pread is not None: + os.close(c2pread) + c2pread=None + if stderr is None and errread is not None: + os.close(errread) + errread=None + if p2cwrite: + self.stdin=os.fdopen(p2cwrite,'wb',bufsize) + if c2pread: + if universal_newlines: + self.stdout=os.fdopen(c2pread,'rU',bufsize) + else: + self.stdout=os.fdopen(c2pread,'rb',bufsize) + if errread: + if universal_newlines: + self.stderr=os.fdopen(errread,'rU',bufsize) + else: + self.stderr=os.fdopen(errread,'rb',bufsize) + def _translate_newlines(self,data): + data=data.replace("\r\n","\n") + data=data.replace("\r","\n") + return data + def __del__(self,sys=sys): + if not self._child_created: + return + self.poll(_deadstate=sys.maxint) + if self.returncode is None and _active is not None: + _active.append(self) + def communicate(self,input=None): + if[self.stdin,self.stdout,self.stderr].count(None)>=2: + stdout=None + stderr=None + if self.stdin: + if input: + self.stdin.write(input) + self.stdin.close() + elif self.stdout: + stdout=self.stdout.read() + elif self.stderr: + stderr=self.stderr.read() + self.wait() + return(stdout,stderr) + return self._communicate(input) + if mswindows: + def _get_handles(self,stdin,stdout,stderr): + if stdin is None and stdout is None and stderr is None: + return(None,None,None,None,None,None) + p2cread,p2cwrite=None,None + c2pread,c2pwrite=None,None + errread,errwrite=None,None + if stdin is None: + p2cread=GetStdHandle(STD_INPUT_HANDLE) + if p2cread is not None: + pass + elif stdin is None or stdin==PIPE: + p2cread,p2cwrite=CreatePipe(None,0) + p2cwrite=p2cwrite.Detach() + p2cwrite=msvcrt.open_osfhandle(p2cwrite,0) + elif isinstance(stdin,int): + p2cread=msvcrt.get_osfhandle(stdin) + else: + p2cread=msvcrt.get_osfhandle(stdin.fileno()) + p2cread=self._make_inheritable(p2cread) + if stdout is None: + c2pwrite=GetStdHandle(STD_OUTPUT_HANDLE) + if c2pwrite is not None: + pass + elif stdout is None or stdout==PIPE: + c2pread,c2pwrite=CreatePipe(None,0) + c2pread=c2pread.Detach() + c2pread=msvcrt.open_osfhandle(c2pread,0) + elif isinstance(stdout,int): + c2pwrite=msvcrt.get_osfhandle(stdout) + else: + c2pwrite=msvcrt.get_osfhandle(stdout.fileno()) + c2pwrite=self._make_inheritable(c2pwrite) + if stderr is None: + errwrite=GetStdHandle(STD_ERROR_HANDLE) + if errwrite is not None: + pass + elif stderr is None or stderr==PIPE: + errread,errwrite=CreatePipe(None,0) + errread=errread.Detach() + errread=msvcrt.open_osfhandle(errread,0) + elif stderr==STDOUT: + errwrite=c2pwrite + elif isinstance(stderr,int): + errwrite=msvcrt.get_osfhandle(stderr) + else: + errwrite=msvcrt.get_osfhandle(stderr.fileno()) + errwrite=self._make_inheritable(errwrite) + return(p2cread,p2cwrite,c2pread,c2pwrite,errread,errwrite) + def _make_inheritable(self,handle): + return DuplicateHandle(GetCurrentProcess(),handle,GetCurrentProcess(),0,1,DUPLICATE_SAME_ACCESS) + def _find_w9xpopen(self): + w9xpopen=os.path.join(os.path.dirname(GetModuleFileName(0)),"w9xpopen.exe") + if not os.path.exists(w9xpopen): + w9xpopen=os.path.join(os.path.dirname(sys.exec_prefix),"w9xpopen.exe") + if not os.path.exists(w9xpopen): + raise RuntimeError("Cannot locate w9xpopen.exe, which is needed for Popen to work with your shell or platform.") + return w9xpopen + def _execute_child(self,args,executable,preexec_fn,close_fds,cwd,env,universal_newlines,startupinfo,creationflags,shell,p2cread,p2cwrite,c2pread,c2pwrite,errread,errwrite): + if not isinstance(args,types.StringTypes): + args=list2cmdline(args) + if startupinfo is None: + startupinfo=STARTUPINFO() + if None not in(p2cread,c2pwrite,errwrite): + startupinfo.dwFlags|=STARTF_USESTDHANDLES + startupinfo.hStdInput=p2cread + startupinfo.hStdOutput=c2pwrite + startupinfo.hStdError=errwrite + if shell: + startupinfo.dwFlags|=STARTF_USESHOWWINDOW + startupinfo.wShowWindow=SW_HIDE + comspec=os.environ.get("COMSPEC","cmd.exe") + args=comspec+" /c "+args + if(GetVersion()>=0x80000000L or os.path.basename(comspec).lower()=="command.com"): + w9xpopen=self._find_w9xpopen() + args='"%s" %s'%(w9xpopen,args) + creationflags|=CREATE_NEW_CONSOLE + try: + hp,ht,pid,tid=CreateProcess(executable,args,None,None,1,creationflags,env,cwd,startupinfo) + except pywintypes.error,e: + raise WindowsError(*e.args) + self._child_created=True + self._handle=hp + self.pid=pid + ht.Close() + if p2cread is not None: + p2cread.Close() + if c2pwrite is not None: + c2pwrite.Close() + if errwrite is not None: + errwrite.Close() + def poll(self,_deadstate=None): + if self.returncode is None: + if WaitForSingleObject(self._handle,0)==WAIT_OBJECT_0: + self.returncode=GetExitCodeProcess(self._handle) + return self.returncode + def wait(self): + if self.returncode is None: + obj=WaitForSingleObject(self._handle,INFINITE) + self.returncode=GetExitCodeProcess(self._handle) + return self.returncode + def _readerthread(self,fh,buffer): + buffer.append(fh.read()) + def _communicate(self,input): + stdout=None + stderr=None + if self.stdout: + stdout=[] + stdout_thread=threading.Thread(target=self._readerthread,args=(self.stdout,stdout)) + stdout_thread.setDaemon(True) + stdout_thread.start() + if self.stderr: + stderr=[] + stderr_thread=threading.Thread(target=self._readerthread,args=(self.stderr,stderr)) + stderr_thread.setDaemon(True) + stderr_thread.start() + if self.stdin: + if input is not None: + self.stdin.write(input) + self.stdin.close() + if self.stdout: + stdout_thread.join() + if self.stderr: + stderr_thread.join() + if stdout is not None: + stdout=stdout[0] + if stderr is not None: + stderr=stderr[0] + if self.universal_newlines and hasattr(file,'newlines'): + if stdout: + stdout=self._translate_newlines(stdout) + if stderr: + stderr=self._translate_newlines(stderr) + self.wait() + return(stdout,stderr) + else: + def _get_handles(self,stdin,stdout,stderr): + p2cread,p2cwrite=None,None + c2pread,c2pwrite=None,None + errread,errwrite=None,None + if stdin is None: + pass + elif stdin==PIPE: + p2cread,p2cwrite=os.pipe() + elif isinstance(stdin,int): + p2cread=stdin + else: + p2cread=stdin.fileno() + if stdout is None: + pass + elif stdout==PIPE: + c2pread,c2pwrite=os.pipe() + elif isinstance(stdout,int): + c2pwrite=stdout + else: + c2pwrite=stdout.fileno() + if stderr is None: + pass + elif stderr==PIPE: + errread,errwrite=os.pipe() + elif stderr==STDOUT: + errwrite=c2pwrite + elif isinstance(stderr,int): + errwrite=stderr + else: + errwrite=stderr.fileno() + return(p2cread,p2cwrite,c2pread,c2pwrite,errread,errwrite) + def _set_cloexec_flag(self,fd): + try: + cloexec_flag=fcntl.FD_CLOEXEC + except AttributeError: + cloexec_flag=1 + old=fcntl.fcntl(fd,fcntl.F_GETFD) + fcntl.fcntl(fd,fcntl.F_SETFD,old|cloexec_flag) + def _close_fds(self,but): + for i in xrange(3,MAXFD): + if i==but: + continue + try: + os.close(i) + except: + pass + def _execute_child(self,args,executable,preexec_fn,close_fds,cwd,env,universal_newlines,startupinfo,creationflags,shell,p2cread,p2cwrite,c2pread,c2pwrite,errread,errwrite): + if isinstance(args,types.StringTypes): + args=[args] + else: + args=list(args) + if shell: + args=["/bin/sh","-c"]+args + if executable is None: + executable=args[0] + errpipe_read,errpipe_write=os.pipe() + self._set_cloexec_flag(errpipe_write) + gc_was_enabled=gc.isenabled() + gc.disable() + try: + self.pid=os.fork() + except: + if gc_was_enabled: + gc.enable() + raise + self._child_created=True + if self.pid==0: + try: + if p2cwrite: + os.close(p2cwrite) + if c2pread: + os.close(c2pread) + if errread: + os.close(errread) + os.close(errpipe_read) + if p2cread: + os.dup2(p2cread,0) + if c2pwrite: + os.dup2(c2pwrite,1) + if errwrite: + os.dup2(errwrite,2) + if p2cread and p2cread not in(0,): + os.close(p2cread) + if c2pwrite and c2pwrite not in(p2cread,1): + os.close(c2pwrite) + if errwrite and errwrite not in(p2cread,c2pwrite,2): + os.close(errwrite) + if close_fds: + self._close_fds(but=errpipe_write) + if cwd is not None: + os.chdir(cwd) + if preexec_fn: + apply(preexec_fn) + if env is None: + os.execvp(executable,args) + else: + os.execvpe(executable,args,env) + except: + exc_type,exc_value,tb=sys.exc_info() + exc_lines=traceback.format_exception(exc_type,exc_value,tb) + exc_value.child_traceback=''.join(exc_lines) + os.write(errpipe_write,pickle.dumps(exc_value)) + os._exit(255) + if gc_was_enabled: + gc.enable() + os.close(errpipe_write) + if p2cread and p2cwrite: + os.close(p2cread) + if c2pwrite and c2pread: + os.close(c2pwrite) + if errwrite and errread: + os.close(errwrite) + data=os.read(errpipe_read,1048576) + os.close(errpipe_read) + if data!="": + os.waitpid(self.pid,0) + child_exception=pickle.loads(data) + raise child_exception + def _handle_exitstatus(self,sts): + if os.WIFSIGNALED(sts): + self.returncode=-os.WTERMSIG(sts) + elif os.WIFEXITED(sts): + self.returncode=os.WEXITSTATUS(sts) + else: + raise RuntimeError("Unknown child exit status!") + def poll(self,_deadstate=None): + if self.returncode is None: + try: + pid,sts=os.waitpid(self.pid,os.WNOHANG) + if pid==self.pid: + self._handle_exitstatus(sts) + except os.error: + if _deadstate is not None: + self.returncode=_deadstate + return self.returncode + def wait(self): + if self.returncode is None: + pid,sts=os.waitpid(self.pid,0) + self._handle_exitstatus(sts) + return self.returncode + def _communicate(self,input): + read_set=[] + write_set=[] + stdout=None + stderr=None + if self.stdin: + self.stdin.flush() + if input: + write_set.append(self.stdin) + else: + self.stdin.close() + if self.stdout: + read_set.append(self.stdout) + stdout=[] + if self.stderr: + read_set.append(self.stderr) + stderr=[] + input_offset=0 + while read_set or write_set: + rlist,wlist,xlist=select.select(read_set,write_set,[]) + if self.stdin in wlist: + bytes_written=os.write(self.stdin.fileno(),buffer(input,input_offset,512)) + input_offset+=bytes_written + if input_offset>=len(input): + self.stdin.close() + write_set.remove(self.stdin) + if self.stdout in rlist: + data=os.read(self.stdout.fileno(),1024) + if data=="": + self.stdout.close() + read_set.remove(self.stdout) + stdout.append(data) + if self.stderr in rlist: + data=os.read(self.stderr.fileno(),1024) + if data=="": + self.stderr.close() + read_set.remove(self.stderr) + stderr.append(data) + if stdout is not None: + stdout=''.join(stdout) + if stderr is not None: + stderr=''.join(stderr) + if self.universal_newlines and hasattr(file,'newlines'): + if stdout: + stdout=self._translate_newlines(stdout) + if stderr: + stderr=self._translate_newlines(stderr) + self.wait() + return(stdout,stderr) + diff --git a/waf-modules/wafadmin/py3kfixes.py b/waf-modules/wafadmin/py3kfixes.py new file mode 100644 index 00000000..b2414c84 --- /dev/null +++ b/waf-modules/wafadmin/py3kfixes.py @@ -0,0 +1,104 @@ +#! /usr/bin/env python +# encoding: utf-8 + +import os +all_modifs={} +def modif(dir,name,fun): + if name=='*': + lst=[] + for y in'. Tools 3rdparty'.split(): + for x in os.listdir(os.path.join(dir,y)): + if x.endswith('.py'): + lst.append(y+os.sep+x) + for x in lst: + modif(dir,x,fun) + return + filename=os.path.join(dir,name) + f=open(filename,'r') + txt=f.read() + f.close() + txt=fun(txt) + f=open(filename,'w') + f.write(txt) + f.close() +def subst(filename): + def do_subst(fun): + global all_modifs + try: + all_modifs[filename]+=fun + except KeyError: + all_modifs[filename]=[fun] + return fun + return do_subst +def r1(code): + code=code.replace("'iluvcuteoverload'","b'iluvcuteoverload'") + code=code.replace("ABI=7","ABI=37") + return code +def r2(code): + code=code.replace("p.stdin.write('\\n')","p.stdin.write(b'\\n')") + code=code.replace('p.communicate()[0]','p.communicate()[0].decode("utf-8")') + return code +def r3(code): + code=code.replace("m.update(str(lst))","m.update(str(lst).encode())") + code=code.replace('p.communicate()[0]','p.communicate()[0].decode("utf-8")') + return code +def r33(code): + code=code.replace('unicode','str') + return code +def r4(code): + code=code.replace("up(self.__class__.__name__)","up(self.__class__.__name__.encode())") + code=code.replace("up(self.env.variant())","up(self.env.variant().encode())") + code=code.replace("up(x.parent.abspath())","up(x.parent.abspath().encode())") + code=code.replace("up(x.name)","up(x.name.encode())") + code=code.replace('class TaskBase(object):\n\t__metaclass__=store_task_type','import binascii\n\nclass TaskBase(object, metaclass=store_task_type):') + code=code.replace('keys=self.cstr_groups.keys()','keys=list(self.cstr_groups.keys())') + code=code.replace("sig.encode('hex')",'binascii.hexlify(sig)') + code=code.replace("os.path.join(Options.cache_global,ssig)","os.path.join(Options.cache_global,ssig.decode())") + return code +def r5(code): + code=code.replace("cPickle.dump(data,file,-1)","cPickle.dump(data,file)") + code=code.replace('for node in src_dir_node.childs.values():','for node in list(src_dir_node.childs.values()):') + return code +def r6(code): + code=code.replace('xrange','range') + code=code.replace('iteritems','items') + code=code.replace('maxint','maxsize') + code=code.replace('iterkeys','keys') + code=code.replace('Error,e:','Error as e:') + code=code.replace('Exception,e:','Exception as e:') + return code +def r7(code): + code=code.replace('class task_gen(object):\n\t__metaclass__=register_obj','class task_gen(object, metaclass=register_obj):') + return code +def r8(code): + code=code.replace('proc.communicate()[0]','proc.communicate()[0].decode("utf-8")') + return code +def r9(code): + code=code.replace('f.write(c)','f.write(c.encode("utf-8"))') + return code +def r10(code): + code=code.replace("key=kw['success']","key=kw['success']\n\t\t\t\ttry:\n\t\t\t\t\tkey=key.decode('utf-8')\n\t\t\t\texcept:\n\t\t\t\t\tpass") + code=code.replace('out=str(out)','out=out.decode("utf-8")') + code=code.replace('err=str(err)','err=err.decode("utf-8")') + return code +def r11(code): + code=code.replace('ret.strip()','ret.strip().decode("utf-8")') + return code +def fixdir(dir): + global all_modifs + for k in all_modifs: + for v in all_modifs[k]: + modif(os.path.join(dir,'wafadmin'),k,v) + +subst('Constants.py')(r1) +subst('Tools/ccroot.py')(r2) +subst('Utils.py')(r3) +subst('ansiterm.py')(r33) +subst('Task.py')(r4) +subst('Build.py')(r5) +subst('*')(r6) +subst('TaskGen.py')(r7) +subst('Tools/python.py')(r8) +subst('Tools/glib2.py')(r9) +subst('Tools/config_c.py')(r10) +subst('Tools/d.py')(r11) diff --git a/waf-unpacked b/waf-unpacked new file mode 100755 index 00000000..568f50a6 --- /dev/null +++ b/waf-unpacked @@ -0,0 +1,159 @@ +#!/usr/bin/env python +# encoding: ISO-8859-1 +# Thomas Nagy, 2005-2010 + +""" +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +3. The name of the author may not be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR +IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, +STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING +IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. +""" + +import os, sys +if sys.hexversion<0x203000f: raise ImportError("Waf requires Python >= 2.3") + +if 'PSYCOWAF' in os.environ: + try:import psyco;psyco.full() + except:pass + +VERSION="1.5.19" +REVISION="d046dea57dbefcabd071866ac51eb518" +INSTALL='' +C1='#*' +C2='#%' +cwd = os.getcwd() +join = os.path.join + +WAF='waf' +def b(x): + return x + +if sys.hexversion>0x300000f: + WAF='waf3' + def b(x): + return x.encode() + +def err(m): + print(('\033[91mError: %s\033[0m' % m)) + sys.exit(1) + +def unpack_wafdir(dir): + f = open(sys.argv[0],'rb') + c = "corrupted waf (%d)" + while 1: + line = f.readline() + if not line: err("run waf-light from a folder containing wafadmin") + if line == b('#==>\n'): + txt = f.readline() + if not txt: err(c % 1) + if f.readline()!=b('#<==\n'): err(c % 2) + break + if not txt: err(c % 3) + txt = txt[1:-1].replace(b(C1), b('\n')).replace(b(C2), b('\r')) + + import shutil, tarfile + try: shutil.rmtree(dir) + except OSError: pass + try: + for x in ['Tools', '3rdparty']: + os.makedirs(join(dir, 'wafadmin', x)) + except OSError: + err("Cannot unpack waf lib into %s\nMove waf into a writeable directory" % dir) + + os.chdir(dir) + tmp = 't.bz2' + t = open(tmp,'wb') + t.write(txt) + t.close() + + t = None + try: + t = tarfile.open(tmp) + except: + try: + os.system('bunzip2 t.bz2') + t = tarfile.open('t') + except: + os.chdir(cwd) + try: shutil.rmtree(dir) + except OSError: pass + err("Waf cannot be unpacked, check that bzip2 support is present") + + for x in t: t.extract(x) + t.close() + + for x in ['Tools', '3rdparty']: + os.chmod(join('wafadmin',x), 493) + + if sys.hexversion>0x300000f: + sys.path = [join(dir, 'wafadmin')] + sys.path + import py3kfixes + py3kfixes.fixdir(dir) + + os.chdir(cwd) + +def test(dir): + try: os.stat(join(dir, 'wafadmin')); return os.path.abspath(dir) + except OSError: pass + +def find_lib(): + name = sys.argv[0] + base = os.path.dirname(os.path.abspath(name)) + + #devs use $WAFDIR + w=test(os.environ.get('WAFDIR', '')) + if w: return w + + #waf-light + if name.endswith('waf-light'): + w = test(base) + if w: return w + err("waf-light requires wafadmin -> export WAFDIR=/folder") + + dir = "/lib/%s-%s-%s/" % (WAF, VERSION, REVISION) + for i in [INSTALL,'/usr','/usr/local','/opt']: + w = test(i+dir) + if w: return w + + #waf-local + s = '.%s-%s-%s' + if sys.platform == 'win32': s = s[1:] + dir = join(base, s % (WAF, VERSION, REVISION)) + w = test(dir) + if w: return w + + #unpack + unpack_wafdir(dir) + return dir + +wafdir = find_lib() +w = join(wafdir, 'wafadmin') +t = join(w, 'Tools') +f = join(w, '3rdparty') +sys.path = [w, t, f] + sys.path + +if __name__ == '__main__': + import Scripting + Scripting.prepare(t, cwd, VERSION, wafdir) + diff --git a/win32/makedist/makedist.midori b/win32/makedist/makedist.midori index 478dd51f..d842a85e 100755 --- a/win32/makedist/makedist.midori +++ b/win32/makedist/makedist.midori @@ -1,7 +1,6 @@ #! /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 @@ -24,39 +23,17 @@ # 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` -grep -q gtk-3.0 _build/config.log && GTK3_BUILD=1 -version=`grep PACKAGE_VERSION _build/default/config.h | awk '{ print $3 $4; }' | sed 's@(debug)@-debug@g'|sed 's@"@@g'` - -if [ "$1" != "" ]; then - if [ "$1" == "debug" ]; then - DEBUG_BUILD=1 - shift - fi - version_tag="$1" -fi - -if [ $version_tag != "" ]; then - version_tag=$version_tag-$version -else - version_tag=$version -fi - # generate unique filename if [ "$have_7zip" != "" ]; then - ARCHIVE=midori-$version_tag-`date +%Y%m%d%H%M`.7z + ARCHIVE=midori$1-`date +%Y%m%d%H%M`.7z else - ARCHIVE=midori-$version_tag-`date +%Y%m%d%H%M`.zip + ARCHIVE=midori$1-`date +%Y%m%d%H%M`.zip fi # function: dll-recursive @@ -78,7 +55,7 @@ dll_recursive () 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 + cp $temp_file_new $temp_file_old strings $files 2> /dev/null | grep \\.dll | cat - $temp_file_old | sort | uniq > $temp_file_new done @@ -87,37 +64,16 @@ dll_recursive () 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 +mkdir $temp_dir/midori$1 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 @@ -126,147 +82,57 @@ echo -n . # copy auto generate dll list pushd $root_dir/bin > /dev/null -mkdir $workdir/bin -cp -L $files $workdir/bin +mkdir $temp_dir/midori$1/bin +cp $files $temp_dir/midori$1/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 - -# We need to ship our CA bundle for now -cp /etc/pki/tls/certs/ca-bundle.crt $workdir/share/midori/res/ +pushd $root_dir > /dev/null +find etc "(" -name "*midori*" -o -name "gtkrc" ")" -prune -exec mkdir -p $temp_dir/midori$1/{} ";" -exec rmdir --ignore-fail-on-non-empty $temp_dir/midori$1/{} ";" -exec cp -r {} $temp_dir/midori$1/{} ";" +popd > /dev/null echo -n . # copy lib -if [ "$GTK3_BUILD" == "1" ]; then - grab_files lib gtk-3.0 -else - grab_files lib gtk-2.0 -fi - -grab_files lib midori -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 +pushd $root_dir > /dev/null +find lib "(" -path "lib/midori/*" -o -path "lib/gtk-2.0/*" -o -path "lib/enchant/*" -o -path "lib/engines/*" ")" -a -name "*.dll" -prune -exec mkdir -p $temp_dir/midori$1/{} ";" -exec rmdir --ignore-fail-on-non-empty $temp_dir/midori$1/{} ";" -exec cp -r {} $temp_dir/midori$1/{} ";" +popd > /dev/null echo -n . # copy share -grab_files share midori -grab_files share icons -grab_files share mime -grab_files share midori.mo - -if [ "$GTK3_BUILD" == "1" ]; then - grab_files share webkitgtk-3.0 - grab_files share schemas - MO_VER=30 -else - grab_files share MS-Windows - grab_files share webkitgtk-1.0 - MO_VER=20 -fi - -if [ "$DEBUG_BUILD" == "" ];then - pushd $workdir > /dev/null - find -iname *.debug -exec rm {} \; - popd > /dev/null -else - #add some gdb helper scripts - cat > $workdir/bin/backtrace.gdb << _EOF -set logging on debug.log -run -thread apply all bt -quit -_EOF - -echo 'gdb.exe --command=backtrace.gdb midori.exe' > $workdir/bin/debug.bat - -fi +pushd $root_dir > /dev/null +find share "(" -name "*midori*" -o -name "icons" -o -name "MS-Windows" -o -name "mime" ")" -prune -exec mkdir -p $temp_dir/midori$1/{} ";" -exec rmdir --ignore-fail-on-non-empty $temp_dir/midori$1/{} ";" -exec cp -r {} $temp_dir/midori$1/{} ";" # 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 +find share "(" -name "midori.mo" ")" > locale.list +mkdir -p $temp_dir/midori$1/share/locale/ +for LOCALE in $(cat locale.list); do LOCALE=$(echo $LOCALE|awk -F/ '{print $3}') - cp /usr/share/locale/$LOCALE/LC_MESSAGES/gtk$MO_VER.mo $workdir/share/locale/$LOCALE/LC_MESSAGES/ + cp /usr/share/locale/$LOCALE/LC_MESSAGES/gtk20.mo $temp_dir/midori$1/share/locale/$LOCALE/LC_MESSAGES/ done -rm $temp_dir/locale.list - -# we want to override default gtk settings -if [ "$GTK3_BUILD" == "1" ]; then - gtk_etc_dir="$workdir/etc/gtk-3.0/" - gtk_rc_file="$gtk_etc_dir/settings.ini" -else - gtk_etc_dir="$workdir/etc/gtk-2.0/" - gtk_rc_file="$gtk_etc_dir/gtkrc" -fi - -mkdir -p $gtk_etc_dir -rm $gtk_rc_file - - -# Use small icons by default and Tango theme -if [ "$GTK3_BUILD" == "1" ]; then - - cat > $gtk_rc_file << _EOF -[Settings] -gtk-icon-theme-name = Faenza -_EOF - -else - cat > $gtk_rc_file << _EOF -gtk-theme-name = "MS-Windows" -gtk-icon-theme-name = "Faenza" -_EOF - -fi - -cat >> $gtk_rc_file << _EOF -gtk-toolbar-style = GTK_TOOLBAR_ICONS -gtk-toolbar-icon-size = GTK_ICON_SIZE_MENU -_EOF - +rm locale.list popd > /dev/null echo -n . # copy doc files to root -cp -L $workdir/share/doc/midori/{COPYING,AUTHORS} $workdir +cp $temp_dir/midori$1/share/doc/midori/{COPYING,AUTHORS} $temp_dir/midori$1 echo -n . -#drop a/la files, we don't do static builds anyway -find $workdir -iname *.*a -exec rm {} \; - 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 + 7za a -m0=lzma -mx=9 $ARCHIVE midori$1 else - zip -rq $ARCHIVE midori-$version_tag + zip -rq $ARCHIVE midori$1 fi popd > /dev/null diff --git a/win32/makedist/midori-0.3.3.nsi b/win32/makedist/midori-0.3.3.nsi index aabed201..cb19b2b2 100644 --- a/win32/makedist/midori-0.3.3.nsi +++ b/win32/makedist/midori-0.3.3.nsi @@ -25,14 +25,13 @@ RequestExecutionLevel user ; set execution level for Windows Vista !define PRODUCT_BUILD "0" !define PRODUCT_VERSION_ID "${PRODUCT_VERSION}.${PRODUCT_BUILD}" !define PRODUCT_PUBLISHER "Christian Dywan" -!define PRODUCT_WEB_SITE "http://www.midori-browser.org" +!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}" -!define ICON_THEME "Faenza" ;;;;;;;;;;;;;;;;;;;;; ; Version resource ; @@ -41,7 +40,7 @@ VIProductVersion "${PRODUCT_VERSION_ID}" VIAddVersionKey "ProductName" "${PRODUCT_NAME}" VIAddVersionKey "FileVersion" "${PRODUCT_VERSION}" VIAddVersionKey "ProductVersion" "${PRODUCT_VERSION}" -VIAddVersionKey "LegalCopyright" "Copyright 2009-2012 by Christian Dywan" +VIAddVersionKey "LegalCopyright" "Copyright 2009 by Christian Dywan" VIAddVersionKey "FileDescription" "${PRODUCT_NAME} Installer" BrandingText "$(^NAME) installer (NSIS ${NSIS_VERSION})" @@ -123,10 +122,10 @@ Section "!Program Files" SEC01 File /r /x "midori" "${RESOURCEDIR}\lib\*" SetOutPath "$INSTDIR\share" - File /r /x "locale" /x "user" /x "${ICON_THEME}" "${RESOURCEDIR}\share\*" + File /r /x "locale" /x "user" /x "Tango" "${RESOURCEDIR}\share\*" - SetOutPath "$INSTDIR\share\icons\${ICON_THEME}" - File "${RESOURCEDIR}\share\icons\${ICON_THEME}\index.theme" + SetOutPath "$INSTDIR\share\icons\Tango" + File "${RESOURCEDIR}\share\icons\Tango\index.theme" SetOutPath "$INSTDIR" CreateShortCut "$INSTDIR\Midori.lnk" "${PRODUCT_EXE}" @@ -135,132 +134,6 @@ Section "!Program Files" SEC01 CreateDirectory "$SMPROGRAMS\$StartmenuFolder" CreateShortCut "$SMPROGRAMS\$StartmenuFolder\Midori.lnk" "${PRODUCT_EXE}" !insertmacro MUI_STARTMENU_WRITE_END - -!macro InstallIconThemeRenameSmall OPath IPath - File "/oname=16x16\${OPath}.png" "${RESOURCEDIR}\share\icons\${ICON_THEME}\16x16\${IPath}.png" - File "/oname=22x22\${OPath}.png" "${RESOURCEDIR}\share\icons\${ICON_THEME}\22x22\${IPath}.png" - File "/oname=24x24\${OPath}.png" "${RESOURCEDIR}\share\icons\${ICON_THEME}\24x24\${IPath}.png" - File "/oname=32x32\${OPath}.png" "${RESOURCEDIR}\share\icons\${ICON_THEME}\32x32\${IPath}.png" -!macroend - -!macro InstallIconThemeRename OPath IPath - !insertmacro InstallIconThemeRenameSmall ${OPath} ${IPath} - File "/oname=48x48\${OPath}.png" "${RESOURCEDIR}\share\icons\${ICON_THEME}\48x48\${IPath}.png" - File "/oname=scalable\${OPath}.svg" "${RESOURCEDIR}\share\icons\${ICON_THEME}\scalable\${IPath}.svg" -!macroend - -!macro InstallIconThemeSmall IconPath - !insertmacro InstallIconThemeRenameSmall ${IconPath} ${IconPath} -!macroend - -!macro InstallIconTheme IconPath - !insertmacro InstallIconThemeRename ${IconPath} ${IconPath} -!macroend - -!macro CreateIconThemeSectionsSmall SectionPath - CreateDirectory "$INSTDIR\share\icons\${ICON_THEME}\16x16\${SectionPath}" - CreateDirectory "$INSTDIR\share\icons\${ICON_THEME}\22x22\${SectionPath}" - CreateDirectory "$INSTDIR\share\icons\${ICON_THEME}\24x24\${SectionPath}" - CreateDirectory "$INSTDIR\share\icons\${ICON_THEME}\32x32\${SectionPath}" -!macroend - -!macro CreateIconThemeSections SectionPath - !insertmacro CreateIconThemeSectionsSmall ${SectionPath} - CreateDirectory "$INSTDIR\share\icons\${ICON_THEME}\48x48\${SectionPath}" - CreateDirectory "$INSTDIR\share\icons\${ICON_THEME}\scalable\${SectionPath}" -!macroend - - SetOutPath "$INSTDIR\share\icons\${ICON_THEME}" - - !insertmacro CreateIconThemeSections "actions" - #!insertmacro CreateIconThemeSectionsSmall "animations" - !insertmacro CreateIconThemeSections "apps" - !insertmacro CreateIconThemeSections "categories" - !insertmacro CreateIconThemeSections "devices" - !insertmacro CreateIconThemeSections "mimetypes" - !insertmacro CreateIconThemeSections "places" - !insertmacro CreateIconThemeSections "status" - - !insertmacro InstallIconTheme "actions\bookmark-new" - !insertmacro InstallIconTheme "actions\document-open" - !insertmacro InstallIconTheme "actions\document-open-recent" - !insertmacro InstallIconTheme "actions\document-print" - !insertmacro InstallIconTheme "actions\document-properties" - !insertmacro InstallIconTheme "actions\document-save-as" - !insertmacro InstallIconTheme "actions\document-save" - !insertmacro InstallIconTheme "actions\edit-clear" - !insertmacro InstallIconTheme "actions\edit-copy" - !insertmacro InstallIconTheme "actions\edit-cut" - !insertmacro InstallIconTheme "actions\edit-delete" - !insertmacro InstallIconTheme "actions\edit-find" - !insertmacro InstallIconTheme "actions\edit-paste" - !insertmacro InstallIconTheme "actions\edit-redo" - !insertmacro InstallIconTheme "actions\edit-select-all" - !insertmacro InstallIconTheme "actions\edit-undo" - !insertmacro InstallIconTheme "actions\folder-new" - !insertmacro InstallIconTheme "actions\format-indent-more" - !insertmacro InstallIconTheme "actions\go-home" - !insertmacro InstallIconTheme "actions\go-jump" - !insertmacro InstallIconTheme "actions\go-next" - !insertmacro InstallIconTheme "actions\go-previous" - !insertmacro InstallIconTheme "actions\gtk-cancel" - !insertmacro InstallIconTheme "actions\gtk-edit" - !insertmacro InstallIconTheme "actions\gtk-no" - !insertmacro InstallIconTheme "actions\gtk-ok" - !insertmacro InstallIconTheme "actions\gtk-save" - !insertmacro InstallIconTheme "actions\help-about" - !insertmacro InstallIconTheme "actions\help-contents" - !insertmacro InstallIconTheme "actions\list-add" - !insertmacro InstallIconTheme "actions\list-remove" - !insertmacro InstallIconTheme "actions\media-skip-backward" - !insertmacro InstallIconTheme "actions\media-skip-forward" - !insertmacro InstallIconTheme "actions\process-stop" - !insertmacro InstallIconTheme "actions\stop" - !insertmacro InstallIconTheme "actions\tab-new" - !insertmacro InstallIconTheme "actions\tools-check-spelling" - !insertmacro InstallIconTheme "actions\view-fullscreen" - !insertmacro InstallIconTheme "actions\view-refresh" - !insertmacro InstallIconTheme "actions\window-close" - !insertmacro InstallIconTheme "actions\window-new" - !insertmacro InstallIconTheme "actions\zoom-in" - !insertmacro InstallIconTheme "actions\zoom-out" - - #!insertmacro InstallIconThemeSmall "animations\process-working" - - !insertmacro InstallIconTheme "apps\internet-news-reader" - !insertmacro InstallIconTheme "apps\midori" - !insertmacro InstallIconTheme "apps\preferences-desktop-theme" - !insertmacro InstallIconTheme "apps\web-browser" - - !insertmacro InstallIconTheme "categories\gtk-preferences" - - !insertmacro InstallIconTheme "devices\drive-harddisk" - !insertmacro InstallIconTheme "devices\media-optical-dvd-rom" - - !insertmacro InstallIconTheme "mimetypes\application-x-shockwave-flash" - !insertmacro InstallIconTheme "mimetypes\extension" - !insertmacro InstallIconTheme "mimetypes\gtk-file" - !insertmacro InstallIconTheme "mimetypes\image-x-generic" - !insertmacro InstallIconTheme "mimetypes\package" - !insertmacro InstallIconTheme "mimetypes\text-html" - !insertmacro InstallIconTheme "mimetypes\text-x-generic" - !insertmacro InstallIconTheme "mimetypes\text-x-javascript" - - !insertmacro InstallIconTheme "places\folder-documents" - !insertmacro InstallIconTheme "places\folder-downloads" - !insertmacro InstallIconTheme "places\folder-music" - !insertmacro InstallIconTheme "places\folder-pictures" - !insertmacro InstallIconTheme "places\folder" - !insertmacro InstallIconTheme "places\folder-videos" - !insertmacro InstallIconTheme "places\inode-directory" - !insertmacro InstallIconTheme "places\user-bookmarks" - !insertmacro InstallIconTheme "places\user-desktop" - !insertmacro InstallIconTheme "places\user-home" - !insertmacro InstallIconTheme "places\user-trash" - - !insertmacro InstallIconTheme "status\dialog-password" - #!insertmacro InstallIconTheme "status\locked" - SectionEnd Section "Extensions" SEC04 @@ -276,6 +149,166 @@ Section "Language Files" SEC02 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 @@ -374,6 +407,8 @@ SectionEnd !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 ;;;;;;;;;;;;;;;;;;;;; diff --git a/win32/x86-mingw32-opensuse/install.sh b/win32/x86-mingw32-opensuse/install.sh index e9993311..fae61618 100755 --- a/win32/x86-mingw32-opensuse/install.sh +++ b/win32/x86-mingw32-opensuse/install.sh @@ -43,7 +43,7 @@ gunzip -N $DOWNLOAD_PATH/other.xml rm packages.version touch packages.version -# download all packages +# downlaod 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` diff --git a/wscript b/wscript index 0699b740..a3e2b9ee 100644 --- a/wscript +++ b/wscript @@ -29,7 +29,7 @@ from Configure import find_program_impl major = 0 minor = 4 -micro = 7 +micro = 3 APPNAME = 'midori' VERSION = VERSION_FULL = str (major) + '.' + str (minor) + '.' + str (micro) @@ -45,7 +45,7 @@ except: pass srcdir = '.' -blddir = '_build' # recognized by ack +blddir = '_build_' def option_enabled (option): if getattr (Options.options, 'enable_' + option): @@ -62,9 +62,6 @@ def is_mingw (env): 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') @@ -92,23 +89,9 @@ def configure (conf): 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 ('.', 2) - if '.' in given_micro: - given_micro, given_pico = given_micro.split ('.', 1) - 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') conf.check_tool ('vala') conf.check_tool ('glib2') - 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') @@ -126,7 +109,7 @@ def configure (conf): else: icons = 'no ' - if is_win32 (conf.env): + if is_mingw (conf.env) or Options.platform == 'win32': conf.find_program ('windres', var='WINRC') conf.env['platform'] = 'win32' @@ -183,12 +166,14 @@ def configure (conf): atleast_version=version, mandatory=mandatory) return conf.env['HAVE_' + var] - if option_enabled ('gtk3'): - gcr_pkg = 'gcr-3' - else: - gcr_pkg = 'gcr-3-gtk2' - check_pkg (gcr_pkg, '2.32', mandatory=False) - conf.define ('GCR_VERSION', ['No',conf.check_cfg(modversion=gcr_pkg)][conf.env['HAVE_GCR'] == 1]) + 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 if option_enabled ('unique'): if option_enabled('gtk3'): unique_pkg = 'unique-3.0' @@ -218,26 +203,6 @@ def configure (conf): 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') - - check_pkg ('zeitgeist-1.0', '0.3.14', mandatory=False) conf.check (lib='m', mandatory=True) check_pkg ('gmodule-2.0', '2.8.0', False) check_pkg ('gthread-2.0', '2.8.0', False) @@ -245,7 +210,6 @@ def configure (conf): args = '' if Options.platform == 'win32': args = '--define-variable=target=win32' - conf.env.append_value ('VALAFLAGS', '-D HAVE_WIN32') elif sys.platform != 'darwin': check_pkg ('x11') # Pass /usr/X11R6/include for OpenBSD @@ -253,6 +217,12 @@ def configure (conf): includes='/usr/X11R6/include', mandatory=False) conf.check (lib='Xss', libpath='/usr/X11R6/lib', mandatory=False) if option_enabled ('gtk3'): + if option_enabled ('addons') and not check_version (conf.env['VALAC_VERSION'], 0, 13, 2): + Utils.pprint ('RED', 'Vala 0.13.2 or later is required ' \ + 'to build with GTK+ 3 and extensions.\n' \ + 'Pass --disable-addons to build without extensions.\n' \ + 'Pass --disable-gtk3 to build with extensions and GTK+ 2.') + sys.exit (1) 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']: @@ -262,29 +232,21 @@ def configure (conf): 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') - conf.env.append_value ('VALAFLAGS', '-D HAVE_OFFSCREEN') else: - check_pkg ('gtk+-2.0', '2.16.0', var='GTK') + 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) - if check_version (conf.check_cfg (modversion='gtk+-2.0'), 2, 20, 0): - conf.env.append_value ('VALAFLAGS', '-D HAVE_OFFSCREEN') conf.env['HAVE_GTK3'] = option_enabled ('gtk3') check_pkg ('libsoup-2.4', '2.27.90') + conf.define ('HAVE_LIBSOUP_2_25_2', 1) + conf.define ('HAVE_LIBSOUP_2_27_90', 1) + 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') + check_pkg ('libsoup-2.4', '2.37.1', False, var='LIBSOUP_2_37_1') 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, 34, 0): - conf.define ('HAVE_LIBSOUP_2_34_0', 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.6.19', True, var='SQLITE') + check_pkg ('sqlite3', '3.0', True, var='SQLITE') if option_enabled ('hildon'): if check_pkg ('hildon-1', mandatory=False, var='HILDON'): @@ -309,6 +271,8 @@ def configure (conf): 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') @@ -390,14 +354,6 @@ def configure (conf): 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.') - sys.exit (1) - if check_version (conf.env['LIBSOUP_VERSION'], 2, 33, 4) \ - and check_version (conf.check_cfg (modversion='gio-2.0'), 2, 32, 1) \ - and not check_version (conf.check_cfg (modversion='gio-2.0'), 2, 32, 3): - Utils.pprint ('RED', 'libsoup >= 2.33.4 found with glib >= 2.32.1 < 2.32.3:') - Utils.pprint ('RED', 'This combination breaks the download GUI.') - Utils.pprint ('RED', 'See https://bugs.launchpad.net/midori/+bug/780133/comments/14') - sys.exit (1) def set_options (opt): def is_maemo (): return os.path.exists ('/etc/osso-af-init/') @@ -435,9 +391,8 @@ def set_options (opt): add_enable_option ('apidocs', 'API documentation', group, disable=True) group = opt.add_option_group ('Optional features', '') - add_enable_option ('unique', 'single instance support', group, disable=is_win32 (os.environ)) + add_enable_option ('unique', 'single instance support', group) 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 ()) @@ -497,7 +452,7 @@ def build (bld): bld.install_files ('${DOCDIR}/api/', blddir + '/docs/api/*') for desktop in [APPNAME + '.desktop', APPNAME + '-private.desktop']: - if is_win32 (bld.env): + if is_mingw (bld.env) or Options.platform == 'win32': break if bld.env['HAVE_HILDON']: appdir = '${MDATADIR}/applications/hildon' @@ -542,8 +497,11 @@ def build (bld): else: Utils.pprint ('BLUE', "logo-shade could not be rasterized.") - for res_file in ['about.css', 'error.html', 'close.png', 'gtk3.css', 'speeddial-head.html']: + for res_file in ['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') @@ -629,6 +587,7 @@ def shutdown (): except: pass try: + ext = 'MIDORI_EXTENSION_PATH=' + relfolder + os.sep + 'extensions' nls = 'MIDORI_NLSPATH=' + relfolder + os.sep + 'po' lang = os.environ['LANG'] try: @@ -645,7 +604,7 @@ def shutdown (): 'LC_MESSAGES' + os.sep + APPNAME + '.mo') except: pass - command = nls + ' ' + command = ext + ' ' + nls + ' ' if is_mingw (Build.bld.env): # This works only if everything is installed to that prefix os.chdir (Build.bld.env['PREFIX'] + os.sep + 'bin') -- 2.39.5